From 917dde5a1cb8ebc2399de0ef5e3564d2672d87a5 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Sat, 13 Nov 2021 19:36:39 +0100 Subject: [PATCH] fix: Minor design fixes --- lib/config/themes.dart | 6 +++--- lib/pages/chat/seen_by_row.dart | 27 ++++++++++++++------------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lib/config/themes.dart b/lib/config/themes.dart index d178a845..d1a0cb95 100644 --- a/lib/config/themes.dart +++ b/lib/config/themes.dart @@ -129,8 +129,8 @@ abstract class FluffyThemes { backgroundColor: Colors.black, scaffoldBackgroundColor: Colors.black, colorScheme: ThemeData.dark().colorScheme.copyWith( - primary: AppConfig.primaryColorLight, - secondary: AppConfig.primaryColorLight, + primary: AppConfig.chatColor, + secondary: AppConfig.chatColor, secondaryVariant: AppConfig.secondaryColor, surface: FluffyThemes.darken(AppConfig.chatColor, 0.4), ), @@ -171,7 +171,7 @@ abstract class FluffyThemes { border: OutlineInputBorder( borderRadius: BorderRadius.circular(AppConfig.borderRadius)), filled: true, - fillColor: FluffyThemes.darken(AppConfig.primaryColorLight, .71), + fillColor: FluffyThemes.darken(AppConfig.chatColor, 0.4), enabledBorder: OutlineInputBorder( borderRadius: BorderRadius.circular(AppConfig.borderRadius), borderSide: BorderSide( diff --git a/lib/pages/chat/seen_by_row.dart b/lib/pages/chat/seen_by_row.dart index 58a0482f..565c15b6 100644 --- a/lib/pages/chat/seen_by_row.dart +++ b/lib/pages/chat/seen_by_row.dart @@ -18,21 +18,22 @@ class SeenByRow extends StatelessWidget { controller.unfolded, ); const maxAvatars = 7; - return AnimatedContainer( - height: seenByUsers.isEmpty ? 0 : 24, - duration: seenByUsers.isEmpty - ? const Duration(milliseconds: 0) - : const Duration(milliseconds: 300), - alignment: controller.filteredEvents.isNotEmpty && - controller.filteredEvents.first.senderId == - Matrix.of(context).client.userID - ? Alignment.topRight - : Alignment.topLeft, - padding: const EdgeInsets.only(bottom: 4), - child: Container( + return Container( + width: double.infinity, + alignment: Alignment.center, + child: AnimatedContainer( constraints: const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5), - alignment: Alignment.center, + height: seenByUsers.isEmpty ? 0 : 24, + duration: seenByUsers.isEmpty + ? const Duration(milliseconds: 0) + : const Duration(milliseconds: 300), + alignment: controller.filteredEvents.isNotEmpty && + controller.filteredEvents.first.senderId == + Matrix.of(context).client.userID + ? Alignment.topRight + : Alignment.topLeft, + padding: const EdgeInsets.only(left: 24, right: 24, bottom: 4), child: Wrap( spacing: 4, children: [