refactor: blacklist and about page

lib/modules/home/sections/genres/genres.dart

@@ -55,6 +55,7 @@ class HomeGenresSection extends HookConsumerWidget {
 
       return () {
         timer.cancel();
+        controller.dispose();
       };
     }, []);
 

lib/pages/settings/about.dart

@@ -1,7 +1,8 @@
-import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 import 'package:spotube/collections/assets.gen.dart';
 import 'package:spotube/collections/env.dart';
+import 'package:spotube/components/button/back_button.dart';
 import 'package:spotube/components/image/universal_image.dart';
 import 'package:spotube/components/links/hyper_link.dart';
 import 'package:spotube/components/titlebar/titlebar.dart';
@@ -26,14 +27,16 @@ class AboutSpotube extends HookConsumerWidget {
     final license = ref.watch(_licenseProvider);
     final theme = Theme.of(context);
 
-    const colon = Text(":");
+    const colon = TableCell(child: Text(":"));
 
     return Scaffold(
-      appBar: TitleBar(
-        leading: const [BackButton()],
-        title: Text(context.l10n.about_spotube),
-      ),
-      body: SingleChildScrollView(
+      headers: [
+        TitleBar(
+          leading: const [BackButton()],
+          title: Text(context.l10n.about_spotube),
+        )
+      ],
+      child: SingleChildScrollView(
         child: Padding(
           padding: const EdgeInsets.symmetric(horizontal: 16.0),
           child: Column(
@@ -45,76 +48,85 @@ class AboutSpotube extends HookConsumerWidget {
               Center(
                 child: Column(
                   children: [
-                    Text(
-                      context.l10n.spotube_description,
-                      style: theme.textTheme.titleLarge,
-                    ),
+                    Text(context.l10n.spotube_description).semiBold().large(),
                     const SizedBox(height: 20),
                     Table(
                       columnWidths: const {
-                        0: FixedColumnWidth(95),
-                        1: FixedColumnWidth(10),
-                        2: IntrinsicColumnWidth(),
+                        0: FixedTableSize(95),
+                        1: FixedTableSize(10),
+                        2: IntrinsicTableSize(),
                       },
-                      children: [
+                      defaultRowHeight: const FixedTableSize(40),
+                      rows: [
                         TableRow(
-                          children: [
-                            Text(context.l10n.founder),
+                          cells: [
+                            TableCell(child: Text(context.l10n.founder)),
                             colon,
-                            Hyperlink(
-                              context.l10n.kingkor_roy_tirtho,
-                              "https://github.com/KRTirtho",
+                            TableCell(
+                              child: Hyperlink(
+                                context.l10n.kingkor_roy_tirtho,
+                                "https://github.com/KRTirtho",
+                              ),
                             )
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.version),
+                          cells: [
+                            TableCell(child: Text(context.l10n.version)),
                             colon,
-                            Text("v${packageInfo.version}")
+                            TableCell(child: Text("v${packageInfo.version}"))
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.channel),
+                          cells: [
+                            TableCell(child: Text(context.l10n.channel)),
                             colon,
-                            Text(Env.releaseChannel.name)
+                            TableCell(child: Text(Env.releaseChannel.name))
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.build_number),
+                          cells: [
+                            TableCell(child: Text(context.l10n.build_number)),
                             colon,
-                            Text(packageInfo.buildNumber.replaceAll(".", " "))
+                            TableCell(
+                              child: Text(
+                                  packageInfo.buildNumber.replaceAll(".", " ")),
+                            )
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.repository),
+                          cells: [
+                            TableCell(child: Text(context.l10n.repository)),
                             colon,
-                            const Hyperlink(
-                              "github.com/KRTirtho/spotube",
-                              "https://github.com/KRTirtho/spotube",
+                            const TableCell(
+                              child: Hyperlink(
+                                "github.com/KRTirtho/spotube",
+                                "https://github.com/KRTirtho/spotube",
+                              ),
                             ),
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.license),
+                          cells: [
+                            TableCell(child: Text(context.l10n.license)),
                             colon,
-                            const Hyperlink(
-                              "BSD-4-Clause",
-                              "https://raw.githubusercontent.com/KRTirtho/spotube/master/LICENSE",
+                            const TableCell(
+                              child: Hyperlink(
+                                "BSD-4-Clause",
+                                "https://raw.githubusercontent.com/KRTirtho/spotube/master/LICENSE",
+                              ),
                             ),
                           ],
                         ),
                         TableRow(
-                          children: [
-                            Text(context.l10n.bug_issues),
+                          cells: [
+                            TableCell(child: Text(context.l10n.bug_issues)),
                             colon,
-                            const Hyperlink(
-                              "github.com/KRTirtho/spotube/issues",
-                              "https://github.com/KRTirtho/spotube/issues",
+                            const TableCell(
+                              child: Hyperlink(
+                                "github.com/KRTirtho/spotube/issues",
+                                "https://github.com/KRTirtho/spotube/issues",
+                              ),
                             ),
                           ],
                         ),
@@ -141,12 +153,12 @@ class AboutSpotube extends HookConsumerWidget {
               Text(
                 context.l10n.made_with,
                 textAlign: TextAlign.center,
-                style: theme.textTheme.bodySmall,
+                style: theme.typography.small,
               ),
               Text(
                 context.l10n.copyright(DateTime.now().year),
                 textAlign: TextAlign.center,
-                style: theme.textTheme.bodySmall,
+                style: theme.typography.small,
               ),
               const SizedBox(height: 20),
               ConstrainedBox(
@@ -156,7 +168,7 @@ class AboutSpotube extends HookConsumerWidget {
                     data: (data) {
                       return Text(
                         data,
-                        style: theme.textTheme.bodySmall,
+                        style: theme.typography.small,
                       );
                     },
                     loading: () {
@@ -167,7 +179,7 @@ class AboutSpotube extends HookConsumerWidget {
                     error: (e, s) {
                       return Text(
                         e.toString(),
-                        style: theme.textTheme.bodySmall,
+                        style: theme.typography.small,
                       );
                     },
                   ),

lib/pages/settings/blacklist.dart

@@ -1,12 +1,14 @@
-import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:collection/collection.dart';
 import 'package:fuzzywuzzy/fuzzywuzzy.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:shadcn_flutter/shadcn_flutter.dart';
 
 import 'package:spotube/collections/spotube_icons.dart';
+import 'package:spotube/components/button/back_button.dart';
 import 'package:spotube/components/inter_scrollbar/inter_scrollbar.dart';
 import 'package:spotube/components/titlebar/titlebar.dart';
+import 'package:spotube/components/ui/button_tile.dart';
 import 'package:spotube/extensions/context.dart';
 import 'package:spotube/provider/blacklist_provider.dart';
 
@@ -44,21 +46,21 @@ class BlackListPage extends HookConsumerWidget {
     );
 
     return Scaffold(
-      appBar: TitleBar(
-        title: Text(context.l10n.blacklist),
-        leading: const [BackButton()],
-      ),
-      body: Column(
+      headers: [
+        TitleBar(
+          title: Text(context.l10n.blacklist),
+          leading: const [BackButton()],
+        )
+      ],
+      child: Column(
         mainAxisSize: MainAxisSize.min,
         children: [
           Padding(
             padding: const EdgeInsets.all(8.0),
             child: TextField(
               onChanged: (value) => searchText.value = value,
-              decoration: InputDecoration(
-                hintText: context.l10n.search,
-                prefixIcon: const Icon(SpotubeIcons.search),
-              ),
+              placeholder: Text(context.l10n.search),
+              leading: const Icon(SpotubeIcons.search),
             ),
           ),
           InterScrollbar(
@@ -69,11 +71,12 @@ class BlackListPage extends HookConsumerWidget {
               itemCount: filteredBlacklist.length,
               itemBuilder: (context, index) {
                 final item = filteredBlacklist.elementAt(index);
-                return ListTile(
+                return ButtonTile(
+                  style: ButtonVariance.ghost,
                   leading: Text("${index + 1}."),
                   title: Text("${item.name} (${item.elementType.name})"),
                   subtitle: Text(item.elementId),
-                  trailing: IconButton(
+                  trailing: IconButton.ghost(
                     icon: Icon(SpotubeIcons.trash, color: Colors.red[400]),
                     onPressed: () {
                       ref

pubspec.lock

@@ -1971,8 +1971,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: fix-scaffold-footer-safearea
-      resolved-ref: "8ede34e1e3270ec3839192a7a6453e19cd00f9ab"
+      ref: d928e73cd734582046c63a3bed99cc42aeab6085
+      resolved-ref: d928e73cd734582046c63a3bed99cc42aeab6085
       url: "https://github.com/KRTirtho/shadcn_flutter.git"
     source: git
     version: "0.0.24"

pubspec.yaml

@@ -105,7 +105,7 @@ dependencies:
   shadcn_flutter:
     git:
       url: https://github.com/KRTirtho/shadcn_flutter.git
-      ref: fix-scaffold-footer-safearea
+      ref: d928e73cd734582046c63a3bed99cc42aeab6085
   shared_preferences: ^2.2.3
   shelf: ^1.4.1
   shelf_router: ^1.1.4