From 9d2ad1c626d92bb6a054b75c859ae6d12c5c29e8 Mon Sep 17 00:00:00 2001 From: Kingkor Roy Tirtho Date: Fri, 28 Mar 2025 22:24:23 +0600 Subject: [PATCH] chore: upgrade shadcn_flutter version --- .../adaptive/adaptive_pop_sheet_list.dart | 2 +- lib/components/heart_button/heart_button.dart | 2 +- .../titlebar/titlebar_icon_buttons.dart | 3 +- lib/components/track_tile/track_tile.dart | 8 ++-- lib/components/ui/button_tile.dart | 2 +- .../genres/genre_card_playlist_card.dart | 2 +- lib/modules/player/player.dart | 2 +- lib/modules/player/player_actions.dart | 2 +- lib/modules/player/player_controls.dart | 2 +- .../player/player_overlay_collapsed.dart | 2 +- lib/modules/playlist/playlist_card.dart | 2 +- lib/modules/root/bottom_player.dart | 2 +- lib/pages/artist/section/header.dart | 2 +- lib/pages/connect/control/control.dart | 2 +- lib/pages/lyrics/lyrics.dart | 2 +- lib/pages/lyrics/mini_lyrics.dart | 2 +- lib/pages/search/search.dart | 46 +++++++++++-------- lib/pages/settings/sections/playback.dart | 6 +-- pubspec.lock | 4 +- pubspec.yaml | 2 +- 20 files changed, 51 insertions(+), 46 deletions(-) diff --git a/lib/components/adaptive/adaptive_pop_sheet_list.dart b/lib/components/adaptive/adaptive_pop_sheet_list.dart index 0f02ee73..4772c860 100644 --- a/lib/components/adaptive/adaptive_pop_sheet_list.dart +++ b/lib/components/adaptive/adaptive_pop_sheet_list.dart @@ -39,7 +39,7 @@ class AdaptivePopSheetList extends StatelessWidget { final Offset offset; - final ButtonVariance variance; + final AbstractButtonStyle variance; const AdaptivePopSheetList({ super.key, diff --git a/lib/components/heart_button/heart_button.dart b/lib/components/heart_button/heart_button.dart index 56cb22ab..80fa077b 100644 --- a/lib/components/heart_button/heart_button.dart +++ b/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, diff --git a/lib/components/titlebar/titlebar_icon_buttons.dart b/lib/components/titlebar/titlebar_icon_buttons.dart index 481a22ce..0a3f6178 100644 --- a/lib/components/titlebar/titlebar_icon_buttons.dart +++ b/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 && diff --git a/lib/components/track_tile/track_tile.dart b/lib/components/track_tile/track_tile.dart index 524575e5..f47980cd 100644 --- a/lib/components/track_tile/track_tile.dart +++ b/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 diff --git a/lib/components/ui/button_tile.dart b/lib/components/ui/button_tile.dart index 8f5a7581..e31a09a5 100644 --- a/lib/components/ui/button_tile.dart +++ b/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({ diff --git a/lib/modules/home/sections/genres/genre_card_playlist_card.dart b/lib/modules/home/sections/genres/genre_card_playlist_card.dart index 1e1b3b76..328507cc 100644 --- a/lib/modules/home/sections/genres/genre_card_playlist_card.dart +++ b/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'; diff --git a/lib/modules/player/player.dart b/lib/modules/player/player.dart index aa5171d5..ac077be6 100644 --- a/lib/modules/player/player.dart +++ b/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'; diff --git a/lib/modules/player/player_actions.dart b/lib/modules/player/player_actions.dart index 0ed56ed2..f3d0a94a 100644 --- a/lib/modules/player/player_actions.dart +++ b/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'; diff --git a/lib/modules/player/player_controls.dart b/lib/modules/player/player_controls.dart index 4d5d6deb..e4c6ca7f 100644 --- a/lib/modules/player/player_controls.dart +++ b/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'; diff --git a/lib/modules/player/player_overlay_collapsed.dart b/lib/modules/player/player_overlay_collapsed.dart index d0961ade..aa5a3b38 100644 --- a/lib/modules/player/player_overlay_collapsed.dart +++ b/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'; diff --git a/lib/modules/playlist/playlist_card.dart b/lib/modules/playlist/playlist_card.dart index 1e2ba1bf..c4ffffa7 100644 --- a/lib/modules/playlist/playlist_card.dart +++ b/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'; diff --git a/lib/modules/root/bottom_player.dart b/lib/modules/root/bottom_player.dart index 18b4c221..806d98e2 100644 --- a/lib/modules/root/bottom_player.dart +++ b/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'; diff --git a/lib/pages/artist/section/header.dart b/lib/pages/artist/section/header.dart index b6224428..8a91f257 100644 --- a/lib/pages/artist/section/header.dart +++ b/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'; diff --git a/lib/pages/connect/control/control.dart b/lib/pages/connect/control/control.dart index 2511809c..b75a135b 100644 --- a/lib/pages/connect/control/control.dart +++ b/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'; diff --git a/lib/pages/lyrics/lyrics.dart b/lib/pages/lyrics/lyrics.dart index d3e77bf0..5c6df2d2 100644 --- a/lib/pages/lyrics/lyrics.dart +++ b/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'; diff --git a/lib/pages/lyrics/mini_lyrics.dart b/lib/pages/lyrics/mini_lyrics.dart index 3e50987d..58c2bc17 100644 --- a/lib/pages/lyrics/mini_lyrics.dart +++ b/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'; diff --git a/lib/pages/search/search.dart b/lib/pages/search/search.dart index 3826a0b6..eeedfb9c 100644 --- a/lib/pages/search/search.dart +++ b/lib/pages/search/search.dart @@ -125,28 +125,34 @@ class SearchPage extends HookConsumerWidget { child: TextField( autofocus: true, controller: controller, - leading: - const Icon(SpotubeIcons.search), - textInputAction: TextInputAction.search, - placeholder: Text(context.l10n.search), - trailing: AnimatedCrossFade( - duration: - const Duration(milliseconds: 300), - crossFadeState: - controller.text.isNotEmpty + features: [ + const InputFeature.leading( + Icon(SpotubeIcons.search), + ), + InputFeature.trailing( + AnimatedCrossFade( + duration: const Duration( + milliseconds: 300), + crossFadeState: controller + .text.isNotEmpty ? CrossFadeState.showFirst : CrossFadeState.showSecond, - firstChild: IconButton.ghost( - size: ButtonSize.small, - icon: - const Icon(SpotubeIcons.close), - onPressed: () { - controller.clear(); - }, - ), - secondChild: const SizedBox.square( - dimension: 28), - ), + firstChild: IconButton.ghost( + size: ButtonSize.small, + icon: const Icon( + SpotubeIcons.close), + onPressed: () { + controller.clear(); + }, + ), + secondChild: + const SizedBox.square( + dimension: 28), + ), + ) + ], + textInputAction: TextInputAction.search, + placeholder: Text(context.l10n.search), onSubmitted: onSubmitted, ), ), diff --git a/lib/pages/settings/sections/playback.dart b/lib/pages/settings/sections/playback.dart index f3b7d131..54273904 100644 --- a/lib/pages/settings/sections/playback.dart +++ b/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, diff --git a/pubspec.lock b/pubspec.lock index 311949d4..1ddc1705 100644 --- a/pubspec.lock +++ b/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: diff --git a/pubspec.yaml b/pubspec.yaml index 01972e58..dbd97b91 100644 --- a/pubspec.yaml +++ b/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