aiden
/
fluffychat
mirror of https://github.com/krille-chan/fluffychat
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Follow up pop space view

Browse Source
pull/1239/head
krille-chan 1 year ago
parent 956a2e6523
commit 754870e3fd
No known key found for this signature in database
2 changed files with 275 additions and 275 deletions
Show Stats Download Patch File Download Diff File

7
lib/pages/chat_list/chat_list_view.dart
Unescape Escape 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();

543
lib/pages/chat_list/space_view.dart
Unescape Escape 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( titleSpacing: 0,
contentPadding: EdgeInsets.zero, title: ListTile(
leading: Avatar( contentPadding: EdgeInsets.zero,
mxContent: room?.avatar, leading: Avatar(
name: displayname, mxContent: room?.avatar,
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2), name: displayname,
), borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
title: Text( ),
displayname, title: Text(
maxLines: 1, displayname,
overflow: TextOverflow.ellipsis, 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: [ subtitle: room == null
PopupMenuButton<SpaceActions>( ? null
onSelected: _onSpaceAction, : Text(
itemBuilder: (context) => [ L10n.of(context)!.countChatsAndCountParticipants(
PopupMenuItem( room.spaceChildren.length,
value: SpaceActions.settings, room.summary.mJoinedMemberCount ?? 1,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
), ),
maxLines: 1,
overflow: TextOverflow.ellipsis,
), ),
PopupMenuItem( ),
value: SpaceActions.invite, actions: [
child: Row( PopupMenuButton<SpaceActions>(
mainAxisSize: MainAxisSize.min, onSelected: _onSpaceAction,
children: [ itemBuilder: (context) => [
const Icon(Icons.person_add_outlined), PopupMenuItem(
const SizedBox(width: 12), value: SpaceActions.settings,
Text(L10n.of(context)!.invite), child: Row(
], mainAxisSize: MainAxisSize.min,
), children: [
const Icon(Icons.settings_outlined),
const SizedBox(width: 12),
Text(L10n.of(context)!.settings),
],
), ),
PopupMenuItem( ),
value: SpaceActions.leave, PopupMenuItem(
child: Row( value: SpaceActions.invite,
mainAxisSize: MainAxisSize.min, child: Row(
children: [ mainAxisSize: MainAxisSize.min,
const Icon(Icons.delete_outlined), children: [
const SizedBox(width: 12), const Icon(Icons.person_add_outlined),
Text(L10n.of(context)!.leave), const SizedBox(width: 12),
], Text(L10n.of(context)!.invite),
), ],
), ),
], ),
), PopupMenuItem(
], value: SpaceActions.leave,
), child: Row(
body: room == null mainAxisSize: MainAxisSize.min,
? const Center( children: [
child: Icon( const Icon(Icons.delete_outlined),
Icons.search_outlined, const SizedBox(width: 12),
size: 80, Text(L10n.of(context)!.leave),
],
), ),
) ),
: StreamBuilder( ],
stream: room.client.onSync.stream ),
.where((s) => s.hasRoomUpdate) ],
.rateLimit(const Duration(seconds: 1)), ),
builder: (context, snapshot) { body: room == null
final childrenIds = room.spaceChildren ? const Center(
.map((c) => c.roomId) child: Icon(
.whereType<String>() Icons.search_outlined,
.toSet(); 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: [ title: Row(
Avatar( children: [
mxContent: joinedParents[i].avatar, Avatar(
name: displayname, mxContent: joinedParents[i].avatar,
size: Avatar.defaultSize / 2, name: displayname,
borderRadius: BorderRadius.circular( size: Avatar.defaultSize / 2,
AppConfig.borderRadius / 4, borderRadius: BorderRadius.circular(
), AppConfig.borderRadius / 4,
), ),
const SizedBox(width: 8), ),
Expanded(child: Text(displayname)), const SizedBox(width: 8),
], Expanded(child: Text(displayname)),
), ],
onTap: () =>
widget.toParentSpace(joinedParents[i].id),
), ),
onTap: () =>
widget.toParentSpace(joinedParents[i].id),
), ),
),
);
},
),
SliverList.builder(
itemCount: joinedRooms.length + 1,
itemBuilder: (context, i) {
if (i == 0) {
return SearchTitle(
title: L10n.of(context)!.joinedChats,
icon: const Icon(Icons.chat_outlined),
); );
}, }
), i--;
SliverList.builder( final room = joinedRooms[i];
itemCount: joinedRooms.length + 1, return ChatListItem(
itemBuilder: (context, i) { room,
if (i == 0) { filter: filter,
return SearchTitle( onTap: () => widget.onChatTab(room),
title: L10n.of(context)!.joinedChats, onLongPress: (context) => widget.onChatContext(
icon: const Icon(Icons.chat_outlined),
);
}
i--;
final room = joinedRooms[i];
return ChatListItem(
room, room,
filter: filter, context,
onTap: () => widget.onChatTab(room), ),
onLongPress: (context) => widget.onChatContext( activeChat: widget.activeChat == room.id,
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--;
SliverList.builder( if (i == _discoveredChildren.length) {
itemCount: _discoveredChildren.length + 2, if (_noMoreRooms) {
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),
),
),
);
}
return Padding( return Padding(
padding: const EdgeInsets.symmetric( padding: const EdgeInsets.all(12.0),
horizontal: 12.0, child: Center(
vertical: 2.0, child: Text(
), L10n.of(context)!.noMoreChatsFound,
child: TextButton( style: const TextStyle(fontSize: 13),
onPressed: _isLoading ? null : _loadHierarchy, ),
child: _isLoading
? LinearProgressIndicator(
borderRadius: BorderRadius.circular(
AppConfig.borderRadius,
),
)
: Text(L10n.of(context)!.loadMore),
), ),
); );
} }
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,
), ),
)
: Text(L10n.of(context)!.loadMore),
),
);
}
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( const SizedBox(width: 8),
Icons.add_circle_outline_outlined, const Icon(
Icons.add_circle_outline_outlined,
),
],
),
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
), ),
], maxLines: 1,
), overflow: TextOverflow.ellipsis,
subtitle: Text(
item.topic ??
L10n.of(context)!.countParticipants(
item.numJoinedMembers,
),
maxLines: 1,
overflow: TextOverflow.ellipsis,
),
), ),
), ),
); ),
}, );
), },
], ),
); ],
}, );
), },
), ),
); );
} }
} }

Write Preview
Loading…
Cancel
Save