ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Upgrade to flutter 3.35.2

Browse source
This commit is contained in:
Christian Kußowski 2025-09-02 12:08:41 +02:00
parent cfc9df59cc
commit 99de670e04
No known key found for this signature in database
GPG key ID: E067ECD60F1A0652
4 changed files with 61 additions and 41 deletions
Show stats 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.32.8 FLUTTER_VERSION=3.35.2
JAVA_VERSION=17 JAVA_VERSION=17

96
lib/pages/chat_access_settings/chat_access_settings_page.dart
View file

@ -45,19 +45,27 @@ class ChatAccessSettingsPageView extends StatelessWidget {
), ),
), ),
), ),
for (final historyVisibility in HistoryVisibility.values) RadioGroup<HistoryVisibility>(
RadioListTile<HistoryVisibility>.adaptive( groupValue: room.historyVisibility,
title: Text( onChanged: controller.historyVisibilityLoading ||
historyVisibility !room.canChangeHistoryVisibility
.getLocalizedString(MatrixLocals(L10n.of(context))), ? (_) {}
), : controller.setHistoryVisibility,
value: historyVisibility, child: Column(
groupValue: room.historyVisibility, mainAxisSize: MainAxisSize.min,
onChanged: controller.historyVisibilityLoading || children: [
!room.canChangeHistoryVisibility for (final historyVisibility in HistoryVisibility.values)
? null RadioListTile<HistoryVisibility>.adaptive(
: controller.setHistoryVisibility, title: Text(
historyVisibility.getLocalizedString(
MatrixLocals(L10n.of(context)),
),
),
value: historyVisibility,
),
],
), ),
),
Divider(color: theme.dividerColor), Divider(color: theme.dividerColor),
ListTile( ListTile(
title: Text( title: Text(
@ -68,19 +76,25 @@ class ChatAccessSettingsPageView extends StatelessWidget {
), ),
), ),
), ),
for (final joinRule in controller.availableJoinRules) RadioGroup(
if (joinRule != JoinRules.private) groupValue: room.joinRules,
RadioListTile<JoinRules>.adaptive( onChanged: controller.setJoinRule,
title: Text( child: Column(
joinRule.localizedString(L10n.of(context)), mainAxisSize: MainAxisSize.min,
), children: [
value: joinRule, for (final joinRule in controller.availableJoinRules)
groupValue: room.joinRules, if (joinRule != JoinRules.private)
onChanged: controller.joinRulesLoading || RadioListTile<JoinRules>.adaptive(
!room.canChangeJoinRules enabled: !controller.joinRulesLoading &&
? null room.canChangeJoinRules,
: controller.setJoinRule, title: Text(
), joinRule.localizedString(L10n.of(context)),
),
value: joinRule,
),
],
),
),
Divider(color: theme.dividerColor), Divider(color: theme.dividerColor),
if ({JoinRules.public, JoinRules.knock} if ({JoinRules.public, JoinRules.knock}
.contains(room.joinRules)) ...[ .contains(room.joinRules)) ...[
@ -93,20 +107,26 @@ class ChatAccessSettingsPageView extends StatelessWidget {
), ),
), ),
), ),
for (final guestAccess in GuestAccess.values) RadioGroup(
RadioListTile<GuestAccess>.adaptive( groupValue: room.guestAccess,
title: Text( onChanged: controller.setGuestAccess,
guestAccess.getLocalizedString( child: Column(
MatrixLocals(L10n.of(context)), mainAxisSize: MainAxisSize.min,
), children: [
), for (final guestAccess in GuestAccess.values)
value: guestAccess, RadioListTile<GuestAccess>.adaptive(
groupValue: room.guestAccess, enabled: !controller.guestAccessLoading &&
onChanged: controller.guestAccessLoading || room.canChangeGuestAccess,
!room.canChangeGuestAccess title: Text(
? null guestAccess.getLocalizedString(
: controller.setGuestAccess, MatrixLocals(L10n.of(context)),
),
),
value: guestAccess,
),
],
), ),
),
Divider(color: theme.dividerColor), Divider(color: theme.dividerColor),
ListTile( ListTile(
title: Text( title: Text(

2
lib/pages/chat_encryption_settings/chat_encryption_settings_view.dart
View file

@ -110,7 +110,7 @@ class ChatEncryptionSettingsView extends StatelessWidget {
itemBuilder: (BuildContext context, int i) => itemBuilder: (BuildContext context, int i) =>
SwitchListTile( SwitchListTile(
value: !deviceKeys[i].blocked, value: !deviceKeys[i].blocked,
activeColor: deviceKeys[i].verified activeThumbColor: deviceKeys[i].verified
? Colors.green ? Colors.green
: Colors.orange, : Colors.orange,
onChanged: (_) => onChanged: (_) =>

2
snap/snapcraft.yaml
View file

@ -53,7 +53,7 @@ platforms:
parts: parts:
flutter-git: flutter-git:
source: https://github.com/flutter/flutter.git source: https://github.com/flutter/flutter.git
source-tag: 3.32.4 source-tag: 3.35.2
source-depth: 1 source-depth: 1
plugin: nil plugin: nil
override-build: | override-build: |