diff --git a/lib/components/Home/Home.dart b/lib/components/Home/Home.dart index bde98304..4395daa4 100644 --- a/lib/components/Home/Home.dart +++ b/lib/components/Home/Home.dart @@ -162,32 +162,33 @@ class Home extends HookConsumerWidget { }; }, [localStorage]); + final titleBarContents = Row( + children: [ + Expanded( + child: Row( + children: [ + Container( + constraints: BoxConstraints( + maxWidth: titleBarDragMaxWidth.toDouble(), + ), + color: Theme.of(context).navigationRailTheme.backgroundColor, + child: MoveWindow(), + ), + Expanded(child: MoveWindow()), + if (!Platform.isMacOS && !Platform.isAndroid && !Platform.isIOS) + const TitleBarActionButtons(), + ], + )) + ], + ); + return SafeArea( child: Scaffold( body: Column( children: [ - WindowTitleBarBox( - child: Row( - children: [ - Expanded( - child: Row( - children: [ - Container( - constraints: BoxConstraints( - maxWidth: titleBarDragMaxWidth.toDouble(), - ), - color: Theme.of(context) - .navigationRailTheme - .backgroundColor, - child: MoveWindow(), - ), - Expanded(child: MoveWindow()), - if (!Platform.isMacOS) const TitleBarActionButtons(), - ], - )) - ], - ), - ), + Platform.isAndroid || Platform.isIOS + ? titleBarContents + : WindowTitleBarBox(child: titleBarContents), Expanded( child: Row( children: [ diff --git a/lib/components/Playlist/PlaylistCard.dart b/lib/components/Playlist/PlaylistCard.dart index 95f2c60c..307253ca 100644 --- a/lib/components/Playlist/PlaylistCard.dart +++ b/lib/components/Playlist/PlaylistCard.dart @@ -2,9 +2,7 @@ import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:spotify/spotify.dart'; -import 'package:spotube/components/Playlist/PlaylistView.dart'; import 'package:spotube/components/Shared/PlaybuttonCard.dart'; -import 'package:spotube/components/Shared/SpotubePageRoute.dart'; import 'package:spotube/helpers/image-to-url-string.dart'; import 'package:spotube/hooks/useBreakpointValue.dart'; import 'package:spotube/provider/Playback.dart'; diff --git a/lib/hooks/useBreakpoints.dart b/lib/hooks/useBreakpoints.dart index e4e73334..5a52e840 100644 --- a/lib/hooks/useBreakpoints.dart +++ b/lib/hooks/useBreakpoints.dart @@ -79,16 +79,16 @@ BreakpointUtils useBreakpoints() { width <= 1920 && breakpoint.value != Breakpoints.xl) { breakpoint.value = Breakpoints.xl; - } else if (width > 768 && + } else if (width > 800 && width <= 1366 && breakpoint.value != Breakpoints.lg) { breakpoint.value = Breakpoints.lg; - } else if (width > 360 && - width <= 768 && + } else if (width > 414 && + width <= 800 && breakpoint.value != Breakpoints.md) { breakpoint.value = Breakpoints.md; } else if (width >= 250 && - width <= 360 && + width <= 414 && breakpoint.value != Breakpoints.sm) { breakpoint.value = Breakpoints.sm; }