fix light mode colors

YehudaKremer · Mar 10, 2022 · 8965a84 · 8965a84
1 parent 243c1cc
commit 8965a84
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/lib/models/alarm.dart b/lib/models/alarm.dart
@@ -59,4 +59,6 @@ class Alarm {
     if (sat) activeDays.add('Sat');
     return activeDays;
   }
+
+  get haveMessage => message != null && message!.isNotEmpty;
 }
diff --git a/lib/pages/alarmClock/alarmClockFrom.dart b/lib/pages/alarmClock/alarmClockFrom.dart
@@ -162,9 +162,12 @@ class _AlarmClockFromState extends State<AlarmClockFrom> {
                   Container(width: 10),
                   BasicButton(
                     title: 'Message',
-                    icon: alarm.message == null || alarm.message!.isEmpty
-                        ? FluentIcons.message
-                        : FluentIcons.message_fill,
+                    icon: alarm.haveMessage
+                        ? FluentIcons.message_fill
+                        : FluentIcons.message,
+                    color: alarm.haveMessage
+                        ? FluentTheme.of(context).accentColor
+                        : FluentTheme.of(context).typography.body!.color,
                     onPressed: toggleAlarmMessageDialogOpen,
                   ),
                   Container(width: 20),

diff --git a/lib/pages/alarmClock/alarmClockItem.dart b/lib/pages/alarmClock/alarmClockItem.dart
@@ -40,11 +40,11 @@ class AlarmClockItem extends StatelessWidget {
                       DateFormat.jm().format(alarm.date),
                       style: TextStyle(
                         color: alarm.isActive
-                            ? FluentTheme.of(context).activeColor
+                            ? FluentTheme.of(context).typography.body!.color
                             : FluentTheme.of(context).disabledColor,
                       ),
                     ),
-                    alarm.message != null && alarm.message!.isNotEmpty
+                    alarm.haveMessage
                         ? Container(
                             margin: EdgeInsets.only(left: 10),
                             child: Tooltip(