chore: Follow up pop space view

This commit is contained in:
krille-chan 2024-07-18 16:47:58 +02:00
commit 754870e3fd
No known key found for this signature in database
2 changed files with 275 additions and 275 deletions

View file

@ -30,9 +30,14 @@ class ChatListView extends StatelessWidget {
final selectMode = controller.selectMode; final selectMode = controller.selectMode;
return PopScope( return PopScope(
canPop: controller.selectMode == SelectMode.normal && canPop: controller.selectMode == SelectMode.normal &&
!controller.isSearchMode, !controller.isSearchMode &&
controller.activeSpaceId == null,
onPopInvoked: (pop) { onPopInvoked: (pop) {
if (pop) return; if (pop) return;
if (controller.activeSpaceId != null) {
controller.clearActiveSpace();
return;
}
final selMode = controller.selectMode; final selMode = controller.selectMode;
if (controller.isSearchMode) { if (controller.isSearchMode) {
controller.cancelSearch(); controller.cancelSearch();

View file

@ -165,315 +165,310 @@ class _SpaceViewState extends State<SpaceView> {
final room = Matrix.of(context).client.getRoomById(widget.spaceId); final room = Matrix.of(context).client.getRoomById(widget.spaceId);
final displayname = final displayname =
room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound; room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
return PopScope( return Scaffold(
canPop: false, appBar: AppBar(
onPopInvoked: (_) => widget.onBack(), leading: Center(
child: Scaffold( child: CloseButton(
appBar: AppBar( onPressed: widget.onBack,
leading: Center(
child: CloseButton(
onPressed: widget.onBack,
),
), ),
titleSpacing: 0,
title: ListTile(
contentPadding: EdgeInsets.zero,
leading: Avatar(
mxContent: room?.avatar,
name: displayname,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
),
title: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
subtitle: room == null
? null
: Text(
L10n.of(context)!.countChatsAndCountParticipants(
room.spaceChildren.length,
room.summary.mJoinedMemberCount ?? 1,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
actions: [
PopupMenuButton<SpaceActions>(
onSelected: _onSpaceAction,
itemBuilder: (context) => [
PopupMenuItem(
value: SpaceActions.settings,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
),
),
PopupMenuItem(
value: SpaceActions.invite,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.person_add_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.invite),
],
),
),
PopupMenuItem(
value: SpaceActions.leave,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.delete_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.leave),
],
),
),
],
),
],
), ),
body: room == null titleSpacing: 0,
? const Center( title: ListTile(
child: Icon( contentPadding: EdgeInsets.zero,
Icons.search_outlined, leading: Avatar(
size: 80, mxContent: room?.avatar,
name: displayname,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
),
title: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
subtitle: room == null
? null
: Text(
L10n.of(context)!.countChatsAndCountParticipants(
room.spaceChildren.length,
room.summary.mJoinedMemberCount ?? 1,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
) ),
: StreamBuilder( actions: [
stream: room.client.onSync.stream PopupMenuButton<SpaceActions>(
.where((s) => s.hasRoomUpdate) onSelected: _onSpaceAction,
.rateLimit(const Duration(seconds: 1)), itemBuilder: (context) => [
builder: (context, snapshot) { PopupMenuItem(
final childrenIds = room.spaceChildren value: SpaceActions.settings,
.map((c) => c.roomId) child: Row(
.whereType<String>() mainAxisSize: MainAxisSize.min,
.toSet(); children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
),
),
PopupMenuItem(
value: SpaceActions.invite,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.person_add_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.invite),
],
),
),
PopupMenuItem(
value: SpaceActions.leave,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.delete_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.leave),
],
),
),
],
),
],
),
body: room == null
? const Center(
child: Icon(
Icons.search_outlined,
size: 80,
),
)
: StreamBuilder(
stream: room.client.onSync.stream
.where((s) => s.hasRoomUpdate)
.rateLimit(const Duration(seconds: 1)),
builder: (context, snapshot) {
final childrenIds = room.spaceChildren
.map((c) => c.roomId)
.whereType<String>()
.toSet();
final joinedRooms = room.client.rooms final joinedRooms = room.client.rooms
.where((room) => childrenIds.remove(room.id)) .where((room) => childrenIds.remove(room.id))
.toList(); .toList();
final joinedParents = room.spaceParents final joinedParents = room.spaceParents
.map((parent) { .map((parent) {
final roomId = parent.roomId; final roomId = parent.roomId;
if (roomId == null) return null; if (roomId == null) return null;
return room.client.getRoomById(roomId); return room.client.getRoomById(roomId);
}) })
.whereType<Room>() .whereType<Room>()
.toList(); .toList();
final filter = _filterController.text.trim().toLowerCase(); final filter = _filterController.text.trim().toLowerCase();
return CustomScrollView( return CustomScrollView(
slivers: [ slivers: [
SliverAppBar( SliverAppBar(
floating: true, floating: true,
toolbarHeight: 72, toolbarHeight: 72,
scrolledUnderElevation: 0, scrolledUnderElevation: 0,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
automaticallyImplyLeading: false, automaticallyImplyLeading: false,
title: TextField( title: TextField(
controller: _filterController, controller: _filterController,
onChanged: (_) => setState(() {}), onChanged: (_) => setState(() {}),
textInputAction: TextInputAction.search, textInputAction: TextInputAction.search,
decoration: InputDecoration( decoration: InputDecoration(
fillColor: Theme.of(context) fillColor:
Theme.of(context).colorScheme.secondaryContainer,
border: OutlineInputBorder(
borderSide: BorderSide.none,
borderRadius: BorderRadius.circular(99),
),
contentPadding: EdgeInsets.zero,
hintText: L10n.of(context)!.search,
hintStyle: TextStyle(
color: Theme.of(context)
.colorScheme .colorScheme
.secondaryContainer, .onPrimaryContainer,
border: OutlineInputBorder( fontWeight: FontWeight.normal,
borderSide: BorderSide.none, ),
borderRadius: BorderRadius.circular(99), floatingLabelBehavior: FloatingLabelBehavior.never,
), prefixIcon: IconButton(
contentPadding: EdgeInsets.zero, onPressed: () {},
hintText: L10n.of(context)!.search, icon: Icon(
hintStyle: TextStyle( Icons.search_outlined,
color: Theme.of(context) color: Theme.of(context)
.colorScheme .colorScheme
.onPrimaryContainer, .onPrimaryContainer,
fontWeight: FontWeight.normal,
),
floatingLabelBehavior: FloatingLabelBehavior.never,
prefixIcon: IconButton(
onPressed: () {},
icon: Icon(
Icons.search_outlined,
color: Theme.of(context)
.colorScheme
.onPrimaryContainer,
),
), ),
), ),
), ),
), ),
SliverList.builder( ),
itemCount: joinedParents.length, SliverList.builder(
itemBuilder: (context, i) { itemCount: joinedParents.length,
final displayname = itemBuilder: (context, i) {
joinedParents[i].getLocalizedDisplayname(); final displayname =
return Padding( joinedParents[i].getLocalizedDisplayname();
padding: const EdgeInsets.symmetric( return Padding(
horizontal: 8, padding: const EdgeInsets.symmetric(
vertical: 1, horizontal: 8,
), vertical: 1,
child: Material( ),
borderRadius: child: Material(
BorderRadius.circular(AppConfig.borderRadius), borderRadius:
clipBehavior: Clip.hardEdge, BorderRadius.circular(AppConfig.borderRadius),
child: ListTile( clipBehavior: Clip.hardEdge,
minVerticalPadding: 0, child: ListTile(
leading: Icon( minVerticalPadding: 0,
Icons.adaptive.arrow_back_outlined, leading: Icon(
size: 16, Icons.adaptive.arrow_back_outlined,
), size: 16,
title: Row(
children: [
Avatar(
mxContent: joinedParents[i].avatar,
name: displayname,
size: Avatar.defaultSize / 2,
borderRadius: BorderRadius.circular(
AppConfig.borderRadius / 4,
),
),
const SizedBox(width: 8),
Expanded(child: Text(displayname)),
],
),
onTap: () =>
widget.toParentSpace(joinedParents[i].id),
), ),
), title: Row(
); children: [
}, Avatar(
), mxContent: joinedParents[i].avatar,
SliverList.builder( name: displayname,
itemCount: joinedRooms.length + 1, size: Avatar.defaultSize / 2,
itemBuilder: (context, i) { borderRadius: BorderRadius.circular(
if (i == 0) { AppConfig.borderRadius / 4,
return SearchTitle( ),
title: L10n.of(context)!.joinedChats,
icon: const Icon(Icons.chat_outlined),
);
}
i--;
final room = joinedRooms[i];
return ChatListItem(
room,
filter: filter,
onTap: () => widget.onChatTab(room),
onLongPress: (context) => widget.onChatContext(
room,
context,
),
activeChat: widget.activeChat == room.id,
);
},
),
SliverList.builder(
itemCount: _discoveredChildren.length + 2,
itemBuilder: (context, i) {
if (i == 0) {
return SearchTitle(
title: L10n.of(context)!.discover,
icon: const Icon(Icons.explore_outlined),
);
}
i--;
if (i == _discoveredChildren.length) {
if (_noMoreRooms) {
return Padding(
padding: const EdgeInsets.all(12.0),
child: Center(
child: Text(
L10n.of(context)!.noMoreChatsFound,
style: const TextStyle(fontSize: 13),
), ),
), const SizedBox(width: 8),
); Expanded(child: Text(displayname)),
} ],
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 12.0,
vertical: 2.0,
), ),
child: TextButton( onTap: () =>
onPressed: _isLoading ? null : _loadHierarchy, widget.toParentSpace(joinedParents[i].id),
child: _isLoading ),
? LinearProgressIndicator( ),
borderRadius: BorderRadius.circular( );
AppConfig.borderRadius, },
), ),
) SliverList.builder(
: Text(L10n.of(context)!.loadMore), itemCount: joinedRooms.length + 1,
itemBuilder: (context, i) {
if (i == 0) {
return SearchTitle(
title: L10n.of(context)!.joinedChats,
icon: const Icon(Icons.chat_outlined),
);
}
i--;
final room = joinedRooms[i];
return ChatListItem(
room,
filter: filter,
onTap: () => widget.onChatTab(room),
onLongPress: (context) => widget.onChatContext(
room,
context,
),
activeChat: widget.activeChat == room.id,
);
},
),
SliverList.builder(
itemCount: _discoveredChildren.length + 2,
itemBuilder: (context, i) {
if (i == 0) {
return SearchTitle(
title: L10n.of(context)!.discover,
icon: const Icon(Icons.explore_outlined),
);
}
i--;
if (i == _discoveredChildren.length) {
if (_noMoreRooms) {
return Padding(
padding: const EdgeInsets.all(12.0),
child: Center(
child: Text(
L10n.of(context)!.noMoreChatsFound,
style: const TextStyle(fontSize: 13),
),
), ),
); );
} }
final item = _discoveredChildren[i];
final displayname = item.name ??
item.canonicalAlias ??
L10n.of(context)!.emptyChat;
if (!displayname.toLowerCase().contains(filter)) {
return const SizedBox.shrink();
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.symmetric(
horizontal: 8, horizontal: 12.0,
vertical: 1, vertical: 2.0,
), ),
child: Material( child: TextButton(
borderRadius: onPressed: _isLoading ? null : _loadHierarchy,
BorderRadius.circular(AppConfig.borderRadius), child: _isLoading
clipBehavior: Clip.hardEdge, ? LinearProgressIndicator(
child: ListTile( borderRadius: BorderRadius.circular(
onTap: () => _joinChildRoom(item), AppConfig.borderRadius,
leading: Avatar(
mxContent: item.avatarUrl,
name: displayname,
borderRadius: item.roomType == 'm.space'
? BorderRadius.circular(
AppConfig.borderRadius / 2,
)
: null,
),
title: Row(
children: [
Expanded(
child: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
), )
const SizedBox(width: 8), : Text(L10n.of(context)!.loadMore),
const Icon(
Icons.add_circle_outline_outlined,
),
],
),
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
), ),
); );
}, }
), final item = _discoveredChildren[i];
], final displayname = item.name ??
); item.canonicalAlias ??
}, L10n.of(context)!.emptyChat;
), if (!displayname.toLowerCase().contains(filter)) {
), return const SizedBox.shrink();
}
return Padding(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 1,
),
child: Material(
borderRadius:
BorderRadius.circular(AppConfig.borderRadius),
clipBehavior: Clip.hardEdge,
child: ListTile(
onTap: () => _joinChildRoom(item),
leading: Avatar(
mxContent: item.avatarUrl,
name: displayname,
borderRadius: item.roomType == 'm.space'
? BorderRadius.circular(
AppConfig.borderRadius / 2,
)
: null,
),
title: Row(
children: [
Expanded(
child: Text(
displayname,
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: 8),
const Icon(
Icons.add_circle_outline_outlined,
),
],
),
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
),
),
);
},
),
],
);
},
),
); );
} }
} }