chore: update flutter and remove custom settings

Author: Feichtmeier

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  FLUTTER_VERSION: '3.19.x'
+  FLUTTER_VERSION: '3.27.4'
 
 jobs:
   analyze:
@@ -49,6 +49,6 @@ jobs:
           channel: 'stable'
           flutter-version: ${{env.FLUTTER_VERSION}}
       - run: sudo apt update
-      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev libmpv-dev
+      - run: sudo apt install -y clang cmake curl libgtk-3-dev ninja-build pkg-config unzip libunwind-dev
       - run: flutter pub get
       - run: flutter build linux -v

analysis_options.yaml

@@ -10,4 +10,9 @@ linter:
     require_trailing_commas: true
     use_super_parameters: true
     close_sinks: true
-    prefer_relative_imports: true
+    prefer_relative_imports: true
+    sort_pub_dependencies: true
+    unnecessary_parenthesis: true
+    unnecessary_await_in_return: true
+    unnecessary_late: true
+    unnecessary_breaks: true

l10n.yaml

@@ -1,4 +1,4 @@
-arb-dir: lib/src/l10n
+arb-dir: lib/l10n
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 nullable-getter: false

lib/src/app/app.dart lib/app/app.dart

@@ -6,9 +6,9 @@ import 'package:flutter_weather_bg_null_safety/bg/weather_bg.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../constants.dart';
-import '../../weather.dart';
-import '../build_context_x.dart';
+import '../constants.dart';
+import '../weather.dart';
+import '../extensions/build_context_x.dart';
 import '../l10n/l10n.dart';
 import '../weather/weather_model.dart';
 import 'side_bar.dart';
@@ -27,12 +27,12 @@ class App extends StatelessWidget {
       darkTheme: yaruDark.copyWith(
         tabBarTheme: TabBarTheme.of(context).copyWith(
           labelColor: Colors.white,
-          unselectedLabelColor: Colors.white.withOpacity(
-            0.8,
+          unselectedLabelColor: Colors.white.withValues(
+            alpha: 0.8,
           ),
         ),
       ),
-      home: const AppPage(),
+      home: const StartPage(),
       scrollBehavior: const MaterialScrollBehavior().copyWith(
         dragDevices: {
           PointerDeviceKind.mouse,
@@ -46,6 +46,45 @@ class App extends StatelessWidget {
   }
 }
 
+class StartPage extends StatefulWidget {
+  const StartPage({super.key});
+
+  @override
+  State<StartPage> createState() => _StartPageState();
+}
+
+class _StartPageState extends State<StartPage> {
+  late final Future<void> _allReady;
+
+  @override
+  void initState() {
+    super.initState();
+    _allReady = di.allReady();
+  }
+
+  @override
+  Widget build(BuildContext context) => FutureBuilder(
+        future: _allReady,
+        builder: (context, snapshot) =>
+            snapshot.hasData ? const AppPage() : const LoadingPage(),
+      );
+}
+
+class LoadingPage extends StatelessWidget {
+  const LoadingPage({super.key});
+
+  @override
+  Widget build(BuildContext context) => const Scaffold(
+        appBar: YaruWindowTitleBar(
+          border: BorderSide.none,
+          backgroundColor: Colors.transparent,
+        ),
+        body: Center(
+          child: YaruCircularProgressIndicator(),
+        ),
+      );
+}
+
 class AppPage extends StatefulWidget with WatchItStatefulWidgetMixin {
   const AppPage({super.key});
 
@@ -56,12 +95,6 @@ class AppPage extends StatefulWidget with WatchItStatefulWidgetMixin {
 class _AppPageState extends State<AppPage> {
   @override
   void initState() {
-    YaruWindow.of(context).onClose(
-      () async {
-        await di.reset();
-        return true;
-      },
-    );
     di<WeatherModel>().loadWeather();
     super.initState();
   }

lib/src/app/app_model.dart lib/app/app_model.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:yaru/yaru.dart';
 
-import '../build_context_x.dart';
+import '../extensions/build_context_x.dart';
 import '../l10n/l10n.dart';
 
 class OfflinePage extends StatelessWidget {

lib/src/app/offline_page.dart lib/app/offline_page.dart

@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
-import '../../constants.dart';
-import '../build_context_x.dart';
+import '../constants.dart';
+import '../extensions/build_context_x.dart';
 import '../weather/view/city_search_field.dart';
 import '../weather/weather_model.dart';
 
@@ -66,7 +66,7 @@ class SideBar extends StatelessWidget with WatchItMixin {
     );
 
     return Material(
-      color: theme.colorScheme.surface.withOpacity(0.4),
+      color: theme.colorScheme.surface.withValues(alpha: 0.4),
       child: SizedBox(
         width: kPaneWidth,
         child: Column(

lib/src/app/side_bar.dart lib/app/side_bar.dart

@@ -0,0 +1,60 @@
+import 'dart:async';
+
+import '../settings/settings_service.dart';
+
+class LocationsService {
+  LocationsService({
+    required SettingsService settingsService,
+  }) : _settingsService = settingsService;
+  final SettingsService _settingsService;
+
+  String? _apiKey;
+  String? get apiKey => _apiKey;
+  void setApiKey(String? value) {
+    _settingsService.setString(
+      key: SettingKeys.apiKey,
+      value: value ?? '',
+      secure: true,
+    );
+  }
+
+  String? get lastLocation =>
+      _settingsService.getString(key: SettingKeys.lastLocation);
+  void setLastLocation(String? value) {
+    if (value == null) return;
+    _settingsService.setString(key: SettingKeys.lastLocation, value: value);
+  }
+
+  Set<String> get favLocations =>
+      _settingsService
+          .getStrings(key: SettingKeys.favoriteLocations)
+          ?.toSet() ??
+      {};
+  bool isFavLocation(String value) => favLocations.contains(value);
+
+  void addFavLocation(String name) {
+    if (favLocations.contains(name)) return;
+    final favs = Set<String>.from(favLocations);
+    favs.add(name);
+    _settingsService.setStrings(
+      key: SettingKeys.favoriteLocations,
+      value: favs.toList(),
+    );
+  }
+
+  Future<void> removeFavLocation(String name) async {
+    if (!favLocations.contains(name)) return;
+    final favs = Set<String>.from(favLocations);
+    favs.remove(name);
+    _settingsService.setStrings(
+      key: SettingKeys.favoriteLocations,
+      value: favs.toList(),
+    );
+  }
+
+  Stream<bool> get propertiesChanged => _settingsService.propertiesChanged;
+
+  Future<void> init() async {
+    _apiKey = await _settingsService.getStringSecure(key: SettingKeys.apiKey);
+  }
+}

lib/src/build_context_x.dart lib/extensions/build_context_x.dart

@@ -1,31 +1,13 @@
 import 'package:flutter/material.dart';
-import 'package:open_weather_client/open_weather.dart';
-import 'package:watch_it/watch_it.dart';
 import 'package:yaru/yaru.dart';
 
-import 'src/app/app.dart';
-import 'src/app/app_model.dart';
-import 'src/locations/locations_service.dart';
-import 'src/weather/weather_model.dart';
+import 'app/app.dart';
+import 'register_dependencies.dart';
 
 Future<void> main() async {
   await YaruWindowTitleBar.ensureInitialized();
 
-  final locationsService = LocationsService();
-  await locationsService.init();
-  di.registerSingleton<LocationsService>(
-    locationsService,
-    dispose: (s) => s.dispose(),
-  );
-  di.registerSingleton(AppModel());
-
-  di.registerLazySingleton(
-    () => WeatherModel(
-      locationsService: locationsService,
-      openWeather: OpenWeather(apiKey: locationsService.apiKey ?? ''),
-    ),
-    dispose: (s) => s.dispose(),
-  );
+  registerDependencies();
 
   runApp(const App());
 }

lib/string_x.dart lib/extensions/string_x.dart

@@ -0,0 +1,57 @@
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:open_weather_client/open_weather.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:watch_it/watch_it.dart';
+
+import 'app/app_model.dart';
+import 'locations/locations_service.dart';
+import 'settings/settings_service.dart';
+import 'weather/weather_model.dart';
+
+void registerDependencies() {
+  di
+    ..registerSingleton<FlutterSecureStorage>(
+      const FlutterSecureStorage(
+        aOptions: AndroidOptions(encryptedSharedPreferences: true),
+      ),
+    )
+    ..registerSingletonAsync<SharedPreferences>(
+      () async => SharedPreferences.getInstance(),
+    )
+    ..registerSingletonWithDependencies<SettingsService>(
+      () => SettingsService(
+        sharedPreferences: di<SharedPreferences>(),
+        flutterSecureStorage: di<FlutterSecureStorage>(),
+      ),
+      dependsOn: [SharedPreferences],
+      dispose: (s) => s.dispose(),
+    )
+    ..registerSingletonAsync<LocationsService>(
+      () async {
+        final locationsService = LocationsService(
+          settingsService: di<SettingsService>(),
+        );
+        await locationsService.init();
+        return locationsService;
+      },
+      dependsOn: [SettingsService],
+    )
+    ..registerSingletonAsync<OpenWeather>(
+      () async {
+        final apiKey = (await di<SettingsService>()
+                .getStringSecure(key: SettingKeys.apiKey)) ??
+            '';
+        return OpenWeather(apiKey: apiKey);
+      },
+      dependsOn: [SettingsService],
+    )
+    ..registerSingletonWithDependencies(
+      () => WeatherModel(
+        locationsService: di<LocationsService>(),
+        openWeather: di<OpenWeather>(),
+      ),
+      dependsOn: [OpenWeather],
+      dispose: (s) => s.dispose(),
+    )
+    ..registerLazySingleton(AppModel.new);
+}

lib/src/l10n/app_de.arb lib/l10n/app_de.arb

@@ -0,0 +1,38 @@
+import 'dart:async';
+
+import 'package:safe_change_notifier/safe_change_notifier.dart';
+
+import 'settings_service.dart';
+
+class SettingsModel extends SafeChangeNotifier {
+  SettingsModel({
+    required SettingsService service,
+  }) : _service = service;
+
+  final SettingsService _service;
+
+  StreamSubscription<bool>? _propertiesChangedSub;
+
+  String? getString({required String key}) => _service.getString(key: key);
+  Future<String?> getStringSecure({required String key}) =>
+      _service.getStringSecure(key: key);
+  void setString({
+    required String key,
+    required String value,
+    bool secure = false,
+  }) async =>
+      _service.setString(
+        key: key,
+        value: value,
+        secure: secure,
+      );
+
+  void init() => _propertiesChangedSub ??=
+      _service.propertiesChanged.listen((_) => notifyListeners());
+
+  @override
+  Future<void> dispose() async {
+    await _propertiesChangedSub?.cancel();
+    super.dispose();
+  }
+}

lib/src/l10n/app_en.arb lib/l10n/app_en.arb

@@ -0,0 +1,47 @@
+import 'dart:async';
+
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+class SettingsService {
+  SettingsService({
+    required SharedPreferences sharedPreferences,
+    required FlutterSecureStorage flutterSecureStorage,
+  })  : _preferences = sharedPreferences,
+        _flutterSecureStorage = flutterSecureStorage;
+
+  final SharedPreferences _preferences;
+  final FlutterSecureStorage _flutterSecureStorage;
+  final _propertiesChangedController = StreamController<bool>.broadcast();
+  Stream<bool> get propertiesChanged => _propertiesChangedController.stream;
+  void notify(bool saved) {
+    if (saved) _propertiesChangedController.add(true);
+  }
+
+  String? getString({required String key}) => _preferences.getString(key);
+  Future<String?> getStringSecure({required String key}) =>
+      _flutterSecureStorage.read(key: key);
+  void setString({
+    required String key,
+    required String value,
+    bool secure = false,
+  }) =>
+      secure
+          ? _flutterSecureStorage
+              .write(key: key, value: value)
+              .then((_) => _propertiesChangedController.add(true))
+          : _preferences.setString(key, value).then(notify);
+
+  List<String>? getStrings({required String key}) =>
+      _preferences.getStringList(key);
+  void setStrings({required String key, required List<String> value}) =>
+      _preferences.setStringList(key, value).then(notify);
+
+  Future<void> dispose() async => _propertiesChangedController.close();
+}
+
+class SettingKeys {
+  static const String apiKey = 'apiKey';
+  static const favoriteLocations = 'favoriteLocations';
+  static const lastLocation = 'lastLocation';
+}