kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-13 07:55:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: use shadcn in all places that's using material

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2025-01-30 21:44:07 +06:00
parent e0760e6250
commit 6cf4ca9179
36 changed files with 70 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/collections/env.dart
View File

@ -39,9 +39,9 @@ abstract class Env {
static final String _releaseChannel = _Env._releaseChannel;
@EnviedField(varName: "DISABLE_SPOTIFY_IMAGES", defaultValue: "0")
static final int _disableSpotifyImages = _Env._disableSpotifyImages;
static final String _disableSpotifyImages = _Env._disableSpotifyImages;
static bool get disableSpotifyImages => _disableSpotifyImages == 1;
static bool get disableSpotifyImages => _disableSpotifyImages == "1";
static ReleaseChannel get releaseChannel => _releaseChannel == "stable"
? ReleaseChannel.stable

2
lib/collections/gradients.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
const gradients = [
LinearGradient(colors: [

2
lib/collections/side_bar_tiles.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/collections/spotube_icons.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:spotube/pages/home/home.dart';

2
lib/collections/spotube_icons.dart
View File

@ -1,5 +1,5 @@
import 'package:fluentui_system_icons/fluentui_system_icons.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_feather_icons/flutter_feather_icons.dart';
import 'package:simple_icons/simple_icons.dart';

2
lib/components/animated_gradient.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
class AnimateGradient extends HookWidget {

2
lib/components/framework/app_pop_scope.dart
View File

@ -1,6 +1,6 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
/// A temporary workaround for [WillPopScope] and [PopScope] not working in GoRouter
/// https://github.com/flutter/flutter/issues/140869#issuecomment-2247181468

2
lib/components/inter_scrollbar/inter_scrollbar.dart
View File

@ -1,5 +1,5 @@
import 'package:draggable_scrollbar/draggable_scrollbar.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:spotube/utils/platform.dart';

2
lib/components/links/artist_link.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/components/links/anchor_button.dart';
import 'package:spotube/extensions/context.dart';

2
lib/components/links/hyper_link.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/components/links/anchor_button.dart';
import 'package:url_launcher/url_launcher_string.dart';

2
lib/components/links/link_text.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/components/links/anchor_button.dart';
import 'package:spotube/utils/service_utils.dart';

2
lib/components/shimmers/shimmer_lyrics.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:gap/gap.dart';

2
lib/components/spotube_page_route.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:go_router/go_router.dart';
class SpotubePage<T> extends MaterialPage<T> {

2
lib/components/titlebar/titlebar_buttons.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shadcn_flutter/shadcn_flutter_extension.dart';

2
lib/extensions/color.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
extension ColorAlterer on Color {
Color darken(double amount) {

2
lib/extensions/context.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
extension AppLocale on BuildContext {

34
lib/extensions/theme.dart
View File

@ -1,34 +0,0 @@
import 'package:flutter/material.dart';
class ShimmerColorTheme extends ThemeExtension<ShimmerColorTheme> {
final Color? shimmerColor;
final Color? shimmerBackgroundColor;
ShimmerColorTheme({
this.shimmerBackgroundColor,
this.shimmerColor,
});
@override
ThemeExtension<ShimmerColorTheme> copyWith(
{Color? shimmerColor, Color? shimmerBackgroundColor}) {
return ShimmerColorTheme(
shimmerBackgroundColor:
shimmerBackgroundColor ?? this.shimmerBackgroundColor,
shimmerColor: shimmerColor ?? this.shimmerColor,
);
}
@override
ThemeExtension<ShimmerColorTheme> lerp(
ThemeExtension<ShimmerColorTheme>? other, double t) {
if (other is! ShimmerColorTheme) {
return this;
}
return ShimmerColorTheme(
shimmerBackgroundColor:
Color.lerp(shimmerBackgroundColor, other.shimmerBackgroundColor, t),
shimmerColor: Color.lerp(shimmerColor, other.shimmerColor, t),
);
}
}

2
lib/hooks/configurators/use_fix_window_stretching.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:spotube/utils/platform.dart';
import 'package:window_manager/window_manager.dart';

2
lib/hooks/configurators/use_has_touch.dart
View File

@ -1,5 +1,5 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:spotube/utils/platform.dart';

2
lib/hooks/controllers/use_auto_scroll_controller.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:scroll_to_index/scroll_to_index.dart';

2
lib/hooks/controllers/use_package_info.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:package_info_plus/package_info_plus.dart';

2
lib/hooks/utils/use_breakpoint_value.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:spotube/extensions/constrains.dart';

3
lib/hooks/utils/use_brightness_value.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
T useBrightnessValue<T>(

4
lib/hooks/utils/use_custom_status_bar_color.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
@ -9,7 +9,7 @@ VoidCallback useCustomStatusBarColor(
bool? automaticSystemUiAdjustment,
}) {
final context = useContext();
final backgroundColor = Theme.of(context).scaffoldBackgroundColor;
final backgroundColor = Theme.of(context).colorScheme.background;
// ignore: invalid_use_of_visible_for_testing_member
final previousState = SystemChrome.latestStyle;

5
lib/hooks/utils/use_palette_color.dart
View File

@ -1,4 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:palette_generator/palette_generator.dart';
@ -6,7 +7,7 @@ import 'package:spotube/components/image/universal_image.dart';
final _paletteColorState = StateProvider<PaletteColor>(
(ref) {
return PaletteColor(Colors.grey[300]!, 0);
return PaletteColor(Colors.gray[300], 0);
},
);

2
lib/l10n/l10n.dart
View File

@ -16,7 +16,7 @@
library l10n;
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
class L10n {
static final all = [

2
lib/models/database/database.steps.dart
View File

@ -2,7 +2,7 @@
import 'package:drift/internal/versioned_schema.dart' as i0;
import 'package:drift/drift.dart' as i1;
import 'package:drift/drift.dart'; // ignore_for_file: type=lint,unused_import
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/models/database/database.dart';
import 'package:spotube/services/sourced_track/enums.dart';

6
lib/modules/player/player_track_details.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotify/spotify.dart';
@ -53,14 +53,14 @@ class PlayerTrackDetails extends HookConsumerWidget {
"/track/${playback.activeTrack?.id}",
push: true,
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodyMedium!.copyWith(
style: theme.typography.normal.copyWith(
color: color,
),
),
Text(
playback.activeTrack?.artists?.asString() ?? "",
overflow: TextOverflow.ellipsis,
style: theme.textTheme.bodySmall!.copyWith(color: color),
style: theme.typography.small.copyWith(color: color),
)
],
),

14
lib/pages/artist/section/footer.dart
View File

@ -1,5 +1,5 @@
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/collections/spotube_icons.dart';
@ -16,7 +16,7 @@ class ArtistPageFooter extends ConsumerWidget {
@override
Widget build(BuildContext context, ref) {
final ThemeData(:textTheme) = Theme.of(context);
final ThemeData(:typography) = Theme.of(context);
final mediaQuery = MediaQuery.of(context);
final artistImage = artist.images.asUrlString(
@ -50,7 +50,7 @@ class ArtistPageFooter extends ConsumerWidget {
alignment: Alignment.center,
child: RichText(
text: TextSpan(
style: textTheme.bodyLarge?.copyWith(
style: typography.semiBold.copyWith(
color: Colors.white,
),
children: [
@ -64,7 +64,7 @@ class ArtistPageFooter extends ConsumerWidget {
),
TextSpan(
text: " Wikipedia",
style: textTheme.titleLarge?.copyWith(
style: typography.large.copyWith(
color: Colors.white,
),
),
@ -74,10 +74,10 @@ class ArtistPageFooter extends ConsumerWidget {
),
TextSpan(
text: '\n...read more at wikipedia',
style: textTheme.bodyLarge?.copyWith(
color: Colors.lightBlue[300],
style: typography.semiBold.copyWith(
color: Colors.sky[300],
decoration: TextDecoration.underline,
decorationColor: Colors.lightBlue[300],
decorationColor: Colors.sky[300],
),
recognizer: TapGestureRecognizer()
..onTap = () async {

2
lib/pages/artist/section/related_artists.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotube/modules/artist/artist_card.dart';
import 'package:spotube/provider/spotify/spotify.dart';

5
lib/pages/mobile_login/hooks/login_callback.dart
View File

@ -1,7 +1,7 @@
import 'dart:io';
import 'package:desktop_webview_window/desktop_webview_window.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' hide join;
import 'package:flutter/services.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart';
@ -28,7 +28,8 @@ Future<void> Function() useLoginCallback(WidgetRef ref) {
final exp = RegExp(r"https:\/\/accounts.spotify.com\/.+\/status");
final applicationSupportDir = await getApplicationSupportDirectory();
final userDataFolder = Directory(
join(applicationSupportDir.path, "webview_window_Webview2"));
join(applicationSupportDir.path, "webview_window_Webview2"),
);
if (!await userDataFolder.exists()) {
await userDataFolder.create();

13
lib/pages/mobile_login/mobile_login.dart
View File

@ -1,7 +1,8 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:spotube/components/button/back_button.dart';
import 'package:spotube/components/titlebar/titlebar.dart';
import 'package:spotube/provider/authentication/authentication.dart';
@ -17,19 +18,21 @@ class WebViewLogin extends HookConsumerWidget {
if (kIsDesktop) {
const Scaffold(
body: Center(
child: Center(
child: Text('This feature is not available on desktop'),
),
);
}
return Scaffold(
appBar: const TitleBar(
headers: const [
TitleBar(
leading: [BackButton(color: Colors.white)],
backgroundColor: Colors.transparent,
),
extendBodyBehindAppBar: true,
body: InAppWebView(
],
floatingHeader: true,
child: InAppWebView(
initialSettings: InAppWebViewSettings(
userAgent:
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/105.0.0.0 safari/537.36",

15
lib/pages/mobile_login/no_webview_runtime_dialog.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/extensions/context.dart';
import 'package:url_launcher/url_launcher_string.dart';
@ -19,7 +19,7 @@ class NoWebviewRuntimeDialog extends StatelessWidget {
},
child: Text(context.l10n.cancel),
),
FilledButton(
Button.primary(
onPressed: () async {
final url = switch (platform) {
TargetPlatform.windows =>
@ -30,8 +30,15 @@ class NoWebviewRuntimeDialog extends StatelessWidget {
_ => "",
};
if (url.isEmpty) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Unsupported platform')),
showToast(
context: context,
builder: (context, overlay) {
return const SurfaceCard(
child: Basic(
title: Text('Unsupported platform'),
),
);
},
);
}

2
lib/provider/spotify/spotify.dart
View File

@ -11,7 +11,7 @@ import 'package:spotube/provider/database/database.dart';
import 'package:spotube/services/logger/logger.dart';
import 'package:collection/collection.dart';
import 'package:dio/dio.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:intl/intl.dart';
import 'package:lrc/lrc.dart';
import 'package:package_info_plus/package_info_plus.dart';

2
lib/services/audio_services/audio_services.dart
View File

@ -1,5 +1,5 @@
import 'package:audio_service/audio_service.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:spotify/spotify.dart';
import 'package:spotube/collections/env.dart';

2
lib/services/logger/logger.dart
View File

@ -3,7 +3,7 @@ import 'dart:io';
import 'dart:isolate';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' hide join;
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:logger/logger.dart';
import 'package:path/path.dart';

2
lib/services/wm_tools/wm_tools.dart
View File

@ -1,4 +1,4 @@
import 'package:flutter/material.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/services/kv_store/kv_store.dart';
import 'package:spotube/utils/platform.dart';
import 'package:window_manager/window_manager.dart';