kitty/spotube
1
0
Fork 0
mirror of https://github.com/KRTirtho/spotube.git synced 2025-09-15 08:35:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: mini player not working in release mode

Browse Source
This commit is contained in:
Kingkor Roy Tirtho 2023-04-15 13:54:11 +06:00
parent 625901482a
commit 28ff3216ef
3 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/collections/routes.dart
View File

@ -51,15 +51,6 @@ final router = GoRouter(
name: "Lyrics", name: "Lyrics",
pageBuilder: (context, state) => pageBuilder: (context, state) =>
const SpotubePage(child: LyricsPage()), const SpotubePage(child: LyricsPage()),
routes: [
GoRoute(
path: "mini",
parentNavigatorKey: rootNavigatorKey,
pageBuilder: (context, state) => const SpotubePage(
child: MiniLyricsPage(),
),
),
],
), ),
GoRoute( GoRoute(
path: "/settings", path: "/settings",
@ -106,6 +97,13 @@ final router = GoRouter(
), ),
], ],
), ),
GoRoute(
path: "/mini-player",
parentNavigatorKey: rootNavigatorKey,
pageBuilder: (context, state) => const SpotubePage(
child: MiniLyricsPage(),
),
),
GoRoute( GoRoute(
path: "/login", path: "/login",
parentNavigatorKey: rootNavigatorKey, parentNavigatorKey: rootNavigatorKey,

22
lib/components/root/bottom_player.dart
View File

@ -1,6 +1,7 @@
import 'dart:ui'; import 'dart:ui';
import 'package:flutter/gestures.dart'; import 'package:flutter/gestures.dart';
import 'package:flutter_desktop_tools/flutter_desktop_tools.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
@ -17,6 +18,7 @@ import 'package:spotube/models/logger.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:spotube/provider/playlist_queue_provider.dart'; import 'package:spotube/provider/playlist_queue_provider.dart';
import 'package:spotube/provider/user_preferences_provider.dart'; import 'package:spotube/provider/user_preferences_provider.dart';
import 'package:spotube/utils/platform.dart';
import 'package:spotube/utils/type_conversion_utils.dart'; import 'package:spotube/utils/type_conversion_utils.dart';
class BottomPlayer extends HookConsumerWidget { class BottomPlayer extends HookConsumerWidget {
@ -130,8 +132,24 @@ class BottomPlayer extends HookConsumerWidget {
IconButton( IconButton(
tooltip: 'Mini Player', tooltip: 'Mini Player',
icon: const Icon(SpotubeIcons.miniPlayer), icon: const Icon(SpotubeIcons.miniPlayer),
onPressed: () { onPressed: () async {
GoRouter.of(context).push('/lyrics/mini'); await DesktopTools.window.setMinimumSize(
const Size(300, 300),
);
await DesktopTools.window.setAlwaysOnTop(true);
if (!kIsLinux) {
await DesktopTools.window.setHasShadow(false);
}
await DesktopTools.window
.setAlignment(Alignment.topRight);
await DesktopTools.window
.setSize(const Size(400, 500));
await Future.delayed(
const Duration(milliseconds: 100),
() async {
GoRouter.of(context).go('/mini-player');
},
);
}, },
), ),
], ],

17
lib/pages/lyrics/mini_lyrics.dart
View File

@ -25,16 +25,14 @@ class MiniLyricsPage extends HookConsumerWidget {
final theme = Theme.of(context); final theme = Theme.of(context);
final update = useForceUpdate(); final update = useForceUpdate();
final prevSize = useRef<Size?>(null); final prevSize = useRef<Size?>(null);
final wasMaximized = useRef<bool>(false);
final playlistQueue = ref.watch(PlaylistQueueNotifier.provider); final playlistQueue = ref.watch(PlaylistQueueNotifier.provider);
useEffect(() { useEffect(() {
WidgetsBinding.instance.addPostFrameCallback((_) async { WidgetsBinding.instance.addPostFrameCallback((_) async {
prevSize.value = await DesktopTools.window.getSize(); prevSize.value = await DesktopTools.window.getSize();
await DesktopTools.window.setMinimumSize(const Size(300, 300)); wasMaximized.value = await DesktopTools.window.isMaximized();
await DesktopTools.window.setAlwaysOnTop(true);
if (!kIsLinux) await DesktopTools.window.setHasShadow(false);
await DesktopTools.window.setSize(const Size(400, 500));
}); });
return null; return null;
}, []); }, []);
@ -106,13 +104,20 @@ class MiniLyricsPage extends HookConsumerWidget {
await DesktopTools.window await DesktopTools.window
.setMinimumSize(const Size(300, 700)); .setMinimumSize(const Size(300, 700));
await DesktopTools.window.setAlwaysOnTop(false); await DesktopTools.window.setAlwaysOnTop(false);
await DesktopTools.window.setSize(prevSize.value!); if (wasMaximized.value) {
await DesktopTools.window.maximize();
} else {
await DesktopTools.window.setSize(prevSize.value!);
}
await DesktopTools.window.setAlignment(Alignment.center); await DesktopTools.window.setAlignment(Alignment.center);
if (!kIsLinux) { if (!kIsLinux) {
await DesktopTools.window.setHasShadow(true); await DesktopTools.window.setHasShadow(true);
} }
await Future.delayed(const Duration(milliseconds: 200));
} finally { } finally {
if (context.mounted) GoRouter.of(context).go('/'); if (context.mounted) {
GoRouter.of(context).go('/lyrics');
}
} }
}, },
), ),