chore: build snap on github

Feichtmeier · Feichtmeier · commit 5359ba9bf1e2 · 2025-02-10T18:20:15.000+01:00
diff --git a/.github/workflows/snap.yaml b/.github/workflows/snap.yaml
@@ -0,0 +1,59 @@
+name: Create Snap Package
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  FLUTTER_VERSION: "3.27.4"
+
+jobs:
+  build_and_release_linux_snap_edge_amd64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - uses: subosito/flutter-action@v2
+        with:
+          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 libsecret-1-dev
+      - run: flutter pub get
+      - run: flutter build linux --release --dart-define=${{ secrets.API_KEY }}
+      - uses: snapcore/action-build@v1
+        id: build
+      - uses: snapcore/action-publish@v1
+        if: steps.build.outcome == 'success'
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+          release: edge
+
+  build_and_release_linux_snap_edge_arm64:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 5
+      - uses: subosito/flutter-action@v2
+        with:
+          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 libsecret-1-dev
+      - run: flutter pub get
+      - run: flutter build linux --release --dart-define=${{ secrets.API_KEY }}
+      - uses: snapcore/action-build@v1
+        id: build
+      - uses: snapcore/action-publish@v1
+        if: steps.build.outcome == 'success'
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+        with:
+          snap: ${{ steps.build.outputs.snap }}
+          release: edge
diff --git a/README.md b/README.md
@@ -8,8 +8,13 @@
 
 Requires an api key from [openweathermap](https://openweathermap.org) which you need to create yourself (free tier) in your own account.
 
+
 ## Build
 
+### Install libsecret
+
+`sudo apt install libsecret-1-dev`
+
 ### Install Flutter
 
 <details>
@@ -22,3 +27,13 @@ sudo apt -y install git curl cmake meson make clang libgtk-3-dev pkg-config && m
 ```
 
 </details>
+
+### Run the app
+
+For the first run or after every `flutter clean`, the app needs to be started with your API_KEY:
+
+`flutter run --dart-define=API_KEY=YOUR_API_KEY_HERE_WITHOUT_QUOTES`
+
+any other times you can use
+
+`flutter run`
diff --git a/lib/app/app.dart b/lib/app/app.dart
@@ -17,43 +17,41 @@ class App extends StatelessWidget {
   const App({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    return MaterialApp(
-      localizationsDelegates: AppLocalizations.localizationsDelegates,
-      supportedLocales: supportedLocales,
-      onGenerateTitle: (context) => 'MusicPod',
-      debugShowCheckedModeBanner: false,
-      theme: yaruLight,
-      darkTheme: yaruDark.copyWith(
-        tabBarTheme: TabBarTheme.of(context).copyWith(
-          labelColor: Colors.white,
-          unselectedLabelColor: Colors.white.withValues(
-            alpha: 0.8,
+  Widget build(BuildContext context) => MaterialApp(
+        localizationsDelegates: AppLocalizations.localizationsDelegates,
+        supportedLocales: supportedLocales,
+        onGenerateTitle: (context) => 'MusicPod',
+        debugShowCheckedModeBanner: false,
+        theme: yaruLight,
+        darkTheme: yaruDark.copyWith(
+          tabBarTheme: TabBarTheme.of(context).copyWith(
+            labelColor: Colors.white,
+            unselectedLabelColor: Colors.white.withValues(
+              alpha: 0.8,
+            ),
           ),
         ),
-      ),
-      home: const StartPage(),
-      scrollBehavior: const MaterialScrollBehavior().copyWith(
-        dragDevices: {
-          PointerDeviceKind.mouse,
-          PointerDeviceKind.touch,
-          PointerDeviceKind.stylus,
-          PointerDeviceKind.unknown,
-          PointerDeviceKind.trackpad,
-        },
-      ),
-    );
-  }
+        home: const _StartPage(),
+        scrollBehavior: const MaterialScrollBehavior().copyWith(
+          dragDevices: {
+            PointerDeviceKind.mouse,
+            PointerDeviceKind.touch,
+            PointerDeviceKind.stylus,
+            PointerDeviceKind.unknown,
+            PointerDeviceKind.trackpad,
+          },
+        ),
+      );
 }
 
-class StartPage extends StatefulWidget {
-  const StartPage({super.key});
+class _StartPage extends StatefulWidget {
+  const _StartPage();
 
   @override
-  State<StartPage> createState() => _StartPageState();
+  State<_StartPage> createState() => _StartPageState();
 }
 
-class _StartPageState extends State<StartPage> {
+class _StartPageState extends State<_StartPage> {
   late final Future<void> _allReady;
 
   @override
@@ -66,12 +64,12 @@ class _StartPageState extends State<StartPage> {
   Widget build(BuildContext context) => FutureBuilder(
         future: _allReady,
         builder: (context, snapshot) =>
-            snapshot.hasData ? const AppPage() : const LoadingPage(),
+            snapshot.hasData ? const _AppPage() : const _LoadingPage(),
       );
 }
 
-class LoadingPage extends StatelessWidget {
-  const LoadingPage({super.key});
+class _LoadingPage extends StatelessWidget {
+  const _LoadingPage();
 
   @override
   Widget build(BuildContext context) => const Scaffold(
@@ -85,14 +83,14 @@ class LoadingPage extends StatelessWidget {
       );
 }
 
-class AppPage extends StatefulWidget with WatchItStatefulWidgetMixin {
-  const AppPage({super.key});
+class _AppPage extends StatefulWidget with WatchItStatefulWidgetMixin {
+  const _AppPage();
 
   @override
-  State<AppPage> createState() => _AppPageState();
+  State<_AppPage> createState() => _AppPageState();
 }
 
-class _AppPageState extends State<AppPage> {
+class _AppPageState extends State<_AppPage> {
   @override
   void initState() {
     di<WeatherModel>().loadWeather();
diff --git a/lib/locations/locations_service.dart b/lib/locations/locations_service.dart
@@ -8,16 +8,6 @@ class LocationsService {
   }) : _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) {
@@ -53,8 +43,4 @@ class LocationsService {
   }
 
   Stream<bool> get propertiesChanged => _settingsService.propertiesChanged;
-
-  Future<void> init() async {
-    _apiKey = await _settingsService.getStringSecure(key: SettingKeys.apiKey);
-  }
 }
diff --git a/lib/register_dependencies.dart b/lib/register_dependencies.dart
@@ -10,10 +10,19 @@ import 'weather/weather_model.dart';
 
 void registerDependencies() {
   di
-    ..registerSingleton<FlutterSecureStorage>(
-      const FlutterSecureStorage(
-        aOptions: AndroidOptions(encryptedSharedPreferences: true),
-      ),
+    ..registerSingletonAsync<FlutterSecureStorage>(
+      () async {
+        const flutterSecureStorage = FlutterSecureStorage(
+          aOptions: AndroidOptions(encryptedSharedPreferences: true),
+        );
+
+        const apiKey = String.fromEnvironment('API_KEY', defaultValue: '');
+
+        if (apiKey.isNotEmpty) {
+          flutterSecureStorage.write(key: SettingKeys.apiKey, value: apiKey);
+        }
+        return flutterSecureStorage;
+      },
     )
     ..registerSingletonAsync<SharedPreferences>(
       () async => SharedPreferences.getInstance(),
@@ -23,26 +32,21 @@ void registerDependencies() {
         sharedPreferences: di<SharedPreferences>(),
         flutterSecureStorage: di<FlutterSecureStorage>(),
       ),
-      dependsOn: [SharedPreferences],
+      dependsOn: [FlutterSecureStorage, SharedPreferences],
       dispose: (s) => s.dispose(),
     )
-    ..registerSingletonAsync<LocationsService>(
-      () async {
-        final locationsService = LocationsService(
-          settingsService: di<SettingsService>(),
-        );
-        await locationsService.init();
-        return locationsService;
-      },
+    ..registerSingletonWithDependencies<LocationsService>(
+      () => LocationsService(
+        settingsService: di<SettingsService>(),
+      ),
       dependsOn: [SettingsService],
     )
     ..registerSingletonAsync<OpenWeather>(
-      () async {
-        final apiKey = (await di<SettingsService>()
-                .getStringSecure(key: SettingKeys.apiKey)) ??
-            '';
-        return OpenWeather(apiKey: apiKey);
-      },
+      () async => OpenWeather(
+        apiKey:
+            await di<FlutterSecureStorage>().read(key: SettingKeys.apiKey) ??
+                '',
+      ),
       dependsOn: [SettingsService],
     )
     ..registerSingletonWithDependencies(
diff --git a/lib/weather/weather_model.dart b/lib/weather/weather_model.dart
@@ -22,8 +22,6 @@ class WeatherModel extends SafeChangeNotifier {
 
   OpenWeather _openWeather;
   void setApiKeyAndLoadWeather(String apiKey) {
-    _locationsService.setApiKey(apiKey);
-
     di
       ..unregister<OpenWeather>()
       ..registerSingleton<OpenWeather>(OpenWeather(apiKey: apiKey));
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -21,7 +21,7 @@ architectures:
 parts:
   flutter-git:
     source: https://github.com/flutter/flutter.git
-    source-tag: 3.19.5
+    source-tag: 3.27.4
     plugin: nil
     override-build: |
       mkdir -p $CRAFT_PART_INSTALL/usr/bin
