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

Merge pull request #679 from selfisekai/flutter-3.16

Browse source 
upgrade flutter to 3.16.0
This commit is contained in:
Krille-chan 2023-11-21 11:52:46 +01:00 • committed by GitHub
commit 83ce07c574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 87 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/pages/chat/chat_view.dart
View file

@ -136,16 +136,15 @@ class ChatView extends StatelessWidget {
final bottomSheetPadding = FluffyThemes.isColumnMode(context) ? 16.0 : 8.0;
final scrollUpBannerEventId = controller.scrollUpBannerEventId;
return WillPopScope(
onWillPop: () async {
return PopScope(
canPop: controller.selectedEvents.isEmpty && !controller.showEmojiPicker,
onPopInvoked: (pop) async {
if (pop) return;
if (controller.selectedEvents.isNotEmpty) {
controller.clearSelectedEvents();
return false;
} else if (controller.showEmojiPicker) {
controller.emojiPickerAction();
return false;
}
return true;
},
child: GestureDetector(
onTapDown: (_) => controller.setReadMarker(),

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

@ -86,16 +86,23 @@ class ChatListView extends StatelessWidget {
stream: Matrix.of(context).onShareContentChanged.stream,
builder: (_, __) {
final selectMode = controller.selectMode;
return WillPopScope(
onWillPop: () async {
return PopScope(
canPop: controller.selectMode == SelectMode.normal &&
!controller.isSearchMode &&
controller.activeFilter ==
(AppConfig.separateChatTypes
? ActiveFilter.messages
: ActiveFilter.allChats),
onPopInvoked: (pop) async {
if (pop) return;
final selMode = controller.selectMode;
if (controller.isSearchMode) {
controller.cancelSearch();
return false;
return;
}
if (selMode != SelectMode.normal) {
controller.cancelAction();
return false;
return;
}
if (controller.activeFilter !=
(AppConfig.separateChatTypes
@ -103,9 +110,8 @@ class ChatListView extends StatelessWidget {
: ActiveFilter.allChats)) {
controller
.onDestinationSelected(AppConfig.separateChatTypes ? 1 : 0);
return false;
return;
}
return true;
},
child: Row(
children: [

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

@ -234,13 +234,13 @@ class _SpaceViewState extends State<SpaceView> {
);
final spaceChildren = response.rooms;
final canLoadMore = response.nextBatch != null;
return WillPopScope(
onWillPop: () async {
return PopScope(
canPop: parentSpace == null,
onPopInvoked: (pop) async {
if (pop) return;
if (parentSpace != null) {
widget.controller.setActiveSpace(parentSpace.id);
return false;
}
return true;
},
child: CustomScrollView(
controller: widget.scrollController,