Merge ff252d6b14 into 3d334d96fd

Made the translations more friendly

lib/collections/routes.dart

@@ -75,17 +75,17 @@ class AppRouter extends RootStackRouter {
                   path: "local",
                   page: UserLocalLibraryRoute.page,
                 ),
-                AutoRoute(
-                  path: "local/folder",
-                  page: LocalLibraryRoute.page,
-                  // parentNavigatorKey: shellRouteNavigatorKey,
-                ),
                 AutoRoute(
                   path: "downloads",
                   page: UserDownloadsRoute.page,
                 ),
               ],
             ),
+            AutoRoute(
+              path: "local/folder",
+              page: LocalLibraryRoute.page,
+              // parentNavigatorKey: shellRouteNavigatorKey,
+            ),
             AutoRoute(
               path: "library/generate",
               page: PlaylistGeneratorRoute.page,

lib/components/adaptive/adaptive_pop_sheet_list.dart

@@ -28,7 +28,7 @@ class AdaptiveMenuButton<T> extends MenuButton {
 /// or equal to 640px
 /// In smaller screen, a [IconButton] with a [showModalBottomSheet] is shown
 class AdaptivePopSheetList<T> extends StatelessWidget {
-  final List<AdaptiveMenuButton<T>> children;
+  final List<AdaptiveMenuButton<T>> Function(BuildContext context) items;
   final Widget? icon;
   final Widget? child;
   final bool useRootNavigator;
@@ -43,7 +43,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   const AdaptivePopSheetList({
     super.key,
-    required this.children,
+    required this.items,
     this.icon,
     this.child,
     this.useRootNavigator = true,
@@ -59,27 +59,28 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   Future<void> showDropdownMenu(BuildContext context, Offset position) async {
     final mediaQuery = MediaQuery.of(context);
-    final childrenModified = children.map((s) {
-      if (s.onPressed == null) {
-        return MenuButton(
-          key: s.key,
-          autoClose: s.autoClose,
-          enabled: s.enabled,
-          leading: s.leading,
-          focusNode: s.focusNode,
-          onPressed: (context) {
-            if (s.value != null) {
-              onSelected?.call(s.value as T);
-            }
-          },
-          popoverController: s.popoverController,
-          subMenu: s.subMenu,
-          trailing: s.trailing,
-          child: s.child,
-        );
-      }
-      return s;
-    }).toList();
+    List<MenuButton> childrenModified(BuildContext context) =>
+        items(context).map((s) {
+          if (s.onPressed == null) {
+            return MenuButton(
+              key: s.key,
+              autoClose: s.autoClose,
+              enabled: s.enabled,
+              leading: s.leading,
+              focusNode: s.focusNode,
+              onPressed: (context) {
+                if (s.value != null) {
+                  onSelected?.call(s.value as T);
+                }
+              },
+              popoverController: s.popoverController,
+              subMenu: s.subMenu,
+              trailing: s.trailing,
+              child: s.child,
+            );
+          }
+          return s;
+        }).toList();
 
     if (mediaQuery.mdAndUp) {
       await showDropdown<T?>(
@@ -92,7 +93,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
         position: position,
         builder: (context) {
           return DropdownMenu(
-            children: childrenModified,
+            children: childrenModified(context),
           );
         },
       ).future;
@@ -109,11 +110,12 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
       ),
       backgroundColor: context.theme.colorScheme.card,
       builder: (context) {
+        final children = childrenModified(context);
         return ListView.builder(
-          itemCount: childrenModified.length,
+          itemCount: children.length,
           shrinkWrap: true,
           itemBuilder: (context, index) {
-            final data = childrenModified[index];
+            final data = children[index];
 
             return Button(
               enabled: data.enabled,

lib/components/track_presentation/presentation_actions.dart

@@ -166,7 +166,7 @@ class TrackPresentationActionsSection extends HookConsumerWidget {
       },
       icon: const Icon(SpotubeIcons.moreVertical),
       variance: ButtonVariance.outline,
-      children: [
+      items: (context) => [
         AdaptiveMenuButton(
           value: "download",
           leading: const Icon(SpotubeIcons.download),

lib/components/track_presentation/sort_tracks_dropdown.dart

@@ -23,7 +23,7 @@ class SortTracksDropdown extends StatelessWidget {
       onSelected: onChanged,
       tooltip: context.l10n.sort_tracks,
       icon: const Icon(SpotubeIcons.sort),
-      children: [
+      items: (context) => [
         AdaptiveMenuButton(
           value: SortBy.none,
           enabled: value != SortBy.none,

lib/components/track_tile/track_options.dart

@@ -366,7 +366,7 @@ class TrackOptions extends HookConsumerWidget {
           ),
         ),
       ],
-      children: [
+      items: (context) => [
         if (isLocalTrack)
           AdaptiveMenuButton(
             value: TrackOptionValue.delete,

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/modules/player/player.dart

@@ -27,6 +27,7 @@ import 'package:spotube/provider/audio_player/audio_player.dart';
 import 'package:spotube/provider/server/active_sourced_track.dart';
 import 'package:spotube/provider/volume_provider.dart';
 import 'package:spotube/services/sourced_track/sources/youtube.dart';
+import 'package:spotube/utils/platform.dart';
 
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -101,7 +102,8 @@ class PlayerView extends HookConsumerWidget {
           backgroundColor: Colors.transparent,
           headers: [
             SafeArea(
-              minimum: const EdgeInsets.only(top: 80),
+              minimum:
+                  kIsMobile ? const EdgeInsets.only(top: 80) : EdgeInsets.zero,
               bottom: false,
               child: TitleBar(
                 surfaceOpacity: 0,

lib/modules/player/player_actions.dart

@@ -191,7 +191,7 @@ class PlayerActions extends HookConsumerWidget {
               sleepTimerNotifier.setSleepTimer(value);
             }
           },
-          children: [
+          items: (context) => [
             for (final entry in sleepTimerEntries.entries)
               AdaptiveMenuButton(
                 value: entry.value,

lib/pages/lyrics/lyrics.dart

@@ -81,6 +81,7 @@ class LyricsPage extends HookConsumerWidget {
                   title: tabbar,
                   height: 58 * context.theme.scaling,
                   surfaceBlur: 0,
+                  automaticallyImplyLeading: false,
                 )
               : tabbar
         ],