2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: Follow up pop space view

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

7
lib/pages/chat_list/chat_list_view.dart
View file

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

11
lib/pages/chat_list/space_view.dart
View file

@ -165,10 +165,7 @@ class _SpaceViewState extends State<SpaceView> {
final room = Matrix.of(context).client.getRoomById(widget.spaceId);
final displayname =
room?.getLocalizedDisplayname() ?? L10n.of(context)!.nothingFound;
return PopScope(
canPop: false,
onPopInvoked: (_) => widget.onBack(),
child: Scaffold(
return Scaffold(
appBar: AppBar(
leading: Center(
child: CloseButton(
@ -283,9 +280,8 @@ class _SpaceViewState extends State<SpaceView> {
onChanged: (_) => setState(() {}),
textInputAction: TextInputAction.search,
decoration: InputDecoration(
fillColor: Theme.of(context)
.colorScheme
.secondaryContainer,
fillColor:
Theme.of(context).colorScheme.secondaryContainer,
border: OutlineInputBorder(
borderSide: BorderSide.none,
borderRadius: BorderRadius.circular(99),
@ -473,7 +469,6 @@ class _SpaceViewState extends State<SpaceView> {
);
},
),
),
);
}
}