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

Merge branch 'android-back-button-cancels-share' into 'main'

Browse source 
android: back button cancels share (still pops)

See merge request famedly/fluffychat!421
This commit is contained in:
Krille Fear 2021-06-02 05:57:13 +00:00
commit 249e97bcbc
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/pages/views/chat_list_view.dart
View file

@ -20,17 +20,12 @@ class ChatListView extends StatelessWidget {
return StreamBuilder<Object>(
stream: Matrix.of(context).onShareContentChanged.stream,
builder: (_, __) {
final selectMode = Matrix.of(context).shareContent != null
? SelectMode.share
: controller.selectedRoomIds.isEmpty
? SelectMode.normal
: SelectMode.select;
final selectMode = controller.selectMode;
return VWidgetGuard(
onSystemPop: (redirector) async {
if (controller.selectedRoomIds.isNotEmpty) {
controller.cancelAction();
redirector.stopRedirection();
}
final selMode = controller.selectMode;
if (selMode != SelectMode.normal) controller.cancelAction();
if (selMode == SelectMode.select) redirector.stopRedirection();
},
child: Scaffold(
appBar: AppBar(