chore: fix snapcraft, add macos icon (#19)

Author: Feichtmeier

assets/pulse.png

@@ -18,7 +18,7 @@ void registerDependencies() {
 
         const apiKey = String.fromEnvironment('API_KEY', defaultValue: '');
 
-        if (apiKey.isNotEmpty) {
+        if (apiKey.trim().isNotEmpty) {
           flutterSecureStorage.write(key: SettingKeys.apiKey, value: apiKey);
         }
         return flutterSecureStorage;
@@ -51,10 +51,11 @@ void registerDependencies() {
     )
     ..registerSingletonWithDependencies(
       () => WeatherModel(
+        settingsService: di<SettingsService>(),
         locationsService: di<LocationsService>(),
         openWeather: di<OpenWeather>(),
       ),
-      dependsOn: [OpenWeather],
+      dependsOn: [OpenWeather, SettingsService],
       dispose: (s) => s.dispose(),
     )
     ..registerLazySingleton(AppModel.new);

lib/register_dependencies.dart

@@ -12,6 +12,7 @@ import 'package:safe_change_notifier/safe_change_notifier.dart';
 import 'package:watch_it/watch_it.dart';
 
 import '../locations/locations_service.dart';
+import '../settings/settings_service.dart';
 import 'weather_data_x.dart';
 import 'weekday.dart';
 import 'package:http/http.dart' as http;
@@ -20,18 +21,26 @@ class WeatherModel extends SafeChangeNotifier {
   WeatherModel({
     required OpenWeather openWeather,
     required LocationsService locationsService,
+    required SettingsService settingsService,
   })  : _openWeather = openWeather,
-        _locationsService = locationsService;
+        _locationsService = locationsService,
+        _settingsService = settingsService;
 
   OpenWeather _openWeather;
   void setApiKeyAndLoadWeather(String apiKey) {
+    _settingsService.setString(
+      key: SettingKeys.apiKey,
+      value: apiKey,
+      secure: true,
+    );
     di
       ..unregister<OpenWeather>()
       ..registerSingleton<OpenWeather>(OpenWeather(apiKey: apiKey));
     _openWeather = di<OpenWeather>();
     loadWeather();
   }
 
+  final SettingsService _settingsService;
   final LocationsService _locationsService;
   StreamSubscription<bool>? _propertiesChangedSub;
 

lib/weather/weather_model.dart

@@ -1,68 +1,68 @@
 {
-  "images" : [
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_16.png",
-      "scale" : "1x"
+    "info": {
+        "version": 1,
+        "author": "xcode"
     },
-    {
-      "size" : "16x16",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_32.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "32x32",
-      "idiom" : "mac",
-      "filename" : "app_icon_64.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_128.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "128x128",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_256.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "256x256",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "2x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_512.png",
-      "scale" : "1x"
-    },
-    {
-      "size" : "512x512",
-      "idiom" : "mac",
-      "filename" : "app_icon_1024.png",
-      "scale" : "2x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
+    "images": [
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_16.png",
+            "scale": "1x"
+        },
+        {
+            "size": "16x16",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "2x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_32.png",
+            "scale": "1x"
+        },
+        {
+            "size": "32x32",
+            "idiom": "mac",
+            "filename": "app_icon_64.png",
+            "scale": "2x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_128.png",
+            "scale": "1x"
+        },
+        {
+            "size": "128x128",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "2x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_256.png",
+            "scale": "1x"
+        },
+        {
+            "size": "256x256",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "2x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_512.png",
+            "scale": "1x"
+        },
+        {
+            "size": "512x512",
+            "idiom": "mac",
+            "filename": "app_icon_1024.png",
+            "scale": "2x"
+        }
+    ]
+}