Skip to content

Commit 750aaf4

Browse files
authored
chore: update flutter and deps (#92)
* chore: update flutter and deps
1 parent cb5e9d8 commit 750aaf4

File tree

13 files changed

+197
-158
lines changed

13 files changed

+197
-158
lines changed

.fvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"flutter": "3.32.8"
2+
"flutter": "3.35.0"
33
}

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@ migrate_working_dir/
1818
*.iws
1919
.idea/
2020

21-
# The .vscode folder contains launch configuration and tasks you configure in
22-
# VS Code which you may wish to be included in version control, so this line
23-
# is commented out by default.
24-
.vscode/
2521

2622
# Flutter/Dart/Pub related
2723
**/doc/api/
@@ -43,7 +39,6 @@ app.*.map.json
4339
/android/app/debug
4440
/android/app/profile
4541
/android/app/release
46-
.vscode/settings.json
4742

4843
# FVM Version Cache
4944
.fvm/

.vscode/launch.json

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
"name": "nebuchadnezzar",
9+
"request": "launch",
10+
"type": "dart",
11+
"args": [
12+
"--web-header=Cross-Origin-Opener-Policy=same-origin",
13+
"--web-header=Cross-Origin-Embedder-Policy=require-corp"
14+
]
15+
},
16+
{
17+
"name": "nebuchadnezzar (profile mode)",
18+
"request": "launch",
19+
"type": "dart",
20+
"flutterMode": "profile"
21+
},
22+
{
23+
"name": "nebuchadnezzar (release mode)",
24+
"request": "launch",
25+
"type": "dart",
26+
"flutterMode": "release"
27+
}
28+
]
29+
}

.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"yaml.schemaStore.enable": false,
3+
"dart.flutterSdkPath": ".fvm/versions/3.35.0"
4+
}

l10n.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ template-arb-file: app_en.arb
33
output-localization-file: app_localizations.dart
44
nullable-getter: false
55
untranslated-messages-file: needs_translation.json
6-
synthetic-package: false
76
format: true

lib/chat_master/view/add_and_remove_from_space_dialog.dart

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ class _RemoveFromSpaceDialogState extends State<RemoveFromSpaceDialog> {
4747
)
4848
.toList()
4949
.map(
50-
(space) => RadioListTile<Room>(
51-
title: Text(space.getLocalizedDisplayname()),
52-
value: space,
50+
(space) => RadioGroup(
5351
groupValue: _selectedSpace,
5452
onChanged: (value) => setState(() => _selectedSpace = value),
53+
child: RadioListTile<Room>(
54+
title: Text(space.getLocalizedDisplayname()),
55+
value: space,
56+
),
5557
),
5658
)
5759
.toList(),
@@ -90,17 +92,19 @@ class _AddToSpaceDialogState extends State<AddToSpaceDialog> {
9092
mainAxisSize: MainAxisSize.min,
9193
children: spaces
9294
.map(
93-
(space) => RadioListTile<Room>(
94-
title: Text(space.getLocalizedDisplayname()),
95-
value: space,
95+
(space) => RadioGroup(
9696
groupValue: _selectedSpace,
97-
onChanged:
98-
space.canEditSpace == true &&
99-
!space.spaceChildren
100-
.map((c) => c.roomId)
101-
.contains(widget.room.id)
102-
? (value) => setState(() => _selectedSpace = value)
103-
: null,
97+
onChanged: (value) => setState(() => _selectedSpace = value),
98+
99+
child: RadioListTile<Room>(
100+
title: Text(space.getLocalizedDisplayname()),
101+
value: space,
102+
enabled:
103+
space.canEditSpace == true &&
104+
!space.spaceChildren
105+
.map((c) => c.roomId)
106+
.contains(widget.room.id),
107+
),
104108
),
105109
)
106110
.toList(),

lib/chat_room/create_or_edit/create_or_edit_room_model.dart

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@ class CreateOrEditRoomModel {
273273
Stream<bool> canChangePowerLevels(Room room) =>
274274
_getJoinedRoomUpdate(room.id).map((_) => room.canChangePowerLevel);
275275

276+
Stream<bool> getCanChangeAnyRoomSettingsStream(Room? room) =>
277+
_getJoinedRoomUpdate(
278+
room?.id,
279+
).map((_) => room?.canChangeAnyRoomSetting ?? false);
280+
276281
Future<void> editPowerLevel({
277282
required Room room,
278283
required String key,

lib/chat_room/info_drawer/chat_room_info_drawer_group_header.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ class ChatRoomInfoDrawerGroupHeader extends StatelessWidget {
7070
automaticallyImplyLeading: false,
7171
actions: [
7272
Flexible(
73-
key: ValueKey(room.canChangeRoomSettings),
73+
key: ValueKey(room.canChangeAnyRoomSetting),
7474
child: Padding(
7575
padding: const EdgeInsets.only(
7676
right: kBigPadding,
7777
left: kMediumPadding,
7878
),
7979
child: IconButton(
80-
onPressed: !room.isArchived && room.canChangeRoomSettings
80+
onPressed: !room.isArchived && room.canChangeAnyRoomSetting
8181
? () => showDialog(
8282
context: context,
8383
builder: (context) => CreateOrEditRoomDialog(room: room),

lib/common/room_x.dart

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
import 'package:matrix/matrix.dart';
22

33
extension RoomX on Room {
4-
bool get canChangeRoomSettings =>
5-
ownPowerLevel == 100 ||
6-
canKick ||
7-
canBan ||
8-
canChangeGuestAccess ||
9-
canChangeHistoryVisibility ||
10-
canChangeJoinRules ||
11-
canInvite ||
12-
canRedact ||
13-
canChangeName ||
14-
canChangeTopic ||
15-
canChangeRoomAlias ||
16-
canEditSpace ||
17-
canChangePowerLevel ||
18-
canChangeCanonicalAlias;
4+
bool get canChangeAnyRoomSetting =>
5+
canSendDefaultMessages &&
6+
(ownPowerLevel == 100 ||
7+
canKick ||
8+
canBan ||
9+
canChangeGuestAccess ||
10+
canChangeHistoryVisibility ||
11+
canChangeJoinRules ||
12+
canInvite ||
13+
canRedact ||
14+
canChangeName ||
15+
canChangeTopic ||
16+
canChangeRoomAlias ||
17+
canEditSpace ||
18+
canChangePowerLevel ||
19+
canChangeCanonicalAlias ||
20+
canChangeAvatar);
1921

2022
bool get canChangeJoinRules => canChangeStateEvent(EventTypes.RoomJoinRules);
2123

macos/Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ PODS:
3939
- sqflite_darwin (0.0.4):
4040
- Flutter
4141
- FlutterMacOS
42-
- SQLCipher (4.9.0):
43-
- SQLCipher/standard (= 4.9.0)
44-
- SQLCipher/common (4.9.0)
45-
- SQLCipher/standard (4.9.0):
42+
- SQLCipher (4.10.0):
43+
- SQLCipher/standard (= 4.10.0)
44+
- SQLCipher/common (4.10.0)
45+
- SQLCipher/standard (4.10.0):
4646
- SQLCipher/common
4747
- sqlcipher_flutter_libs (0.0.1):
4848
- FlutterMacOS
49-
- SQLCipher (~> 4.9.0)
49+
- SQLCipher (~> 4.10.0)
5050
- super_native_extensions (0.0.1):
5151
- FlutterMacOS
5252
- system_theme (0.0.1):
@@ -55,7 +55,7 @@ PODS:
5555
- FlutterMacOS
5656
- video_compress (0.3.0):
5757
- FlutterMacOS
58-
- window_manager (0.2.0):
58+
- window_manager (0.5.0):
5959
- FlutterMacOS
6060
- window_to_front (0.0.1):
6161
- FlutterMacOS
@@ -150,14 +150,14 @@ SPEC CHECKSUMS:
150150
appkit_ui_element_colors: c8e13c23cbd781e0f5d9b75cad686e6a4bb958da
151151
desktop_webview_window: 7e37af677d6d19294cb433d9b1d878ef78dffa4d
152152
device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76
153-
dynamic_color: b820c000cc68df65e7ba7ff177cb98404ce56651
153+
dynamic_color: cb7c2a300ee67ed3bd96c3e852df3af0300bf610
154154
emoji_picker_flutter: 51ca408e289d84d1e460016b2a28721ec754fcf7
155155
file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
156156
file_selector_macos: 6280b52b459ae6c590af5d78fc35c7267a3c4b31
157157
flutter_secure_storage_macos: 7f45e30f838cf2659862a4e4e3ee1c347c2b3b54
158158
flutter_vodozemac: fd2ea9cb3e2a37beaac883a369811fbfe042fc53
159159
flutter_web_auth_2: 62b08da29f15a20fa63f144234622a1488d45b65
160-
FlutterMacOS: 8f6f14fa908a6fb3fba0cd85dbd81ec4b251fb24
160+
FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
161161
irondash_engine_context: 893c7d96d20ce361d7e996f39d360c4c2f9869ba
162162
local_notifier: ebf072651e35ae5e47280ad52e2707375cb2ae4e
163163
macos_ui: ff29104a215c2e1b76f37aacdcbba648abb25faa
@@ -166,13 +166,13 @@ SPEC CHECKSUMS:
166166
screen_retriever_macos: 452e51764a9e1cdb74b3c541238795849f21557f
167167
shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
168168
sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
169-
SQLCipher: 31878d8ebd27e5c96db0b7cb695c96e9f8ad77da
170-
sqlcipher_flutter_libs: df4c20ce574779df9ffa0dceb33e751b068e81c4
169+
SQLCipher: eb79c64049cb002b4e9fcb30edb7979bf4706dfc
170+
sqlcipher_flutter_libs: 01ead34db27ae5e49987cae46c8a34199eb22cfe
171171
super_native_extensions: c2795d6d9aedf4a79fae25cb6160b71b50549189
172172
system_theme: ed74293ad07d3a05e3e2d0059ff342360346f1a0
173173
url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673
174174
video_compress: 752b161da855df2492dd1a8fa899743cc8fe9534
175-
window_manager: 1d01fa7ac65a6e6f83b965471b1a7fdd3f06166c
175+
window_manager: b729e31d38fb04905235df9ea896128991cad99e
176176
window_to_front: 9e76fd432e36700a197dac86a0011e49c89abe0a
177177

178178
PODFILE CHECKSUM: 5bc6a71ad752a68d2b4bce2aeb96d0f7aab52719

0 commit comments

Comments
 (0)