feat: replace all types of buttons with platform buttons

KRTirtho · Oct 29, 2022 · 69739b4 · 69739b4
1 parent 9eee573
commit 69739b4
Show file tree

Hide file tree

Showing 26 changed files with 131 additions and 97 deletions.
diff --git a/lib/components/Artist/ArtistProfile.dart b/lib/components/Artist/ArtistProfile.dart
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/Artist/ArtistAlbumList.dart';
 import 'package:spotube/components/Artist/ArtistCard.dart';
@@ -176,7 +177,7 @@ class ArtistProfile extends HookConsumerWidget {
                                     );
                                   },
                                 ),
-                                IconButton(
+                                PlatformIconButton(
                                   icon: const Icon(Icons.share_rounded),
                                   onPressed: () {
                                     Clipboard.setData(
@@ -260,11 +261,13 @@ class ArtistProfile extends HookConsumerWidget {
                                 color: Theme.of(context).primaryColor,
                                 borderRadius: BorderRadius.circular(50),
                               ),
-                              child: IconButton(
-                                icon: Icon(isPlaylistPlaying
-                                    ? Icons.stop_rounded
-                                    : Icons.play_arrow_rounded),
-                                color: Colors.white,
+                              child: PlatformIconButton(
+                                icon: Icon(
+                                  isPlaylistPlaying
+                                      ? Icons.stop_rounded
+                                      : Icons.play_arrow_rounded,
+                                  color: Colors.white,
+                                ),
                                 onPressed: () =>
                                     playPlaylist(topTracks.toList()),
                               ),

diff --git a/lib/components/Home/Sidebar.dart b/lib/components/Home/Sidebar.dart
@@ -75,7 +75,7 @@ class Sidebar extends HookConsumerWidget {
 
     if (layoutMode == LayoutMode.compact ||
         (breakpoints.isSm && layoutMode == LayoutMode.adaptive)) {
-      return Container();
+      return child;
     }
 
     void toggleExtended() =>
@@ -117,7 +117,7 @@ class Sidebar extends HookConsumerWidget {
                 child: MoveWindow(
                   child: !extended.value
                       ? Center(
-                          child: IconButton(
+                          child: PlatformIconButton(
                             icon: const Icon(Icons.menu_rounded),
                             onPressed: toggleExtended,
                           ),
@@ -127,7 +127,7 @@ class Sidebar extends HookConsumerWidget {
               ),
             if (!kIsDesktop && !extended.value)
               Center(
-                child: IconButton(
+                child: PlatformIconButton(
                   icon: const Icon(Icons.menu_rounded),
                   onPressed: toggleExtended,
                 ),
@@ -143,7 +143,7 @@ class Sidebar extends HookConsumerWidget {
                         "Spotube",
                         style: Theme.of(context).textTheme.headline4,
                       ),
-                      IconButton(
+                      PlatformIconButton(
                         icon: const Icon(Icons.menu_rounded),
                         onPressed: toggleExtended,
                       ),
@@ -241,7 +241,7 @@ class SidebarFooter extends HookConsumerWidget {
                           ],
                         ),
                       ),
-                    IconButton(
+                    PlatformIconButton(
                         icon: const Icon(Icons.settings_outlined),
                         onPressed: () => Sidebar.goToSettings(context)),
                   ],

diff --git a/lib/components/Library/UserDownloads.dart b/lib/components/Library/UserDownloads.dart
@@ -30,7 +30,7 @@ class UserDownloads extends HookConsumerWidget {
                 ),
               ),
               const SizedBox(width: 10),
-              ElevatedButton(
+              PlatformFilledButton(
                 style: ElevatedButton.styleFrom(
                   backgroundColor: Colors.red[50],
                   foregroundColor: Colors.red[400],

diff --git a/lib/components/Login/LoginTutorial.dart b/lib/components/Login/LoginTutorial.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:introduction_screen/introduction_screen.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Login/TokenLoginForms.dart';
 import 'package:spotube/components/Shared/Hyperlink.dart';
 import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
@@ -16,7 +17,7 @@ class LoginTutorial extends ConsumerWidget {
 
     return Scaffold(
       appBar: PageWindowTitleBar(
-        leading: TextButton(
+        leading: PlatformTextButton(
           child: const Text("Exit"),
           onPressed: () {
             Navigator.of(context).pop();
@@ -27,7 +28,7 @@ class LoginTutorial extends ConsumerWidget {
         next: const Text("Next"),
         back: const Text("Previous"),
         showBackButton: true,
-        overrideDone: TextButton(
+        overrideDone: PlatformTextButton(
           onPressed: auth.isLoggedIn
               ? () {
                   ServiceUtils.navigate(context, "/");

diff --git a/lib/components/Login/TokenLogin.dart b/lib/components/Login/TokenLogin.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Login/TokenLoginForms.dart';
 import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
 import 'package:spotube/hooks/useBreakpoints.dart';
@@ -45,7 +46,7 @@ class TokenLogin extends HookConsumerWidget {
                     crossAxisAlignment: WrapCrossAlignment.center,
                     children: [
                       const Text("Don't know how to do this?"),
-                      TextButton(
+                      PlatformTextButton(
                         child: const Text(
                           "Follow along the Step by Step guide",
                         ),

diff --git a/lib/components/Login/TokenLoginForms.dart b/lib/components/Login/TokenLoginForms.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/provider/Auth.dart';
 import 'package:spotube/utils/service_utils.dart';
 
@@ -42,7 +43,7 @@ class TokenLoginForm extends HookConsumerWidget {
             keyboardType: TextInputType.visiblePassword,
           ),
           const SizedBox(height: 20),
-          ElevatedButton(
+          PlatformFilledButton(
             onPressed: () async {
               if (keyCodeController.text.isEmpty ||
                   directCodeController.text.isEmpty) {

diff --git a/lib/components/Lyrics/LyricDelayAdjustDialog.dart b/lib/components/Lyrics/LyricDelayAdjustDialog.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Lyrics/SyncedLyrics.dart';
 
 class LyricDelayAdjustDialog extends HookConsumerWidget {
@@ -18,13 +19,13 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
     return AlertDialog(
       title: const Center(child: Text("Adjust Lyrics Delay")),
       actions: [
-        ElevatedButton(
+        PlatformFilledButton(
           child: const Text("Cancel"),
           onPressed: () {
             Navigator.of(context).pop();
           },
         ),
-        ElevatedButton(
+        PlatformFilledButton(
           child: const Text("Done"),
           onPressed: () {
             Navigator.of(context).pop(
@@ -38,7 +39,7 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
       content: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
-          IconButton(
+          PlatformIconButton(
             icon: const Icon(Icons.remove_rounded),
             onPressed: () {
               controller.text = "${getValue() - 25}ms";
@@ -61,7 +62,7 @@ class LyricDelayAdjustDialog extends HookConsumerWidget {
               },
             ),
           ),
-          IconButton(
+          PlatformIconButton(
             icon: const Icon(Icons.add_rounded),
             onPressed: () {
               controller.text = "${getValue() + 25}ms";

diff --git a/lib/components/Lyrics/SyncedLyrics.dart b/lib/components/Lyrics/SyncedLyrics.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:palette_generator/palette_generator.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/LoaderShimmers/ShimmerLyrics.dart';
 import 'package:spotube/components/Lyrics/LyricDelayAdjustDialog.dart';
@@ -85,7 +86,7 @@ class SyncedLyrics extends HookConsumerWidget {
                 Positioned.fill(
                   child: Align(
                     alignment: Alignment.centerRight,
-                    child: IconButton(
+                    child: PlatformIconButton(
                       tooltip: "Lyrics Delay",
                       icon: const Icon(Icons.av_timer_rounded),
                       onPressed: () async {

diff --git a/lib/components/Player/PlayerActions.dart b/lib/components/Player/PlayerActions.dart
@@ -2,6 +2,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/Library/UserLocalTracks.dart';
 import 'package:spotube/components/Player/PlayerQueue.dart';
@@ -48,7 +49,7 @@ class PlayerActions extends HookConsumerWidget {
     return Row(
       mainAxisAlignment: mainAxisAlignment,
       children: [
-        IconButton(
+        PlatformIconButton(
           icon: const Icon(Icons.queue_music_rounded),
           tooltip: 'Queue',
           onPressed: playback.playlist != null
@@ -73,7 +74,7 @@ class PlayerActions extends HookConsumerWidget {
                 }
               : null,
         ),
-        IconButton(
+        PlatformIconButton(
           icon: const Icon(Icons.alt_route_rounded),
           tooltip: "Alternative Track Sources",
           onPressed: playback.track != null
@@ -108,7 +109,7 @@ class PlayerActions extends HookConsumerWidget {
               ),
             )
           else
-            IconButton(
+            PlatformIconButton(
               tooltip: 'Download track',
               icon: Icon(
                 isDownloaded

diff --git a/lib/components/Player/PlayerControls.dart b/lib/components/Player/PlayerControls.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/hooks/playback.dart';
 import 'package:spotube/models/Intents.dart';
 import 'package:spotube/models/Logger.dart';
@@ -138,7 +139,7 @@ class PlayerControls extends HookConsumerWidget {
               Row(
                 mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                 children: [
-                  IconButton(
+                  PlatformIconButton(
                     tooltip: playback.isLoop
                         ? "Repeat playlist"
                         : playback.isShuffled
@@ -156,14 +157,16 @@ class PlayerControls extends HookConsumerWidget {
                             ? null
                             : playback.cyclePlaybackMode,
                   ),
-                  IconButton(
+                  PlatformIconButton(
                       tooltip: "Previous track",
-                      icon: const Icon(Icons.skip_previous_rounded),
-                      color: iconColor,
+                      icon: Icon(
+                        Icons.skip_previous_rounded,
+                        color: iconColor,
+                      ),
                       onPressed: () {
                         onPrevious();
                       }),
-                  IconButton(
+                  PlatformIconButton(
                     tooltip: playback.isPlaying
                         ? "Pause playback"
                         : "Resume playback",
@@ -177,23 +180,27 @@ class PlayerControls extends HookConsumerWidget {
                             playback.isPlaying
                                 ? Icons.pause_rounded
                                 : Icons.play_arrow_rounded,
+                            color: iconColor,
                           ),
-                    color: iconColor,
                     onPressed: Actions.handler<PlayPauseIntent>(
                       context,
                       PlayPauseIntent(ref),
                     ),
                   ),
-                  IconButton(
+                  PlatformIconButton(
                     tooltip: "Next track",
-                    icon: const Icon(Icons.skip_next_rounded),
+                    icon: Icon(
+                      Icons.skip_next_rounded,
+                      color: iconColor,
+                    ),
                     onPressed: () => onNext(),
-                    color: iconColor,
                   ),
-                  IconButton(
+                  PlatformIconButton(
                     tooltip: "Stop playback",
-                    icon: const Icon(Icons.stop_rounded),
-                    color: iconColor,
+                    icon: Icon(
+                      Icons.stop_rounded,
+                      color: iconColor,
+                    ),
                     onPressed: playback.track != null
                         ? () async {
                             try {

diff --git a/lib/components/Player/PlayerOverlay.dart b/lib/components/Player/PlayerOverlay.dart
@@ -3,6 +3,7 @@ import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Player/PlayerTrackDetails.dart';
 import 'package:spotube/hooks/playback.dart';
 import 'package:spotube/hooks/usePaletteColor.dart';
@@ -79,32 +80,36 @@ class PlayerOverlay extends HookConsumerWidget {
                     ),
                     Row(
                       children: [
-                        IconButton(
-                            icon: const Icon(Icons.skip_previous_rounded),
-                            color: paletteColor.bodyTextColor,
+                        PlatformIconButton(
+                            icon: Icon(
+                              Icons.skip_previous_rounded,
+                              color: paletteColor.bodyTextColor,
+                            ),
                             onPressed: () {
                               onPrevious();
                             }),
                         Consumer(
                           builder: (context, ref, _) {
-                            return IconButton(
+                            return PlatformIconButton(
                               icon: Icon(
                                 ref.read(playbackProvider).isPlaying
                                     ? Icons.pause_rounded
                                     : Icons.play_arrow_rounded,
+                                color: paletteColor.bodyTextColor,
                               ),
-                              color: paletteColor.bodyTextColor,
                               onPressed: Actions.handler<PlayPauseIntent>(
                                 context,
                                 PlayPauseIntent(ref),
                               ),
                             );
                           },
                         ),
-                        IconButton(
-                          icon: const Icon(Icons.skip_next_rounded),
+                        PlatformIconButton(
+                          icon: Icon(
+                            Icons.skip_next_rounded,
+                            color: paletteColor.bodyTextColor,
+                          ),
                           onPressed: () => onNext(),
-                          color: paletteColor.bodyTextColor,
                         ),
                       ],
                     ),

diff --git a/lib/components/Player/PlayerView.dart b/lib/components/Player/PlayerView.dart
@@ -5,6 +5,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:go_router/go_router.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:palette_generator/palette_generator.dart';
+import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Player/PlayerActions.dart';
 import 'package:spotube/components/Player/PlayerControls.dart';
 import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
@@ -162,7 +163,7 @@ class PlayerView extends HookConsumerWidget {
                     mainAxisAlignment: MainAxisAlignment.spaceEvenly,
                     floatingQueue: false,
                     extraActions: [
-                      IconButton(
+                      PlatformIconButton(
                         tooltip: "Open Lyrics",
                         icon: const Icon(Icons.lyrics_rounded),
                         onPressed: () {

diff --git a/lib/components/Search/Search.dart b/lib/components/Search/Search.dart
@@ -185,7 +185,7 @@ class Search extends HookConsumerWidget {
                             }),
                           if (searchTrack.hasNextPage && tracks.isNotEmpty)
                             Center(
-                              child: TextButton(
+                              child: PlatformTextButton(
                                 onPressed: searchTrack.isFetchingNextPage
                                     ? null
                                     : () => searchTrack.fetchNextPage(),