feat: titlebar complete compatibility, platform specific login, library tabbar in titlebar

lib/components/Home/Genres.dart

@@ -6,6 +6,7 @@ import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/Category/CategoryCard.dart';
 import 'package:spotube/components/LoaderShimmers/ShimmerCategories.dart';
+import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
 import 'package:spotube/components/Shared/Waypoint.dart';
 import 'package:spotube/provider/SpotifyDI.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
@@ -42,6 +43,7 @@ class Genres extends HookConsumerWidget {
     ];
 
     return PlatformScaffold(
+      appBar: PageWindowTitleBar(),
       body: ListView.builder(
         itemCount: categories.length,
         itemBuilder: (context, index) {

lib/components/Home/Shell.dart

@@ -64,40 +64,14 @@ class Shell extends HookConsumerWidget {
       return null;
     }, [backgroundColor]);
 
-    final allowedPath =
-        rootPaths.values.contains(GoRouter.of(context).location);
-    final titleBar = PageWindowTitleBar(
-      backgroundColor:
-          platform == TargetPlatform.android ? Colors.transparent : null,
-    );
-    final preferredSize = allowedPath ? titleBar.preferredSize : Size.zero;
-    var appBar = kIsDesktop
-        ? PreferredSize(
-            preferredSize: preferredSize,
-            child: AnimatedContainer(
-              duration: const Duration(milliseconds: 250),
-              height: allowedPath ? titleBar.preferredSize.height : 0,
-              child: AnimatedOpacity(
-                duration: const Duration(milliseconds: 250),
-                opacity: allowedPath ? 1 : 0,
-                child: titleBar,
-              ),
-            ),
-          )
-        : null;
     return PlatformScaffold(
-      appBar: platform == TargetPlatform.windows ? appBar : null,
-      extendBodyBehindAppBar: false,
       body: Sidebar(
         selectedIndex: index.value,
         onSelectedIndexChanged: (i) {
           index.value = i;
           GoRouter.of(context).go(rootPaths[index.value]!);
         },
-        child: PlatformScaffold(
+        child: child,
-          appBar: platform != TargetPlatform.windows ? appBar : null,
-          body: child,
-        ),
       ),
       extendBody: true,
       bottomNavigationBar: Column(

lib/components/Home/Sidebar.dart

@@ -133,7 +133,9 @@ class Sidebar extends HookConsumerWidget {
                 ),
               ),
             (extended.value)
-                ? Row(
+                ? Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: Row(
                       children: [
                         brandLogo(),
                         const SizedBox(
@@ -145,6 +147,7 @@ class Sidebar extends HookConsumerWidget {
                           onPressed: toggleExtended,
                         ),
                       ],
+                    ),
                   )
                 : brandLogo(),
           ],

lib/components/Library/UserAlbums.dart

@@ -4,6 +4,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/components/Album/AlbumCard.dart';
 import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
+import 'package:spotube/components/Shared/AnonymousFallback.dart';
+import 'package:spotube/provider/Auth.dart';
 import 'package:spotube/provider/SpotifyDI.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
@@ -13,6 +15,10 @@ class UserAlbums extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, ref) {
+    final auth = ref.watch(authProvider);
+    if (auth.isAnonymous) {
+      return const AnonymousFallback();
+    }
     final albumsQuery = useQuery(
       job: currentUserAlbumsQueryJob,
       externalData: ref.watch(spotifyProvider),

lib/components/Library/UserArtists.dart

@@ -5,7 +5,9 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotify/spotify.dart';
 import 'package:spotube/components/Artist/ArtistCard.dart';
+import 'package:spotube/components/Shared/AnonymousFallback.dart';
 import 'package:spotube/components/Shared/Waypoint.dart';
+import 'package:spotube/provider/Auth.dart';
 import 'package:spotube/provider/SpotifyDI.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
@@ -14,6 +16,10 @@ class UserArtists extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, ref) {
+    final auth = ref.watch(authProvider);
+    if (auth.isAnonymous) {
+      return const AnonymousFallback();
+    }
     final artistQuery = useInfiniteQuery(
       job: currentUserFollowingArtistsQueryJob,
       externalData: ref.watch(spotifyProvider),

lib/components/Library/UserLibrary.dart

@@ -1,47 +1,48 @@
 import 'package:flutter/material.dart' hide Image;
-import 'package:flutter_riverpod/flutter_riverpod.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/Library/UserAlbums.dart';
 import 'package:spotube/components/Library/UserArtists.dart';
 import 'package:spotube/components/Library/UserDownloads.dart';
 import 'package:spotube/components/Library/UserLocalTracks.dart';
 import 'package:spotube/components/Library/UserPlaylists.dart';
-import 'package:spotube/components/Shared/AnonymousFallback.dart';
+import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
 
-class UserLibrary extends ConsumerWidget {
+class UserLibrary extends HookConsumerWidget {
   const UserLibrary({Key? key}) : super(key: key);
   @override
   Widget build(BuildContext context, ref) {
-    return DefaultTabController(
+    final index = useState(0);
-      length: 5,
+
-      child: SafeArea(
+    final body = [
-        child: PlatformTabView(
+      const UserPlaylists(),
+      const UserLocalTracks(),
+      const UserDownloads(),
+      const UserArtists(),
+      const UserAlbums(),
+    ][index.value];
+
+    return PlatformScaffold(
+      appBar: PageWindowTitleBar(
+        titleWidth: 415,
+        centerTitle: true,
+        center: PlatformTabBar(
           androidIsScrollable: true,
-          placement: PlatformProperty.all(PlatformTabbarPlacement.top),
+          selectedIndex: index.value,
-          body: {
+          onSelectedIndexChanged: (value) => index.value = value,
-            PlatformTab(
+          isNavigational:
-              label: "Playlist",
+              PlatformProperty.byPlatformGroup(mobile: false, desktop: true),
-              icon: Container(),
+          tabs: [
-            ): const AnonymousFallback(child: UserPlaylists()),
+            PlatformTab(label: 'Playlists', icon: const SizedBox.shrink()),
-            PlatformTab(
+            PlatformTab(label: 'Tracks', icon: const SizedBox.shrink()),
-              label: "Downloads",
+            PlatformTab(label: 'Downloads', icon: const SizedBox.shrink()),
-              icon: Container(),
+            PlatformTab(label: 'Artists', icon: const SizedBox.shrink()),
-            ): const UserDownloads(),
+            PlatformTab(label: 'Albums', icon: const SizedBox.shrink()),
-            PlatformTab(
+          ],
-              label: "Local",
-              icon: Container(),
-            ): const UserLocalTracks(),
-            PlatformTab(
-              label: "Artists",
-              icon: Container(),
-            ): const AnonymousFallback(child: UserArtists()),
-            PlatformTab(
-              label: "Album",
-              icon: Container(),
-            ): const AnonymousFallback(child: UserAlbums()),
-          },
         ),
       ),
+      body: body,
     );
   }
 }

lib/components/Library/UserPlaylists.dart

@@ -6,6 +6,8 @@ import 'package:spotify/spotify.dart';
 import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
 import 'package:spotube/components/Playlist/PlaylistCard.dart';
 import 'package:spotube/components/Playlist/PlaylistCreateDialog.dart';
+import 'package:spotube/components/Shared/AnonymousFallback.dart';
+import 'package:spotube/provider/Auth.dart';
 import 'package:spotube/provider/SpotifyDI.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
 
@@ -14,6 +16,11 @@ class UserPlaylists extends HookConsumerWidget {
 
   @override
   Widget build(BuildContext context, ref) {
+    final auth = ref.watch(authProvider);
+    if (auth.isAnonymous) {
+      return const AnonymousFallback();
+    }
+
     final playlistsQuery = useQuery(
       job: currentUserPlaylistsQueryJob,
       externalData: ref.watch(spotifyProvider),

lib/components/Login/LoginTutorial.dart

@@ -14,46 +14,56 @@ class LoginTutorial extends ConsumerWidget {
   @override
   Widget build(BuildContext context, ref) {
     final auth = ref.watch(authProvider);
+    final key = GlobalKey<State<IntroductionScreen>>();
 
-    return Scaffold(
+    return PlatformScaffold(
       appBar: PageWindowTitleBar(
         leading: PlatformTextButton(
-          child: const Text("Exit"),
+          child: const PlatformText("Exit"),
           onPressed: () {
             Navigator.of(context).pop();
           },
         ),
       ),
       body: IntroductionScreen(
-        next: const Text("Next"),
+        key: key,
-        back: const Text("Previous"),
+        overrideBack: PlatformFilledButton(
+          isSecondary: true,
+          child: const Center(child: PlatformText("Previous")),
+          onPressed: () {
+            (key.currentState as IntroductionScreenState).previous();
+          },
+        ),
+        overrideNext: PlatformFilledButton(
+          child: const Center(child: PlatformText("Next")),
+          onPressed: () {
+            (key.currentState as IntroductionScreenState).next();
+          },
+        ),
         showBackButton: true,
-        overrideDone: PlatformTextButton(
+        overrideDone: PlatformFilledButton(
           onPressed: auth.isLoggedIn
               ? () {
                   ServiceUtils.navigate(context, "/");
                 }
               : null,
-          child: const Text("Done"),
+          child: const Center(child: PlatformText("Done")),
         ),
         pages: [
           PageViewModel(
             title: "Step 1",
             image: Image.asset("assets/tutorial/step-1.png"),
             bodyWidget: Wrap(
-              children: [
+              children: const [
-                Text(
+                PlatformText(
                   "First, Go to ",
-                  style: Theme.of(context).textTheme.bodyText1,
                 ),
                 Hyperlink(
                   "accounts.spotify.com ",
                   "https://accounts.spotify.com",
-                  style: Theme.of(context).textTheme.bodyText1!,
                 ),
-                Text(
+                PlatformText(
                   "and Login/Sign up if you're not logged in",
-                  style: Theme.of(context).textTheme.bodyText1,
                 ),
               ],
             ),
@@ -61,10 +71,9 @@ class LoginTutorial extends ConsumerWidget {
           PageViewModel(
             title: "Step 2",
             image: Image.asset("assets/tutorial/step-2.png"),
-            bodyWidget: Text(
+            bodyWidget: const PlatformText(
               "1. Once you're logged in, press F12 or Mouse Right Click > Inspect to Open the Browser devtools.\n2. Then go the \"Application\" Tab (Chrome, Edge, Brave etc..) or \"Storage\" Tab (Firefox, Palemoon etc..)\n3. Go to the \"Cookies\" section then the \"https://accounts.spotify.com\" subsection",
               textAlign: TextAlign.left,
-              style: Theme.of(context).textTheme.bodyText1,
             ),
           ),
           PageViewModel(
@@ -72,10 +81,9 @@ class LoginTutorial extends ConsumerWidget {
             image: Image.asset(
               "assets/tutorial/step-3.png",
             ),
-            bodyWidget: Text(
+            bodyWidget: const PlatformText(
               "Copy the values of \"sp_dc\" and \"sp_key\" Cookies",
               textAlign: TextAlign.left,
-              style: Theme.of(context).textTheme.bodyText1,
             ),
           ),
           if (auth.isLoggedIn)
@@ -92,13 +100,12 @@ class LoginTutorial extends ConsumerWidget {
             PageViewModel(
               title: "Step 5",
               bodyWidget: Column(
-                children: [
+                children: const [
-                  Text(
+                  PlatformText(
                     "Paste the copied \"sp_dc\" and \"sp_key\" values in the respective fields",
-                    style: Theme.of(context).textTheme.bodyText1,
                   ),
-                  const SizedBox(height: 10),
+                  SizedBox(height: 10),
-                  const TokenLoginForm(),
+                  TokenLoginForm(),
                 ],
               ),
             ),

lib/components/Login/TokenLogin.dart

@@ -15,12 +15,17 @@ class TokenLogin extends HookConsumerWidget {
     final textTheme = Theme.of(context).textTheme;
 
     return SafeArea(
-      child: Scaffold(
+      child: PlatformScaffold(
-        appBar: PageWindowTitleBar(leading: PlatformBackButton()),
+        appBar: PageWindowTitleBar(leading: const PlatformBackButton()),
         body: SingleChildScrollView(
           child: Center(
             child: Container(
-              margin: const EdgeInsets.symmetric(horizontal: 10),
+              margin: const EdgeInsets.all(10),
+              padding: const EdgeInsets.all(10),
+              decoration: BoxDecoration(
+                color: PlatformTheme.of(context).secondaryBackgroundColor,
+                borderRadius: BorderRadius.circular(10),
+              ),
               child: Column(
                 children: [
                   Image.asset(
@@ -28,11 +33,11 @@ class TokenLogin extends HookConsumerWidget {
                     width: MediaQuery.of(context).size.width *
                         (breakpoint <= Breakpoints.md ? .5 : .3),
                   ),
-                  Text("Add your spotify credentials to get started",
+                  PlatformText("Add your spotify credentials to get started",
                       style: breakpoint <= Breakpoints.md
                           ? textTheme.headline5
                           : textTheme.headline4),
-                  Text(
+                  PlatformText(
                     "Don't worry, any of your credentials won't be collected or shared with anyone",
                     style: Theme.of(context).textTheme.caption,
                   ),
@@ -45,9 +50,9 @@ class TokenLogin extends HookConsumerWidget {
                     alignment: WrapAlignment.center,
                     crossAxisAlignment: WrapCrossAlignment.center,
                     children: [
-                      const Text("Don't know how to do this?"),
+                      const PlatformText("Don't know how to do this?"),
                       PlatformTextButton(
-                        child: const Text(
+                        child: const PlatformText(
                           "Follow along the Step by Step guide",
                         ),
                         onPressed: () => GoRouter.of(context).push(

lib/components/Login/TokenLoginForms.dart

@@ -25,21 +25,17 @@ class TokenLoginForm extends HookConsumerWidget {
       ),
       child: Column(
         children: [
-          TextField(
+          PlatformTextField(
             controller: directCodeController,
-            decoration: const InputDecoration(
+            placeholder: "Spotify \"sp_dc\" Cookie",
-              hintText: "Spotify \"sp_dc\" Cookie",
+            label: "sp_dc Cookie",
-              label: Text("sp_dc Cookie"),
-            ),
             keyboardType: TextInputType.visiblePassword,
           ),
           const SizedBox(height: 10),
-          TextField(
+          PlatformTextField(
             controller: keyCodeController,
-            decoration: const InputDecoration(
+            placeholder: "Spotify \"sp_key\" Cookie",
-              hintText: "Spotify \"sp_key\" Cookie",
+            label: "sp_key Cookie",
-              label: Text("sp_key Cookie"),
-            ),
             keyboardType: TextInputType.visiblePassword,
           ),
           const SizedBox(height: 20),
@@ -49,7 +45,7 @@ class TokenLoginForm extends HookConsumerWidget {
                   directCodeController.text.isEmpty) {
                 ScaffoldMessenger.of(context).showSnackBar(
                   const SnackBar(
-                    content: Text("Please fill in all fields"),
+                    content: PlatformText("Please fill in all fields"),
                     behavior: SnackBarBehavior.floating,
                   ),
                 );
@@ -68,7 +64,7 @@ class TokenLoginForm extends HookConsumerWidget {
                 onDone?.call();
               }
             },
-            child: const Text("Submit"),
+            child: const PlatformText("Submit"),
           )
         ],
       ),

lib/components/Login/WebViewLogin.dart

@@ -3,6 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.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/provider/Auth.dart';
 import 'package:spotube/utils/platform.dart';
 import 'package:spotube/utils/service_utils.dart';
@@ -23,7 +24,7 @@ class WebViewLogin extends HookConsumerWidget {
       );
     }
 
-    return Scaffold(
+    return PlatformScaffold(
       body: SafeArea(
         child: InAppWebView(
           initialOptions: InAppWebViewGroupOptions(

lib/components/Lyrics/Lyrics.dart

@@ -3,38 +3,20 @@ import 'dart:ui';
 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:spotube/components/Lyrics/GeniusLyrics.dart';
 import 'package:spotube/components/Lyrics/SyncedLyrics.dart';
+import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
 import 'package:spotube/components/Shared/UniversalImage.dart';
 import 'package:spotube/hooks/useCustomStatusBarColor.dart';
 import 'package:spotube/hooks/usePaletteColor.dart';
 import 'package:spotube/provider/Playback.dart';
+import 'package:spotube/utils/platform.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 
 class Lyrics extends HookConsumerWidget {
   const Lyrics({Key? key}) : super(key: key);
 
-  Widget buildContainer(Widget child, String albumArt, PaletteColor palette) {
-    return Container(
-      clipBehavior: Clip.hardEdge,
-      decoration: BoxDecoration(
-        image: DecorationImage(
-          image: UniversalImage.imageProvider(albumArt),
-          fit: BoxFit.cover,
-        ),
-      ),
-      child: BackdropFilter(
-        filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
-        child: Container(
-          color: palette.color.withOpacity(.7),
-          child: child,
-        ),
-      ),
-    );
-  }
-
   @override
   Widget build(BuildContext context, ref) {
     Playback playback = ref.watch(playbackProvider);
@@ -47,6 +29,7 @@ class Lyrics extends HookConsumerWidget {
       [playback.track?.album?.images],
     );
     final palette = usePaletteColor(albumArt, ref);
+    final index = useState(0);
 
     useCustomStatusBarColor(
       palette.color,
@@ -54,31 +37,29 @@ class Lyrics extends HookConsumerWidget {
       noSetBGColor: true,
     );
 
-    return SafeArea(
+    final body = [
-      child: PlatformTabView(
+      SyncedLyrics(palette: palette),
-        body: {
+      GeniusLyrics(palette: palette),
-          PlatformTab(
+    ][index.value];
-            label: "Synced Lyrics",
-            icon: Container(),
-          ): buildContainer(SyncedLyrics(palette: palette), albumArt, palette),
-          PlatformTab(
-            label: "Lyrics (genius.com)",
-            icon: Container(),
-          ): buildContainer(GeniusLyrics(palette: palette), albumArt, palette),
-        },
-      ),
-    );
 
-    return SafeArea(
+    return PlatformScaffold(
-      child: Scaffold(
       extendBodyBehindAppBar: true,
-        appBar: const TabBar(
+      appBar: !kIsMacOS
-          isScrollable: true,
+          ? PageWindowTitleBar(
+              backgroundColor: Colors.transparent,
+              toolbarOpacity: 0,
+              center: PlatformTabBar(
+                isNavigational:
+                    PlatformProperty.only(linux: true, other: false),
+                selectedIndex: index.value,
+                onSelectedIndexChanged: (value) => index.value = value,
                 tabs: [
-            Tab(text: "Synced Lyrics"),
+                  PlatformTab(label: "Synced", icon: const SizedBox.shrink()),
-            Tab(text: "Lyrics (genius.com)"),
+                  PlatformTab(label: "Genius", icon: const SizedBox.shrink()),
                 ],
               ),
+            )
+          : null,
       body: Container(
         clipBehavior: Clip.hardEdge,
         decoration: BoxDecoration(
@@ -91,15 +72,7 @@ class Lyrics extends HookConsumerWidget {
           filter: ImageFilter.blur(sigmaX: 5, sigmaY: 5),
           child: Container(
             color: palette.color.withOpacity(.7),
-              child: SafeArea(
+            child: SafeArea(child: body),
-                child: TabBarView(
-                  children: [
-                    SyncedLyrics(palette: palette),
-                    GeniusLyrics(palette: palette),
-                  ],
-                ),
-              ),
-            ),
           ),
         ),
       ),

lib/components/Player/PlayerView.dart

@@ -58,7 +58,14 @@ class PlayerView extends HookConsumerWidget {
       noSetBGColor: true,
     );
 
-    return Scaffold(
+    return PlatformScaffold(
+      appBar: PageWindowTitleBar(
+        backgroundColor: Colors.transparent,
+        foregroundColor: paletteColor.titleTextColor,
+        toolbarOpacity: 0,
+        automaticallyImplyLeading: true,
+      ),
+      extendBodyBehindAppBar: true,
       body: Container(
         decoration: BoxDecoration(
           image: DecorationImage(
@@ -74,11 +81,6 @@ class PlayerView extends HookConsumerWidget {
             child: SafeArea(
               child: Column(
                 children: [
-                  PageWindowTitleBar(
-                    leading: const PlatformBackButton(),
-                    backgroundColor: Colors.transparent,
-                    foregroundColor: paletteColor.titleTextColor,
-                  ),
                   Padding(
                     padding: const EdgeInsets.all(10),
                     child: Column(

lib/components/Search/Search.dart

@@ -10,6 +10,7 @@ import 'package:spotube/components/Artist/ArtistCard.dart';
 import 'package:spotube/components/LoaderShimmers/ShimmerPlaybuttonCard.dart';
 import 'package:spotube/components/Playlist/PlaylistCard.dart';
 import 'package:spotube/components/Shared/AnonymousFallback.dart';
+import 'package:spotube/components/Shared/PageWindowTitleBar.dart';
 import 'package:spotube/components/Shared/TrackTile.dart';
 import 'package:spotube/components/Shared/Waypoint.dart';
 import 'package:spotube/hooks/useBreakpoints.dart';
@@ -18,6 +19,7 @@ import 'package:spotube/provider/Auth.dart';
 import 'package:spotube/provider/Playback.dart';
 import 'package:spotube/provider/SpotifyDI.dart';
 import 'package:spotube/provider/SpotifyRequests.dart';
+import 'package:spotube/utils/platform.dart';
 import 'package:spotube/utils/primitive_utils.dart';
 import 'package:spotube/utils/type_conversion_utils.dart';
 import 'package:tuple/tuple.dart';
@@ -57,10 +59,6 @@ class Search extends HookConsumerWidget {
         job: searchQueryJob(SearchType.artist.key),
         externalData: getVariables());
 
-    if (auth.isAnonymous) {
-      return const AnonymousFallback();
-    }
-
     void onSearch() {
       for (final query in [
         searchTrack,
@@ -75,11 +73,11 @@ class Search extends HookConsumerWidget {
       }
     }
 
-    return SafeArea(
+    return PlatformScaffold(
-      child: Material(
+      appBar: !kIsMacOS ? PageWindowTitleBar() : null,
-        color: PlatformTheme.of(context).scaffoldBackgroundColor,
+      body: auth.isAnonymous
-        textStyle: PlatformTheme.of(context).textTheme!.body!,
+          ? const AnonymousFallback()
-        child: Column(
+          : Column(
               children: [
                 Container(
                   padding: const EdgeInsets.symmetric(
@@ -133,13 +131,14 @@ class Search extends HookConsumerWidget {
                           child: Column(
                             crossAxisAlignment: CrossAxisAlignment.start,
                             children: [
-                          if (tracks.isNotEmpty) PlatformText.headline("Songs"),
+                              if (tracks.isNotEmpty)
+                                PlatformText.headline("Songs"),
                               if (searchTrack.isLoading &&
                                   !searchTrack.isFetchingNextPage)
                                 const PlatformCircularProgressIndicator()
                               else if (searchTrack.hasError)
-                            PlatformText(
+                                PlatformText(searchTrack
-                                searchTrack.error?[searchTrack.pageParams.last])
+                                    .error?[searchTrack.pageParams.last])
                               else
                                 ...tracks.asMap().entries.map((track) {
                                   String duration =
@@ -148,8 +147,10 @@ class Search extends HookConsumerWidget {
                                     playback,
                                     track: track,
                                     duration: duration,
-                                isActive: playback.track?.id == track.value.id,
+                                    isActive:
-                                onTrackPlayButtonPressed: (currentTrack) async {
+                                        playback.track?.id == track.value.id,
+                                    onTrackPlayButtonPressed:
+                                        (currentTrack) async {
                                       var isPlaylistPlaying =
                                           playback.playlist?.id != null &&
                                               playback.playlist?.id ==
@@ -170,7 +171,8 @@ class Search extends HookConsumerWidget {
                                         );
                                       } else if (isPlaylistPlaying &&
                                           currentTrack.id != null &&
-                                      currentTrack.id != playback.track?.id) {
+                                          currentTrack.id !=
+                                              playback.track?.id) {
                                         playback.play(currentTrack);
                                       }
                                     },
@@ -222,7 +224,8 @@ class Search extends HookConsumerWidget {
                                                   searchPlaylist.hasNextPage) {
                                                 return Waypoint(
                                                   onEnter: () {
-                                                searchPlaylist.fetchNextPage();
+                                                    searchPlaylist
+                                                        .fetchNextPage();
                                                   },
                                                   child:
                                                       const ShimmerPlaybuttonCard(
@@ -269,7 +272,8 @@ class Search extends HookConsumerWidget {
                                                   searchArtist.hasNextPage) {
                                                 return Waypoint(
                                                   onEnter: () {
-                                                searchArtist.fetchNextPage();
+                                                    searchArtist
+                                                        .fetchNextPage();
                                                   },
                                                   child:
                                                       const ShimmerPlaybuttonCard(
@@ -277,7 +281,8 @@ class Search extends HookConsumerWidget {
                                                 );
                                               }
                                               return Container(
-                                            margin: const EdgeInsets.symmetric(
+                                                margin:
+                                                    const EdgeInsets.symmetric(
                                                         horizontal: 15),
                                                 child: ArtistCard(artist),
                                               );
@@ -299,8 +304,8 @@ class Search extends HookConsumerWidget {
                                   !searchAlbum.isFetchingNextPage)
                                 const PlatformCircularProgressIndicator()
                               else if (searchAlbum.hasError)
-                            PlatformText(
+                                PlatformText(searchAlbum
-                                searchAlbum.error?[searchAlbum.pageParams.last])
+                                    .error?[searchAlbum.pageParams.last])
                               else
                                 ScrollConfiguration(
                                   behavior:
@@ -324,7 +329,8 @@ class Search extends HookConsumerWidget {
                                                 onEnter: () {
                                                   searchAlbum.fetchNextPage();
                                                 },
-                                            child: const ShimmerPlaybuttonCard(
+                                                child:
+                                                    const ShimmerPlaybuttonCard(
                                                         count: 1),
                                               );
                                             }
@@ -349,7 +355,6 @@ class Search extends HookConsumerWidget {
                 )
               ],
             ),
-      ),
     );
   }
 }

lib/components/Shared/AnonymousFallback.dart

@@ -20,10 +20,10 @@ class AnonymousFallback extends ConsumerWidget {
       child: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
-          const Text("You're not logged in"),
+          const PlatformText("You're not logged in"),
           const SizedBox(height: 10),
           PlatformFilledButton(
-            child: const Text("Login with Spotify"),
+            child: const PlatformText("Login with Spotify"),
             onPressed: () => ServiceUtils.navigate(context, "/settings"),
           )
         ],

lib/components/Shared/PageWindowTitleBar.dart

@@ -1,3 +1,4 @@
+import 'package:bitsdojo_window/bitsdojo_window.dart';
 import 'package:flutter/material.dart';
 import 'package:platform_ui/platform_ui.dart';
 import 'package:spotube/utils/platform.dart';
@@ -26,4 +27,9 @@ class PageWindowTitleBar extends PlatformAppBar {
           ],
           title: center,
         );
+
+  @override
+  Widget build(BuildContext context) {
+    return MoveWindow(child: super.build(context));
+  }
 }