diff --git a/filcnaplo/lib/models/settings.dart b/filcnaplo/lib/models/settings.dart index dc09751..948a82a 100644 --- a/filcnaplo/lib/models/settings.dart +++ b/filcnaplo/lib/models/settings.dart @@ -244,11 +244,11 @@ class SettingsProvider extends ChangeNotifier { theme: ThemeMode.system, accentColor: AccentColor.filc, gradeColors: [ - DarkMobileAppColors().red, - DarkMobileAppColors().orange, - DarkMobileAppColors().yellow, - DarkMobileAppColors().green, - DarkMobileAppColors().filc, + DarkMobileAppColors().gradeOne, + DarkMobileAppColors().gradeTwo, + DarkMobileAppColors().gradeThree, + DarkMobileAppColors().gradeFour, + DarkMobileAppColors().gradeFive, ], newsEnabled: true, newsState: -1, diff --git a/filcnaplo/lib/theme/colors/accent.dart b/filcnaplo/lib/theme/colors/accent.dart index 73d25f9..2bc19d8 100644 --- a/filcnaplo/lib/theme/colors/accent.dart +++ b/filcnaplo/lib/theme/colors/accent.dart @@ -15,7 +15,7 @@ enum AccentColor { } Map accentColorMap = { - AccentColor.filc: Color.fromARGB(255, 61, 123, 244), + AccentColor.filc: const Color(0xFF3D7BF4), AccentColor.blue: Colors.blue.shade300, AccentColor.green: Colors.green.shade400, AccentColor.lime: Colors.lightGreen.shade400, @@ -24,6 +24,6 @@ Map accentColorMap = { AccentColor.red: Colors.red.shade300, AccentColor.pink: Colors.pink.shade300, AccentColor.purple: Colors.purple.shade300, - AccentColor.adaptive: const Color(0xff3d7bf4), - AccentColor.custom: const Color(0xff3d7bf4), + AccentColor.adaptive: const Color(0xFF3D7BF4), + AccentColor.custom: const Color(0xFF3D7BF4), }; diff --git a/filcnaplo/lib/theme/colors/colors.dart b/filcnaplo/lib/theme/colors/colors.dart index e1f3dc7..e28ff48 100644 --- a/filcnaplo/lib/theme/colors/colors.dart +++ b/filcnaplo/lib/theme/colors/colors.dart @@ -44,4 +44,10 @@ abstract class ThemeAppColors { final Color indigo = const Color(0x00000000); final Color purple = const Color(0x00000000); final Color pink = const Color(0x00000000); + // new default grade colors + final Color gradeFive = const Color(0x00000000); + final Color gradeFour = const Color(0x00000000); + final Color gradeThree = const Color(0x00000000); + final Color gradeTwo = const Color(0x00000000); + final Color gradeOne = const Color(0x00000000); } diff --git a/filcnaplo/lib/theme/colors/dark_desktop.dart b/filcnaplo/lib/theme/colors/dark_desktop.dart index f03f492..6857f5b 100644 --- a/filcnaplo/lib/theme/colors/dark_desktop.dart +++ b/filcnaplo/lib/theme/colors/dark_desktop.dart @@ -30,4 +30,15 @@ class DarkDesktopAppColors implements ThemeAppColors { final purple = const Color(0xffBF5AF2); @override final pink = const Color(0xffFF375F); + // new default grade colors + @override + final gradeFive = const Color(0xff3d7bf4); + @override + final gradeFour = const Color(0xFF4C3DF4); + @override + final gradeThree = const Color(0xFF833DF4); + @override + final gradeTwo = const Color(0xFFAE3DF4); + @override + final gradeOne = const Color(0xFFF43DAB); } diff --git a/filcnaplo/lib/theme/colors/dark_mobile.dart b/filcnaplo/lib/theme/colors/dark_mobile.dart index 8062240..ecb5348 100644 --- a/filcnaplo/lib/theme/colors/dark_mobile.dart +++ b/filcnaplo/lib/theme/colors/dark_mobile.dart @@ -27,6 +27,17 @@ class DarkMobileAppColors implements ThemeAppColors { @override final indigo = const Color(0xff5E5CE6); @override + // new default grade colors + @override + final gradeFive = const Color(0xff3d7bf4); + @override + final gradeFour = const Color(0xFF4C3DF4); + @override + final gradeThree = const Color(0xFF833DF4); + @override + final gradeTwo = const Color(0xFFAE3DF4); + @override + final gradeOne = const Color(0xFFF43DAB); final purple = const Color(0xffBF5AF2); @override final pink = const Color(0xffFF375F); diff --git a/filcnaplo/lib/theme/colors/light_desktop.dart b/filcnaplo/lib/theme/colors/light_desktop.dart index 4a150b1..a7236fa 100644 --- a/filcnaplo/lib/theme/colors/light_desktop.dart +++ b/filcnaplo/lib/theme/colors/light_desktop.dart @@ -30,4 +30,15 @@ class LightDesktopAppColors implements ThemeAppColors { final purple = const Color(0xffAF52DE); @override final pink = const Color(0xffFF2D55); + // new default grade colors + @override + final gradeFive = const Color(0xff3d7bf4); + @override + final gradeFour = const Color(0xFF4C3DF4); + @override + final gradeThree = const Color(0xFF833DF4); + @override + final gradeTwo = const Color(0xFFAE3DF4); + @override + final gradeOne = const Color(0xFFF43DAB); } diff --git a/filcnaplo/lib/theme/colors/light_mobile.dart b/filcnaplo/lib/theme/colors/light_mobile.dart index 46766eb..db3baf6 100644 --- a/filcnaplo/lib/theme/colors/light_mobile.dart +++ b/filcnaplo/lib/theme/colors/light_mobile.dart @@ -30,4 +30,15 @@ class LightMobileAppColors implements ThemeAppColors { final purple = const Color(0xffAF52DE); @override final pink = const Color(0xffFF2D55); + // new default grade colors + @override + final gradeFive = const Color(0xff3d7bf4); + @override + final gradeFour = const Color(0xFF4C3DF4); + @override + final gradeThree = const Color(0xFF833DF4); + @override + final gradeTwo = const Color(0xFFAE3DF4); + @override + final gradeOne = const Color(0xFFF43DAB); }