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

refactor: titlebar to use shadcn appbar and library tabs to use shadcn TabList

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2024-12-21 16:05:35 +06:00
parent 1089e90511
commit fcefce4b1b
3 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/components/playbutton_card.dart
View File

@ -33,7 +33,7 @@ class PlaybuttonCard extends HookWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final unescapeHtml = description?.unescapeHtml().cleanHtml(); final unescapeHtml = description?.unescapeHtml().cleanHtml() ?? "";
return Container( return Container(
width: 150, width: 150,
@ -42,6 +42,7 @@ class PlaybuttonCard extends HookWidget {
children: [ children: [
UniversalImage( UniversalImage(
path: imageUrl, path: imageUrl,
height: 150,
fit: BoxFit.cover, fit: BoxFit.cover,
), ),
StatedWidget.builder( StatedWidget.builder(
@ -95,13 +96,11 @@ class PlaybuttonCard extends HookWidget {
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
), ),
subtitle: unescapeHtml == null subtitle: Text(
? null unescapeHtml.isEmpty ? "\n" : unescapeHtml,
: Text( maxLines: 2,
unescapeHtml, overflow: TextOverflow.ellipsis,
maxLines: 2, ),
overflow: TextOverflow.ellipsis,
),
onPressed: onTap, onPressed: onTap,
), ),
); );

30
lib/components/titlebar/titlebar.dart
View File

@ -1,5 +1,6 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart' hide AppBar;
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart' show AppBar;
import 'package:spotube/components/titlebar/titlebar_buttons.dart'; import 'package:spotube/components/titlebar/titlebar_buttons.dart';
import 'package:spotube/provider/user_preferences/user_preferences_provider.dart'; import 'package:spotube/provider/user_preferences/user_preferences_provider.dart';
import 'package:spotube/utils/platform.dart'; import 'package:spotube/utils/platform.dart';
@ -148,29 +149,26 @@ class _PageWindowTitleBarState extends ConsumerState<PageWindowTitleBar> {
left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0, left: kIsMacOS && hasFullscreen && hasLeadingOrCanPop ? 65 : 0,
), ),
child: AppBar( child: AppBar(
leading: widget.leading, leading: [
automaticallyImplyLeading: widget.automaticallyImplyLeading, if (widget.leading != null) widget.leading!,
actions: [ if (widget.leading == null &&
widget.automaticallyImplyLeading &&
Navigator.canPop(context))
const BackButton(),
],
trailing: [
...?widget.actions, ...?widget.actions,
WindowTitleBarButtons(foregroundColor: widget.foregroundColor), WindowTitleBarButtons(foregroundColor: widget.foregroundColor),
], ],
backgroundColor: widget.backgroundColor, backgroundColor: widget.backgroundColor,
foregroundColor: widget.foregroundColor,
actionsIconTheme: widget.actionsIconTheme,
centerTitle: widget.centerTitle,
titleSpacing: widget.titleSpacing,
toolbarOpacity: widget.toolbarOpacity,
leadingWidth: widget.leadingWidth,
toolbarTextStyle: widget.toolbarTextStyle,
titleTextStyle: widget.titleTextStyle,
title: SizedBox( title: SizedBox(
width: double.infinity, // workaround to force dragging width: double.infinity, // workaround to force dragging
child: widget.title ?? const Text(""), child: widget.title ?? const Text(""),
), ),
scrolledUnderElevation: 0, alignment: widget.centerTitle == true
shadowColor: Colors.transparent, ? Alignment.center
forceMaterialTransparency: true, : Alignment.centerLeft,
elevation: 0, leadingGap: widget.leadingWidth,
), ),
), ),
); );

78
lib/pages/library/library.dart
View File

@ -1,5 +1,7 @@
import 'package:flutter/material.dart' hide Image; import 'package:flutter/material.dart' show Badge;
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:spotube/modules/library/user_local_tracks.dart'; import 'package:spotube/modules/library/user_local_tracks.dart';
import 'package:spotube/components/titlebar/titlebar.dart'; import 'package:spotube/components/titlebar/titlebar.dart';
@ -7,7 +9,6 @@ import 'package:spotube/modules/library/user_albums.dart';
import 'package:spotube/modules/library/user_artists.dart'; import 'package:spotube/modules/library/user_artists.dart';
import 'package:spotube/modules/library/user_downloads.dart'; import 'package:spotube/modules/library/user_downloads.dart';
import 'package:spotube/modules/library/user_playlists.dart'; import 'package:spotube/modules/library/user_playlists.dart';
import 'package:spotube/components/themed_button_tab_bar.dart';
import 'package:spotube/extensions/context.dart'; import 'package:spotube/extensions/context.dart';
import 'package:spotube/provider/download_manager_provider.dart'; import 'package:spotube/provider/download_manager_provider.dart';
@ -18,40 +19,53 @@ class LibraryPage extends HookConsumerWidget {
@override @override
Widget build(BuildContext context, ref) { Widget build(BuildContext context, ref) {
final downloadingCount = ref.watch(downloadManagerProvider).$downloadCount; final downloadingCount = ref.watch(downloadManagerProvider).$downloadCount;
final index = useState(0);
return DefaultTabController( final children = [
length: 5, Text(context.l10n.playlists),
child: SafeArea( Text(context.l10n.local_tab),
bottom: false, Badge(
child: Scaffold( isLabelVisible: downloadingCount > 0,
appBar: PageWindowTitleBar( label: Text(downloadingCount.toString()),
centerTitle: true, child: Text(context.l10n.downloads),
leading: ThemedButtonsTabBar( ),
tabs: [ Text(context.l10n.artists),
Tab(text: " ${context.l10n.playlists} "), Text(context.l10n.albums),
Tab(text: " ${context.l10n.local_tab} "), ];
Tab(
child: Badge( return SafeArea(
isLabelVisible: downloadingCount > 0, bottom: false,
label: Text(downloadingCount.toString()), child: Scaffold(
child: Text(" ${context.l10n.downloads} "), headers: [
PageWindowTitleBar(
leading: TabList(
index: index.value,
children: [
for (final child in children)
TabButton(
child: child,
onPressed: () {
index.value = children.indexOf(child);
},
), ),
),
Tab(text: " ${context.l10n.artists} "),
Tab(text: " ${context.l10n.albums} "),
], ],
), ),
leadingWidth: double.infinity, )
), ],
body: const TabBarView( child: IndexedStack(
children: [ index: index.value,
UserPlaylists(), children: const [
UserLocalTracks(), UserPlaylists(),
UserDownloads(), UserLocalTracks(),
UserArtists(), UserDownloads(),
UserAlbums(), UserArtists(),
], UserAlbums(),
), // Text("UserPlaylists()"),
// Text("UserLocalTracks()"),
// Text("UserDownloads()"),
// Text("UserArtists()"),
// Text("UserAlbums()"),
],
), ),
), ),
); );