From 1ef2af0a822ce76d7c88adfc08be758038fdc07b Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Mon, 15 Nov 2021 07:36:07 +0100 Subject: [PATCH] fix: Colors --- lib/config/themes.dart | 4 ++-- lib/pages/settings_style/settings_style.dart | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/config/themes.dart b/lib/config/themes.dart index fa0ea34b..3d1d5082 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -41,7 +41,7 @@ abstract class FluffyThemes { primary: AppConfig.chatColor, secondary: AppConfig.chatColor, secondaryVariant: AppConfig.secondaryColor, - surface: FluffyThemes.lighten(AppConfig.chatColor, 0.51), + surface: FluffyThemes.lighten(AppConfig.chatColor, 0.535), ), backgroundColor: Colors.white, secondaryHeaderColor: Colors.blueGrey.shade50, @@ -132,7 +132,7 @@ abstract class FluffyThemes { primary: FluffyThemes.lighten(AppConfig.chatColor, 0.33), secondary: FluffyThemes.lighten(AppConfig.chatColor, 0.33), secondaryVariant: AppConfig.secondaryColor, - surface: FluffyThemes.darken(AppConfig.chatColor, 0.4), + surface: FluffyThemes.darken(AppConfig.chatColor, 0.35), ), secondaryHeaderColor: Colors.blueGrey.shade900, textTheme: Typography.material2018().white.merge(fallbackTextTheme), diff --git a/lib/pages/settings_style/settings_style.dart b/lib/pages/settings_style/settings_style.dart index 9fee862d..a4639719 100644 --- a/lib/pages/settings_style/settings_style.dart +++ b/lib/pages/settings_style/settings_style.dart @@ -51,13 +51,13 @@ class SettingsStyleController extends State { AdaptiveThemeMode currentTheme; - static List customColors = [ - AppConfig.primaryColor, - Colors.blue.shade700, - Colors.green.shade700, - Colors.pink.shade700, - Colors.orange.shade800, - ]; + static List get customColors => [ + AppConfig.primaryColor, + HSLColor.fromColor(AppConfig.primaryColor).withHue(200).toColor(), + HSLColor.fromColor(AppConfig.primaryColor).withHue(130).toColor(), + HSLColor.fromColor(AppConfig.primaryColor).withHue(65).toColor(), + HSLColor.fromColor(AppConfig.primaryColor).withHue(8).toColor(), + ]; void switchTheme(AdaptiveThemeMode newTheme) { switch (newTheme) {