From e2ac4303f3ca18f13edeb2676c6de9a9c7819d1f Mon Sep 17 00:00:00 2001
From: Kima <kimavideos97@gmail.com>
Date: Tue, 5 Mar 2024 23:08:47 +0100
Subject: [PATCH] color (theme) fixes, NOT FINISHED
---
refilc/lib/theme/theme.dart | 35 +++++++++++++------
.../lib/screens/settings/settings_screen.dart | 2 +-
refilc_mobile_ui/lib/common/filter_bar.dart | 2 +-
.../lib/common/round_border_icon.dart | 5 +--
.../common/splitted_panel/splitted_panel.dart | 6 ++--
.../widgets/message/message_view_tile.dart | 2 +-
.../lib/common/widgets/note/note_view.dart | 14 ++++----
.../lib/common/widgets/tick_tile.dart | 4 +--
.../lib/pages/absences/absences_page.dart | 6 ++--
.../lib/pages/grades/grades_page.dart | 2 +-
.../lib/pages/home/home_page.dart | 2 +-
.../lib/pages/messages/messages_page.dart | 2 +-
.../lib/pages/notes/notes_page.dart | 2 +-
.../lib/pages/timetable/timetable_page.dart | 4 +--
.../lib/screens/navigation/navbar_item.dart | 2 +-
.../settings/accounts/account_view.dart | 2 +-
.../lib/screens/settings/settings_screen.dart | 4 +--
17 files changed, 57 insertions(+), 39 deletions(-)
diff --git a/refilc/lib/theme/theme.dart b/refilc/lib/theme/theme.dart
index a6aac8a..4ff4a43 100644
--- a/refilc/lib/theme/theme.dart
+++ b/refilc/lib/theme/theme.dart
@@ -62,27 +62,32 @@ class AppTheme {
: _paletteHighlightLight(palette)) ??
lightColors.highlight;
- Color newPrimary = ColorsUtils().darken(accent, amount: 0.4);
+ Color newSecondary = ColorsUtils().darken(accent, amount: 0.4);
// Color newScaffoldBg = ColorsUtils().lighten(accent, amount: 0.4);
- Color newScaffoldBg = backgroundColor;
+ Color newTertiary = ColorsUtils().darken(accent, amount: 0.5);
return ThemeData(
brightness: Brightness.light,
useMaterial3: true,
fontFamily: _defaultFontFamily,
textTheme: googleFontsMap[settings.fontFamily],
- scaffoldBackgroundColor: newScaffoldBg,
+ scaffoldBackgroundColor: backgroundColor,
primaryColor: lightColors.filc,
dividerColor: const Color(0x00000000),
colorScheme: ColorScheme(
- primary: newPrimary,
+ primary: accent,
onPrimary:
- (newPrimary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
- .withOpacity(.9),
- secondary: accent,
- onSecondary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
+ secondary: newSecondary,
+ onSecondary: (newSecondary.computeLuminance() > 0.5
+ ? Colors.black
+ : Colors.white)
+ .withOpacity(.9),
+ tertiary: newTertiary,
+ onTertiary:
+ (newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
+ .withOpacity(.9),
background: highlightColor,
onBackground: Colors.black.withOpacity(.9),
brightness: Brightness.light,
@@ -150,6 +155,9 @@ class AppTheme {
: _paletteHighlightDark(palette)) ??
darkColors.highlight;
+ Color newSecondary = ColorsUtils().lighten(accent, amount: 0.4);
+ Color newTertiary = ColorsUtils().lighten(accent, amount: 0.5);
+
return ThemeData(
brightness: Brightness.dark,
useMaterial3: true,
@@ -163,9 +171,14 @@ class AppTheme {
onPrimary:
(accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
- secondary: accent,
- onSecondary:
- (accent.computeLuminance() > 0.5 ? Colors.black : Colors.white)
+ secondary: newSecondary,
+ onSecondary: (newSecondary.computeLuminance() > 0.5
+ ? Colors.black
+ : Colors.white)
+ .withOpacity(.9),
+ tertiary: newTertiary,
+ onTertiary:
+ (newTertiary.computeLuminance() > 0.5 ? Colors.black : Colors.white)
.withOpacity(.9),
background: highlightColor,
onBackground: Colors.white.withOpacity(.9),
diff --git a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart
index 8ccf7f6..ae94435 100644
--- a/refilc_desktop_ui/lib/screens/settings/settings_screen.dart
+++ b/refilc_desktop_ui/lib/screens/settings/settings_screen.dart
@@ -98,7 +98,7 @@ class _SettingsScreenState extends State<SettingsScreen>
name: _firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //!settings.presentationMode
+ .secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(account.name)
//: Theme.of(context).colorScheme.secondary,
role: account.role,
diff --git a/refilc_mobile_ui/lib/common/filter_bar.dart b/refilc_mobile_ui/lib/common/filter_bar.dart
index 3515375..ade96a3 100644
--- a/refilc_mobile_ui/lib/common/filter_bar.dart
+++ b/refilc_mobile_ui/lib/common/filter_bar.dart
@@ -61,7 +61,7 @@ class _FilterBarState extends State<FilterBar> {
indicatorSize: TabBarIndicatorSize.tab,
indicatorPadding: const EdgeInsets.symmetric(vertical: 8.0),
indicator: BoxDecoration(
- color: Theme.of(context).colorScheme.secondary.withOpacity(0.25),
+ color: Theme.of(context).colorScheme.secondary.withOpacity(.2),
borderRadius: BorderRadius.circular(45.0),
),
overlayColor: MaterialStateProperty.all(const Color(0x00000000)),
diff --git a/refilc_mobile_ui/lib/common/round_border_icon.dart b/refilc_mobile_ui/lib/common/round_border_icon.dart
index 330c5c5..9a6e594 100644
--- a/refilc_mobile_ui/lib/common/round_border_icon.dart
+++ b/refilc_mobile_ui/lib/common/round_border_icon.dart
@@ -1,4 +1,3 @@
-import 'package:refilc/theme/colors/colors.dart';
import 'package:flutter/material.dart';
class RoundBorderIcon extends StatelessWidget {
@@ -19,7 +18,9 @@ class RoundBorderIcon extends StatelessWidget {
return Container(
decoration: BoxDecoration(
border: Border.all(
- color: color ?? AppColors.of(context).text, width: width),
+ color: color ??
+ Theme.of(context).colorScheme.secondary.withOpacity(0.25),
+ width: width),
borderRadius: BorderRadius.circular(50.0),
),
child: Padding(
diff --git a/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart b/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
index 89fe034..4517b48 100644
--- a/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
+++ b/refilc_mobile_ui/lib/common/splitted_panel/splitted_panel.dart
@@ -53,8 +53,10 @@ class SplittedPanel extends StatelessWidget {
),
border: hasBorder
? Border.all(
- color:
- Theme.of(context).colorScheme.primary.withOpacity(.25),
+ color: Theme.of(context)
+ .colorScheme
+ .secondary
+ .withOpacity(.25),
width: 1.0)
: null,
),
diff --git a/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart b/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart
index 55825e8..8e80e33 100644
--- a/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/message/message_view_tile.dart
@@ -91,7 +91,7 @@ class MessageViewTile extends StatelessWidget {
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(16.0),
border: Border.all(
- color: Theme.of(context).colorScheme.primary.withOpacity(.25),
+ color: Theme.of(context).colorScheme.secondary.withOpacity(.25),
width: 1.0,
),
),
diff --git a/refilc_mobile_ui/lib/common/widgets/note/note_view.dart b/refilc_mobile_ui/lib/common/widgets/note/note_view.dart
index b0ffaff..865ef0d 100644
--- a/refilc_mobile_ui/lib/common/widgets/note/note_view.dart
+++ b/refilc_mobile_ui/lib/common/widgets/note/note_view.dart
@@ -1,4 +1,3 @@
-import 'package:refilc/utils/color.dart';
import 'package:refilc_kreta_api/models/note.dart';
import 'package:refilc_mobile_ui/common/profile_image/profile_image.dart';
import 'package:refilc/utils/format.dart';
@@ -31,12 +30,13 @@ class NoteView extends StatelessWidget {
: note.teacher.name) ??
'',
radius: 22.0,
- backgroundColor: ColorUtils.stringToColor(
- (note.teacher.isRenamed
- ? note.teacher.renamedTo
- : note.teacher.name) ??
- '',
- ),
+ backgroundColor: Theme.of(context).colorScheme.secondary,
+ // backgroundColor: ColorUtils.stringToColor(
+ // (note.teacher.isRenamed
+ // ? note.teacher.renamedTo
+ // : note.teacher.name) ??
+ // '',
+ // ),
),
title: Text(
note.title,
diff --git a/refilc_mobile_ui/lib/common/widgets/tick_tile.dart b/refilc_mobile_ui/lib/common/widgets/tick_tile.dart
index 36e3600..04e7a7f 100644
--- a/refilc_mobile_ui/lib/common/widgets/tick_tile.dart
+++ b/refilc_mobile_ui/lib/common/widgets/tick_tile.dart
@@ -58,7 +58,7 @@ class TickTileState extends State<TickTile> {
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
- color: Theme.of(context).colorScheme.primary,
+ color: Theme.of(context).colorScheme.secondary,
width: 2.0,
),
),
@@ -67,7 +67,7 @@ class TickTileState extends State<TickTile> {
: Icon(
FeatherIcons.checkCircle,
size: 22.0,
- color: Theme.of(context).colorScheme.primary,
+ color: Theme.of(context).colorScheme.secondary,
),
title: Row(
children: [
diff --git a/refilc_mobile_ui/lib/pages/absences/absences_page.dart b/refilc_mobile_ui/lib/pages/absences/absences_page.dart
index 5e9c2cd..906c19a 100644
--- a/refilc_mobile_ui/lib/pages/absences/absences_page.dart
+++ b/refilc_mobile_ui/lib/pages/absences/absences_page.dart
@@ -164,7 +164,7 @@ class AbsencesPageState extends State<AbsencesPage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
+ .secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
@@ -423,7 +423,9 @@ class AbsencesPageState extends State<AbsencesPage>
child: filterWidgets[index - (activeData <= 1 ? 1 : 0)],
);
} else {
- return _tabController.index == 1 ? Empty(subtitle: "emptyDelays".i18n) : Empty(subtitle: "emptyMisses".i18n);
+ return _tabController.index == 1
+ ? Empty(subtitle: "emptyDelays".i18n)
+ : Empty(subtitle: "emptyMisses".i18n);
}
},
),
diff --git a/refilc_mobile_ui/lib/pages/grades/grades_page.dart b/refilc_mobile_ui/lib/pages/grades/grades_page.dart
index e67e526..3c40eb1 100644
--- a/refilc_mobile_ui/lib/pages/grades/grades_page.dart
+++ b/refilc_mobile_ui/lib/pages/grades/grades_page.dart
@@ -540,7 +540,7 @@ class GradesPageState extends State<GradesPage> {
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
+ .secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
diff --git a/refilc_mobile_ui/lib/pages/home/home_page.dart b/refilc_mobile_ui/lib/pages/home/home_page.dart
index 4576514..f23ea67 100644
--- a/refilc_mobile_ui/lib/pages/home/home_page.dart
+++ b/refilc_mobile_ui/lib/pages/home/home_page.dart
@@ -252,7 +252,7 @@ class HomePageState extends State<HomePage> with TickerProviderStateMixin {
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //!settings.presentationMode
+ .secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(user.displayName ?? "?")
//: Theme.of(context).colorScheme.secondary,
badge: updateProvider.available,
diff --git a/refilc_mobile_ui/lib/pages/messages/messages_page.dart b/refilc_mobile_ui/lib/pages/messages/messages_page.dart
index e08f1a7..87c9b80 100644
--- a/refilc_mobile_ui/lib/pages/messages/messages_page.dart
+++ b/refilc_mobile_ui/lib/pages/messages/messages_page.dart
@@ -105,7 +105,7 @@ class MessagesPageState extends State<MessagesPage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
+ .secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
diff --git a/refilc_mobile_ui/lib/pages/notes/notes_page.dart b/refilc_mobile_ui/lib/pages/notes/notes_page.dart
index 117e1d6..a229f71 100644
--- a/refilc_mobile_ui/lib/pages/notes/notes_page.dart
+++ b/refilc_mobile_ui/lib/pages/notes/notes_page.dart
@@ -250,7 +250,7 @@ class NotesPageState extends State<NotesPage> with TickerProviderStateMixin {
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
+ .secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
diff --git a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
index dd5a563..0b2fb75 100644
--- a/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
+++ b/refilc_mobile_ui/lib/pages/timetable/timetable_page.dart
@@ -271,7 +271,7 @@ class TimetablePageState extends State<TimetablePage>
name: firstName,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //ColorUtils.stringToColor(user.displayName ?? "?"),
+ .secondary, //ColorUtils.stringToColor(user.displayName ?? "?"),
badge: updateProvider.available,
role: user.role,
profilePictureString: user.picture,
@@ -523,7 +523,7 @@ class TimetablePageState extends State<TimetablePage>
border: Border.all(
color: Theme.of(context)
.colorScheme
- .primary
+ .secondary
.withOpacity(0.25),
),
borderRadius:
diff --git a/refilc_mobile_ui/lib/screens/navigation/navbar_item.dart b/refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
index fa370c7..3c38804 100644
--- a/refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
+++ b/refilc_mobile_ui/lib/screens/navigation/navbar_item.dart
@@ -34,7 +34,7 @@ class NavbarItem extends StatelessWidget {
padding: const EdgeInsets.all(12.0),
decoration: BoxDecoration(
color: active
- ? Theme.of(context).colorScheme.secondary.withOpacity(.4)
+ ? Theme.of(context).colorScheme.secondary.withOpacity(.2)
: null,
borderRadius: BorderRadius.circular(14.0),
),
diff --git a/refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart b/refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart
index e16ec19..bcccc37 100644
--- a/refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart
+++ b/refilc_mobile_ui/lib/screens/settings/accounts/account_view.dart
@@ -30,7 +30,7 @@ class AccountView extends StatelessWidget {
AccountTile(
profileImage: ProfileImage(
name: _firstName,
- backgroundColor: Theme.of(context).colorScheme.primary,
+ backgroundColor: Theme.of(context).colorScheme.secondary,
role: user.role,
),
name: SelectableText(
diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
index af97a8c..ee68d94 100644
--- a/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
+++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.dart
@@ -133,7 +133,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: account.picture,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //!settings.presentationMode
+ .secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(account.name)
//: Theme.of(context).colorScheme.secondary,
),
@@ -319,7 +319,7 @@ class SettingsScreenState extends State<SettingsScreen>
profilePictureString: user.picture,
backgroundColor: Theme.of(context)
.colorScheme
- .primary, //!settings.presentationMode
+ .secondary, //!settings.presentationMode
//? ColorUtils.stringToColor(user.displayName ?? "?")
//: Theme.of(context).colorScheme.secondary,
),