GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2024-12-25 06:52:35 +01:00
Code Issues Projects Releases Wiki Activity

back button clears selection: room list and chat

Browse Source 
When a room or event is selected and the Android back button is pressed,
don't pop but clear the current selection. Fixes #399.
This commit is contained in:
Steef Hegeman 2021-05-26 20:28:08 +02:00
parent bb5e0f8fb3
commit 24b632fc90
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/pages/views/chat_list_view.dart
View File

@ -26,7 +26,15 @@ class ChatListView extends StatelessWidget {
: controller.selectedRoomIds.isEmpty
? SelectMode.normal
: SelectMode.select;
return Scaffold(
return VWidgetGuard(
onSystemPop: (redirector) async {
if (controller.selectedRoomIds.isNotEmpty) {
controller.cancelAction();
redirector.stopRedirection();
}
},
child:
Scaffold(
appBar: AppBar(
elevation: MediaQuery.of(context).size.width >
FluffyThemes.columnWidth * 2
@ -231,7 +239,7 @@ class ChatListView extends StatelessWidget {
child: Icon(CupertinoIcons.chat_bubble),
)
: null,
);
));
});
}
}

12
lib/pages/views/chat_view.dart
View File

@ -54,7 +54,15 @@ class ChatView extends StatelessWidget {
context: context, future: () => controller.room.join());
}
return Scaffold(
return VWidgetGuard(
onSystemPop: (redirector) async {
if (controller.selectedEvents.isNotEmpty) {
controller.clearSelectedEvents();
redirector.stopRedirection();
}
},
child:
Scaffold(
appBar: AppBar(
leading: controller.selectMode
? IconButton(
@ -694,7 +702,7 @@ class ChatView extends StatelessWidget {
),
],
),
);
));
}
}