From 56edb77b68e8e720a255745c60b55eb77d48ab7a Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sun, 31 Jan 2021 23:54:33 +0100 Subject: [PATCH] change: Minor design colors --- lib/app_config.dart | 2 +- lib/components/list_items/chat_list_item.dart | 10 +++++----- lib/components/list_items/state_message.dart | 2 +- lib/config/themes.dart | 8 ++++---- lib/views/chat.dart | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/app_config.dart b/lib/app_config.dart index ee7806af..2d214ee3 100644 --- a/lib/app_config.dart +++ b/lib/app_config.dart @@ -11,7 +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 const Color primaryColorLight = Color(0xFFCCBDEA); 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/components/list_items/chat_list_item.dart b/lib/components/list_items/chat_list_item.dart index 0ac9fd08..006acebf 100644 --- a/lib/components/list_items/chat_list_item.dart +++ b/lib/components/list_items/chat_list_item.dart @@ -180,7 +180,7 @@ class ChatListItem extends StatelessWidget { style: TextStyle( fontSize: 13, color: room.notificationCount > 0 - ? Theme.of(context).primaryColor + ? Theme.of(context).accentColor : null, ), ), @@ -200,7 +200,7 @@ class ChatListItem extends StatelessWidget { if (typingText.isNotEmpty) ...{ Icon( Icons.edit_outlined, - color: Theme.of(context).primaryColor, + color: Theme.of(context).accentColor, size: 14, ), SizedBox(width: 4), @@ -210,7 +210,7 @@ class ChatListItem extends StatelessWidget { ? Text( typingText, style: TextStyle( - color: Theme.of(context).primaryColor, + color: Theme.of(context).accentColor, ), softWrap: false, ) @@ -218,7 +218,7 @@ class ChatListItem extends StatelessWidget { ? Text( L10n.of(context).youAreInvitedToThisChat, style: TextStyle( - color: Theme.of(context).primaryColor, + color: Theme.of(context).accentColor, ), softWrap: false, ) @@ -248,7 +248,7 @@ class ChatListItem extends StatelessWidget { child: Icon( Icons.push_pin_outlined, size: 20, - color: Theme.of(context).primaryColor, + color: Theme.of(context).accentColor, ), ), if (room.isUnread) diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart index ade3ee02..580e5fe3 100644 --- a/lib/components/list_items/state_message.dart +++ b/lib/components/list_items/state_message.dart @@ -19,7 +19,7 @@ class StateMessage extends StatelessWidget { child: Container( padding: const EdgeInsets.all(8), decoration: BoxDecoration( - color: Theme.of(context).secondaryHeaderColor.withOpacity(0.9), + color: Theme.of(context).secondaryHeaderColor, borderRadius: BorderRadius.circular(7), ), child: Text( diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 634f06d8..2c9ba62c 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -34,7 +34,7 @@ abstract class FluffyThemes { primaryColor: AppConfig.primaryColor, accentColor: AppConfig.primaryColor, backgroundColor: Colors.white, - secondaryHeaderColor: Color(0xFFECECF2), + secondaryHeaderColor: AppConfig.primaryColor.withAlpha(16), scaffoldBackgroundColor: Colors.white, textTheme: Typography.material2018().black.merge(fallback_text_theme), snackBarTheme: SnackBarThemeData( @@ -57,7 +57,7 @@ abstract class FluffyThemes { inputDecorationTheme: InputDecorationTheme( border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), filled: true, - fillColor: Color(0xFFECECF2), + fillColor: AppConfig.primaryColor.withAlpha(16), ), appBarTheme: AppBarTheme( brightness: Brightness.light, @@ -80,7 +80,7 @@ abstract class FluffyThemes { backgroundColor: Colors.black, scaffoldBackgroundColor: Colors.black, accentColor: AppConfig.primaryColorLight, - secondaryHeaderColor: Color(0xff2D2D2D), + secondaryHeaderColor: AppConfig.primaryColorLight.withAlpha(32), textTheme: Typography.material2018().white.merge(fallback_text_theme), dialogTheme: DialogTheme( shape: RoundedRectangleBorder( @@ -99,7 +99,7 @@ abstract class FluffyThemes { inputDecorationTheme: InputDecorationTheme( border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), filled: true, - fillColor: Color(0xff2D2D2D), + fillColor: AppConfig.primaryColorLight.withAlpha(32), ), appBarTheme: AppBarTheme( brightness: Brightness.dark, diff --git a/lib/views/chat.dart b/lib/views/chat.dart index b516a7c3..4cd41939 100644 --- a/lib/views/chat.dart +++ b/lib/views/chat.dart @@ -707,8 +707,8 @@ class _ChatState extends State { maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle( - color: Theme.of(context) - .primaryColor, + color: + Theme.of(context).accentColor, ), ), ),