From 9b29ede6eb65ce042dde2ecec1189bb9cd8a397f Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 8 May 2024 16:12:09 +0200 Subject: [PATCH 1/3] fix: change all remaining #3D7BF4 color codes to #052460 (new primary) --- refilc/android/app/src/main/res/layout/timetable_item.xml | 4 ++-- refilc/android/app/src/main/res/values/colors.xml | 8 ++++---- refilc/lib/models/settings.dart | 2 +- refilc/lib/theme/colors/accent.dart | 6 +++--- refilc/lib/theme/colors/dark_desktop.dart | 4 ++-- refilc/lib/theme/colors/dark_mobile.dart | 4 ++-- refilc/lib/theme/colors/light_desktop.dart | 4 ++-- refilc/lib/theme/colors/light_mobile.dart | 2 +- refilc_kreta_api/lib/providers/share_provider.dart | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/refilc/android/app/src/main/res/layout/timetable_item.xml b/refilc/android/app/src/main/res/layout/timetable_item.xml index f057d2d..c72dc65 100644 --- a/refilc/android/app/src/main/res/layout/timetable_item.xml +++ b/refilc/android/app/src/main/res/layout/timetable_item.xml @@ -20,7 +20,7 @@ android:gravity="center" android:text="1." android:textColor="@color/filc" - android:textColorLink="#ff3D7BF4" + android:textColorLink="#ff052460" android:textSize="30sp" android:textStyle="bold" tools:ignore="HardcodedText" /> @@ -110,4 +110,4 @@ android:textColor="@color/white" tools:ignore="HardcodedText" /> - \ No newline at end of file + diff --git a/refilc/android/app/src/main/res/values/colors.xml b/refilc/android/app/src/main/res/values/colors.xml index 955cc10..f1facef 100644 --- a/refilc/android/app/src/main/res/values/colors.xml +++ b/refilc/android/app/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ #ffFFCC00 #40FFD60A #ff34C759 - #ff3D7BF4 + #ff052460 #ff5AC8FA #ff007AFF #ff5856D6 @@ -49,8 +49,8 @@ #ffFFD60A #40FFD60A #ff32D74B - #ff3D7BF4 - #ff3D93F5 + #ff052460 + #ff06348f #ff64D2FF #ff0A84FF #ff5E5CE6 @@ -66,4 +66,4 @@ #FFF06292 #FFBA68C8 #FF22AC9B - \ No newline at end of file + diff --git a/refilc/lib/models/settings.dart b/refilc/lib/models/settings.dart index 72d23f1..bd52e48 100644 --- a/refilc/lib/models/settings.dart +++ b/refilc/lib/models/settings.dart @@ -450,7 +450,7 @@ class SettingsProvider extends ChangeNotifier { bellDelay: 0, gradeOpeningFun: false, iconPack: IconPack.cupertino, - customAccentColor: const Color(0xff3D7BF4), + customAccentColor: const Color(0xff052460), customBackgroundColor: const Color(0xff000000), customHighlightColor: const Color(0xff222222), customIconColor: const Color(0x00000000), diff --git a/refilc/lib/theme/colors/accent.dart b/refilc/lib/theme/colors/accent.dart index df27bc0..d6d3f2f 100644 --- a/refilc/lib/theme/colors/accent.dart +++ b/refilc/lib/theme/colors/accent.dart @@ -17,7 +17,7 @@ enum AccentColor { } Map accentColorMap = { - AccentColor.filc: const Color(0xFF3D7BF4), + AccentColor.filc: const Color(0xFF052460), AccentColor.blue: Colors.blue.shade300, AccentColor.green: Colors.green.shade400, AccentColor.lime: Colors.lightGreen.shade400, @@ -28,8 +28,8 @@ Map accentColorMap = { AccentColor.purple: Colors.purple.shade300, //AccentColor.none: Colors.black, AccentColor.ogfilc: const Color(0xff20AC9B), - AccentColor.adaptive: const Color(0xFF3D7BF4), - AccentColor.custom: const Color(0xFF3D7BF4), + AccentColor.adaptive: const Color(0xFF052460), + AccentColor.custom: const Color(0xFF052460), }; // new v5 things diff --git a/refilc/lib/theme/colors/dark_desktop.dart b/refilc/lib/theme/colors/dark_desktop.dart index 58aaf08..f0f3115 100644 --- a/refilc/lib/theme/colors/dark_desktop.dart +++ b/refilc/lib/theme/colors/dark_desktop.dart @@ -19,7 +19,7 @@ class DarkDesktopAppColors implements ThemeAppColors { @override final green = const Color(0xff32D74B); @override - final filc = const Color(0xff3d7bf4); + final filc = const Color(0xff052460); @override final teal = const Color(0xff64D2FF); @override @@ -32,7 +32,7 @@ class DarkDesktopAppColors implements ThemeAppColors { final pink = const Color(0xffFF375F); // new default grade colors @override - final gradeFive = const Color(0xff3d7bf4); + final gradeFive = const Color(0xff052460); @override final gradeFour = const Color(0xFF4C3DF4); @override diff --git a/refilc/lib/theme/colors/dark_mobile.dart b/refilc/lib/theme/colors/dark_mobile.dart index cc1ac5c..47e7f45 100644 --- a/refilc/lib/theme/colors/dark_mobile.dart +++ b/refilc/lib/theme/colors/dark_mobile.dart @@ -19,7 +19,7 @@ class DarkMobileAppColors implements ThemeAppColors { @override final green = const Color(0xff32D74B); @override - final filc = const Color(0xff3d7bf4); + final filc = const Color(0xff052460); @override final teal = const Color(0xff64D2FF); @override @@ -51,5 +51,5 @@ class DarkMobileAppColors implements ThemeAppColors { @override final loginBackground = const Color(0xFF0F131D); @override - final buttonBackground = const Color(0xFF3D7BF4); + final buttonBackground = const Color(0xFF052460); } diff --git a/refilc/lib/theme/colors/light_desktop.dart b/refilc/lib/theme/colors/light_desktop.dart index 56fcd0b..e5b2e29 100644 --- a/refilc/lib/theme/colors/light_desktop.dart +++ b/refilc/lib/theme/colors/light_desktop.dart @@ -19,7 +19,7 @@ class LightDesktopAppColors implements ThemeAppColors { @override final green = const Color(0xff34C759); @override - final filc = const Color(0xff3d7bf4); + final filc = const Color(0xff052460); @override final teal = const Color(0xff5AC8FA); @override @@ -32,7 +32,7 @@ class LightDesktopAppColors implements ThemeAppColors { final pink = const Color(0xffFF2D55); // new default grade colors @override - final gradeFive = const Color(0xff3d7bf4); + final gradeFive = const Color(0xff052460); @override final gradeFour = const Color(0xFF4C3DF4); @override diff --git a/refilc/lib/theme/colors/light_mobile.dart b/refilc/lib/theme/colors/light_mobile.dart index eede7c7..90c6bba 100644 --- a/refilc/lib/theme/colors/light_mobile.dart +++ b/refilc/lib/theme/colors/light_mobile.dart @@ -19,7 +19,7 @@ class LightMobileAppColors implements ThemeAppColors { @override final green = const Color(0xff34C759); @override - final filc = const Color(0xff3d7bf4); + final filc = const Color(0xff052460); @override final teal = const Color(0xff5AC8FA); @override diff --git a/refilc_kreta_api/lib/providers/share_provider.dart b/refilc_kreta_api/lib/providers/share_provider.dart index e44d3b7..7d2597d 100644 --- a/refilc_kreta_api/lib/providers/share_provider.dart +++ b/refilc_kreta_api/lib/providers/share_provider.dart @@ -41,7 +41,7 @@ class ShareProvider extends ChangeNotifier { 'accent_color': (settings.customAccentColor ?? SettingsProvider.defaultSettings().customAccentColor) ?.value ?? - const Color(0xFF3D7BF4).value, + const Color(0xFF052460).value, 'icon_color': (settings.customIconColor ?? SettingsProvider.defaultSettings().customIconColor) ?.value ?? From cacf566794b7522c246fce38b5bc456db0bb6e02 Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 8 May 2024 17:58:31 +0200 Subject: [PATCH 2/3] Revert "fix: change all remaining #3D7BF4 color codes to #052460 (new primary)" This reverts commit 9b29ede6eb65ce042dde2ecec1189bb9cd8a397f. --- refilc/android/app/src/main/res/layout/timetable_item.xml | 4 ++-- refilc/android/app/src/main/res/values/colors.xml | 8 ++++---- refilc/lib/models/settings.dart | 2 +- refilc/lib/theme/colors/accent.dart | 6 +++--- refilc/lib/theme/colors/dark_desktop.dart | 4 ++-- refilc/lib/theme/colors/dark_mobile.dart | 4 ++-- refilc/lib/theme/colors/light_desktop.dart | 4 ++-- refilc/lib/theme/colors/light_mobile.dart | 2 +- refilc_kreta_api/lib/providers/share_provider.dart | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/refilc/android/app/src/main/res/layout/timetable_item.xml b/refilc/android/app/src/main/res/layout/timetable_item.xml index c72dc65..f057d2d 100644 --- a/refilc/android/app/src/main/res/layout/timetable_item.xml +++ b/refilc/android/app/src/main/res/layout/timetable_item.xml @@ -20,7 +20,7 @@ android:gravity="center" android:text="1." android:textColor="@color/filc" - android:textColorLink="#ff052460" + android:textColorLink="#ff3D7BF4" android:textSize="30sp" android:textStyle="bold" tools:ignore="HardcodedText" /> @@ -110,4 +110,4 @@ android:textColor="@color/white" tools:ignore="HardcodedText" /> - + \ No newline at end of file diff --git a/refilc/android/app/src/main/res/values/colors.xml b/refilc/android/app/src/main/res/values/colors.xml index f1facef..955cc10 100644 --- a/refilc/android/app/src/main/res/values/colors.xml +++ b/refilc/android/app/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ #ffFFCC00 #40FFD60A #ff34C759 - #ff052460 + #ff3D7BF4 #ff5AC8FA #ff007AFF #ff5856D6 @@ -49,8 +49,8 @@ #ffFFD60A #40FFD60A #ff32D74B - #ff052460 - #ff06348f + #ff3D7BF4 + #ff3D93F5 #ff64D2FF #ff0A84FF #ff5E5CE6 @@ -66,4 +66,4 @@ #FFF06292 #FFBA68C8 #FF22AC9B - + \ No newline at end of file diff --git a/refilc/lib/models/settings.dart b/refilc/lib/models/settings.dart index bd52e48..72d23f1 100644 --- a/refilc/lib/models/settings.dart +++ b/refilc/lib/models/settings.dart @@ -450,7 +450,7 @@ class SettingsProvider extends ChangeNotifier { bellDelay: 0, gradeOpeningFun: false, iconPack: IconPack.cupertino, - customAccentColor: const Color(0xff052460), + customAccentColor: const Color(0xff3D7BF4), customBackgroundColor: const Color(0xff000000), customHighlightColor: const Color(0xff222222), customIconColor: const Color(0x00000000), diff --git a/refilc/lib/theme/colors/accent.dart b/refilc/lib/theme/colors/accent.dart index d6d3f2f..df27bc0 100644 --- a/refilc/lib/theme/colors/accent.dart +++ b/refilc/lib/theme/colors/accent.dart @@ -17,7 +17,7 @@ enum AccentColor { } Map accentColorMap = { - AccentColor.filc: const Color(0xFF052460), + AccentColor.filc: const Color(0xFF3D7BF4), AccentColor.blue: Colors.blue.shade300, AccentColor.green: Colors.green.shade400, AccentColor.lime: Colors.lightGreen.shade400, @@ -28,8 +28,8 @@ Map accentColorMap = { AccentColor.purple: Colors.purple.shade300, //AccentColor.none: Colors.black, AccentColor.ogfilc: const Color(0xff20AC9B), - AccentColor.adaptive: const Color(0xFF052460), - AccentColor.custom: const Color(0xFF052460), + AccentColor.adaptive: const Color(0xFF3D7BF4), + AccentColor.custom: const Color(0xFF3D7BF4), }; // new v5 things diff --git a/refilc/lib/theme/colors/dark_desktop.dart b/refilc/lib/theme/colors/dark_desktop.dart index f0f3115..58aaf08 100644 --- a/refilc/lib/theme/colors/dark_desktop.dart +++ b/refilc/lib/theme/colors/dark_desktop.dart @@ -19,7 +19,7 @@ class DarkDesktopAppColors implements ThemeAppColors { @override final green = const Color(0xff32D74B); @override - final filc = const Color(0xff052460); + final filc = const Color(0xff3d7bf4); @override final teal = const Color(0xff64D2FF); @override @@ -32,7 +32,7 @@ class DarkDesktopAppColors implements ThemeAppColors { final pink = const Color(0xffFF375F); // new default grade colors @override - final gradeFive = const Color(0xff052460); + final gradeFive = const Color(0xff3d7bf4); @override final gradeFour = const Color(0xFF4C3DF4); @override diff --git a/refilc/lib/theme/colors/dark_mobile.dart b/refilc/lib/theme/colors/dark_mobile.dart index 47e7f45..cc1ac5c 100644 --- a/refilc/lib/theme/colors/dark_mobile.dart +++ b/refilc/lib/theme/colors/dark_mobile.dart @@ -19,7 +19,7 @@ class DarkMobileAppColors implements ThemeAppColors { @override final green = const Color(0xff32D74B); @override - final filc = const Color(0xff052460); + final filc = const Color(0xff3d7bf4); @override final teal = const Color(0xff64D2FF); @override @@ -51,5 +51,5 @@ class DarkMobileAppColors implements ThemeAppColors { @override final loginBackground = const Color(0xFF0F131D); @override - final buttonBackground = const Color(0xFF052460); + final buttonBackground = const Color(0xFF3D7BF4); } diff --git a/refilc/lib/theme/colors/light_desktop.dart b/refilc/lib/theme/colors/light_desktop.dart index e5b2e29..56fcd0b 100644 --- a/refilc/lib/theme/colors/light_desktop.dart +++ b/refilc/lib/theme/colors/light_desktop.dart @@ -19,7 +19,7 @@ class LightDesktopAppColors implements ThemeAppColors { @override final green = const Color(0xff34C759); @override - final filc = const Color(0xff052460); + final filc = const Color(0xff3d7bf4); @override final teal = const Color(0xff5AC8FA); @override @@ -32,7 +32,7 @@ class LightDesktopAppColors implements ThemeAppColors { final pink = const Color(0xffFF2D55); // new default grade colors @override - final gradeFive = const Color(0xff052460); + final gradeFive = const Color(0xff3d7bf4); @override final gradeFour = const Color(0xFF4C3DF4); @override diff --git a/refilc/lib/theme/colors/light_mobile.dart b/refilc/lib/theme/colors/light_mobile.dart index 90c6bba..eede7c7 100644 --- a/refilc/lib/theme/colors/light_mobile.dart +++ b/refilc/lib/theme/colors/light_mobile.dart @@ -19,7 +19,7 @@ class LightMobileAppColors implements ThemeAppColors { @override final green = const Color(0xff34C759); @override - final filc = const Color(0xff052460); + final filc = const Color(0xff3d7bf4); @override final teal = const Color(0xff5AC8FA); @override diff --git a/refilc_kreta_api/lib/providers/share_provider.dart b/refilc_kreta_api/lib/providers/share_provider.dart index 7d2597d..e44d3b7 100644 --- a/refilc_kreta_api/lib/providers/share_provider.dart +++ b/refilc_kreta_api/lib/providers/share_provider.dart @@ -41,7 +41,7 @@ class ShareProvider extends ChangeNotifier { 'accent_color': (settings.customAccentColor ?? SettingsProvider.defaultSettings().customAccentColor) ?.value ?? - const Color(0xFF052460).value, + const Color(0xFF3D7BF4).value, 'icon_color': (settings.customIconColor ?? SettingsProvider.defaultSettings().customIconColor) ?.value ?? From aaa3d79b304fabbb66e37a828fd9b9d979833857 Mon Sep 17 00:00:00 2001 From: pml68 Date: Wed, 8 May 2024 18:00:33 +0200 Subject: [PATCH 3/3] fix: change only the widget's "filc" color to the new primary --- refilc/android/app/src/main/res/layout/timetable_item.xml | 4 ++-- refilc/android/app/src/main/res/values/colors.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/refilc/android/app/src/main/res/layout/timetable_item.xml b/refilc/android/app/src/main/res/layout/timetable_item.xml index f057d2d..c72dc65 100644 --- a/refilc/android/app/src/main/res/layout/timetable_item.xml +++ b/refilc/android/app/src/main/res/layout/timetable_item.xml @@ -20,7 +20,7 @@ android:gravity="center" android:text="1." android:textColor="@color/filc" - android:textColorLink="#ff3D7BF4" + android:textColorLink="#ff052460" android:textSize="30sp" android:textStyle="bold" tools:ignore="HardcodedText" /> @@ -110,4 +110,4 @@ android:textColor="@color/white" tools:ignore="HardcodedText" /> - \ No newline at end of file + diff --git a/refilc/android/app/src/main/res/values/colors.xml b/refilc/android/app/src/main/res/values/colors.xml index 955cc10..f1facef 100644 --- a/refilc/android/app/src/main/res/values/colors.xml +++ b/refilc/android/app/src/main/res/values/colors.xml @@ -27,7 +27,7 @@ #ffFFCC00 #40FFD60A #ff34C759 - #ff3D7BF4 + #ff052460 #ff5AC8FA #ff007AFF #ff5856D6 @@ -49,8 +49,8 @@ #ffFFD60A #40FFD60A #ff32D74B - #ff3D7BF4 - #ff3D93F5 + #ff052460 + #ff06348f #ff64D2FF #ff0A84FF #ff5E5CE6 @@ -66,4 +66,4 @@ #FFF06292 #FFBA68C8 #FF22AC9B - \ No newline at end of file +