diff --git a/lib/config/themes.dart b/lib/config/themes.dart index 967b9f4e1..beed70ffb 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -121,10 +121,12 @@ abstract class FluffyThemes { ), ), ), - snackBarTheme: SnackBarThemeData( - behavior: SnackBarBehavior.floating, - width: isColumnMode ? null : FluffyThemes.columnWidth * 1.5, - ), + snackBarTheme: isColumnMode + ? const SnackBarThemeData( + behavior: SnackBarBehavior.floating, + width: FluffyThemes.columnWidth * 1.5, + ) + : const SnackBarThemeData(behavior: SnackBarBehavior.floating), elevatedButtonTheme: ElevatedButtonThemeData( style: ElevatedButton.styleFrom( backgroundColor: colorScheme.secondaryContainer, diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 08152d2cb..04c84fbf0 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -246,6 +246,8 @@ class ChatView extends StatelessWidget { ), ), ), + floatingActionButtonLocation: + FloatingActionButtonLocation.miniCenterFloat, floatingActionButton: controller.showScrollDownButton && controller.selectedEvents.isEmpty ? Padding( diff --git a/lib/pages/chat/events/reply_content.dart b/lib/pages/chat/events/reply_content.dart index 4d5ca7405..e5b7f2975 100644 --- a/lib/pages/chat/events/reply_content.dart +++ b/lib/pages/chat/events/reply_content.dart @@ -34,9 +34,7 @@ class ReplyContent extends StatelessWidget { timeline != null ? replyEvent.getDisplayEvent(timeline) : replyEvent; final fontSize = AppConfig.messageFontSize * AppConfig.fontSizeFactor; final color = theme.brightness == Brightness.dark - ? ownMessage - ? theme.colorScheme.onTertiaryContainer - : theme.colorScheme.onTertiary + ? theme.colorScheme.onTertiaryContainer : ownMessage ? theme.colorScheme.tertiaryContainer : theme.colorScheme.tertiary; @@ -84,9 +82,11 @@ class ReplyContent extends StatelessWidget { overflow: TextOverflow.ellipsis, maxLines: 1, style: TextStyle( - color: ownMessage - ? theme.colorScheme.onTertiary - : theme.colorScheme.onSurface, + color: theme.brightness == Brightness.dark + ? theme.colorScheme.onSurface + : ownMessage + ? theme.colorScheme.onTertiary + : theme.colorScheme.onSurface, fontSize: fontSize, ), ),