chore: replace ubuntu_service with watch_it, upgrade all the things

.github/workflows/ci.yml

@@ -10,11 +10,11 @@ on:
   workflow_dispatch:
 
 env:
-  FLUTTER_VERSION: 3.16.x
+  FLUTTER_VERSION: 3.24.3
 
 jobs:
   analyze:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -24,7 +24,7 @@ jobs:
       - run: flutter analyze
 
   format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -33,7 +33,7 @@ jobs:
       - run: dart format --set-exit-if-changed .
 
   linux:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2
@@ -47,7 +47,7 @@ jobs:
       - run: flutter build linux -v
 
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2

lib/app.dart

@@ -4,11 +4,9 @@ import 'package:provider/provider.dart';
 import 'package:settings/app_model.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/schemas/schemas.dart';
-import 'package:settings/services/settings_service.dart';
 import 'package:settings/view/app_theme.dart';
 import 'package:settings/view/pages/page_items.dart';
 import 'package:yaru/yaru.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
 
 class UbuntuSettingsApp extends StatelessWidget {
   const UbuntuSettingsApp({
@@ -18,7 +16,7 @@ class UbuntuSettingsApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return ChangeNotifierProvider(
-      create: (_) => AppTheme(Settings(schemaInterface)),
+      create: (_) => AppTheme(GnomeSettings(schemaInterface)),
       child: YaruTheme(
         builder: (context, yaru, child) {
           return MaterialApp(
@@ -66,9 +64,7 @@ class App extends StatelessWidget {
         : getPageItems(context);
 
     return YaruMasterDetailPage(
-      layoutDelegate: const YaruMasterFixedPaneDelegate(
-        paneWidth: 270,
-      ),
+      paneLayoutDelegate: const YaruFixedPaneDelegate(paneSize: 270),
       length: items.length,
       tileBuilder: (context, index, selected, availableWidth) => IconTheme(
         data: Theme.of(context).iconTheme.copyWith(size: 21),

lib/main.dart

@@ -12,76 +12,76 @@ import 'package:settings/services/keyboard_service.dart';
 import 'package:settings/services/locale_service.dart';
 import 'package:settings/services/power_profile_service.dart';
 import 'package:settings/services/power_settings_service.dart';
-import 'package:settings/services/settings_service.dart';
-import 'package:ubuntu_service/ubuntu_service.dart';
 import 'package:udisks/udisks.dart';
 import 'package:upower/upower.dart';
+import 'package:watch_it/watch_it.dart';
 import 'package:xdg_accounts/xdg_accounts.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 void main() async {
   await YaruWindowTitleBar.ensureInitialized();
 
   final networkManagerClient = NetworkManagerClient();
   await networkManagerClient.connect();
 
-  registerService<BluetoothService>(
-    BluetoothService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<HostnameService>(
-    HostnameService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<KeyboardService>(
-    KeyboardMethodChannel.new,
-  );
-  registerService<NetworkManagerClient>(() => networkManagerClient);
-  registerService<PowerProfileService>(
-    PowerProfileService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<PowerSettingsService>(
-    PowerSettingsService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<SettingsService>(
-    SettingsService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<UDisksClient>(
-    UDisksClient.new,
-    dispose: (client) => client.close(),
-  );
-  registerService<UPowerClient>(
-    UPowerClient.new,
-    dispose: (client) => client.close(),
-  );
-  registerService<BlueZClient>(
-    BlueZClient.new,
-    dispose: (client) => client.close(),
-  );
-  registerService<InputSourceService>(InputSourceService.new);
-  registerService<HouseKeepingService>(
-    HouseKeepingService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<DateTimeService>(
-    DateTimeService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<LocaleService>(
-    LocaleService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<DisplayService>(
-    DisplayService.new,
-    dispose: (s) => s.dispose(),
-  );
-  registerService<XdgAccounts>(
-    XdgAccounts.new,
-    dispose: (s) => s.dispose(),
-  );
+  di
+    ..registerLazySingleton<BluetoothService>(
+      BluetoothService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<HostnameService>(
+      HostnameService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<KeyboardService>(
+      KeyboardMethodChannel.new,
+    )
+    ..registerLazySingleton<NetworkManagerClient>(() => networkManagerClient)
+    ..registerLazySingleton<PowerProfileService>(
+      PowerProfileService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<PowerGSettingsService>(
+      PowerGSettingsService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<GSettingsService>(
+      GSettingsService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<UDisksClient>(
+      UDisksClient.new,
+      dispose: (client) => client.close(),
+    )
+    ..registerLazySingleton<UPowerClient>(
+      UPowerClient.new,
+      dispose: (client) => client.close(),
+    )
+    ..registerLazySingleton<BlueZClient>(
+      BlueZClient.new,
+      dispose: (client) => client.close(),
+    )
+    ..registerLazySingleton<InputSourceService>(InputSourceService.new)
+    ..registerLazySingleton<HouseKeepingService>(
+      HouseKeepingService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<DateTimeService>(
+      DateTimeService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<LocaleService>(
+      LocaleService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<DisplayService>(
+      DisplayService.new,
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton<XdgAccounts>(
+      XdgAccounts.new,
+      dispose: (s) => s.dispose(),
+    );
 
   runApp(const UbuntuSettingsApp());
 }

lib/services/power_settings_service.dart

@@ -9,7 +9,7 @@ const kPowerSettingsInterface = 'org.gnome.SettingsDaemon.Power';
 @visibleForTesting
 const kPowerSettingsPath = '/org/gnome/SettingsDaemon/Power';
 
-class PowerSettingsService {
+class PowerGSettingsService {
   final screen = Brightness('Screen');
   final keyboard = Brightness('Keyboard');
 

lib/view/app_theme.dart

@@ -1,11 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:settings/services/settings_service.dart';
 import 'package:yaru/yaru.dart';
 
 class AppTheme extends ValueNotifier<ThemeMode> {
   AppTheme(this._settings) : super(ThemeMode.system);
 
-  final Settings _settings;
+  final GnomeSettings _settings;
 
   void apply(Brightness brightness, YaruVariant variant) {
     switch (brightness) {

lib/view/common/duration_dropdown_button.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:settings/l10n/l10n.dart';
 import 'package:settings/utils.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class DurationDropdownButton extends StatelessWidget {
   const DurationDropdownButton({

lib/view/common/selectable_svg_image.dart

@@ -37,7 +37,7 @@ class SelectableSvgImage extends StatelessWidget {
               colorFilter: ColorFilter.mode(
                 selected
                     ? selectedColor
-                    : Theme.of(context).colorScheme.background,
+                    : Theme.of(context).colorScheme.surface,
                 selected ? BlendMode.srcIn : BlendMode.color,
               ),
               height: height,

lib/view/common/settings_section.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class SettingsSection extends StatelessWidget {
   const SettingsSection({

lib/view/common/yaru_checkbox_row.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class YaruCheckboxRow extends StatelessWidget {
   /// Creates a check box in a row along with a text

lib/view/common/yaru_extra_option_row.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class YaruExtraOptionRow extends StatelessWidget {
   /// Creates a row having switch, label, description and YaruOptionButton.

lib/view/common/yaru_single_info_row.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class YaruSingleInfoRow extends StatelessWidget {
   /// Creates an info widget with infoLabel and infoValue.

lib/view/common/yaru_slider_row.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class YaruSliderRow extends StatelessWidget {
   /// Creates a yaru style slider.

lib/view/common/yaru_switch_row.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:yaru_widgets/yaru_widgets.dart';
+import 'package:yaru/yaru.dart';
 
 class YaruSwitchRow extends StatelessWidget {
   /// Creates yaru style switch. The [Switch] will be aligned horizontally along with the  `trailingWidget`.