groove/Vaani
1
0
Fork 0
mirror of https://github.com/Dr-Blank/Vaani.git synced 2026-02-16 06:19:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

注释未使用包

Browse source
This commit is contained in:
rang 2025-12-09 17:26:04 +08:00
parent 50a27fdf67
commit 20a3b95edc
48 changed files with 637 additions and 1472 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/features/player/view/mini_player_bottom_padding.dart
View file

@ -9,7 +9,7 @@ class MiniPlayerBottomPadding extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
return AnimatedSize(
duration: const Duration(milliseconds: 200),
child: ref.watch(absAudioPlayerProvider).playing
child: ref.watch(audioPlayerProvider).playing
? const SizedBox(height: playerMinHeight + 8)
: const SizedBox.shrink(),
);

83
lib/features/player/view/player_expanded_desktop.dart
View file

@ -12,6 +12,7 @@ import 'package:vaani/features/player/view/player_minimized.dart';
import 'package:vaani/features/player/view/widgets/audiobook_player_seek_button.dart';
import 'package:vaani/features/player/view/widgets/audiobook_player_seek_chapter_button.dart';
import 'package:vaani/features/player/view/widgets/player_player_pause_button.dart';
import 'package:vaani/features/player/view/widgets/player_progress_bar.dart';
import 'package:vaani/features/player/view/widgets/player_speed_adjust_button.dart';
import 'package:vaani/features/skip_start_end/view/skip_start_end_button.dart';
import 'package:vaani/features/sleep_timer/view/sleep_timer_button.dart';
@ -64,35 +65,18 @@ class PlayerExpandedDesktop extends HookConsumerWidget {
// add a shadow to the image elevation hovering effect
child: PlayerExpandedImage(imageSize),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// previous chapter
const AudiobookPlayerSeekChapterButton(
isForward: false),
// buttonSkipBackwards
const AudiobookPlayerSeekButton(isForward: false),
AudiobookPlayerPlayPauseButton(),
// // buttonSkipForwards
const AudiobookPlayerSeekButton(isForward: true),
// // next chapter
const AudiobookPlayerSeekChapterButton(
isForward: true),
],
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
// speed control
const PlayerSpeedAdjustButton(),
const Spacer(),
// sleep timer
const SleepTimerButton(),
const Spacer(),
// 跳过片头片尾
SkipChapterStartEndButton(),
],
_buildControls(imageSize),
SizedBox(
width: imageSize,
child: Padding(
padding: EdgeInsets.only(
left: AppElementSizes.paddingRegular,
right: AppElementSizes.paddingRegular,
),
child: const AudiobookChapterProgressBar(),
),
),
_buildSettings(imageSize),
],
),
),
@ -130,10 +114,49 @@ class PlayerExpandedDesktop extends HookConsumerWidget {
),
),
),
Hero(tag: 'player_hero', child: const PlayerMinimized()),
Hero(tag: 'player_hero', child: const PlayerMinimizedControls()),
],
);
}
Widget _buildControls(double width) {
return SizedBox(
width: width,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// previous chapter
const AudiobookPlayerSeekChapterButton(isForward: false),
// buttonSkipBackwards
const AudiobookPlayerSeekButton(isForward: false),
AudiobookPlayerPlayPauseButton(),
// // buttonSkipForwards
const AudiobookPlayerSeekButton(isForward: true),
// // next chapter
const AudiobookPlayerSeekChapterButton(isForward: true),
],
),
);
}
Widget _buildSettings(double width) {
return SizedBox(
width: width,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
// speed control
const PlayerSpeedAdjustButton(),
const Spacer(),
// sleep timer
const SleepTimerButton(),
const Spacer(),
// 跳过片头片尾
SkipChapterStartEndButton(),
],
),
);
}
}
class ChapterSelection extends HookConsumerWidget {
@ -200,7 +223,7 @@ class ChapterSelection extends HookConsumerWidget {
selected: isCurrent,
// key: isCurrent ? chapterKey : null,
onTap: () {
ref.read(absAudioPlayerProvider).switchChapter(chapter.id);
ref.read(audioPlayerProvider).switchChapter(chapter.id);
},
);
},

222
lib/features/player/view/player_minimized.dart
View file

@ -22,105 +22,32 @@ class PlayerMinimized extends HookConsumerWidget {
if (currentBook == null) {
return SizedBox.shrink();
}
final currentChapter = ref.watch(currentChapterProvider);
return PlayerMinimizedFramework(
children: [
// image
Padding(
padding: EdgeInsets.all(AppElementSizes.paddingSmall),
child: GestureDetector(
onTap: () {
// navigate to item page
context.pushNamed(
Routes.libraryItem.name,
pathParameters: {
Routes.libraryItem.pathParamName!: currentBook.libraryItemId,
},
);
},
child: ConstrainedBox(
constraints: BoxConstraints(
maxWidth: playerMinimizedHeight,
),
child: BookCoverWidget(),
),
),
return GestureDetector(
child: Container(
height: playerMinimizedHeight,
color: Theme.of(context).colorScheme.surface,
child: Stack(
alignment: Alignment.topCenter,
children: [
Hero(tag: 'player_hero', child: const PlayerMinimizedControls()),
PlayerMinimizedProgress(),
],
),
// author and title of the book
Expanded(
child: Padding(
padding: const EdgeInsets.only(
left: AppElementSizes.paddingRegular,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
// AutoScrollText(
Text(
'${currentBook.metadata.title ?? ''} - ${currentChapter?.title ?? ''}',
maxLines: 1, overflow: TextOverflow.ellipsis,
// velocity:
// const Velocity(pixelsPerSecond: Offset(16, 0)),
style: Theme.of(context).textTheme.bodyLarge,
),
Text(
currentBook.metadata.asBookMetadataExpanded.authorName ?? '',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context)
.colorScheme
.onSurface
.withValues(alpha: 0.7),
),
),
],
),
),
),
// rewind button
Padding(
padding: const EdgeInsets.only(left: 8),
child: IconButton(
icon: const Icon(
Icons.replay_30,
size: AppElementSizes.iconSizeSmall,
),
onPressed: () {},
),
),
// play/pause button
Padding(
padding: const EdgeInsets.only(right: 8),
child: AudiobookPlayerPlayPauseButton(),
),
],
),
);
}
}
class PlayerMinimizedFramework extends HookConsumerWidget {
final List<Widget> children;
const PlayerMinimizedFramework({super.key, required this.children});
class PlayerMinimizedControls extends HookConsumerWidget {
const PlayerMinimizedControls({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
// final player = ref.watch(playerProvider);
final currentBook = ref.watch(currentBookProvider);
final currentChapter = ref.watch(currentChapterProvider);
final progress =
// useStream(player.positionStreamInChapter, initialData: Duration.zero);
useStream(
ref.read(absAudioPlayerProvider).positionInChapterStream,
initialData: Duration.zero,
);
return GestureDetector(
behavior: HitTestBehavior.opaque,
onTap: () {
if (GoRouterState.of(context).topRoute?.name != Routes.player.name) {
context.pushNamed(Routes.player.name);
@ -128,26 +55,109 @@ class PlayerMinimizedFramework extends HookConsumerWidget {
context.pop();
}
},
child: Container(
height: playerMinimizedHeight,
color: Theme.of(context).colorScheme.surface,
child: Stack(
alignment: Alignment.topCenter,
children: [
Row(
children: children,
),
SizedBox(
height: AppElementSizes.barHeight,
child: LinearProgressIndicator(
value: (progress.data ?? Duration.zero).inSeconds /
(currentChapter?.duration.inSeconds ?? 1),
// color: Theme.of(context).colorScheme.onPrimaryContainer,
// backgroundColor: Theme.of(context).colorScheme.primaryContainer,
child: Row(
children: [
// image
Padding(
padding: EdgeInsets.all(AppElementSizes.paddingSmall),
child: GestureDetector(
onTap: () {
// navigate to item page
if (currentBook != null) {
context.pushNamed(
Routes.libraryItem.name,
pathParameters: {
Routes.libraryItem.pathParamName!:
currentBook.libraryItemId,
},
);
}
},
child: ConstrainedBox(
constraints: BoxConstraints(
maxWidth: playerMinimizedHeight,
),
child: BookCoverWidget(),
),
),
],
),
),
// author and title of the book
Expanded(
child: Padding(
padding: const EdgeInsets.only(
left: AppElementSizes.paddingRegular,
),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisAlignment: MainAxisAlignment.center,
mainAxisSize: MainAxisSize.min,
children: [
// AutoScrollText(
Text(
'${currentBook?.metadata.title ?? ''} - ${currentChapter?.title ?? ''}',
maxLines: 1, overflow: TextOverflow.ellipsis,
// velocity:
// const Velocity(pixelsPerSecond: Offset(16, 0)),
style: Theme.of(context).textTheme.bodyLarge,
),
Text(
currentBook?.metadata.asBookMetadataExpanded.authorName ??
'',
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
color: Theme.of(context)
.colorScheme
.onSurface
.withValues(alpha: 0.7),
),
),
],
),
),
),
// rewind button
Padding(
padding: const EdgeInsets.only(left: 8),
child: IconButton(
icon: const Icon(
Icons.replay_30,
size: AppElementSizes.iconSizeSmall,
),
onPressed: () {},
),
),
// play/pause button
Padding(
padding: const EdgeInsets.only(right: 8),
child: AudiobookPlayerPlayPauseButton(),
),
],
),
);
}
}
class PlayerMinimizedProgress extends HookConsumerWidget {
const PlayerMinimizedProgress({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final currentChapter = ref.watch(currentChapterProvider);
final progress = useStream(
ref.read(audioPlayerProvider).positionInChapterStream,
initialData: Duration.zero,
);
return SizedBox(
height: AppElementSizes.barHeight,
child: LinearProgressIndicator(
value: (progress.data ?? Duration.zero).inSeconds /
(currentChapter?.duration.inSeconds ?? 1),
// color: Theme.of(context).colorScheme.onPrimaryContainer,
// backgroundColor: Theme.of(context).colorScheme.primaryContainer,
),
);
}

2
lib/features/player/view/widgets/audiobook_player_seek_button.dart
View file

@ -14,7 +14,7 @@ class AudiobookPlayerSeekButton extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(absAudioPlayerProvider);
final player = ref.read(audioPlayerProvider);
return IconButton(
icon: Icon(
isForward ? Icons.forward_30 : Icons.replay_30,

2
lib/features/player/view/widgets/audiobook_player_seek_chapter_button.dart
View file

@ -20,7 +20,7 @@ class AudiobookPlayerSeekChapterButton extends HookConsumerWidget {
size: AppElementSizes.iconSizeSmall,
),
onPressed: () {
final player = ref.read(absAudioPlayerProvider);
final player = ref.read(audioPlayerProvider);
final book = ref.read(currentBookProvider);
if (book == null) {
return;

2
lib/features/player/view/widgets/chapter_selection_button.dart
View file

@ -116,7 +116,7 @@ class ChapterSelectionModal extends HookConsumerWidget {
onTap: () {
Navigator.of(context).pop();
ref
.read(absAudioPlayerProvider)
.read(audioPlayerProvider)
.switchChapter(chapter.id);
},
);

4
lib/features/player/view/widgets/player_player_pause_button.dart
View file

@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:vaani/features/player/providers/abs_provider.dart'
hide PlayerState;
import 'package:vaani/shared/audio_player.dart';
import 'package:vaani/features/player/core/abs_audio_player.dart';
class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
const AudiobookPlayerPlayPauseButton({
@ -35,7 +35,7 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
}
void _actionButtonPressed(AbsPlayerState playerState, WidgetRef ref) async {
final player = ref.read(absAudioPlayerProvider);
final player = ref.read(audioPlayerProvider);
if (playerState.playing) {
await player.pause();
} else {

4
lib/features/player/view/widgets/player_progress_bar.dart
View file

@ -12,7 +12,7 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.watch(absAudioPlayerProvider);
final player = ref.watch(audioPlayerProvider);
final currentChapter = ref.watch(currentChapterProvider);
final position = useStream(
player.positionInBookStream,
@ -63,7 +63,7 @@ class AudiobookProgressBar extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(absAudioPlayerProvider);
final player = ref.read(audioPlayerProvider);
final position = useStream(
player.positionInBookStream,
initialData: const Duration(seconds: 0),

2
lib/features/player/view/widgets/player_speed_adjust_button.dart
View file

@ -16,7 +16,7 @@ class PlayerSpeedAdjustButton extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final player = ref.read(absAudioPlayerProvider);
final player = ref.read(audioPlayerProvider);
final book = ref.read(currentBookProvider);
final bookId = book?.libraryItemId ?? '_';
final bookSettings = ref.watch(bookSettingsProvider(bookId));

2
lib/features/player/view/widgets/speed_selector.dart
View file

@ -22,7 +22,7 @@ class SpeedSelector extends HookConsumerWidget {
final appSettings = ref.watch(appSettingsProvider);
final playerSettings = appSettings.playerSettings;
final speeds = playerSettings.speedOptions;
final currentSpeed = ref.watch(absAudioPlayerProvider).speed;
final currentSpeed = ref.watch(audioPlayerProvider).speed;
final speedState = useState(currentSpeed);
// hook the onSpeedSelected function to the state