Merge branch 'desktop-beta' into pr/Komodo5197/720

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-android:
-    name: Build for Android and Linux
+    name: Build for Android
     runs-on: ubuntu-latest
     steps:
     - name: Clone repository
@@ -23,6 +23,7 @@ jobs:
       uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
+    - run: flutter doctor
     - run: flutter pub get
     # - run: flutter test
     - run: flutter build apk --debug --no-pub
@@ -32,7 +33,29 @@ jobs:
         path: build/app/outputs/flutter-apk/app-debug.apk
         compression-level: 0 # no compression
     - run: flutter build appbundle --debug --no-pub
-    - run: flutter --suppress-analytics build linux --release --no-pub
+  build-linux:
+    name: Build for Linux
+    runs-on: ubuntu-latest
+    steps:
+    - name: Clone repository
+      uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'zulu'
+        java-version: '17'
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y build-essential cmake ninja-build libgtk-3-dev
+    - name: Set up Flutter
+      uses: subosito/flutter-action@v2
+      with:
+        channel: 'stable'
+    - run: flutter doctor
+    - run: flutter pub get
+    - run: flutter gen-l10n
+    # - run: flutter test
+    - run: flutter build linux --release --no-pub
     - run: |
         tar -czf finamp-linux-release-bundle.tar.gz --directory build/linux/x64/release/ bundle \
         && sha256sum finamp-linux-release-bundle.tar.gz > finamp-linux-release-bundle.tar.gz.sha256sum
@@ -62,7 +85,9 @@ jobs:
       uses: subosito/flutter-action@v2
       with:
         channel: 'stable'
+    - run: flutter doctor
     - run: flutter pub get
+    - run: flutter gen-l10n
     # - run: flutter test
     - run: flutter build windows
     # TODO pack in redistributables?
@@ -87,6 +112,7 @@ jobs:
       with:
         channel: 'stable'
         architecture: x64
+    - run: flutter doctor
     - run: flutter pub get
     # - run: flutter test
     - run: flutter build ios --release --no-pub --no-codesign

lib/components/AddToPlaylistScreen/add_to_playlist_button.dart

@@ -1,9 +1,9 @@
-import 'package:finamp/components/PlayerScreen/queue_source_helper.dart';
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/services/favorite_provider.dart';
-import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/components/PlayerScreen/queue_source_helper.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/services/favorite_provider.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/AddToPlaylistScreen/add_to_playlist_list.dart

@@ -1,11 +1,11 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
-import 'package:finamp/components/Buttons/cta_medium.dart';
-import 'package:finamp/components/PlayerScreen/queue_source_helper.dart';
-import 'package:finamp/components/album_image.dart';
-import 'package:finamp/services/finamp_settings_helper.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/components/Buttons/cta_medium.dart';
+import 'package:Finamp/components/PlayerScreen/queue_source_helper.dart';
+import 'package:Finamp/components/album_image.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/AddToPlaylistScreen/new_playlist_dialog.dart

@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/services/downloads_service.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/services/downloads_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/AlbumScreen/album_screen_content_flexible_space_bar.dart

@@ -1,8 +1,8 @@
-import 'package:finamp/components/Buttons/cta_medium.dart';
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/services/queue_service.dart';
-import 'package:finamp/services/feedback_helper.dart';
+import 'package:Finamp/components/Buttons/cta_medium.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/services/queue_service.dart';
+import 'package:Finamp/services/feedback_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/AlbumScreen/download_button.dart

@@ -1,5 +1,5 @@
-import 'package:finamp/services/finamp_settings_helper.dart';
-import 'package:finamp/services/finamp_user_helper.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/finamp_user_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/AlbumScreen/download_dialog.dart

@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:file_sizes/file_sizes.dart';
-import 'package:finamp/models/jellyfin_models.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/AlbumScreen/item_info.dart

@@ -1,5 +1,5 @@
-import 'package:finamp/components/PlayerScreen/artist_chip.dart';
-import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/components/PlayerScreen/artist_chip.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 

lib/components/AlbumScreen/preset_chip.dart

@@ -1,7 +1,7 @@
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:finamp/services/queue_service.dart';
+import 'package:Finamp/services/queue_service.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 

lib/components/AlbumScreen/song_list_tile.dart

@@ -2,13 +2,13 @@ import 'dart:async';
 
 import 'package:audio_service/audio_service.dart';
 import 'package:collection/collection.dart';
-import 'package:finamp/components/AlbumScreen/song_menu.dart';
-import 'package:finamp/components/MusicScreen/music_screen_tab_view.dart';
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/models/jellyfin_models.dart' as jellyfin_models;
-import 'package:finamp/services/finamp_user_helper.dart';
-import 'package:finamp/services/queue_service.dart';
+import 'package:Finamp/components/AlbumScreen/song_menu.dart';
+import 'package:Finamp/components/MusicScreen/music_screen_tab_view.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/models/jellyfin_models.dart' as jellyfin_models;
+import 'package:Finamp/services/finamp_user_helper.dart';
+import 'package:Finamp/services/queue_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/AlbumScreen/song_menu.dart

@@ -1,18 +1,18 @@
 import 'dart:async';
 
-import 'package:finamp/components/AlbumScreen/speed_menu.dart';
-import 'package:finamp/components/PlayerScreen/queue_list.dart';
-import 'package:finamp/components/PlayerScreen/sleep_timer_cancel_dialog.dart';
-import 'package:finamp/components/PlayerScreen/sleep_timer_dialog.dart';
-import 'package:finamp/components/themed_bottom_sheet.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/screens/artist_screen.dart';
-import 'package:finamp/services/current_track_metadata_provider.dart';
-import 'package:finamp/services/feedback_helper.dart';
-import 'package:finamp/services/metadata_provider.dart';
-import 'package:finamp/services/music_player_background_task.dart';
-import 'package:finamp/services/queue_service.dart';
-import 'package:finamp/services/theme_provider.dart';
+import 'package:Finamp/components/AlbumScreen/speed_menu.dart';
+import 'package:Finamp/components/PlayerScreen/queue_list.dart';
+import 'package:Finamp/components/PlayerScreen/sleep_timer_cancel_dialog.dart';
+import 'package:Finamp/components/PlayerScreen/sleep_timer_dialog.dart';
+import 'package:Finamp/components/themed_bottom_sheet.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/screens/artist_screen.dart';
+import 'package:Finamp/services/current_track_metadata_provider.dart';
+import 'package:Finamp/services/feedback_helper.dart';
+import 'package:Finamp/services/metadata_provider.dart';
+import 'package:Finamp/services/music_player_background_task.dart';
+import 'package:Finamp/services/queue_service.dart';
+import 'package:Finamp/services/theme_provider.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/AlbumScreen/speed_menu.dart

@@ -2,8 +2,8 @@ import 'dart:async';
 import 'dart:math';
 import 'dart:ui';
 
-import 'package:finamp/services/feedback_helper.dart';
-import 'package:finamp/services/queue_service.dart';
+import 'package:Finamp/services/feedback_helper.dart';
+import 'package:Finamp/services/queue_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/ArtistScreen/artist_item_info.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/ArtistScreen/artist_screen_content_flexible_space_bar.dart

@@ -1,11 +1,11 @@
 import 'package:collection/collection.dart';
-import 'package:finamp/components/Buttons/cta_medium.dart';
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/services/jellyfin_api.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
-import 'package:finamp/services/queue_service.dart';
-import 'package:finamp/services/feedback_helper.dart';
+import 'package:Finamp/components/Buttons/cta_medium.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/services/jellyfin_api.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/services/queue_service.dart';
+import 'package:Finamp/services/feedback_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/Buttons/cta_large.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/feedback_helper.dart';
+import 'package:Finamp/services/feedback_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vibrate/flutter_vibrate.dart';
 

lib/components/Buttons/cta_medium.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/feedback_helper.dart';
+import 'package:Finamp/services/feedback_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_vibrate/flutter_vibrate.dart';
 

lib/components/Buttons/simple_button.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/color_schemes.g.dart';
+import 'package:Finamp/color_schemes.g.dart';
 import 'package:flutter/material.dart';
 
 enum IconPosition {

lib/components/DownloadLocationSettingsScreen/download_location_list_tile.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/DownloadsScreen/downloaded_items_list.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/DownloadsScreen/sync_downloads_button.dart

@@ -1,5 +1,5 @@
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/services/downloads_service.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/services/downloads_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/LayoutSettingsScreen/CustomizationSettingsScreen/playback_speed_control_visibility_dropdown_list_tile.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/services/metadata_provider.dart';
+import 'package:Finamp/services/metadata_provider.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

lib/components/LoginScreen/login_authentication_page.dart

@@ -1,9 +1,9 @@
-import 'package:finamp/components/Buttons/cta_medium.dart';
-import 'package:finamp/components/Buttons/simple_button.dart';
-import 'package:finamp/components/LoginScreen/login_user_selection_page.dart';
-import 'package:finamp/components/global_snackbar.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/components/Buttons/cta_medium.dart';
+import 'package:Finamp/components/Buttons/simple_button.dart';
+import 'package:Finamp/components/LoginScreen/login_user_selection_page.dart';
+import 'package:Finamp/components/global_snackbar.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
 import 'package:flutter/material.dart' hide ConnectionState;
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/LoginScreen/login_flow.dart

@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:finamp/components/LoginScreen/login_server_selection_page.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/screens/view_selector.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/components/LoginScreen/login_server_selection_page.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/screens/view_selector.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:get_it/get_it.dart';

lib/components/LoginScreen/login_server_selection_page.dart

@@ -1,6 +1,6 @@
-import 'package:finamp/components/Buttons/simple_button.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/components/Buttons/simple_button.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';

lib/components/LoginScreen/login_splash_page.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/components/Buttons/cta_large.dart';
+import 'package:Finamp/components/Buttons/cta_large.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';

lib/components/LoginScreen/login_user_selection_page.dart

@@ -1,7 +1,7 @@
-import 'package:finamp/components/Buttons/simple_button.dart';
-import 'package:finamp/components/LoginScreen/login_server_selection_page.dart';
-import 'package:finamp/models/jellyfin_models.dart';
-import 'package:finamp/services/jellyfin_api_helper.dart';
+import 'package:Finamp/components/Buttons/simple_button.dart';
+import 'package:Finamp/components/LoginScreen/login_server_selection_page.dart';
+import 'package:Finamp/models/jellyfin_models.dart';
+import 'package:Finamp/services/jellyfin_api_helper.dart';
 import 'package:flutter/material.dart' hide ConnectionState;
 import 'package:flutter_tabler_icons/flutter_tabler_icons.dart';
 import 'package:get_it/get_it.dart';

lib/components/LogsScreen/copy_logs_button.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/components/global_snackbar.dart';
+import 'package:Finamp/components/global_snackbar.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';

lib/components/LogsScreen/log_tile.dart

@@ -1,6 +1,6 @@
 import 'package:clipboard/clipboard.dart';
-import 'package:finamp/services/censored_log.dart';
-import 'package:finamp/services/contains_login.dart';
+import 'package:Finamp/services/censored_log.dart';
+import 'package:Finamp/services/contains_login.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:logging/logging.dart';

lib/components/MusicScreen/album_item.dart

@@ -1,9 +1,9 @@
 import 'dart:async';
 
-import 'package:finamp/components/MusicScreen/album_item_list_tile.dart';
-import 'package:finamp/models/finamp_models.dart';
-import 'package:finamp/services/finamp_settings_helper.dart';
-import 'package:finamp/services/queue_service.dart';
+import 'package:Finamp/components/MusicScreen/album_item_list_tile.dart';
+import 'package:Finamp/models/finamp_models.dart';
+import 'package:Finamp/services/finamp_settings_helper.dart';
+import 'package:Finamp/services/queue_service.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';

lib/components/MusicScreen/album_item_list_tile.dart

@@ -1,4 +1,4 @@
-import 'package:finamp/components/favourite_button.dart';
+import 'package:Finamp/components/favourite_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';