From 8f89d539d0bd2277616d245545c347617d927f82 Mon Sep 17 00:00:00 2001 From: Krille Fear Date: Mon, 26 Dec 2022 16:02:45 +0100 Subject: [PATCH] chore: follow up fix --- lib/pages/chat_list/chat_list_body.dart | 456 ++++++++++++------------ lib/pages/chat_list/chat_list_view.dart | 312 ++++++++-------- 2 files changed, 378 insertions(+), 390 deletions(-) diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 15c51d38..05dd24c4 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -10,6 +10,7 @@ import 'package:fluffychat/pages/chat_list/chat_list_item.dart'; import 'package:fluffychat/pages/chat_list/search_title.dart'; import 'package:fluffychat/pages/chat_list/space_view.dart'; import 'package:fluffychat/pages/chat_list/stories_header.dart'; +import 'package:fluffychat/utils/stream_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/profile_bottom_sheet.dart'; import 'package:fluffychat/widgets/public_room_bottom_sheet.dart'; @@ -41,237 +42,248 @@ class ChatListViewBody extends StatelessWidget { child: child, ); }, - child: Builder(builder: (context) { - if (controller.activeFilter == ActiveFilter.spaces && - !controller.isSearchMode) { - return SpaceView( - controller, - scrollController: controller.scrollController, - key: Key(controller.activeSpaceId ?? 'Spaces'), - ); - } - if (controller.waitForFirstSync && client.prevBatch != null) { - final rooms = controller.filteredRooms; - final displayStoriesHeader = { - ActiveFilter.allChats, - ActiveFilter.messages, - }.contains(controller.activeFilter); - return ListView.builder( - controller: controller.scrollController, - // add +1 space below in order to properly scroll below the spaces bar - itemCount: rooms.length + 1, - itemBuilder: (BuildContext context, int i) { - if (i == 0) { - return Column( - mainAxisSize: MainAxisSize.min, - children: [ - if (roomSearchResult != null) ...[ - SearchTitle( - title: L10n.of(context)!.publicRooms, - icon: const Icon(Icons.explore_outlined), - ), - AnimatedContainer( - height: roomSearchResult.chunk.isEmpty ? 0 : 106, - duration: const Duration(milliseconds: 250), - clipBehavior: Clip.hardEdge, - decoration: const BoxDecoration(), - child: ListView.builder( - scrollDirection: Axis.horizontal, - itemCount: roomSearchResult.chunk.length, - itemBuilder: (context, i) => _SearchItem( - title: roomSearchResult.chunk[i].name ?? - roomSearchResult - .chunk[i].canonicalAlias?.localpart ?? - L10n.of(context)!.group, - avatar: roomSearchResult.chunk[i].avatarUrl, - onPressed: () => showModalBottomSheet( - context: context, - builder: (c) => PublicRoomBottomSheet( - roomAlias: - roomSearchResult.chunk[i].canonicalAlias ?? - roomSearchResult.chunk[i].roomId, - outerContext: context, - chunk: roomSearchResult.chunk[i], - ), - ), - ), - ), - ), - ], - if (userSearchResult != null) ...[ - SearchTitle( - title: L10n.of(context)!.users, - icon: const Icon(Icons.group_outlined), - ), - AnimatedContainer( - height: userSearchResult.results.isEmpty ? 0 : 106, - duration: const Duration(milliseconds: 250), - clipBehavior: Clip.hardEdge, - decoration: const BoxDecoration(), - child: ListView.builder( - scrollDirection: Axis.horizontal, - itemCount: userSearchResult.results.length, - itemBuilder: (context, i) => _SearchItem( - title: userSearchResult.results[i].displayName ?? - userSearchResult.results[i].userId.localpart ?? - L10n.of(context)!.unknownDevice, - avatar: userSearchResult.results[i].avatarUrl, - onPressed: () => showModalBottomSheet( - context: context, - builder: (c) => ProfileBottomSheet( - userId: userSearchResult.results[i].userId, - outerContext: context, - ), - ), - ), - ), - ), - ], - if (controller.isSearchMode) - SearchTitle( - title: L10n.of(context)!.stories, - icon: const Icon(Icons.camera_alt_outlined), - ), - if (displayStoriesHeader) - StoriesHeader( - key: const Key('stories_header'), - filter: controller.searchController.text, - ), - const ConnectionStatusHeader(), - AnimatedContainer( - height: controller.isTorBrowser ? 64 : 0, - duration: const Duration(milliseconds: 300), - clipBehavior: Clip.hardEdge, - curve: Curves.bounceInOut, - decoration: const BoxDecoration(), - child: Material( - color: Theme.of(context).colorScheme.surface, - child: ListTile( - leading: const Icon(Icons.vpn_key), - title: Text(L10n.of(context)!.dehydrateTor), - subtitle: Text(L10n.of(context)!.dehydrateTorLong), - trailing: const Icon(Icons.chevron_right_outlined), - onTap: controller.dehydrate, - ), - ), - ), - if (controller.isSearchMode) - SearchTitle( - title: L10n.of(context)!.chats, - icon: const Icon(Icons.chat_outlined), - ), - if (rooms.isEmpty && !controller.isSearchMode) - Padding( - padding: const EdgeInsets.all(32.0), - child: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - const SizedBox(height: 32), - Image.asset( - 'assets/start_chat.png', - ), - Divider( - height: 1, - color: Theme.of(context).colorScheme.onBackground, - ), - const SizedBox(height: 32), - FloatingActionButton.extended( - backgroundColor: - Theme.of(context).colorScheme.primary, - foregroundColor: - Theme.of(context).colorScheme.onPrimary, - icon: const Icon(Icons.edit_outlined), - onPressed: () => - VRouter.of(context).to('/newprivatechat'), - label: Text(L10n.of(context)!.startFirstChat), - ), - ], - ), - ), - ], - ); - } - i--; - if (!rooms[i] - .displayname - .toLowerCase() - .contains(controller.searchController.text.toLowerCase())) { - return Container(); - } - return ChatListItem( - rooms[i], - key: Key('chat_list_item_${rooms[i].id}'), - selected: controller.selectedRoomIds.contains(rooms[i].id), - onTap: controller.selectMode == SelectMode.select - ? () => controller.toggleSelection(rooms[i].id) - : null, - onLongPress: () => controller.toggleSelection(rooms[i].id), - activeChat: controller.activeChat == rooms[i].id, + child: StreamBuilder( + key: ValueKey(client.userID.toString() + + controller.activeFilter.toString() + + controller.activeSpaceId.toString()), + stream: client.onSync.stream + .where((s) => s.hasRoomUpdate) + .rateLimit(const Duration(seconds: 1)), + builder: (context, _) { + if (controller.activeFilter == ActiveFilter.spaces && + !controller.isSearchMode) { + return SpaceView( + controller, + scrollController: controller.scrollController, + key: Key(controller.activeSpaceId ?? 'Spaces'), ); - }, - ); - } - const dummyChatCount = 5; - final titleColor = - Theme.of(context).textTheme.bodyText1!.color!.withAlpha(100); - final subtitleColor = - Theme.of(context).textTheme.bodyText1!.color!.withAlpha(50); - return ListView.builder( - key: const Key('dummychats'), - itemCount: dummyChatCount, - itemBuilder: (context, i) => Opacity( - opacity: (dummyChatCount - i) / dummyChatCount, - child: ListTile( - leading: CircleAvatar( - backgroundColor: titleColor, - child: CircularProgressIndicator( - strokeWidth: 1, - color: Theme.of(context).textTheme.bodyText1!.color, - ), - ), - title: Row( - children: [ - Expanded( - child: Container( - height: 14, - decoration: BoxDecoration( - color: titleColor, - borderRadius: BorderRadius.circular(3), + } + if (controller.waitForFirstSync && client.prevBatch != null) { + final rooms = controller.filteredRooms; + final displayStoriesHeader = { + ActiveFilter.allChats, + ActiveFilter.messages, + }.contains(controller.activeFilter); + return ListView.builder( + controller: controller.scrollController, + // add +1 space below in order to properly scroll below the spaces bar + itemCount: rooms.length + 1, + itemBuilder: (BuildContext context, int i) { + if (i == 0) { + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (roomSearchResult != null) ...[ + SearchTitle( + title: L10n.of(context)!.publicRooms, + icon: const Icon(Icons.explore_outlined), + ), + AnimatedContainer( + height: roomSearchResult.chunk.isEmpty ? 0 : 106, + duration: const Duration(milliseconds: 250), + clipBehavior: Clip.hardEdge, + decoration: const BoxDecoration(), + child: ListView.builder( + scrollDirection: Axis.horizontal, + itemCount: roomSearchResult.chunk.length, + itemBuilder: (context, i) => _SearchItem( + title: roomSearchResult.chunk[i].name ?? + roomSearchResult + .chunk[i].canonicalAlias?.localpart ?? + L10n.of(context)!.group, + avatar: roomSearchResult.chunk[i].avatarUrl, + onPressed: () => showModalBottomSheet( + context: context, + builder: (c) => PublicRoomBottomSheet( + roomAlias: roomSearchResult + .chunk[i].canonicalAlias ?? + roomSearchResult.chunk[i].roomId, + outerContext: context, + chunk: roomSearchResult.chunk[i], + ), + ), + ), + ), + ), + ], + if (userSearchResult != null) ...[ + SearchTitle( + title: L10n.of(context)!.users, + icon: const Icon(Icons.group_outlined), + ), + AnimatedContainer( + height: userSearchResult.results.isEmpty ? 0 : 106, + duration: const Duration(milliseconds: 250), + clipBehavior: Clip.hardEdge, + decoration: const BoxDecoration(), + child: ListView.builder( + scrollDirection: Axis.horizontal, + itemCount: userSearchResult.results.length, + itemBuilder: (context, i) => _SearchItem( + title: + userSearchResult.results[i].displayName ?? + userSearchResult + .results[i].userId.localpart ?? + L10n.of(context)!.unknownDevice, + avatar: userSearchResult.results[i].avatarUrl, + onPressed: () => showModalBottomSheet( + context: context, + builder: (c) => ProfileBottomSheet( + userId: userSearchResult.results[i].userId, + outerContext: context, + ), + ), + ), + ), + ), + ], + if (controller.isSearchMode) + SearchTitle( + title: L10n.of(context)!.stories, + icon: const Icon(Icons.camera_alt_outlined), + ), + if (displayStoriesHeader) + StoriesHeader( + key: const Key('stories_header'), + filter: controller.searchController.text, + ), + const ConnectionStatusHeader(), + AnimatedContainer( + height: controller.isTorBrowser ? 64 : 0, + duration: const Duration(milliseconds: 300), + clipBehavior: Clip.hardEdge, + curve: Curves.bounceInOut, + decoration: const BoxDecoration(), + child: Material( + color: Theme.of(context).colorScheme.surface, + child: ListTile( + leading: const Icon(Icons.vpn_key), + title: Text(L10n.of(context)!.dehydrateTor), + subtitle: + Text(L10n.of(context)!.dehydrateTorLong), + trailing: + const Icon(Icons.chevron_right_outlined), + onTap: controller.dehydrate, + ), + ), + ), + if (controller.isSearchMode) + SearchTitle( + title: L10n.of(context)!.chats, + icon: const Icon(Icons.chat_outlined), + ), + if (rooms.isEmpty && !controller.isSearchMode) + Padding( + padding: const EdgeInsets.all(32.0), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + const SizedBox(height: 32), + Image.asset( + 'assets/start_chat.png', + ), + Divider( + height: 1, + color: Theme.of(context) + .colorScheme + .onBackground, + ), + const SizedBox(height: 32), + FloatingActionButton.extended( + backgroundColor: + Theme.of(context).colorScheme.primary, + foregroundColor: + Theme.of(context).colorScheme.onPrimary, + icon: const Icon(Icons.edit_outlined), + onPressed: () => + VRouter.of(context).to('/newprivatechat'), + label: Text(L10n.of(context)!.startFirstChat), + ), + ], + ), + ), + ], + ); + } + i--; + if (!rooms[i].displayname.toLowerCase().contains( + controller.searchController.text.toLowerCase())) { + return Container(); + } + return ChatListItem( + rooms[i], + key: Key('chat_list_item_${rooms[i].id}'), + selected: controller.selectedRoomIds.contains(rooms[i].id), + onTap: controller.selectMode == SelectMode.select + ? () => controller.toggleSelection(rooms[i].id) + : null, + onLongPress: () => controller.toggleSelection(rooms[i].id), + activeChat: controller.activeChat == rooms[i].id, + ); + }, + ); + } + const dummyChatCount = 5; + final titleColor = + Theme.of(context).textTheme.bodyText1!.color!.withAlpha(100); + final subtitleColor = + Theme.of(context).textTheme.bodyText1!.color!.withAlpha(50); + return ListView.builder( + key: const Key('dummychats'), + itemCount: dummyChatCount, + itemBuilder: (context, i) => Opacity( + opacity: (dummyChatCount - i) / dummyChatCount, + child: ListTile( + leading: CircleAvatar( + backgroundColor: titleColor, + child: CircularProgressIndicator( + strokeWidth: 1, + color: Theme.of(context).textTheme.bodyText1!.color, + ), + ), + title: Row( + children: [ + Expanded( + child: Container( + height: 14, + decoration: BoxDecoration( + color: titleColor, + borderRadius: BorderRadius.circular(3), + ), + ), ), - ), + const SizedBox(width: 36), + Container( + height: 14, + width: 14, + decoration: BoxDecoration( + color: subtitleColor, + borderRadius: BorderRadius.circular(14), + ), + ), + const SizedBox(width: 12), + Container( + height: 14, + width: 14, + decoration: BoxDecoration( + color: subtitleColor, + borderRadius: BorderRadius.circular(14), + ), + ), + ], ), - const SizedBox(width: 36), - Container( - height: 14, - width: 14, + subtitle: Container( decoration: BoxDecoration( color: subtitleColor, - borderRadius: BorderRadius.circular(14), + borderRadius: BorderRadius.circular(3), ), + height: 12, + margin: const EdgeInsets.only(right: 22), ), - const SizedBox(width: 12), - Container( - height: 14, - width: 14, - decoration: BoxDecoration( - color: subtitleColor, - borderRadius: BorderRadius.circular(14), - ), - ), - ], - ), - subtitle: Container( - decoration: BoxDecoration( - color: subtitleColor, - borderRadius: BorderRadius.circular(3), ), - height: 12, - margin: const EdgeInsets.only(right: 22), ), - ), - ), - ); - }), + ); + }), ); } } diff --git a/lib/pages/chat_list/chat_list_view.dart b/lib/pages/chat_list/chat_list_view.dart index 70c370cf..806c5e93 100644 --- a/lib/pages/chat_list/chat_list_view.dart +++ b/lib/pages/chat_list/chat_list_view.dart @@ -4,13 +4,11 @@ import 'package:flutter/services.dart'; import 'package:badges/badges.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:keyboard_shortcuts/keyboard_shortcuts.dart'; -import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/pages/chat_list/chat_list.dart'; -import 'package:fluffychat/utils/stream_extension.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/unread_rooms_badge.dart'; import '../../widgets/matrix.dart'; @@ -105,177 +103,155 @@ class ChatListView extends StatelessWidget { return; } }, - child: StreamBuilder( - key: ValueKey(client.userID.toString() + - controller.activeFilter.toString() + - controller.activeSpaceId.toString()), - stream: client.onSync.stream - .where((s) => s.hasRoomUpdate) - .rateLimit(const Duration(seconds: 1)), - builder: (context, snapshot) { - return Row( - children: [ - if (FluffyThemes.isColumnMode(context) && - FluffyThemes.getDisplayNavigationRail(context)) ...[ - Builder(builder: (context) { - final allSpaces = - client.rooms.where((room) => room.isSpace); - final rootSpaces = allSpaces - .where( - (space) => !allSpaces.any( - (parentSpace) => parentSpace.spaceChildren - .any((child) => child.roomId == space.id), - ), - ) - .toList(); - final destinations = getNavigationDestinations(context); + child: Row( + children: [ + if (FluffyThemes.isColumnMode(context) && + FluffyThemes.getDisplayNavigationRail(context)) ...[ + Builder(builder: (context) { + final allSpaces = client.rooms.where((room) => room.isSpace); + final rootSpaces = allSpaces + .where( + (space) => !allSpaces.any( + (parentSpace) => parentSpace.spaceChildren + .any((child) => child.roomId == space.id), + ), + ) + .toList(); + final destinations = getNavigationDestinations(context); - return SizedBox( + return SizedBox( + width: 64, + child: ListView.builder( + scrollDirection: Axis.vertical, + itemCount: rootSpaces.length + destinations.length, + itemBuilder: (context, i) { + if (i < destinations.length) { + final isSelected = i == controller.selectedIndex; + return Container( + height: 64, + width: 64, + decoration: BoxDecoration( + border: Border( + bottom: i == (destinations.length - 1) + ? BorderSide( + width: 1, + color: Theme.of(context).dividerColor, + ) + : BorderSide.none, + left: BorderSide( + color: isSelected + ? Theme.of(context).colorScheme.primary + : Colors.transparent, + width: 4, + ), + right: const BorderSide( + color: Colors.transparent, + width: 4, + ), + ), + ), + alignment: Alignment.center, + child: IconButton( + color: isSelected + ? Theme.of(context).colorScheme.secondary + : null, + icon: CircleAvatar( + backgroundColor: isSelected + ? Theme.of(context).colorScheme.secondary + : Theme.of(context) + .colorScheme + .background, + foregroundColor: isSelected + ? Theme.of(context) + .colorScheme + .onSecondary + : Theme.of(context) + .colorScheme + .onBackground, + child: i == controller.selectedIndex + ? destinations[i].selectedIcon ?? + destinations[i].icon + : destinations[i].icon), + tooltip: destinations[i].label, + onPressed: () => + controller.onDestinationSelected(i), + ), + ); + } + i -= destinations.length; + final isSelected = + controller.activeFilter == ActiveFilter.spaces && + rootSpaces[i].id == controller.activeSpaceId; + return Container( + height: 64, width: 64, - child: ListView.builder( - scrollDirection: Axis.vertical, - itemCount: rootSpaces.length + destinations.length, - itemBuilder: (context, i) { - if (i < destinations.length) { - final isSelected = - i == controller.selectedIndex; - return Container( - height: 64, - width: 64, - decoration: BoxDecoration( - border: Border( - bottom: i == (destinations.length - 1) - ? BorderSide( - width: 1, - color: Theme.of(context) - .dividerColor, - ) - : BorderSide.none, - left: BorderSide( - color: isSelected - ? Theme.of(context) - .colorScheme - .primary - : Colors.transparent, - width: 4, - ), - right: const BorderSide( - color: Colors.transparent, - width: 4, - ), - ), - ), - alignment: Alignment.center, - child: IconButton( - color: isSelected - ? Theme.of(context) - .colorScheme - .secondary - : null, - icon: CircleAvatar( - backgroundColor: isSelected - ? Theme.of(context) - .colorScheme - .secondary - : Theme.of(context) - .colorScheme - .background, - foregroundColor: isSelected - ? Theme.of(context) - .colorScheme - .onSecondary - : Theme.of(context) - .colorScheme - .onBackground, - child: i == controller.selectedIndex - ? destinations[i].selectedIcon ?? - destinations[i].icon - : destinations[i].icon), - tooltip: destinations[i].label, - onPressed: () => - controller.onDestinationSelected(i), - ), - ); - } - i -= destinations.length; - final isSelected = controller.activeFilter == - ActiveFilter.spaces && - rootSpaces[i].id == controller.activeSpaceId; - return Container( - height: 64, - width: 64, - decoration: BoxDecoration( - border: Border( - left: BorderSide( - color: isSelected - ? Theme.of(context) - .colorScheme - .secondary - : Colors.transparent, - width: 4, - ), - right: const BorderSide( - color: Colors.transparent, - width: 4, - ), - ), - ), - alignment: Alignment.center, - child: IconButton( - tooltip: rootSpaces[i].displayname, - icon: Avatar( - mxContent: rootSpaces[i].avatar, - name: rootSpaces[i].displayname, - size: 32, - fontSize: 12, - ), - onPressed: () => controller - .setActiveSpace(rootSpaces[i].id), - ), - ); - }, + decoration: BoxDecoration( + border: Border( + left: BorderSide( + color: isSelected + ? Theme.of(context).colorScheme.secondary + : Colors.transparent, + width: 4, + ), + right: const BorderSide( + color: Colors.transparent, + width: 4, + ), + ), + ), + alignment: Alignment.center, + child: IconButton( + tooltip: rootSpaces[i].displayname, + icon: Avatar( + mxContent: rootSpaces[i].avatar, + name: rootSpaces[i].displayname, + size: 32, + fontSize: 12, + ), + onPressed: () => + controller.setActiveSpace(rootSpaces[i].id), ), ); - }), - Container( - color: Theme.of(context).dividerColor, - width: 1, - ), - ], - Expanded( - child: Scaffold( - appBar: ChatListHeader(controller: controller), - body: ChatListViewBody(controller), - bottomNavigationBar: controller.displayNavigationBar - ? NavigationBar( - height: 64, - selectedIndex: controller.selectedIndex, - onDestinationSelected: - controller.onDestinationSelected, - destinations: - getNavigationDestinations(context), - ) - : null, - floatingActionButton: controller - .filteredRooms.isNotEmpty && - selectMode == SelectMode.normal - ? KeyBoardShortcuts( - keysToPress: { - LogicalKeyboardKey.controlLeft, - LogicalKeyboardKey.keyN - }, - onKeysPressed: () => - VRouter.of(context).to('/newprivatechat'), - helpLabel: L10n.of(context)!.newChat, - child: StartChatFloatingActionButton( - controller: controller), - ) - : null, - ), + }, ), - ], - ); - }), + ); + }), + Container( + color: Theme.of(context).dividerColor, + width: 1, + ), + ], + Expanded( + child: Scaffold( + appBar: ChatListHeader(controller: controller), + body: ChatListViewBody(controller), + bottomNavigationBar: controller.displayNavigationBar + ? NavigationBar( + height: 64, + selectedIndex: controller.selectedIndex, + onDestinationSelected: + controller.onDestinationSelected, + destinations: getNavigationDestinations(context), + ) + : null, + floatingActionButton: controller.filteredRooms.isNotEmpty && + selectMode == SelectMode.normal + ? KeyBoardShortcuts( + keysToPress: { + LogicalKeyboardKey.controlLeft, + LogicalKeyboardKey.keyN + }, + onKeysPressed: () => + VRouter.of(context).to('/newprivatechat'), + helpLabel: L10n.of(context)!.newChat, + child: StartChatFloatingActionButton( + controller: controller), + ) + : null, + ), + ), + ], + ), ); }, );