Skip to content

Commit 14421b1

Browse files
authored
Update deps where possible (#441)
* Update deps where possible * update ci flutter version
1 parent 490a30c commit 14421b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+111
-108
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
workflow_dispatch:
1111

1212
env:
13-
FLUTTER_VERSION: 3.10.x
13+
FLUTTER_VERSION: 3.16.x
1414

1515
jobs:
1616
analyze:

lib/services/display/display_service.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class DisplayService {
8989
displayConfig.identity(i).connector,
9090
), // maybe monitorId ?
9191
DBusString(confMonitor.monitorModeId), // option selected
92-
DBusDict.stringVariant({})
93-
])
92+
DBusDict.stringVariant({}),
93+
]),
9494
]),
9595
]),
9696
);

lib/services/settings_service.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,13 @@ class Settings {
7474
}
7575
_values[key] = value;
7676
switch (T) {
77-
case bool:
77+
case const (bool):
7878
return _settings.set(key, DBusBoolean(value as bool));
79-
case int:
79+
case const (int):
8080
return _settings.set(key, DBusInt32(value as int));
81-
case double:
81+
case const (double):
8282
return _settings.set(key, DBusDouble(value as double));
83-
case String:
83+
case const (String):
8484
return _settings.set(key, DBusString(value as String));
8585
default:
8686
break;

lib/view/common/section_description.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class SectionDescription extends StatelessWidget {
2323
text,
2424
style: Theme.of(context).textTheme.bodySmall,
2525
),
26-
)
26+
),
2727
],
2828
),
2929
),

lib/view/common/title_bar_tab.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class TitleBarTab extends StatelessWidget {
3030
textAlign: TextAlign.center,
3131
overflow: TextOverflow.ellipsis,
3232
),
33-
)
33+
),
3434
],
3535
),
3636
);

lib/view/pages/accessibility/seeing_section.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -281,14 +281,14 @@ class _MagnifierPositionOptions extends StatelessWidget {
281281
initialValue: model.screenPosition,
282282
itemBuilder: (_) {
283283
return [
284-
for (var item in ScreenPosition.values)
284+
for (final item in ScreenPosition.values)
285285
PopupMenuItem(
286286
value: item,
287287
onTap: !model.screenPartEnabled
288288
? null
289289
: () => model.screenPosition = item,
290290
child: Text(item.localize(context.l10n)),
291-
)
291+
),
292292
];
293293
},
294294
child: Text(

lib/view/pages/accounts/accounts_page.dart

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ class AccountsPage extends StatelessWidget {
6363
init: () async {
6464
await Future.delayed(const Duration(seconds: 1));
6565
},
66-
)
66+
),
6767
],
6868
),
6969
),
70-
)
70+
),
7171
],
7272
);
7373
}
@@ -158,7 +158,7 @@ class _AddUserDialogState extends State<_AddUserDialog> {
158158
controller: _passwordHintController,
159159
obscureText: true,
160160
decoration: const InputDecoration(labelText: 'Password hint'),
161-
)
161+
),
162162
],
163163
),
164164
actions: [
@@ -175,7 +175,7 @@ class _AddUserDialogState extends State<_AddUserDialog> {
175175
model.init().then((value) => Navigator.pop(context));
176176
}),
177177
child: Text(context.l10n.confirm),
178-
)
178+
),
179179
],
180180
);
181181
}
@@ -309,7 +309,7 @@ class _EditUserDialogState extends State<_EditUserDialog> {
309309
TextField(
310310
controller: userNameController,
311311
onSubmitted: (value) => model.userName = value,
312-
)
312+
),
313313
],
314314
);
315315
}

lib/view/pages/appearance/dock_section.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class DockSection extends StatelessWidget {
154154
),
155155
),
156156
],
157-
)
157+
),
158158
],
159159
),
160160
SettingsSection(
@@ -184,7 +184,7 @@ class DockSection extends StatelessWidget {
184184
),
185185
height: assetHeight,
186186
),
187-
)
187+
),
188188
],
189189
),
190190
YaruSwitchRow(

lib/view/pages/appearance/theme_section.dart

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class _ThemeSectionState extends State<ThemeSection> {
6363
spacing: 5,
6464
runSpacing: 5,
6565
children: [
66-
for (var globalTheme in globalThemeList)
66+
for (final globalTheme in globalThemeList)
6767
YaruColorDisk(
6868
onPressed: () {
6969
theme.apply(Theme.of(context).brightness, globalTheme);
@@ -72,7 +72,7 @@ class _ThemeSectionState extends State<ThemeSection> {
7272
selected: YaruTheme.of(context).variant == globalTheme,
7373
),
7474
],
75-
)
75+
),
7676
],
7777
);
7878
}

lib/view/pages/apps/apps_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class AppsPage extends StatelessWidget {
3232
icon: const Icon(YaruIcons.application_bag),
3333
),
3434
),
35-
)
35+
),
3636
],
3737
);
3838
}

lib/view/pages/bluetooth/bluetooth_device_model.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const yaruIcons = <String, IconData>{
4444
'video-display': YaruIcons.computer,
4545
'preferences-desktop-keyboard': YaruIcons.keyboard,
4646
'touchpad-disabled': YaruIcons.touchpad,
47-
'thunderbolt': YaruIcons.thunderbolt
47+
'thunderbolt': YaruIcons.thunderbolt,
4848
};
4949

5050
class BluetoothDeviceModel extends SafeChangeNotifier {

lib/view/pages/bluetooth/bluetooth_device_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class _BluetoothDeviceDialog extends StatelessWidget {
162162
Text(
163163
model.errorMessage,
164164
style: TextStyle(color: Theme.of(context).colorScheme.error),
165-
)
165+
),
166166
],
167167
);
168168
}

lib/view/pages/bluetooth/bluetooth_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class _BluetoothPageState extends State<BluetoothPage> {
108108
return const SizedBox();
109109
}
110110
},
111-
)
111+
),
112112
],
113113
),
114114
],

lib/view/pages/connections/connections_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class _ConnectionsPageState extends State<ConnectionsPage> {
6262
TitleBarTab(
6363
iconData: YaruIcons.network_cellular,
6464
text: 'Cellular',
65-
)
65+
),
6666
],
6767
),
6868
),

lib/view/pages/connections/widgets/authentication_dialog.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class AuthenticationDialog extends StatelessWidget {
4242
DropdownMenuItem(
4343
value: 'a',
4444
child: Text('Not Implemented yet'),
45-
)
45+
),
4646
],
4747
),
4848
),
@@ -90,7 +90,7 @@ class AuthenticationDialog extends StatelessWidget {
9090
),
9191
),
9292
),
93-
)
93+
),
9494
],
9595
),
9696
actions: [
@@ -107,7 +107,7 @@ class AuthenticationDialog extends StatelessWidget {
107107
TextButton(
108108
onPressed: () => Navigator.of(context).pop(),
109109
child: const Text('Cancel'),
110-
)
110+
),
111111
],
112112
);
113113
}
@@ -133,7 +133,7 @@ class _DialogRow extends StatelessWidget {
133133
),
134134
),
135135
const SizedBox(width: 10),
136-
Flexible(fit: FlexFit.loose, flex: 10, child: field)
136+
Flexible(fit: FlexFit.loose, flex: 10, child: field),
137137
],
138138
);
139139
}

lib/view/pages/connections/wifi_content.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class WifiDevicesContent extends StatelessWidget {
4040
.onSurface
4141
.withOpacity(0.5),
4242
),
43-
)
43+
),
4444
],
4545
),
4646
onChanged: wifiModel.toggleWifi,
@@ -74,11 +74,11 @@ class WifiDevicesContent extends StatelessWidget {
7474
);
7575
}
7676
},
77-
)
77+
),
7878
],
7979
);
8080
},
81-
)
81+
),
8282
],
8383
);
8484
}
@@ -120,7 +120,7 @@ class WifiAdaptorNotFound extends StatelessWidget {
120120
Text(
121121
'Make sure you have a Wi-Fi adaptor plugged and turned on',
122122
style: Theme.of(context).textTheme.bodyMedium,
123-
)
123+
),
124124
],
125125
);
126126
}

lib/view/pages/date_and_time/date_time_page.dart

+3-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ class _DateTimePageState extends State<DateTimePage> {
105105
style: Theme.of(context).textTheme.displayLarge,
106106
),
107107
),
108-
)
108+
),
109109
],
110110
),
111111
SettingsSection(
@@ -165,7 +165,7 @@ class _TimezoneSelectDialog extends StatelessWidget {
165165
title: context.l10n.dateAmdTimePageSelectTimezone,
166166
child: SettingsPage(
167167
children: [
168-
for (var timezone in timezones)
168+
for (final timezone in timezones)
169169
InkWell(
170170
borderRadius: BorderRadius.circular(6.0),
171171
onTap: () {
@@ -179,7 +179,7 @@ class _TimezoneSelectDialog extends StatelessWidget {
179179
),
180180
trailing: const Text(''),
181181
),
182-
)
182+
),
183183
],
184184
),
185185
);

lib/view/pages/date_and_time/timezones.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -593,5 +593,5 @@ const timezones = [
593593
'Universal',
594594
'W-SU',
595595
'WET',
596-
'Zulu'
596+
'Zulu',
597597
];

lib/view/pages/default_apps/default_apps_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class DefaultAppsPage extends StatelessWidget {
2323
children: [
2424
Center(
2525
child: Text(context.l10n.defaultAppsPageTitle),
26-
)
26+
),
2727
],
2828
);
2929
}

lib/view/pages/displays/displays_model.dart

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class DisplaysModel extends SafeChangeNotifier {
5454
extension DisplayModelSetters on DisplaysModel {
5555
void setResolution(int index, String resolution) {
5656
final configurations = <DisplayMonitorConfiguration>[
57-
..._currentNotifier.value!.configurations
57+
..._currentNotifier.value!.configurations,
5858
];
5959

6060
final configurationMonitorUpdate = configurations.removeAt(index);
@@ -93,7 +93,7 @@ extension DisplayModelSetters on DisplaysModel {
9393
}
9494

9595
final configurations = <DisplayMonitorConfiguration>[
96-
..._currentNotifier.value!.configurations
96+
..._currentNotifier.value!.configurations,
9797
];
9898
final configurationMonitorUpdate = configurations.removeAt(index);
9999

@@ -110,7 +110,7 @@ extension DisplayModelSetters on DisplaysModel {
110110

111111
void setOrientation(int index, LogicalMonitorOrientation orientation) {
112112
final configurations = <DisplayMonitorConfiguration>[
113-
..._currentNotifier.value!.configurations
113+
..._currentNotifier.value!.configurations,
114114
];
115115
final configurationMonitorUpdate = configurations.removeAt(index);
116116

@@ -126,7 +126,7 @@ extension DisplayModelSetters on DisplaysModel {
126126

127127
void setScale(int index, double scale) {
128128
final configurations = <DisplayMonitorConfiguration>[
129-
..._currentNotifier.value!.configurations
129+
..._currentNotifier.value!.configurations,
130130
];
131131
final configurationMonitorUpdate = configurations.removeAt(index);
132132

lib/view/pages/displays/nightlight_page.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class NightlightPage extends StatelessWidget {
6363
),
6464
const TimeSelector(
6565
isFrom: false,
66-
)
66+
),
6767
],
6868
),
6969
),

lib/view/pages/displays/widgets/monitor_section.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class MonitorSection extends StatelessWidget {
119119
child: Text(
120120
'x${config.availableScales[i].toString().replaceAll('.0', '')}',
121121
),
122-
)
122+
),
123123
],
124124
child:
125125
Text('x${config.scale.toString().replaceAll('.0', '')}'),

0 commit comments

Comments
 (0)