GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-11-14 16:09:31 +01:00
Code Issues Projects Releases Wiki Activity

change: Minor design colors

Browse Source
This commit is contained in:
Christian Pauly 2021-01-31 23:54:33 +01:00
parent f5b1ae818d
commit 56edb77b68
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app_config.dart
View File

@ -11,7 +11,7 @@ abstract class AppConfig {
static const bool allowOtherHomeservers = true; static const bool allowOtherHomeservers = true;
static const bool enableRegistration = true; static const bool enableRegistration = true;
static const Color primaryColor = Color(0xFF5625BA); 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 _privacyUrl = 'https://fluffychat.im/en/privacy.html';
static String get privacyUrl => _privacyUrl; static String get privacyUrl => _privacyUrl;
static const String appId = 'im.fluffychat.FluffyChat'; static const String appId = 'im.fluffychat.FluffyChat';

10
lib/components/list_items/chat_list_item.dart
View File

@ -180,7 +180,7 @@ class ChatListItem extends StatelessWidget {
style: TextStyle( style: TextStyle(
fontSize: 13, fontSize: 13,
color: room.notificationCount > 0 color: room.notificationCount > 0
? Theme.of(context).primaryColor ? Theme.of(context).accentColor
: null, : null,
), ),
), ),
@ -200,7 +200,7 @@ class ChatListItem extends StatelessWidget {
if (typingText.isNotEmpty) ...{ if (typingText.isNotEmpty) ...{
Icon( Icon(
Icons.edit_outlined, Icons.edit_outlined,
color: Theme.of(context).primaryColor, color: Theme.of(context).accentColor,
size: 14, size: 14,
), ),
SizedBox(width: 4), SizedBox(width: 4),
@ -210,7 +210,7 @@ class ChatListItem extends StatelessWidget {
? Text( ? Text(
typingText, typingText,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryColor, color: Theme.of(context).accentColor,
), ),
softWrap: false, softWrap: false,
) )
@ -218,7 +218,7 @@ class ChatListItem extends StatelessWidget {
? Text( ? Text(
L10n.of(context).youAreInvitedToThisChat, L10n.of(context).youAreInvitedToThisChat,
style: TextStyle( style: TextStyle(
color: Theme.of(context).primaryColor, color: Theme.of(context).accentColor,
), ),
softWrap: false, softWrap: false,
) )
@ -248,7 +248,7 @@ class ChatListItem extends StatelessWidget {
child: Icon( child: Icon(
Icons.push_pin_outlined, Icons.push_pin_outlined,
size: 20, size: 20,
color: Theme.of(context).primaryColor, color: Theme.of(context).accentColor,
), ),
), ),
if (room.isUnread) if (room.isUnread)

2
lib/components/list_items/state_message.dart
View File

@ -19,7 +19,7 @@ class StateMessage extends StatelessWidget {
child: Container( child: Container(
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
decoration: BoxDecoration( decoration: BoxDecoration(
color: Theme.of(context).secondaryHeaderColor.withOpacity(0.9), color: Theme.of(context).secondaryHeaderColor,
borderRadius: BorderRadius.circular(7), borderRadius: BorderRadius.circular(7),
), ),
child: Text( child: Text(

8
lib/config/themes.dart
View File

@ -34,7 +34,7 @@ abstract class FluffyThemes {
primaryColor: AppConfig.primaryColor, primaryColor: AppConfig.primaryColor,
accentColor: AppConfig.primaryColor, accentColor: AppConfig.primaryColor,
backgroundColor: Colors.white, backgroundColor: Colors.white,
secondaryHeaderColor: Color(0xFFECECF2), secondaryHeaderColor: AppConfig.primaryColor.withAlpha(16),
scaffoldBackgroundColor: Colors.white, scaffoldBackgroundColor: Colors.white,
textTheme: Typography.material2018().black.merge(fallback_text_theme), textTheme: Typography.material2018().black.merge(fallback_text_theme),
snackBarTheme: SnackBarThemeData( snackBarTheme: SnackBarThemeData(
@ -57,7 +57,7 @@ abstract class FluffyThemes {
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
filled: true, filled: true,
fillColor: Color(0xFFECECF2), fillColor: AppConfig.primaryColor.withAlpha(16),
), ),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
brightness: Brightness.light, brightness: Brightness.light,
@ -80,7 +80,7 @@ abstract class FluffyThemes {
backgroundColor: Colors.black, backgroundColor: Colors.black,
scaffoldBackgroundColor: Colors.black, scaffoldBackgroundColor: Colors.black,
accentColor: AppConfig.primaryColorLight, accentColor: AppConfig.primaryColorLight,
secondaryHeaderColor: Color(0xff2D2D2D), secondaryHeaderColor: AppConfig.primaryColorLight.withAlpha(32),
textTheme: Typography.material2018().white.merge(fallback_text_theme), textTheme: Typography.material2018().white.merge(fallback_text_theme),
dialogTheme: DialogTheme( dialogTheme: DialogTheme(
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
@ -99,7 +99,7 @@ abstract class FluffyThemes {
inputDecorationTheme: InputDecorationTheme( inputDecorationTheme: InputDecorationTheme(
border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)), border: OutlineInputBorder(borderRadius: BorderRadius.circular(12)),
filled: true, filled: true,
fillColor: Color(0xff2D2D2D), fillColor: AppConfig.primaryColorLight.withAlpha(32),
), ),
appBarTheme: AppBarTheme( appBarTheme: AppBarTheme(
brightness: Brightness.dark, brightness: Brightness.dark,

4
lib/views/chat.dart
View File

@ -707,8 +707,8 @@ class _ChatState extends State<Chat> {
maxLines: 1, maxLines: 1,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
color: Theme.of(context) color:
.primaryColor, Theme.of(context).accentColor,
), ),
), ),
), ),