From 39b892523b9d365fd34c36212361cf4c9cd200a5 Mon Sep 17 00:00:00 2001 From: Kima Date: Tue, 12 Mar 2024 21:40:24 +0100 Subject: [PATCH] added toggle for new colors --- refilc/lib/theme/theme.dart | 4 +- .../settings/settings_screen.i18n.dart | 3 ++ .../settings/submenu/personalize_screen.dart | 38 +++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) diff --git a/refilc/lib/theme/theme.dart b/refilc/lib/theme/theme.dart index ff90d89..77535e2 100644 --- a/refilc/lib/theme/theme.dart +++ b/refilc/lib/theme/theme.dart @@ -170,14 +170,14 @@ class AppTheme { accentColor == AccentColor.ogfilc) || !settings.newColors ? accent - : ColorsUtils().lighten(accent, amount: 0.4); + : ColorsUtils().lighten(accent, amount: 0.3); // Color newScaffoldBg = ColorsUtils().lighten(accent, amount: 0.4); Color newTertiary = (accentColor == AccentColor.adaptive || accentColor == AccentColor.custom || accentColor == AccentColor.ogfilc) || !settings.newColors ? accent - : ColorsUtils().lighten(accent, amount: 0.5); + : ColorsUtils().lighten(accent, amount: 0.4); return ThemeData( brightness: Brightness.dark, diff --git a/refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart b/refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart index 67fe2da..83dbd63 100644 --- a/refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart +++ b/refilc_mobile_ui/lib/screens/settings/settings_screen.i18n.dart @@ -112,6 +112,7 @@ extension SettingsLocalization on String { "choose_calendar": "Choose calendar", 'change_account': 'Change Account (Logout)', "soon": "Soon", + "new_colors": "New Colors", }, "hu_hu": { "personal_details": "Személyes információk", @@ -222,6 +223,7 @@ extension SettingsLocalization on String { "choose_calendar": "Válassz naptárat", "change_account": "Fiók cseréje (Kijelentkezés)", "soon": "Hamarosan", + "new_colors": "Új színek", }, "de_de": { "personal_details": "Persönliche Angaben", @@ -332,6 +334,7 @@ extension SettingsLocalization on String { "choose_calendar": "Kalender wählen", "change_account": "Konto ändern (Abmeldung)", "soon": "Bald", + "new_colors": "Neue Farben", }, }; diff --git a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart index 2498083..4c73b32 100644 --- a/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart +++ b/refilc_mobile_ui/lib/screens/settings/submenu/personalize_screen.dart @@ -7,6 +7,7 @@ import 'package:refilc/api/providers/user_provider.dart'; import 'package:refilc/helpers/subject.dart'; import 'package:refilc/models/settings.dart'; import 'package:refilc/theme/colors/colors.dart'; +import 'package:refilc/theme/observer.dart'; import 'package:refilc/utils/format.dart'; import 'package:refilc_kreta_api/models/grade.dart'; import 'package:refilc_kreta_api/providers/absence_provider.dart'; @@ -368,6 +369,43 @@ class PersonalizeSettingsScreenState extends State bottom: Radius.circular(4.0), ), ), + PanelButton( + padding: const EdgeInsets.only(left: 14.0, right: 6.0), + onPressed: () async { + settingsProvider.update( + newColors: !settingsProvider.newColors); + Provider.of(context, listen: false) + .changeTheme(settingsProvider.theme); + + setState(() {}); + }, + title: Text( + "new_colors".i18n, + style: TextStyle( + color: AppColors.of(context).text.withOpacity( + settingsProvider.newColors ? .95 : .25), + ), + ), + leading: Icon( + Icons.flare_outlined, + size: 22.0, + color: AppColors.of(context).text.withOpacity( + settingsProvider.newColors ? .95 : .25), + ), + trailing: Switch( + onChanged: (v) async { + settingsProvider.update(newColors: v); + + setState(() {}); + }, + value: settingsProvider.newColors, + activeColor: Theme.of(context).colorScheme.secondary, + ), + borderRadius: const BorderRadius.vertical( + top: Radius.circular(4.0), + bottom: Radius.circular(4.0), + ), + ), const MenuPaintList( borderRadius: BorderRadius.vertical( top: Radius.circular(4.0),