mirror of
https://github.com/Dr-Blank/Vaani.git
synced 2026-02-16 14:29:35 +00:00
一堆乱七八糟的修改
播放页面增加桌面版
This commit is contained in:
parent
aee1fbde88
commit
3ba35b31b8
116 changed files with 1238 additions and 2592 deletions
|
|
@ -8,18 +8,18 @@ import 'package:vaani/features/library_browser/view/library_browser_page.dart';
|
|||
import 'package:vaani/features/logging/view/logs_page.dart';
|
||||
import 'package:vaani/features/onboarding/view/callback_page.dart';
|
||||
import 'package:vaani/features/onboarding/view/onboarding_single_page.dart';
|
||||
import 'package:vaani/features/player/view/player_expanded.dart';
|
||||
import 'package:vaani/features/settings/view/app_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/auto_sleep_timer_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/home_page_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/notification_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/player_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/shake_detector_settings_page.dart';
|
||||
import 'package:vaani/features/settings/view/theme_settings_page.dart';
|
||||
import 'package:vaani/features/you/view/server_manager.dart';
|
||||
import 'package:vaani/features/you/view/you_page.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
import 'package:vaani/pages/home_page.dart';
|
||||
import 'package:vaani/settings/view/app_settings_page.dart';
|
||||
import 'package:vaani/settings/view/auto_sleep_timer_settings_page.dart';
|
||||
import 'package:vaani/settings/view/home_page_settings_page.dart';
|
||||
import 'package:vaani/settings/view/notification_settings_page.dart';
|
||||
import 'package:vaani/settings/view/player_settings_page.dart';
|
||||
import 'package:vaani/settings/view/shake_detector_settings_page.dart';
|
||||
import 'package:vaani/settings/view/theme_settings_page.dart';
|
||||
import 'package:vaani/pages/player_page.dart';
|
||||
|
||||
import 'scaffold_with_nav_bar.dart';
|
||||
import 'transitions/slide.dart';
|
||||
|
|
@ -235,11 +235,11 @@ class MyAppRouter {
|
|||
],
|
||||
),
|
||||
|
||||
// loggers page
|
||||
// player full page
|
||||
GoRoute(
|
||||
path: Routes.player.localPath,
|
||||
name: Routes.player.name,
|
||||
pageBuilder: defaultPageBuilder(const PlayerExpanded()),
|
||||
pageBuilder: defaultPageBuilder(const PlayerPage()),
|
||||
),
|
||||
|
||||
// loggers page
|
||||
|
|
|
|||
|
|
@ -3,15 +3,13 @@ import 'package:go_router/go_router.dart';
|
|||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/api/library_provider.dart' show currentLibraryProvider;
|
||||
import 'package:vaani/features/explore/providers/search_controller.dart';
|
||||
import 'package:vaani/features/player/providers/player_form.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/player/view/player_minimized.dart';
|
||||
import 'package:vaani/features/you/view/widgets/library_switch_chip.dart';
|
||||
import 'package:vaani/generated/l10n.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
import 'package:vaani/router/router.dart';
|
||||
import 'package:vaani/shared/icons/abs_icons.dart' show AbsIcons;
|
||||
import 'package:vaani/shared/utils/utils.dart';
|
||||
|
||||
// stack to track changes in navigationShell.currentIndex
|
||||
// home is always at index 0 and at the start and should be the last before popping
|
||||
|
|
@ -35,21 +33,18 @@ class ScaffoldWithNavBar extends HookConsumerWidget {
|
|||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final size = MediaQuery.of(context).size;
|
||||
// 竖屏
|
||||
final isVertical = size.height > size.width;
|
||||
|
||||
return Scaffold(
|
||||
body: Stack(
|
||||
alignment: Alignment.bottomCenter,
|
||||
children: [
|
||||
Utils.isMobile() || isVertical
|
||||
? navigationShell
|
||||
: buildNavLeft(context, ref),
|
||||
// const AudiobookPlayer(),
|
||||
const PlayerMinimized(),
|
||||
isVertical ? navigationShell : buildNavLeft(context, ref),
|
||||
Hero(tag: 'player_hero', child: const PlayerMinimized()),
|
||||
],
|
||||
),
|
||||
bottomNavigationBar:
|
||||
Utils.isMobile() || isVertical ? buildNavBottom(context, ref) : null,
|
||||
bottomNavigationBar: isVertical ? buildNavBottom(context, ref) : null,
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue