Skip to content

Commit b306f52

Browse files
FeichtmeierFeichtmeier
authored
chore: replace ubuntu_service with watch_it, upgrade all the things (#446)
1 parent 345c28e commit b306f52

File tree

97 files changed

+658
-575
lines changed

Some content is hidden

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

97 files changed

+658
-575
lines changed

‎.github/workflows/ci.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ on:
1010
workflow_dispatch:
1111

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

1515
jobs:
1616
analyze:
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-latest
1818
steps:
1919
- uses: actions/checkout@v3
2020
- uses: subosito/flutter-action@v2
@@ -24,7 +24,7 @@ jobs:
2424
- run: flutter analyze
2525

2626
format:
27-
runs-on: ubuntu-22.04
27+
runs-on: ubuntu-latest
2828
steps:
2929
- uses: actions/checkout@v3
3030
- uses: subosito/flutter-action@v2
@@ -33,7 +33,7 @@ jobs:
3333
- run: dart format --set-exit-if-changed .
3434

3535
linux:
36-
runs-on: ubuntu-22.04
36+
runs-on: ubuntu-latest
3737
steps:
3838
- uses: actions/checkout@v3
3939
- uses: subosito/flutter-action@v2
@@ -47,7 +47,7 @@ jobs:
4747
- run: flutter build linux -v
4848

4949
test:
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-latest
5151
steps:
5252
- uses: actions/checkout@v3
5353
- uses: subosito/flutter-action@v2

‎lib/app.dart

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@ import 'package:provider/provider.dart';
44
import 'package:settings/app_model.dart';
55
import 'package:settings/l10n/l10n.dart';
66
import 'package:settings/schemas/schemas.dart';
7-
import 'package:settings/services/settings_service.dart';
87
import 'package:settings/view/app_theme.dart';
98
import 'package:settings/view/pages/page_items.dart';
109
import 'package:yaru/yaru.dart';
11-
import 'package:yaru_widgets/yaru_widgets.dart';
1210

1311
class UbuntuSettingsApp extends StatelessWidget {
1412
const UbuntuSettingsApp({
@@ -18,7 +16,7 @@ class UbuntuSettingsApp extends StatelessWidget {
1816
@override
1917
Widget build(BuildContext context) {
2018
return ChangeNotifierProvider(
21-
create: (_) => AppTheme(Settings(schemaInterface)),
19+
create: (_) => AppTheme(GnomeSettings(schemaInterface)),
2220
child: YaruTheme(
2321
builder: (context, yaru, child) {
2422
return MaterialApp(
@@ -66,9 +64,7 @@ class App extends StatelessWidget {
6664
: getPageItems(context);
6765

6866
return YaruMasterDetailPage(
69-
layoutDelegate: const YaruMasterFixedPaneDelegate(
70-
paneWidth: 270,
71-
),
67+
paneLayoutDelegate: const YaruFixedPaneDelegate(paneSize: 270),
7268
length: items.length,
7369
tileBuilder: (context, index, selected, availableWidth) => IconTheme(
7470
data: Theme.of(context).iconTheme.copyWith(size: 21),

‎lib/main.dart

+60-60
Original file line numberDiff line numberDiff line change
@@ -12,76 +12,76 @@ import 'package:settings/services/keyboard_service.dart';
1212
import 'package:settings/services/locale_service.dart';
1313
import 'package:settings/services/power_profile_service.dart';
1414
import 'package:settings/services/power_settings_service.dart';
15-
import 'package:settings/services/settings_service.dart';
16-
import 'package:ubuntu_service/ubuntu_service.dart';
1715
import 'package:udisks/udisks.dart';
1816
import 'package:upower/upower.dart';
17+
import 'package:watch_it/watch_it.dart';
1918
import 'package:xdg_accounts/xdg_accounts.dart';
20-
import 'package:yaru_widgets/yaru_widgets.dart';
19+
import 'package:yaru/yaru.dart';
2120

2221
void main() async {
2322
await YaruWindowTitleBar.ensureInitialized();
2423

2524
final networkManagerClient = NetworkManagerClient();
2625
await networkManagerClient.connect();
2726

28-
registerService<BluetoothService>(
29-
BluetoothService.new,
30-
dispose: (s) => s.dispose(),
31-
);
32-
registerService<HostnameService>(
33-
HostnameService.new,
34-
dispose: (s) => s.dispose(),
35-
);
36-
registerService<KeyboardService>(
37-
KeyboardMethodChannel.new,
38-
);
39-
registerService<NetworkManagerClient>(() => networkManagerClient);
40-
registerService<PowerProfileService>(
41-
PowerProfileService.new,
42-
dispose: (s) => s.dispose(),
43-
);
44-
registerService<PowerSettingsService>(
45-
PowerSettingsService.new,
46-
dispose: (s) => s.dispose(),
47-
);
48-
registerService<SettingsService>(
49-
SettingsService.new,
50-
dispose: (s) => s.dispose(),
51-
);
52-
registerService<UDisksClient>(
53-
UDisksClient.new,
54-
dispose: (client) => client.close(),
55-
);
56-
registerService<UPowerClient>(
57-
UPowerClient.new,
58-
dispose: (client) => client.close(),
59-
);
60-
registerService<BlueZClient>(
61-
BlueZClient.new,
62-
dispose: (client) => client.close(),
63-
);
64-
registerService<InputSourceService>(InputSourceService.new);
65-
registerService<HouseKeepingService>(
66-
HouseKeepingService.new,
67-
dispose: (s) => s.dispose(),
68-
);
69-
registerService<DateTimeService>(
70-
DateTimeService.new,
71-
dispose: (s) => s.dispose(),
72-
);
73-
registerService<LocaleService>(
74-
LocaleService.new,
75-
dispose: (s) => s.dispose(),
76-
);
77-
registerService<DisplayService>(
78-
DisplayService.new,
79-
dispose: (s) => s.dispose(),
80-
);
81-
registerService<XdgAccounts>(
82-
XdgAccounts.new,
83-
dispose: (s) => s.dispose(),
84-
);
27+
di
28+
..registerLazySingleton<BluetoothService>(
29+
BluetoothService.new,
30+
dispose: (s) => s.dispose(),
31+
)
32+
..registerLazySingleton<HostnameService>(
33+
HostnameService.new,
34+
dispose: (s) => s.dispose(),
35+
)
36+
..registerLazySingleton<KeyboardService>(
37+
KeyboardMethodChannel.new,
38+
)
39+
..registerLazySingleton<NetworkManagerClient>(() => networkManagerClient)
40+
..registerLazySingleton<PowerProfileService>(
41+
PowerProfileService.new,
42+
dispose: (s) => s.dispose(),
43+
)
44+
..registerLazySingleton<PowerGSettingsService>(
45+
PowerGSettingsService.new,
46+
dispose: (s) => s.dispose(),
47+
)
48+
..registerLazySingleton<GSettingsService>(
49+
GSettingsService.new,
50+
dispose: (s) => s.dispose(),
51+
)
52+
..registerLazySingleton<UDisksClient>(
53+
UDisksClient.new,
54+
dispose: (client) => client.close(),
55+
)
56+
..registerLazySingleton<UPowerClient>(
57+
UPowerClient.new,
58+
dispose: (client) => client.close(),
59+
)
60+
..registerLazySingleton<BlueZClient>(
61+
BlueZClient.new,
62+
dispose: (client) => client.close(),
63+
)
64+
..registerLazySingleton<InputSourceService>(InputSourceService.new)
65+
..registerLazySingleton<HouseKeepingService>(
66+
HouseKeepingService.new,
67+
dispose: (s) => s.dispose(),
68+
)
69+
..registerLazySingleton<DateTimeService>(
70+
DateTimeService.new,
71+
dispose: (s) => s.dispose(),
72+
)
73+
..registerLazySingleton<LocaleService>(
74+
LocaleService.new,
75+
dispose: (s) => s.dispose(),
76+
)
77+
..registerLazySingleton<DisplayService>(
78+
DisplayService.new,
79+
dispose: (s) => s.dispose(),
80+
)
81+
..registerLazySingleton<XdgAccounts>(
82+
XdgAccounts.new,
83+
dispose: (s) => s.dispose(),
84+
);
8585

8686
runApp(const UbuntuSettingsApp());
8787
}

‎lib/services/power_settings_service.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ const kPowerSettingsInterface = 'org.gnome.SettingsDaemon.Power';
99
@visibleForTesting
1010
const kPowerSettingsPath = '/org/gnome/SettingsDaemon/Power';
1111

12-
class PowerSettingsService {
12+
class PowerGSettingsService {
1313
final screen = Brightness('Screen');
1414
final keyboard = Brightness('Keyboard');
1515

‎lib/services/settings_service.dart

-105
This file was deleted.

‎lib/view/app_theme.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import 'package:flutter/material.dart';
2-
import 'package:settings/services/settings_service.dart';
32
import 'package:yaru/yaru.dart';
43

54
class AppTheme extends ValueNotifier<ThemeMode> {
65
AppTheme(this._settings) : super(ThemeMode.system);
76

8-
final Settings _settings;
7+
final GnomeSettings _settings;
98

109
void apply(Brightness brightness, YaruVariant variant) {
1110
switch (brightness) {

‎lib/view/common/duration_dropdown_button.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:settings/l10n/l10n.dart';
33
import 'package:settings/utils.dart';
4-
import 'package:yaru_widgets/yaru_widgets.dart';
4+
import 'package:yaru/yaru.dart';
55

66
class DurationDropdownButton extends StatelessWidget {
77
const DurationDropdownButton({

‎lib/view/common/selectable_svg_image.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class SelectableSvgImage extends StatelessWidget {
3737
colorFilter: ColorFilter.mode(
3838
selected
3939
? selectedColor
40-
: Theme.of(context).colorScheme.background,
40+
: Theme.of(context).colorScheme.surface,
4141
selected ? BlendMode.srcIn : BlendMode.color,
4242
),
4343
height: height,

‎lib/view/common/settings_section.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class SettingsSection extends StatelessWidget {
55
const SettingsSection({

‎lib/view/common/yaru_checkbox_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class YaruCheckboxRow extends StatelessWidget {
55
/// Creates a check box in a row along with a text

‎lib/view/common/yaru_extra_option_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class YaruExtraOptionRow extends StatelessWidget {
55
/// Creates a row having switch, label, description and YaruOptionButton.

‎lib/view/common/yaru_single_info_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class YaruSingleInfoRow extends StatelessWidget {
55
/// Creates an info widget with infoLabel and infoValue.

‎lib/view/common/yaru_slider_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class YaruSliderRow extends StatelessWidget {
55
/// Creates a yaru style slider.

‎lib/view/common/yaru_switch_row.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'package:yaru_widgets/yaru_widgets.dart';
2+
import 'package:yaru/yaru.dart';
33

44
class YaruSwitchRow extends StatelessWidget {
55
/// Creates yaru style switch. The [Switch] will be aligned horizontally along with the `trailingWidget`.

0 commit comments

Comments
 (0)