From 36746c86ac3f5cddabdca94a9afc183fac258ee0 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sun, 24 Jan 2021 17:37:55 +0100 Subject: [PATCH] fix: Dark mode fixes --- lib/app_config.dart | 1 + lib/config/themes.dart | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/app_config.dart b/lib/app_config.dart index 25088a77..47d2711b 100644 --- a/lib/app_config.dart +++ b/lib/app_config.dart @@ -11,6 +11,7 @@ abstract class AppConfig { static const bool allowOtherHomeservers = true; static const bool enableRegistration = true; static const Color primaryColor = Color(0xFF5625BA); + static const Color primaryColorLight = Color(0xFFF5B4D2); static String _privacyUrl = 'https://fluffychat.im/en/privacy.html'; static String get privacyUrl => _privacyUrl; static const String appId = 'im.fluffychat.FluffyChat'; diff --git a/lib/config/themes.dart b/lib/config/themes.dart index e1435f3c..634f06d8 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -32,6 +32,7 @@ abstract class FluffyThemes { primaryColorLight: Color(0xff121212), brightness: Brightness.light, primaryColor: AppConfig.primaryColor, + accentColor: AppConfig.primaryColor, backgroundColor: Colors.white, secondaryHeaderColor: Color(0xFFECECF2), scaffoldBackgroundColor: Colors.white, @@ -74,12 +75,12 @@ abstract class FluffyThemes { static ThemeData dark = ThemeData.dark().copyWith( primaryColorDark: Color(0xff121212), primaryColorLight: Colors.white, - primaryColor: Color(0xFF8966CF), + primaryColor: AppConfig.primaryColor, errorColor: Color(0xFFCF6679), backgroundColor: Colors.black, scaffoldBackgroundColor: Colors.black, - accentColor: Color(0xFFF5B4D2), - secondaryHeaderColor: Color(0xff1D1D1D), + accentColor: AppConfig.primaryColorLight, + secondaryHeaderColor: Color(0xff2D2D2D), textTheme: Typography.material2018().white.merge(fallback_text_theme), dialogTheme: DialogTheme( shape: RoundedRectangleBorder( @@ -95,6 +96,11 @@ abstract class FluffyThemes { backgroundColor: AppConfig.primaryColor, foregroundColor: Colors.white, ), + inputDecorationTheme: InputDecorationTheme( + border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), + filled: true, + fillColor: Color(0xff2D2D2D), + ), appBarTheme: AppBarTheme( brightness: Brightness.dark, color: Color(0xff1D1D1D),