Merge pull request #297 from takenet/release/0.3.4

Release/0.3.4
takenet · Feb 5, 2025 · 500fda2 · 500fda2
2 parents cf66419 + 963b042
commit 500fda2
Show file tree

Hide file tree

Showing 31 changed files with 247 additions and 94 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.3.4
+
+- Added support to dark mode.
+
 ## 0.3.3
 
 - [DSTabBar] Added new widget based on Material TabBar.

diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1,3 @@
+description: This file stores settings for Dart & Flutter DevTools.
+documentation: https://docs.flutter.dev/tools/devtools/extensions#configure-extension-enablement-states
+extensions:
diff --git a/lib/blip_ds.dart b/lib/blip_ds.dart
@@ -64,6 +64,7 @@ export 'src/services/ds_file.service.dart' show DSFileService;
 export 'src/services/ds_localization.service.dart' show DSLocalizationService;
 export 'src/services/ds_media_format.service.dart' show DSMediaFormatService;
 export 'src/services/ds_security.service.dart' show DSSecurityService;
+export 'src/services/ds_theme.service.dart' show DSThemeService;
 export 'src/services/ds_toast.service.dart' show DSToastService;
 export 'src/themes/colors/ds_colors.theme.dart' show DSColors;
 export 'src/themes/colors/ds_dark_colors.theme.dart' show DSDarkColors;

diff --git a/lib/src/models/ds_media_link.model.dart b/lib/src/models/ds_media_link.model.dart
@@ -21,11 +21,18 @@ class DSMediaLink {
 
   DSMediaLink.fromJson(Map<String, dynamic> json)
       : uri = json['uri'],
-        type = json['type'],
+        type = _formatMimeType(
+          type: json['type'],
+        ),
         title = json['title'],
         text = json['text'],
         aspectRatio = json['aspectRatio'],
         size = json['size'],
         authorizationRealm = json['authorizationRealm'],
         previewUri = json['previewUri'];
+
+  static String _formatMimeType({
+    required final String? type,
+  }) =>
+      type?.toLowerCase().replaceFirst('sticker/', 'image/') ?? '';
 }
diff --git a/lib/src/services/ds_bottom_sheet.service.dart b/lib/src/services/ds_bottom_sheet.service.dart
@@ -1,19 +1,23 @@
 import 'package:flutter/material.dart';
+import 'package:get/get.dart';
 
 import '../themes/colors/ds_colors.theme.dart';
+import '../themes/colors/ds_dark_colors.theme.dart';
 
 class DSBottomSheetService {
   final BuildContext context;
   final Widget Function(ScrollController?) builder;
   final Widget? fixedHeader;
   final bool hasBottomInsets;
+  final RxBool darkMode;
 
   DSBottomSheetService({
     required this.context,
     required this.builder,
     this.hasBottomInsets = true,
     this.fixedHeader,
-  });
+    RxBool? darkMode,
+  }) : darkMode = darkMode ?? RxBool(false);
 
   Widget _buildBottomSheet({
     ScrollController? controller,
@@ -24,37 +28,39 @@ class DSBottomSheetService {
     return GestureDetector(
       onTap: () => FocusManager.instance.primaryFocus?.unfocus(),
       behavior: HitTestBehavior.translucent,
-      child: Container(
-        padding: hasBottomInsets
-            ? EdgeInsets.only(
-                bottom: MediaQuery.of(context).viewInsets.bottom,
-              )
-            : null,
-        margin: EdgeInsets.only(
-          top: MediaQueryData.fromView(window).padding.top + 10,
-        ),
-        decoration: _border(),
-        child: Column(
-          mainAxisSize: MainAxisSize.min,
-          children: [
-            Visibility(
-              visible: !hideGrabber,
-              replacement: Container(
-                decoration: _border(),
+      child: Obx(
+        () => Container(
+          padding: hasBottomInsets
+              ? EdgeInsets.only(
+                  bottom: MediaQuery.of(context).viewInsets.bottom,
+                )
+              : null,
+          margin: EdgeInsets.only(
+            top: MediaQueryData.fromView(window).padding.top + 10,
+          ),
+          decoration: _border(),
+          child: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              Visibility(
+                visible: !hideGrabber,
+                replacement: Container(
+                  decoration: _border(),
+                ),
+                child: _grabber(),
               ),
-              child: _grabber(),
-            ),
-            fixedHeader ?? const SizedBox.shrink(),
-            _buildChild(controller),
-          ],
+              fixedHeader ?? const SizedBox.shrink(),
+              _buildChild(controller),
+            ],
+          ),
         ),
       ),
     );
   }
 
   BoxDecoration _border() {
-    return const BoxDecoration(
-      color: DSColors.neutralLightSnow,
+    return BoxDecoration(
+      color: darkMode.value ? DSDarkColors.surface3 : DSColors.neutralLightSnow,
       borderRadius: BorderRadius.only(
         topLeft: Radius.circular(22.0),
         topRight: Radius.circular(22.0),
@@ -73,8 +79,10 @@ class DSBottomSheetService {
           Container(
             height: 4.0,
             width: 32.0,
-            decoration: const BoxDecoration(
-              color: DSColors.neutralMediumWave,
+            decoration: BoxDecoration(
+              color: darkMode.value
+                  ? DSColors.neutralLightSnow
+                  : DSColors.neutralMediumWave,
               borderRadius: BorderRadius.all(
                 Radius.circular(15.0),
               ),

diff --git a/lib/src/services/ds_dialog.service.dart b/lib/src/services/ds_dialog.service.dart
@@ -3,11 +3,13 @@ import 'package:flutter/services.dart';
 
 import '../enums/ds_dialog_type.enum.dart';
 import '../themes/colors/ds_colors.theme.dart';
+import '../themes/colors/ds_dark_colors.theme.dart';
 import '../themes/icons/ds_icons.dart';
 import '../themes/system_overlay/ds_system_overlay.style.dart';
 import '../widgets/texts/ds_body_text.widget.dart';
 import '../widgets/texts/ds_headline_small_text.widget.dart';
 import 'ds_context.service.dart';
+import 'ds_theme.service.dart';
 
 /// A Design System's [Dialog] used to display a dialog box.
 class DSDialogService {
@@ -77,7 +79,9 @@ class DSDialogService {
           child: Container(
             constraints: const BoxConstraints(maxWidth: 400.0),
             decoration: BoxDecoration(
-              color: DSColors.neutralLightSnow,
+              color: DSThemeService.isDarkMode()
+                  ? DSDarkColors.surface3
+                  : DSColors.neutralLightSnow,
               borderRadius: const BorderRadius.all(Radius.circular(15.0)),
               boxShadow: [
                 BoxShadow(
@@ -151,6 +155,7 @@ class DSDialogService {
                 child: DSHeadlineSmallText(
                   title,
                   overflow: TextOverflow.visible,
+                  color: DSColors.neutralDarkCity,
                 ),
               ),
             ),
@@ -166,6 +171,7 @@ class DSDialogService {
       child: DSBodyText(
         text,
         overflow: TextOverflow.clip,
+        color: DSThemeService.foregoundColor,
       ),
     );
   }

diff --git a/lib/src/services/ds_theme.service.dart b/lib/src/services/ds_theme.service.dart
@@ -0,0 +1,15 @@
+import 'package:flutter/material.dart';
+
+import '../themes/colors/ds_colors.theme.dart';
+
+abstract class DSThemeService {
+  static ThemeMode _themeMode = ThemeMode.light;
+
+  static setThemeMode(final ThemeMode themeMode) => _themeMode = themeMode;
+
+  static isDarkMode() => _themeMode == ThemeMode.dark;
+
+  static Color get foregoundColor => _themeMode == ThemeMode.dark
+      ? DSColors.neutralLightSnow
+      : DSColors.neutralDarkCity;
+}
diff --git a/lib/src/widgets/buttons/audio/ds_audio_icon_button.widget.dart b/lib/src/widgets/buttons/audio/ds_audio_icon_button.widget.dart
@@ -10,12 +10,13 @@ class DSAudioIconButton extends DSTertiaryButton {
     super.key,
     super.onPressed,
     super.isLoading,
+    Color? iconColor,
   }) : super(
           leadingIcon: SvgPicture.asset(
             'assets/images/microphone.svg',
             package: DSUtils.packageName,
-            colorFilter: const ColorFilter.mode(
-              DSColors.neutralDarkRooftop,
+            colorFilter: ColorFilter.mode(
+              iconColor ?? DSColors.neutralDarkRooftop,
               BlendMode.srcIn,
             ),
             height: 24.0,

diff --git a/lib/src/widgets/buttons/audio/ds_audio_resume_button.widget.dart b/lib/src/widgets/buttons/audio/ds_audio_resume_button.widget.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/painting.dart';
 import 'package:flutter_svg/svg.dart';
 
+import '../../../services/ds_theme.service.dart';
 import '../../../themes/colors/ds_colors.theme.dart';
 import '../../../utils/ds_utils.util.dart';
 import '../ds_tertiary_button.widget.dart';
@@ -14,8 +15,10 @@ class DSAudioResumeButton extends DSTertiaryButton {
           leadingIcon: SvgPicture.asset(
             'assets/images/microphone.svg',
             package: DSUtils.packageName,
-            colorFilter: const ColorFilter.mode(
-              DSColors.neutralDarkRooftop,
+            colorFilter: ColorFilter.mode(
+              DSThemeService.isDarkMode()
+                  ? DSColors.neutralLightSnow
+                  : DSColors.neutralDarkRooftop,
               BlendMode.srcIn,
             ),
             height: 24.0,

diff --git a/lib/src/widgets/buttons/ds_attachment_button.widget.dart b/lib/src/widgets/buttons/ds_attachment_button.widget.dart
@@ -9,10 +9,11 @@ class DSAttachmentButton extends DSIconButton {
     super.key,
     required super.onPressed,
     super.isLoading,
+    Color? iconColor,
   }) : super(
-          icon: const Icon(
+          icon: Icon(
             DSIcons.attach_outline,
-            color: DSColors.neutralDarkRooftop,
+            color: iconColor ?? DSColors.neutralDarkRooftop,
           ),
         );
 }
diff --git a/lib/src/widgets/buttons/ds_custom_replies_icon_button.widget.dart b/lib/src/widgets/buttons/ds_custom_replies_icon_button.widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+import '../../services/ds_theme.service.dart';
 import '../../themes/colors/ds_colors.theme.dart';
 import '../../themes/icons/ds_icons.dart';
 import 'ds_icon_button.widget.dart';
@@ -22,9 +23,11 @@ class DSCustomRepliesIconButton extends StatelessWidget {
         child: DSIconButton(
           isLoading: isLoading,
           onPressed: onPressed,
-          icon: const Icon(
+          icon: Icon(
             DSIcons.message_talk_outline,
-            color: DSColors.neutralDarkRooftop,
+            color: DSThemeService.isDarkMode()
+                ? DSColors.neutralLightSnow
+                : DSColors.neutralDarkRooftop,
           ),
         ),
       );

diff --git a/lib/src/widgets/buttons/ds_secondary_button.widget.dart b/lib/src/widgets/buttons/ds_secondary_button.widget.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
+import '../../services/ds_theme.service.dart';
 import '../../themes/colors/ds_colors.theme.dart';
+import '../../themes/colors/ds_dark_colors.theme.dart';
 import 'ds_button.widget.dart';
 
 /// A Design System's [ButtonStyleButton] primarily used by secondary actions.
@@ -23,10 +25,15 @@ class DSSecondaryButton extends DSButton {
     Color? foregroundColor,
     Color? borderColor,
   }) : super(
-          backgroundColor: backgroundColor ?? DSColors.neutralLightSnow,
+          backgroundColor: backgroundColor ??
+              (DSThemeService.isDarkMode()
+                  ? DSDarkColors.surface3
+                  : DSColors.neutralLightSnow),
           foregroundColor: foregroundColor ??
               (isEnabled
-                  ? DSColors.primaryNight
+                  ? DSThemeService.isDarkMode()
+                      ? DSColors.neutralLightSnow
+                      : DSColors.primaryNight
                   : DSColors.neutralMediumElephant),
           borderColor: borderColor ??
               (isEnabled

diff --git a/lib/src/widgets/buttons/ds_tertiary_button.widget.dart b/lib/src/widgets/buttons/ds_tertiary_button.widget.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 
+import '../../services/ds_theme.service.dart';
 import '../../themes/colors/ds_colors.theme.dart';
 import 'ds_button.widget.dart';
 
@@ -22,7 +23,11 @@ class DSTertiaryButton extends DSButton {
   }) : super(
           backgroundColor: Colors.transparent,
           foregroundColor: isEnabled
-              ? DSColors.neutralDarkCity
-              : DSColors.neutralMediumElephant,
+              ? DSThemeService.isDarkMode()
+                  ? DSColors.neutralLightSnow
+                  : DSColors.neutralDarkCity
+              : DSThemeService.isDarkMode()
+                  ? DSColors.neutralDarkCity
+                  : DSColors.neutralMediumElephant,
         );
 }
diff --git a/lib/src/widgets/chat/calls/ds_end_calls_message_bubble.widget.dart b/lib/src/widgets/chat/calls/ds_end_calls_message_bubble.widget.dart
@@ -121,6 +121,7 @@ class _DSEndCallsMessageBubbleState extends State<DSEndCallsMessageBubble> {
                             : DSIcons.voip_calling_outline
                         : DSIcons.voip_ended_outline,
                     size: 24.0,
+                    color: DSColors.neutralDarkCity,
                   ),
                 ),
               ),

diff --git a/lib/src/widgets/chat/ds_highlight.dart b/lib/src/widgets/chat/ds_highlight.dart
@@ -1,6 +1,8 @@
 import 'package:flutter/material.dart';
 
 import '../../controllers/chat/ds_highlight.controller.dart';
+import '../../services/ds_theme.service.dart';
+import '../../themes/colors/ds_dark_colors.theme.dart';
 
 class DSHighlight extends StatefulWidget {
   final Widget child;
@@ -38,7 +40,9 @@ class _DSTesteState extends State<DSHighlight> with TickerProviderStateMixin {
       decoration: DecorationTween(
         begin: BoxDecoration(),
         end: BoxDecoration(
-          color: Colors.black.withValues(alpha: 0.1),
+          color: DSThemeService.isDarkMode()
+              ? DSDarkColors.surface1
+              : Colors.black.withValues(alpha: 0.1),
         ),
       ).animate(animationController!),
       child: widget.child,

diff --git a/lib/src/widgets/chat/ds_interactive_voice_call_message_bubble.widget.dart b/lib/src/widgets/chat/ds_interactive_voice_call_message_bubble.widget.dart
@@ -53,7 +53,7 @@ class DSInteractiveVoiceCallMessageBubble extends StatelessWidget {
           content.action?.name == 'voice_call'
               ? Column(
                   children: [
-                    const Padding(
+                    Padding(
                       padding: EdgeInsets.symmetric(
                         vertical: 8.0,
                       ),

diff --git a/lib/src/widgets/chat/ds_location_message_bubble.widget.dart b/lib/src/widgets/chat/ds_location_message_bubble.widget.dart
@@ -175,7 +175,7 @@ class _DSLocationMessageBubbleState extends State<DSLocationMessageBubble> {
             ),
           ),
         ),
-        const DSDivider()
+        DSDivider()
       ],
     );
   }

diff --git a/lib/src/widgets/fields/ds_input_container.widget.dart b/lib/src/widgets/fields/ds_input_container.widget.dart
@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 
 import '../../enums/ds_input_container_shape.enum.dart';
+import '../../services/ds_theme.service.dart';
 import '../../themes/colors/ds_colors.theme.dart';
+import '../../themes/colors/ds_dark_colors.theme.dart';
 import '../../utils/ds_utils.util.dart';
 
 class DSInputContainer extends StatelessWidget {
@@ -45,8 +47,12 @@ class DSInputContainer extends StatelessWidget {
                           : DSColors.neutralLightBox,
             ),
             color: isEnabled
-                ? DSColors.neutralLightSnow
-                : DSColors.neutralLightWhisper,
+                ? DSThemeService.isDarkMode()
+                    ? DSDarkColors.surface3
+                    : DSColors.neutralLightSnow
+                : DSThemeService.isDarkMode()
+                    ? DSDarkColors.surface1
+                    : DSColors.neutralLightWhisper,
           ),
           child: Container(
             constraints: BoxConstraints(
-Original file line number
+Diff line change
@@ Expand Up @@
                 ),
               ),
             ),
-            const DSDivider()
+            DSDivider()
           ],
         );
       }
@@ Expand Down @@