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

Merge pull request #1269 from selfisekai/flutter-3.24

Browse source 
chore: upgrade flutter to 3.24
This commit is contained in:
Krille-chan 2024-08-31 15:02:09 +02:00 • committed by GitHub
commit 6bdeba7cd7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/versions.env vendored
View file

@ -1,2 +1,2 @@
FLUTTER_VERSION=3.22.3 FLUTTER_VERSION=3.24.1
JAVA_VERSION=17 JAVA_VERSION=17

2
lib/pages/chat/add_widget_tile_view.dart
View file

@ -59,7 +59,7 @@ class AddWidgetTileView extends StatelessWidget {
), ),
), ),
), ),
ButtonBar( OverflowBar(
children: [ children: [
TextButton( TextButton(
onPressed: controller.addWidget, onPressed: controller.addWidget,

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

@ -142,7 +142,7 @@ class ChatView extends StatelessWidget {
return PopScope( return PopScope(
canPop: controller.selectedEvents.isEmpty && !controller.showEmojiPicker, canPop: controller.selectedEvents.isEmpty && !controller.showEmojiPicker,
onPopInvoked: (pop) async { onPopInvokedWithResult: (pop, _) async {
if (pop) return; if (pop) return;
if (controller.selectedEvents.isNotEmpty) { if (controller.selectedEvents.isNotEmpty) {
controller.clearSelectedEvents(); controller.clearSelectedEvents();

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

@ -32,7 +32,7 @@ class ChatListView extends StatelessWidget {
canPop: controller.selectMode == SelectMode.normal && canPop: controller.selectMode == SelectMode.normal &&
!controller.isSearchMode && !controller.isSearchMode &&
controller.activeSpaceId == null, controller.activeSpaceId == null,
onPopInvoked: (pop) { onPopInvokedWithResult: (pop, _) {
if (pop) return; if (pop) return;
if (controller.activeSpaceId != null) { if (controller.activeSpaceId != null) {
controller.clearActiveSpace(); controller.clearActiveSpace();