Merge ff252d6b14 into b8ecd758cf

Made the translations more friendly

lib/l10n/app_it.arb

@@ -137,16 +137,16 @@
   "pre_download_play_description": "Anzi che effettuare lo stream dell'audio, scarica invece i byte e li riproduce (raccomandato per gli utenti con banda più alta)",
   "skip_non_music": "Salta i segmenti non di musica (SponsorBlock)",
   "blacklist_description": "Tracce e artisti in blacklist",
-  "wait_for_download_to_finish": "Prego attendere che lo scaricamento corrente finisca",
+  "wait_for_download_to_finish": "Prego attendere che il download corrente finisca",
   "desktop": "Desktop",
   "close_behavior": "Comportamento Chiusura",
   "close": "Chiudi",
   "minimize_to_tray": "Minimizza in tray",
   "show_tray_icon": "Mostra icona in tray di sistema",
-  "about": "A proposito di",
+  "about": "Informazioni su",
   "u_love_spotube": "Sappiamo che ami Spotube",
   "check_for_updates": "Controlla aggiornamenti",
-  "about_spotube": "A proposito di Spotube",
+  "about_spotube": "Informazioni su Spotube",
   "blacklist": "Blacklist",
   "please_sponsor": "Per favore sponsorizza/dona",
   "spotube_description": "Spotube, un client spotify gratis per tutti, multipiattaforma e leggero",
@@ -187,7 +187,7 @@
   "generate_playlist": "Genera Playlist",
   "track_exists": "La traccia {track} esiste già",
   "replace_downloaded_tracks": "Sostituisci tutte le tracce scaricate",
-  "skip_download_tracks": "Salta lo scaricamento di tutte le tracce scaricate",
+  "skip_download_tracks": "Salta il download di tutte le tracce scaricate",
   "do_you_want_to_replace": "Vuoi sovrascrivere la traccia esistente??",
   "replace": "Sovrascrivi",
   "skip": "Salta",
@@ -256,7 +256,7 @@
   "querying_info": "Richiesta informazioni...",
   "piped_api_down": "Le Piped API non funzionano",
   "piped_down_error_instructions": "L'istanza di Piped {pipedInstance} è correntemente offline\n\nCambia istanza o cambia 'Tipo API' alle API ufficiali YouTube\n\nAssicurati di riavviare l'app dopo il cambio",
-  "you_are_offline": "Sei correntemente offline",
+  "you_are_offline": "Al momento sei offline",
   "connection_restored": "Connessione ad internet ripristinata",
   "use_system_title_bar": "Usa la barra del titolo di sistema",
   "crunching_results": "Elaborazione risultati...",
@@ -267,15 +267,15 @@
   "change_cover": "Cambia copertina",
   "add_cover": "Aggiungi copertina",
   "restore_defaults": "Ripristina default",
-  "download_music_codec": "Codec musicale scaricamento",
-  "streaming_music_codec": "Codec musicale streaming",
-  "login_with_lastfm": "Accesso a Last.fm",
-  "connect": "Connetti",
-  "disconnect_lastfm": "Disconnetti Last.fm",
+  "download_music_codec": "Codec download musica",
+  "streaming_music_codec": "Codec streaming musica",
+  "login_with_lastfm": "Accedi con Last.fm",
+  "connect": "Connettiti",
+  "disconnect_lastfm": "Disconnettiti da Last.fm",
   "disconnect": "Disconnetti",
   "username": "Nome utente",
   "password": "Password",
-  "login": "Accesso",
+  "login": "Accedi",
   "login_with_your_lastfm": "Accedi con il tuo account Last.fm",
   "scrobble_to_lastfm": "Invia a Last.fm",
   "audio_source": "Fonte audio",
@@ -299,7 +299,7 @@
   "song_link": "Link della Canzone",
   "skip_this_nonsense": "Salta questa sciocchezza",
   "freedom_of_music": "“Libertà della Musica”",
-  "freedom_of_music_palm": "“Libertà della Musica nel palmo della tua mano”",
+  "freedom_of_music_palm": "“Libertà della Musica nelle tue mani”",
   "get_started": "Cominciamo",
   "youtube_source_description": "Consigliato e funziona meglio.",
   "piped_source_description": "Ti senti libero? Come YouTube ma molto più gratuito.",

lib/pages/settings/metadata_plugins.dart

@@ -1,5 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:collection/collection.dart';
+import 'package:file_selector/file_selector.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_form_builder/flutter_form_builder.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:form_builder_validators/form_builder_validators.dart';
@@ -154,6 +156,20 @@ class SettingsMetadataProviderPage extends HookConsumerWidget {
                       child: IconButton.primary(
                         icon: const Icon(SpotubeIcons.upload),
                         onPressed: () async {
+                          Uint8List bytes;
+
+                          if (kIsFlatpak) {
+                            final result = await openFile(
+                              acceptedTypeGroups: [
+                                const XTypeGroup(
+                                  label: 'Spotube Metadata Plugin',
+                                  extensions: ['smplug'],
+                                ),
+                              ],
+                            );
+                            if (result == null) return;
+                            bytes = await result.readAsBytes();
+                          } else {
                             final result = await FilePicker.platform.pickFiles(
                               type: kIsAndroid ? FileType.any : FileType.custom,
                               allowedExtensions: kIsAndroid ? [] : ["smplug"],
@@ -163,11 +179,12 @@ class SettingsMetadataProviderPage extends HookConsumerWidget {
                             if (result == null) return;
 
                             final file = result.files.first;
-
                             if (file.bytes == null) return;
+                            bytes = file.bytes!;
+                          }
 
-                          final pluginConfig = await pluginsNotifier
-                              .extractPluginArchive(file.bytes!);
+                          final pluginConfig =
+                              await pluginsNotifier.extractPluginArchive(bytes);
                           await pluginsNotifier.addPlugin(pluginConfig);
                         },
                       ),

lib/provider/server/routes/connect.dart

@@ -161,7 +161,7 @@ class ServerConnectRoutes {
 
                 event.onLoad((event) async {
                   await audioPlayerNotifier.load(
-                    event.data.tracks as List<SpotubeFullTrackObject>,
+                    event.data.tracks.cast<SpotubeFullTrackObject>().toList(),
                     autoPlay: true,
                     initialIndex: event.data.initialIndex ?? 0,
                   );
@@ -186,7 +186,7 @@ class ServerConnectRoutes {
                 });
 
                 event.onStop((event) async {
-                  await audioPlayer.stop();
+                  await ref.read(audioPlayerProvider.notifier).stop();
                 });
 
                 event.onNext((event) async {

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -12,6 +12,7 @@ import bonsoir_darwin
 import connectivity_plus
 import desktop_webview_window
 import device_info_plus
+import file_picker
 import file_selector_macos
 import flutter_inappwebview_macos
 import flutter_secure_storage_macos
@@ -40,6 +41,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlusPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlusPlugin"))
   DesktopWebviewWindowPlugin.register(with: registry.registrar(forPlugin: "DesktopWebviewWindowPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
+  FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
   InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
   FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))

pubspec.lock

@@ -681,10 +681,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: "16dc141db5a2ccc6520ebb6a2eb5945b1b09e95085c021d9f914f8ded7f1465c"
+      sha256: f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f
       url: "https://pub.dev"
     source: hosted
-    version: "8.1.4"
+    version: "10.3.3"
   file_selector:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -41,7 +41,7 @@ dependencies:
   duration: ^3.0.12
   encrypt: ^5.0.3
   envied: ^1.0.0
-  file_picker: 8.1.4
+  file_picker: 10.3.3
   file_selector: ^1.0.3
   fluentui_system_icons: ^1.1.234
   flutter: