Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps where possible #441

Merged
merged 2 commits into from
Feb 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
workflow_dispatch:

env:
FLUTTER_VERSION: 3.10.x
FLUTTER_VERSION: 3.16.x

jobs:
analyze:
Expand Down
4 changes: 2 additions & 2 deletions lib/services/display/display_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ class DisplayService {
displayConfig.identity(i).connector,
), // maybe monitorId ?
DBusString(confMonitor.monitorModeId), // option selected
DBusDict.stringVariant({})
])
DBusDict.stringVariant({}),
]),
]),
]),
);
Expand Down
8 changes: 4 additions & 4 deletions lib/services/settings_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@ class Settings {
}
_values[key] = value;
switch (T) {
case bool:
case const (bool):
return _settings.set(key, DBusBoolean(value as bool));
case int:
case const (int):
return _settings.set(key, DBusInt32(value as int));
case double:
case const (double):
return _settings.set(key, DBusDouble(value as double));
case String:
case const (String):
return _settings.set(key, DBusString(value as String));
default:
break;
Expand Down
2 changes: 1 addition & 1 deletion lib/view/common/section_description.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SectionDescription extends StatelessWidget {
text,
style: Theme.of(context).textTheme.bodySmall,
),
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/view/common/title_bar_tab.dart
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class TitleBarTab extends StatelessWidget {
textAlign: TextAlign.center,
overflow: TextOverflow.ellipsis,
),
)
),
],
),
);
Expand Down
4 changes: 2 additions & 2 deletions lib/view/pages/accessibility/seeing_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -281,14 +281,14 @@ class _MagnifierPositionOptions extends StatelessWidget {
initialValue: model.screenPosition,
itemBuilder: (_) {
return [
for (var item in ScreenPosition.values)
for (final item in ScreenPosition.values)
PopupMenuItem(
value: item,
onTap: !model.screenPartEnabled
? null
: () => model.screenPosition = item,
child: Text(item.localize(context.l10n)),
)
),
];
},
child: Text(
Expand Down
10 changes: 5 additions & 5 deletions lib/view/pages/accounts/accounts_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ class AccountsPage extends StatelessWidget {
init: () async {
await Future.delayed(const Duration(seconds: 1));
},
)
),
],
),
),
)
),
],
);
}
Expand Down Expand Up @@ -158,7 +158,7 @@ class _AddUserDialogState extends State<_AddUserDialog> {
controller: _passwordHintController,
obscureText: true,
decoration: const InputDecoration(labelText: 'Password hint'),
)
),
],
),
actions: [
Expand All @@ -175,7 +175,7 @@ class _AddUserDialogState extends State<_AddUserDialog> {
model.init().then((value) => Navigator.pop(context));
}),
child: Text(context.l10n.confirm),
)
),
],
);
}
Expand Down Expand Up @@ -309,7 +309,7 @@ class _EditUserDialogState extends State<_EditUserDialog> {
TextField(
controller: userNameController,
onSubmitted: (value) => model.userName = value,
)
),
],
);
}
Expand Down
4 changes: 2 additions & 2 deletions lib/view/pages/appearance/dock_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class DockSection extends StatelessWidget {
),
),
],
)
),
],
),
SettingsSection(
Expand Down Expand Up @@ -184,7 +184,7 @@ class DockSection extends StatelessWidget {
),
height: assetHeight,
),
)
),
],
),
YaruSwitchRow(
Expand Down
4 changes: 2 additions & 2 deletions lib/view/pages/appearance/theme_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class _ThemeSectionState extends State<ThemeSection> {
spacing: 5,
runSpacing: 5,
children: [
for (var globalTheme in globalThemeList)
for (final globalTheme in globalThemeList)
YaruColorDisk(
onPressed: () {
theme.apply(Theme.of(context).brightness, globalTheme);
Expand All @@ -72,7 +72,7 @@ class _ThemeSectionState extends State<ThemeSection> {
selected: YaruTheme.of(context).variant == globalTheme,
),
],
)
),
],
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/apps/apps_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class AppsPage extends StatelessWidget {
icon: const Icon(YaruIcons.application_bag),
),
),
)
),
],
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/bluetooth/bluetooth_device_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const yaruIcons = <String, IconData>{
'video-display': YaruIcons.computer,
'preferences-desktop-keyboard': YaruIcons.keyboard,
'touchpad-disabled': YaruIcons.touchpad,
'thunderbolt': YaruIcons.thunderbolt
'thunderbolt': YaruIcons.thunderbolt,
};

class BluetoothDeviceModel extends SafeChangeNotifier {
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/bluetooth/bluetooth_device_row.dart
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ class _BluetoothDeviceDialog extends StatelessWidget {
Text(
model.errorMessage,
style: TextStyle(color: Theme.of(context).colorScheme.error),
)
),
],
);
}
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/bluetooth/bluetooth_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class _BluetoothPageState extends State<BluetoothPage> {
return const SizedBox();
}
},
)
),
],
),
],
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/connections/connections_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class _ConnectionsPageState extends State<ConnectionsPage> {
TitleBarTab(
iconData: YaruIcons.network_cellular,
text: 'Cellular',
)
),
],
),
),
Expand Down
8 changes: 4 additions & 4 deletions lib/view/pages/connections/widgets/authentication_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class AuthenticationDialog extends StatelessWidget {
DropdownMenuItem(
value: 'a',
child: Text('Not Implemented yet'),
)
),
],
),
),
Expand Down Expand Up @@ -90,7 +90,7 @@ class AuthenticationDialog extends StatelessWidget {
),
),
),
)
),
],
),
actions: [
Expand All @@ -107,7 +107,7 @@ class AuthenticationDialog extends StatelessWidget {
TextButton(
onPressed: () => Navigator.of(context).pop(),
child: const Text('Cancel'),
)
),
],
);
}
Expand All @@ -133,7 +133,7 @@ class _DialogRow extends StatelessWidget {
),
),
const SizedBox(width: 10),
Flexible(fit: FlexFit.loose, flex: 10, child: field)
Flexible(fit: FlexFit.loose, flex: 10, child: field),
],
);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/view/pages/connections/wifi_content.dart
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class WifiDevicesContent extends StatelessWidget {
.onSurface
.withOpacity(0.5),
),
)
),
],
),
onChanged: wifiModel.toggleWifi,
Expand Down Expand Up @@ -74,11 +74,11 @@ class WifiDevicesContent extends StatelessWidget {
);
}
},
)
),
],
);
},
)
),
],
);
}
Expand Down Expand Up @@ -120,7 +120,7 @@ class WifiAdaptorNotFound extends StatelessWidget {
Text(
'Make sure you have a Wi-Fi adaptor plugged and turned on',
style: Theme.of(context).textTheme.bodyMedium,
)
),
],
);
}
Expand Down
6 changes: 3 additions & 3 deletions lib/view/pages/date_and_time/date_time_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class _DateTimePageState extends State<DateTimePage> {
style: Theme.of(context).textTheme.displayLarge,
),
),
)
),
],
),
SettingsSection(
Expand Down Expand Up @@ -165,7 +165,7 @@ class _TimezoneSelectDialog extends StatelessWidget {
title: context.l10n.dateAmdTimePageSelectTimezone,
child: SettingsPage(
children: [
for (var timezone in timezones)
for (final timezone in timezones)
InkWell(
borderRadius: BorderRadius.circular(6.0),
onTap: () {
Expand All @@ -179,7 +179,7 @@ class _TimezoneSelectDialog extends StatelessWidget {
),
trailing: const Text(''),
),
)
),
],
),
);
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/date_and_time/timezones.dart
Original file line number Diff line number Diff line change
Expand Up @@ -593,5 +593,5 @@ const timezones = [
'Universal',
'W-SU',
'WET',
'Zulu'
'Zulu',
];
2 changes: 1 addition & 1 deletion lib/view/pages/default_apps/default_apps_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class DefaultAppsPage extends StatelessWidget {
children: [
Center(
child: Text(context.l10n.defaultAppsPageTitle),
)
),
],
);
}
Expand Down
8 changes: 4 additions & 4 deletions lib/view/pages/displays/displays_model.dart
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class DisplaysModel extends SafeChangeNotifier {
extension DisplayModelSetters on DisplaysModel {
void setResolution(int index, String resolution) {
final configurations = <DisplayMonitorConfiguration>[
..._currentNotifier.value!.configurations
..._currentNotifier.value!.configurations,
];

final configurationMonitorUpdate = configurations.removeAt(index);
Expand Down Expand Up @@ -93,7 +93,7 @@ extension DisplayModelSetters on DisplaysModel {
}

final configurations = <DisplayMonitorConfiguration>[
..._currentNotifier.value!.configurations
..._currentNotifier.value!.configurations,
];
final configurationMonitorUpdate = configurations.removeAt(index);

Expand All @@ -110,7 +110,7 @@ extension DisplayModelSetters on DisplaysModel {

void setOrientation(int index, LogicalMonitorOrientation orientation) {
final configurations = <DisplayMonitorConfiguration>[
..._currentNotifier.value!.configurations
..._currentNotifier.value!.configurations,
];
final configurationMonitorUpdate = configurations.removeAt(index);

Expand All @@ -126,7 +126,7 @@ extension DisplayModelSetters on DisplaysModel {

void setScale(int index, double scale) {
final configurations = <DisplayMonitorConfiguration>[
..._currentNotifier.value!.configurations
..._currentNotifier.value!.configurations,
];
final configurationMonitorUpdate = configurations.removeAt(index);

Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/displays/nightlight_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class NightlightPage extends StatelessWidget {
),
const TimeSelector(
isFrom: false,
)
),
],
),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/view/pages/displays/widgets/monitor_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class MonitorSection extends StatelessWidget {
child: Text(
'x${config.availableScales[i].toString().replaceAll('.0', '')}',
),
)
),
],
child:
Text('x${config.scale.toString().replaceAll('.0', '')}'),
Expand Down
Loading
Loading