From 3c7926c81a9de7cc267685cf3ce0522e7741b1c0 Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 9 Jul 2022 09:01:22 +0200 Subject: [PATCH] chore: Adjust design --- lib/pages/chat/chat_view.dart | 2 +- lib/pages/chat_list/chat_list_header.dart | 126 +++++++++++----------- lib/pages/chat_list/chat_list_item.dart | 4 +- 3 files changed, 68 insertions(+), 64 deletions(-) diff --git a/lib/pages/chat/chat_view.dart b/lib/pages/chat/chat_view.dart index 718def3a..3f1fdcc8 100644 --- a/lib/pages/chat/chat_view.dart +++ b/lib/pages/chat/chat_view.dart @@ -164,7 +164,7 @@ class ChatView extends StatelessWidget { builder: (BuildContext context, snapshot) { return Scaffold( appBar: AppBar( - elevation: 4, + elevation: 2, actionsIconTheme: IconThemeData( color: controller.selectedEvents.isEmpty ? null diff --git a/lib/pages/chat_list/chat_list_header.dart b/lib/pages/chat_list/chat_list_header.dart index 68e890e4..a66d78af 100644 --- a/lib/pages/chat_list/chat_list_header.dart +++ b/lib/pages/chat_list/chat_list_header.dart @@ -36,70 +36,74 @@ class ChatListHeader extends StatelessWidget implements PreferredSizeWidget { controller.selectedRoomIds.length.toString(), key: const ValueKey(SelectMode.select), ) - : TextField( - controller: controller.searchController, - textInputAction: TextInputAction.search, - onChanged: controller.onSearchEnter, - decoration: InputDecoration( - fillColor: Theme.of(context).colorScheme.surfaceVariant, - contentPadding: EdgeInsets.zero, - border: OutlineInputBorder( - borderRadius: BorderRadius.circular(90), - borderSide: BorderSide.none, - ), - hintText: controller.activeSpacesEntry.getName(context), - prefixIcon: controller.isSearchMode - ? IconButton( - tooltip: L10n.of(context)!.cancel, - icon: const Icon(Icons.close_outlined), - onPressed: controller.cancelSearch, - color: Theme.of(context).colorScheme.primary, - ) - : IconButton( - onPressed: Scaffold.of(context).openDrawer, - icon: Icon( - Icons.menu, - color: Theme.of(context).colorScheme.onBackground, + : SizedBox( + height: 44, + child: TextField( + controller: controller.searchController, + textInputAction: TextInputAction.search, + onChanged: controller.onSearchEnter, + decoration: InputDecoration( + fillColor: Theme.of(context).colorScheme.surfaceVariant, + contentPadding: EdgeInsets.zero, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(90), + borderSide: BorderSide.none, + ), + hintText: controller.activeSpacesEntry.getName(context), + prefixIcon: controller.isSearchMode + ? IconButton( + tooltip: L10n.of(context)!.cancel, + icon: const Icon(Icons.close_outlined), + onPressed: controller.cancelSearch, + color: Theme.of(context).colorScheme.primary, + ) + : IconButton( + onPressed: Scaffold.of(context).openDrawer, + icon: Icon( + Icons.menu, + color: + Theme.of(context).colorScheme.onBackground, + ), ), - ), - suffixIcon: Row( - mainAxisSize: MainAxisSize.min, - children: controller.isSearchMode - ? [ - if (controller.isSearching) - const CircularProgressIndicator.adaptive( - strokeWidth: 2, + suffixIcon: Row( + mainAxisSize: MainAxisSize.min, + children: controller.isSearchMode + ? [ + if (controller.isSearching) + const CircularProgressIndicator.adaptive( + strokeWidth: 2, + ), + TextButton( + onPressed: controller.setServer, + style: TextButton.styleFrom( + textStyle: const TextStyle(fontSize: 12), + ), + child: Text( + controller.searchServer ?? + Matrix.of(context) + .client + .homeserver! + .host, + maxLines: 2, + ), ), - TextButton( - onPressed: controller.setServer, - style: TextButton.styleFrom( - textStyle: const TextStyle(fontSize: 12), + ] + : [ + IconButton( + icon: Icon( + Icons.camera_alt_outlined, + color: Theme.of(context) + .colorScheme + .onBackground, + ), + tooltip: L10n.of(context)!.addToStory, + onPressed: () => + VRouter.of(context).to('/stories/create'), ), - child: Text( - controller.searchServer ?? - Matrix.of(context) - .client - .homeserver! - .host, - maxLines: 2, - ), - ), - ] - : [ - IconButton( - icon: Icon( - Icons.camera_alt_outlined, - color: Theme.of(context) - .colorScheme - .onBackground, - ), - tooltip: L10n.of(context)!.addToStory, - onPressed: () => - VRouter.of(context).to('/stories/create'), - ), - ClientChooserButton(controller), - const SizedBox(width: 12), - ], + ClientChooserButton(controller), + const SizedBox(width: 12), + ], + ), ), ), ), diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 9affa6dc..f7cbded3 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -157,9 +157,9 @@ class ChatListItem extends StatelessWidget { : 0.0; return Material( color: selected - ? Theme.of(context).primaryColor.withAlpha(100) + ? Theme.of(context).colorScheme.primaryContainer : activeChat - ? Theme.of(context).secondaryHeaderColor + ? Theme.of(context).colorScheme.secondaryContainer : Colors.transparent, child: ListTile( selected: selected || activeChat,