From da857d6abe2aa491cf1d6b079ec355683eeb9011 Mon Sep 17 00:00:00 2001 From: krille-chan Date: Sun, 3 Nov 2024 12:51:22 +0100 Subject: [PATCH] chore: Follow up design --- lib/pages/chat/chat_view.dart | 4 +--- lib/pages/chat/events/message.dart | 14 +++++--------- lib/pages/settings_style/settings_style_view.dart | 6 ++---- lib/widgets/mxc_image.dart | 2 +- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 14c70459f..30a9687a4 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -304,9 +304,7 @@ class ChatView extends StatelessWidget { alignment: Alignment.center, child: Material( clipBehavior: Clip.hardEdge, - color: accountConfig.wallpaperUrl != null - ? theme.colorScheme.surfaceBright - : theme.colorScheme.surfaceContainerHigh, + color: theme.colorScheme.surfaceContainerHigh, borderRadius: const BorderRadius.all( Radius.circular(24), ), diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart index 6a515d4d2..dc4790e0f 100644 --- a/lib/pages/chat/events/message.dart +++ b/lib/pages/chat/events/message.dart @@ -84,9 +84,7 @@ class Message extends StatelessWidget { final ownMessage = event.senderId == client.userID; final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft; - var color = wallpaperMode - ? theme.colorScheme.surfaceBright - : theme.colorScheme.surfaceContainerHigh; + var color = theme.colorScheme.surfaceContainerHigh; final displayTime = event.type == EventTypes.RoomCreate || nextEvent == null || !event.originServerTs.sameEnvironment(nextEvent!.originServerTs); @@ -270,15 +268,13 @@ class Message extends StatelessWidget { shadows: !wallpaperMode ? null : [ - Shadow( - offset: const Offset( + const Shadow( + offset: Offset( 0.0, 0.0, ), - blurRadius: 5, - color: theme - .colorScheme - .surface, + blurRadius: 3, + color: Colors.black, ), ], ), diff --git a/lib/pages/settings_style/settings_style_view.dart b/lib/pages/settings_style/settings_style_view.dart index f531b5280..0b73bbc3e 100644 --- a/lib/pages/settings_style/settings_style_view.dart +++ b/lib/pages/settings_style/settings_style_view.dart @@ -256,10 +256,8 @@ class SettingsStyleView extends StatelessWidget { bottom: 12, ), child: Material( - color: accountConfig.wallpaperUrl == null - ? theme - .colorScheme.surfaceContainerHighest - : theme.colorScheme.surfaceBright, + color: + theme.colorScheme.surfaceContainerHigh, borderRadius: BorderRadius.circular( AppConfig.borderRadius, ), diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart index bf007f530..1d5625998 100644 --- a/lib/widgets/mxc_image.dart +++ b/lib/widgets/mxc_image.dart @@ -140,7 +140,7 @@ class _MxcImageState extends State { return AnimatedCrossFade( crossFadeState: hasData ? CrossFadeState.showSecond : CrossFadeState.showFirst, - duration: FluffyThemes.animationDuration, + duration: const Duration(milliseconds: 128), firstChild: placeholder(context), secondChild: hasData ? Image.memory(