Merge ff252d6b14 into 8a7f5c4008

Made the translations more friendly

lib/components/adaptive/adaptive_pop_sheet_list.dart

@@ -39,7 +39,7 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
 
   final Offset offset;
 
-  final ButtonVariance variance;
+  final AbstractButtonStyle variance;
 
   const AdaptivePopSheetList({
     super.key,
@@ -92,8 +92,10 @@ class AdaptivePopSheetList<T> extends StatelessWidget {
         // ),
         position: position,
         builder: (context) {
-          return DropdownMenu(
+          return WidgetStatesProvider.boundary(
+            child: DropdownMenu(
               children: childrenModified(context),
+            ),
           );
         },
       ).future;

lib/components/heart_button/heart_button.dart

@@ -13,7 +13,7 @@ class HeartButton extends HookConsumerWidget {
   final IconData? icon;
   final Color? color;
   final String? tooltip;
-  final ButtonVariance variance;
+  final AbstractButtonStyle variance;
   final ButtonSize size;
   const HeartButton({
     required this.isLiked,

lib/components/titlebar/titlebar_icon_buttons.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:shadcn_flutter/shadcn_flutter.dart';
-import 'package:spotube/extensions/button_variance.dart';
 
 class ShadcnWindowButton extends StatelessWidget {
   final Widget icon;
@@ -22,7 +21,7 @@ class ShadcnWindowButton extends StatelessWidget {
       height: 32,
       child: IconButton(
         variance: ButtonVariance.ghost.copyWith(
-          decoration: (context, states) {
+          decoration: (context, states, value) {
             final decoration = ButtonVariance.ghost.decoration(context, states)
                 as BoxDecoration;
             if (hoverBackgroundColor != null &&

lib/components/track_tile/track_tile.dart

@@ -5,7 +5,7 @@ import 'package:flutter/gestures.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/collections/routes.gr.dart';
@@ -17,7 +17,6 @@ import 'package:spotube/components/links/link_text.dart';
 import 'package:spotube/components/track_tile/track_options.dart';
 import 'package:spotube/components/ui/button_tile.dart';
 import 'package:spotube/extensions/artist_simple.dart';
-import 'package:spotube/extensions/button_variance.dart';
 import 'package:spotube/extensions/constrains.dart';
 import 'package:spotube/extensions/duration.dart';
 import 'package:spotube/extensions/image.dart';
@@ -108,7 +107,7 @@ class TrackTile extends HookConsumerWidget {
                     ? ButtonVariance.destructive
                     : ButtonVariance.ghost)
                 .copyWith(
-              padding: (context, states) =>
+              padding: (context, states, value) =>
                   const EdgeInsets.symmetric(vertical: 8, horizontal: 0),
             ),
             leading: Row(
@@ -229,7 +228,8 @@ class TrackTile extends HookConsumerWidget {
                           Flexible(
                             child: Button(
                               style: ButtonVariance.link.copyWith(
-                                padding: (context, states) => EdgeInsets.zero,
+                                padding: (context, states, value) =>
+                                    EdgeInsets.zero,
                               ),
                               onPressed: () {
                                 context

lib/components/ui/button_tile.dart

@@ -9,7 +9,7 @@ class ButtonTile extends StatelessWidget {
   final VoidCallback? onPressed;
   final VoidCallback? onLongPress;
   final bool selected;
-  final ButtonVariance style;
+  final AbstractButtonStyle style;
   final EdgeInsets? padding;
 
   const ButtonTile({

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",
+  "download_music_codec": "Codec download musica",
-  "streaming_music_codec": "Codec musicale streaming",
+  "streaming_music_codec": "Codec streaming musica",
-  "login_with_lastfm": "Accesso a Last.fm",
+  "login_with_lastfm": "Accedi con Last.fm",
-  "connect": "Connetti",
+  "connect": "Connettiti",
-  "disconnect_lastfm": "Disconnetti Last.fm",
+  "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/home/sections/genres/genre_card_playlist_card.dart

@@ -1,6 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:spotify/spotify.dart' hide Image;
 import 'package:spotube/collections/env.dart';
 import 'package:spotube/collections/routes.gr.dart';

lib/modules/player/player.dart

@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 
 import 'package:spotube/collections/assets.gen.dart';

lib/modules/player/player_actions.dart

@@ -2,7 +2,7 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 

lib/modules/player/player_controls.dart

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:media_kit/media_kit.dart';
 import 'package:palette_generator/palette_generator.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/collections/intents.dart';

lib/modules/player/player_overlay_collapsed.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:sliding_up_panel/sliding_up_panel.dart';
 import 'package:spotube/collections/intents.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/modules/playlist/playlist_card.dart

@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:spotify/spotify.dart' hide Offset, Image;
 import 'package:spotube/collections/env.dart';
 import 'package:spotube/collections/routes.gr.dart';

lib/modules/root/bottom_player.dart

@@ -1,7 +1,7 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 
 import 'package:spotube/collections/assets.gen.dart';

lib/pages/artist/section/header.dart

@@ -1,7 +1,7 @@
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:skeletonizer/skeletonizer.dart';
 import 'package:spotube/collections/fake.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/connect/control/control.dart

@@ -1,6 +1,6 @@
 import 'package:auto_route/auto_route.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/lyrics/lyrics.dart

@@ -1,6 +1,6 @@
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 
 import 'package:spotube/components/titlebar/titlebar.dart';

lib/pages/lyrics/mini_lyrics.dart

@@ -2,7 +2,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:palette_generator/palette_generator.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:shadcn_flutter/shadcn_flutter_extension.dart';
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';

lib/pages/search/search.dart

@@ -125,28 +125,34 @@ class SearchPage extends HookConsumerWidget {
                                       child: TextField(
                                         autofocus: true,
                                         controller: controller,
-                                        leading:
+                                        features: [
-                                            const Icon(SpotubeIcons.search),
+                                          const InputFeature.leading(
-                                        textInputAction: TextInputAction.search,
+                                            Icon(SpotubeIcons.search),
-                                        placeholder: Text(context.l10n.search),
+                                          ),
-                                        trailing: AnimatedCrossFade(
+                                          InputFeature.trailing(
-                                          duration:
+                                            AnimatedCrossFade(
-                                              const Duration(milliseconds: 300),
+                                              duration: const Duration(
-                                          crossFadeState:
+                                                  milliseconds: 300),
-                                              controller.text.isNotEmpty
+                                              crossFadeState: controller
+                                                      .text.isNotEmpty
                                                   ? CrossFadeState.showFirst
                                                   : CrossFadeState.showSecond,
                                               firstChild: IconButton.ghost(
                                                 size: ButtonSize.small,
-                                            icon:
+                                                icon: const Icon(
-                                                const Icon(SpotubeIcons.close),
+                                                    SpotubeIcons.close),
                                                 onPressed: () {
                                                   controller.clear();
                                                 },
                                               ),
-                                          secondChild: const SizedBox.square(
+                                              secondChild:
+                                                  const SizedBox.square(
                                                       dimension: 28),
                                             ),
+                                          )
+                                        ],
+                                        textInputAction: TextInputAction.search,
+                                        placeholder: Text(context.l10n.search),
                                         onSubmitted: onSubmitted,
                                       ),
                                     ),

lib/pages/settings/sections/playback.dart

@@ -11,7 +11,7 @@ import 'package:form_builder_validators/form_builder_validators.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:piped_client/piped_client.dart';
-import 'package:shadcn_flutter/shadcn_flutter.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart' hide Consumer;
 import 'package:spotube/collections/routes.gr.dart';
 import 'package:spotube/collections/spotube_icons.dart';
 import 'package:spotube/components/form/text_form_field.dart';
@@ -106,7 +106,7 @@ class SettingsPlaybackSection extends HookConsumerWidget {
                       Tooltip(
                         tooltip: TooltipContainer(
                           child: Text(context.l10n.add_custom_url),
-                        ),
+                        ).call,
                         child: IconButton.outline(
                           icon: const Icon(SpotubeIcons.edit),
                           size: ButtonSize.small,
@@ -261,7 +261,7 @@ class SettingsPlaybackSection extends HookConsumerWidget {
                       Tooltip(
                         tooltip: TooltipContainer(
                           child: Text(context.l10n.add_custom_url),
-                        ),
+                        ).call,
                         child: IconButton.outline(
                           icon: const Icon(SpotubeIcons.edit),
                           size: ButtonSize.small,

pubspec.lock

@@ -2012,10 +2012,10 @@ packages:
     dependency: "direct main"
     description:
       name: shadcn_flutter
-      sha256: "1e5f40484a42217a69af254952168783d1305025d56dabc45ab16396dba84d5e"
+      sha256: "2b6faf9a93628469c29a534e653295e26781f2799efe5dc971b91e91062ebf52"
       url: "https://pub.dev"
     source: hosted
-    version: "0.0.26"
+    version: "0.0.32"
   shared_preferences:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -102,7 +102,7 @@ dependencies:
       ref: dart-3-support
       url: https://github.com/KRTirtho/scrobblenaut.git
   scroll_to_index: ^3.0.1
-  shadcn_flutter: ^0.0.26
+  shadcn_flutter: ^0.0.32
   shared_preferences: ^2.2.3
   shelf: ^1.4.1
   shelf_router: ^1.1.4