mirror of
https://github.com/Dr-Blank/Vaani.git
synced 2026-02-16 14:29:35 +00:00
完善新播放逻辑
This commit is contained in:
rang
parent
eb1955e5e6
commit
114c9761fd
30 changed files with 658 additions and 683 deletions
|
|
@ -6,8 +6,10 @@ import 'package:collection/collection.dart';
|
|||
import 'package:flutter/foundation.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:rxdart/rxdart.dart';
|
||||
import 'package:shelfsdk/audiobookshelf_api.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
import 'package:vaani/features/player/core/player_status.dart' as core;
|
||||
import 'package:vaani/features/player/providers/player_status_provider.dart';
|
||||
import 'package:vaani/shared/extensions/chapter.dart';
|
||||
|
||||
// add a small offset so the display does not show the previous chapter for a split second
|
||||
|
|
@ -20,27 +22,28 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
|
||||
PlaybackSessionExpanded? _session;
|
||||
|
||||
final _currentChapterObject = BehaviorSubject<BookChapter?>.seeded(null);
|
||||
AbsAudioHandler(this.ref) {
|
||||
_setupAudioPlayer();
|
||||
}
|
||||
|
||||
void _setupAudioPlayer() {
|
||||
// // 监听播放位置变化，更新全局位置
|
||||
// _player.positionStream.listen((position) {
|
||||
// // _updateGlobalPosition(position);
|
||||
// });
|
||||
|
||||
// // 监听音轨变化
|
||||
// _player.currentIndexStream.listen((index) {
|
||||
// if (index != null) {
|
||||
// _onTrackChanged(index);
|
||||
// }
|
||||
// });
|
||||
final statusNotifier = ref.read(playerStatusProvider.notifier);
|
||||
|
||||
// 转发播放状态
|
||||
_player.playbackEventStream.map(_transformEvent).pipe(playbackState);
|
||||
_player.playerStateStream.distinct().listen((event) {
|
||||
ref.read(playStateProvider.notifier).setState(event);
|
||||
_player.playerStateStream.listen((event) {
|
||||
if (event.playing) {
|
||||
statusNotifier.setPlayStatusVerify(core.PlayStatus.playing);
|
||||
} else {
|
||||
statusNotifier.setPlayStatusVerify(core.PlayStatus.paused);
|
||||
}
|
||||
});
|
||||
_player.positionStream.distinct().listen((position) {
|
||||
final chapter = _session?.findChapterAtTime(positionInBook);
|
||||
if (chapter != currentChapter) {
|
||||
_currentChapterObject.sink.add(chapter);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -109,58 +112,85 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
(ch) => ch.id == chapterId,
|
||||
orElse: () => throw Exception('Chapter not found'),
|
||||
);
|
||||
|
||||
await seekInBook(chapter.start + offset);
|
||||
}
|
||||
|
||||
Duration get positionInBook {
|
||||
if (_session != null && _player.currentIndex != null) {
|
||||
return _session!.audioTracks[_player.currentIndex!].startOffset +
|
||||
_player.position;
|
||||
}
|
||||
return Duration.zero;
|
||||
}
|
||||
PlaybackSessionExpanded? get session => _session;
|
||||
|
||||
// 当前音轨
|
||||
AudioTrack? get currentTrack {
|
||||
if (_session == null) {
|
||||
if (_session == null || _player.currentIndex == null) {
|
||||
return null;
|
||||
}
|
||||
return _session!.findTrackAtTime(positionInBook);
|
||||
return _session!.audioTracks[_player.currentIndex!];
|
||||
}
|
||||
|
||||
// 当前章节
|
||||
BookChapter? get currentChapter {
|
||||
if (_session == null) {
|
||||
return null;
|
||||
}
|
||||
return _session!.findChapterAtTime(positionInBook);
|
||||
return _currentChapterObject.value;
|
||||
}
|
||||
|
||||
Duration get position => _player.position;
|
||||
Duration get positionInChapter {
|
||||
return _player.position +
|
||||
(currentTrack?.startOffset ?? Duration.zero) -
|
||||
(currentChapter?.start ?? Duration.zero);
|
||||
}
|
||||
|
||||
Duration get positionInBook {
|
||||
return _player.position + (currentTrack?.startOffset ?? Duration.zero);
|
||||
}
|
||||
|
||||
Duration get bufferedPositionInBook {
|
||||
return _player.bufferedPosition +
|
||||
(currentTrack?.startOffset ?? Duration.zero);
|
||||
}
|
||||
|
||||
Duration? get chapterDuration => currentChapter?.duration;
|
||||
|
||||
Stream<PlayerState> get playerStateStream => _player.playerStateStream;
|
||||
|
||||
Stream<Duration> get positionStream => _player.positionStream;
|
||||
Stream<Duration> get positionStreamInChapter {
|
||||
|
||||
Stream<Duration> get positionStreamInBook {
|
||||
return _player.positionStream.map((position) {
|
||||
final currentIndex = _player.currentIndex;
|
||||
if (_session == null || currentIndex == null) {
|
||||
return Duration.zero;
|
||||
}
|
||||
final globalPosition =
|
||||
position + _session!.audioTracks[currentIndex].startOffset;
|
||||
final chapter = _session!.findChapterAtTime(globalPosition);
|
||||
return globalPosition - chapter.start;
|
||||
return position + (currentTrack?.startOffset ?? Duration.zero);
|
||||
});
|
||||
}
|
||||
|
||||
Future<void> togglePlayPause() {
|
||||
Stream<Duration> get slowPositionStreamInBook {
|
||||
final superPositionStream = _player.createPositionStream(
|
||||
steps: 100,
|
||||
minPeriod: const Duration(milliseconds: 500),
|
||||
maxPeriod: const Duration(seconds: 1),
|
||||
);
|
||||
return superPositionStream.map((position) {
|
||||
return position + (currentTrack?.startOffset ?? Duration.zero);
|
||||
});
|
||||
}
|
||||
|
||||
Stream<Duration> get bufferedPositionStreamInBook {
|
||||
return _player.bufferedPositionStream.map((position) {
|
||||
return position + (currentTrack?.startOffset ?? Duration.zero);
|
||||
});
|
||||
}
|
||||
|
||||
Stream<Duration> get positionStreamInChapter {
|
||||
return _player.positionStream.distinct().map((position) {
|
||||
return position +
|
||||
(currentTrack?.startOffset ?? Duration.zero) -
|
||||
(currentChapter?.start ?? Duration.zero);
|
||||
});
|
||||
}
|
||||
|
||||
Stream<BookChapter?> get chapterStream => _currentChapterObject.stream;
|
||||
|
||||
Future<void> togglePlayPause() async {
|
||||
// check if book is set
|
||||
if (_session == null) {
|
||||
return Future.value();
|
||||
}
|
||||
|
||||
return switch (_player.playerState) {
|
||||
PlayerState(playing: var isPlaying) => isPlaying ? pause() : play(),
|
||||
};
|
||||
_player.playerState.playing ? await pause() : await play();
|
||||
}
|
||||
|
||||
// 播放控制方法
|
||||
|
|
@ -196,12 +226,8 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
|
||||
@override
|
||||
Future<void> skipToPrevious() async {
|
||||
if (_session == null) {
|
||||
return _player.seekToPrevious();
|
||||
}
|
||||
|
||||
final chapter = currentChapter;
|
||||
if (chapter == null) {
|
||||
if (_session == null || chapter == null) {
|
||||
return _player.seekToPrevious();
|
||||
}
|
||||
final currentIndex = _session!.chapters.indexOf(chapter);
|
||||
|
|
@ -243,8 +269,8 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
final track = _session!.findTrackAtTime(globalPosition);
|
||||
final index = _session!.audioTracks.indexOf(track);
|
||||
Duration positionInTrack = globalPosition - track.startOffset;
|
||||
if (positionInTrack <= Duration.zero) {
|
||||
positionInTrack = offset;
|
||||
if (positionInTrack < Duration.zero) {
|
||||
positionInTrack = Duration.zero;
|
||||
}
|
||||
// 切换到目标音轨具体位置
|
||||
await _player.seek(positionInTrack, index: index);
|
||||
|
|
@ -264,6 +290,7 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
systemActions: {
|
||||
if (kIsWeb || !Platform.isAndroid) MediaAction.skipToPrevious,
|
||||
MediaAction.rewind,
|
||||
MediaAction.seek,
|
||||
MediaAction.fastForward,
|
||||
MediaAction.stop,
|
||||
MediaAction.setSpeed,
|
||||
|
|
@ -280,7 +307,7 @@ class AbsAudioHandler extends BaseAudioHandler with QueueHandler, SeekHandler {
|
|||
AudioProcessingState.idle,
|
||||
playing: _player.playing,
|
||||
updatePosition: _player.position,
|
||||
bufferedPosition: _player.bufferedPosition,
|
||||
bufferedPosition: event.bufferedPosition,
|
||||
speed: _player.speed,
|
||||
queueIndex: event.currentIndex,
|
||||
captioningEnabled: false,
|
||||
|
|
|
|||
58
lib/features/player/core/player_status.dart
Normal file
58
lib/features/player/core/player_status.dart
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
enum PlayStatus { stopped, playing, paused, hidden, loading, completed }
|
||||
|
||||
class PlayerStatus {
|
||||
PlayStatus playStatus;
|
||||
String itemId;
|
||||
bool quite;
|
||||
|
||||
PlayerStatus({
|
||||
this.playStatus = PlayStatus.hidden,
|
||||
this.itemId = '',
|
||||
this.quite = false,
|
||||
}) {
|
||||
// addListener(_onStatusChanged);
|
||||
}
|
||||
bool isPlaying({String? itemId}) {
|
||||
if (itemId != null && this.itemId.isNotEmpty) {
|
||||
return playStatus == PlayStatus.playing && this.itemId == itemId;
|
||||
} else {
|
||||
return playStatus == PlayStatus.playing;
|
||||
}
|
||||
}
|
||||
|
||||
bool isPaused({String? itemId}) {
|
||||
if (itemId != null && this.itemId.isNotEmpty) {
|
||||
return playStatus == PlayStatus.paused && this.itemId == itemId;
|
||||
} else {
|
||||
return playStatus == PlayStatus.paused;
|
||||
}
|
||||
}
|
||||
|
||||
bool isStopped({String? itemId}) {
|
||||
if (itemId != null && this.itemId.isNotEmpty) {
|
||||
return playStatus == PlayStatus.stopped && this.itemId == itemId;
|
||||
} else {
|
||||
return playStatus == PlayStatus.stopped;
|
||||
}
|
||||
}
|
||||
|
||||
bool isLoading(String? itemId) {
|
||||
if (itemId != null && this.itemId.isNotEmpty) {
|
||||
return playStatus == PlayStatus.loading && this.itemId == itemId;
|
||||
} else {
|
||||
return playStatus == PlayStatus.loading;
|
||||
}
|
||||
}
|
||||
|
||||
PlayerStatus copyWith({
|
||||
PlayStatus? playStatus,
|
||||
String? itemId,
|
||||
bool? quite,
|
||||
}) {
|
||||
return PlayerStatus(
|
||||
playStatus: playStatus ?? this.playStatus,
|
||||
itemId: itemId ?? this.itemId,
|
||||
quite: quite ?? this.quite,
|
||||
);
|
||||
}
|
||||
}
|
||||
40
lib/features/player/providers/player_status_provider.dart
Normal file
40
lib/features/player/providers/player_status_provider.dart
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
import 'package:vaani/features/player/core/player_status.dart' as core;
|
||||
|
||||
part 'player_status_provider.g.dart';
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class PlayerStatus extends _$PlayerStatus {
|
||||
@override
|
||||
core.PlayerStatus build() {
|
||||
return core.PlayerStatus();
|
||||
}
|
||||
|
||||
void setPlayStatus(core.PlayStatus playStatus) {
|
||||
state = state.copyWith(playStatus: playStatus);
|
||||
}
|
||||
|
||||
void setPlayStatusQuietly(core.PlayStatus playStatus) {
|
||||
// state.copyWith(quite: true);
|
||||
setPlayStatus(playStatus);
|
||||
// state.copyWith(quite: false);
|
||||
}
|
||||
|
||||
// 校验原值, 不相同则更新
|
||||
void setPlayStatusVerify(core.PlayStatus playStatus) {
|
||||
if (state.playStatus != playStatus) {
|
||||
setPlayStatus(playStatus);
|
||||
}
|
||||
}
|
||||
|
||||
void setLoading(String itemId) {
|
||||
state = state.copyWith(
|
||||
playStatus: core.PlayStatus.loading,
|
||||
itemId: itemId,
|
||||
);
|
||||
}
|
||||
|
||||
void setHidden() {
|
||||
state = state.copyWith(playStatus: core.PlayStatus.hidden);
|
||||
}
|
||||
}
|
||||
25
lib/features/player/providers/player_status_provider.g.dart
Normal file
25
lib/features/player/providers/player_status_provider.g.dart
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||
|
||||
part of 'player_status_provider.dart';
|
||||
|
||||
// **************************************************************************
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$playerStatusHash() => r'4a8f222b8c1d5c92883f4358c69571c35a378861';
|
||||
|
||||
/// See also [PlayerStatus].
|
||||
@ProviderFor(PlayerStatus)
|
||||
final playerStatusProvider =
|
||||
NotifierProvider<PlayerStatus, core.PlayerStatus>.internal(
|
||||
PlayerStatus.new,
|
||||
name: r'playerStatusProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product') ? null : _$playerStatusHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$PlayerStatus = Notifier<core.PlayerStatus>;
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
import 'package:audio_service/audio_service.dart';
|
||||
import 'package:http/http.dart' as http;
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:just_audio_media_kit/just_audio_media_kit.dart';
|
||||
import 'package:riverpod/riverpod.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
|
@ -9,24 +8,55 @@ import 'package:vaani/api/api_provider.dart';
|
|||
import 'package:vaani/api/library_item_provider.dart';
|
||||
import 'package:vaani/features/downloads/providers/download_manager.dart';
|
||||
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
|
||||
import 'package:vaani/features/playback_reporting/core/playback_reporter_session.dart'
|
||||
as core;
|
||||
import 'package:vaani/features/player/core/audiobook_player_session.dart';
|
||||
import 'package:vaani/features/player/providers/player_status_provider.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
import 'package:vaani/settings/app_settings_provider.dart';
|
||||
import 'package:vaani/shared/extensions/obfuscation.dart';
|
||||
|
||||
part 'session_provider.g.dart';
|
||||
|
||||
class SessionPlayer {
|
||||
late final AbsAudioHandler _audioService;
|
||||
core.PlaybackSessionExpanded? _session;
|
||||
Ref ref;
|
||||
SessionPlayer(this.ref);
|
||||
void setAudioService(AbsAudioHandler audioPlayer) {
|
||||
_audioService = audioPlayer;
|
||||
@Riverpod(keepAlive: true)
|
||||
Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
|
||||
// JustAudioMediaKit.ensureInitialized(windows: false);
|
||||
JustAudioMediaKit.ensureInitialized();
|
||||
final audioService = await AudioService.init(
|
||||
builder: () => AbsAudioHandler(ref),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'com.vaani.rang.channel.audio',
|
||||
androidNotificationChannelName: 'ABSPlayback',
|
||||
androidNotificationChannelDescription:
|
||||
'Needed to control audio from lock screen',
|
||||
androidNotificationOngoing: false,
|
||||
androidStopForegroundOnPause: false,
|
||||
androidNotificationIcon: 'drawable/ic_stat_logo',
|
||||
preloadArtwork: true,
|
||||
),
|
||||
);
|
||||
return audioService;
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Player extends _$Player {
|
||||
@override
|
||||
AbsAudioHandler build() {
|
||||
return ref.watch(audioHandlerInitProvider).requireValue;
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Session extends _$Session {
|
||||
@override
|
||||
core.PlaybackSessionExpanded? build() {
|
||||
return null;
|
||||
}
|
||||
|
||||
Future<void> load(String id, String? episodeId) async {
|
||||
ref.read(sessionLoadingProvider(id).notifier).setLoading();
|
||||
final audioService = ref.read(playerProvider);
|
||||
await audioService.pause();
|
||||
ref.read(playerStatusProvider.notifier).setLoading(id);
|
||||
final api = ref.read(authenticatedApiProvider);
|
||||
final playBack = await api.items.play(
|
||||
libraryItemId: id,
|
||||
|
|
@ -52,7 +82,7 @@ class SessionPlayer {
|
|||
),
|
||||
responseErrorHandler: _responseErrorHandler,
|
||||
) as core.PlaybackSessionExpanded;
|
||||
|
||||
state = playBack;
|
||||
final downloadManager = ref.read(simpleDownloadManagerProvider);
|
||||
final libItem =
|
||||
await ref.read(libraryItemProvider(playBack.libraryItemId).future);
|
||||
|
|
@ -66,35 +96,29 @@ class SessionPlayer {
|
|||
appPlayerSettings.configurePlayerForEveryBook;
|
||||
|
||||
await Future.wait([
|
||||
_audioService.setSourceAudiobook(
|
||||
audioService.setSourceAudiobook(
|
||||
playBack,
|
||||
baseUrl: api.baseUrl,
|
||||
token: api.token!,
|
||||
downloadedUris: downloadedUris,
|
||||
),
|
||||
// set the volume
|
||||
_audioService.setVolume(
|
||||
audioService.setVolume(
|
||||
configurePlayerForEveryBook
|
||||
? bookPlayerSettings.preferredDefaultVolume ??
|
||||
appPlayerSettings.preferredDefaultVolume
|
||||
: appPlayerSettings.preferredDefaultVolume,
|
||||
),
|
||||
// set the speed
|
||||
_audioService.setSpeed(
|
||||
audioService.setSpeed(
|
||||
configurePlayerForEveryBook
|
||||
? bookPlayerSettings.preferredDefaultSpeed ??
|
||||
appPlayerSettings.preferredDefaultSpeed
|
||||
: appPlayerSettings.preferredDefaultSpeed,
|
||||
),
|
||||
]);
|
||||
_session = playBack;
|
||||
ref.read(sessionLoadingProvider(id).notifier).setLoaded();
|
||||
ref.notifyListeners();
|
||||
}
|
||||
|
||||
AbsAudioHandler get audioService => _audioService;
|
||||
core.PlaybackSession? get session => _session;
|
||||
|
||||
void _responseErrorHandler(http.Response response, [error]) {
|
||||
if (response.statusCode != 200) {
|
||||
appLogger.severe('Error with api: ${response.obfuscate()}, $error');
|
||||
|
|
@ -106,104 +130,48 @@ class SessionPlayer {
|
|||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class Player extends _$Player {
|
||||
class CurrentChapter extends _$CurrentChapter {
|
||||
@override
|
||||
AbsAudioHandler build() {
|
||||
final audioService = ref.watch(sessionProvider).audioService;
|
||||
// audioService.positionStream.listen((position){
|
||||
|
||||
// });
|
||||
return audioService;
|
||||
core.BookChapter? build() {
|
||||
final player = ref.watch(playerProvider);
|
||||
player.chapterStream.distinct().listen((chapter) {
|
||||
update(chapter);
|
||||
});
|
||||
return player.currentChapter;
|
||||
}
|
||||
|
||||
Future<void> togglePlayPause() => state.togglePlayPause();
|
||||
Future<void> play() => state.play();
|
||||
Future<void> pause() => state.pause();
|
||||
Future<void> seekInBook(Duration globalPosition) =>
|
||||
state.seekInBook(globalPosition);
|
||||
void update(core.BookChapter? chapter) {
|
||||
if (state != chapter) {
|
||||
state = chapter;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
SessionPlayer session(Ref ref) {
|
||||
return SessionPlayer(ref);
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class SessionLoading extends _$SessionLoading {
|
||||
class PlaybackReporter extends _$PlaybackReporter {
|
||||
@override
|
||||
bool build(String itemId) {
|
||||
return false;
|
||||
}
|
||||
Future<core.PlaybackReporter?> build() async {
|
||||
final session = ref.watch(sessionProvider);
|
||||
if (session == null) {
|
||||
return null;
|
||||
}
|
||||
final playerSettings = ref.watch(appSettingsProvider).playerSettings;
|
||||
final player = ref.watch(playerProvider);
|
||||
final api = ref.watch(authenticatedApiProvider);
|
||||
|
||||
setLoading() {
|
||||
state = true;
|
||||
}
|
||||
|
||||
setLoaded() {
|
||||
state = false;
|
||||
final reporter = core.PlaybackReporter(
|
||||
player,
|
||||
api,
|
||||
reportingInterval: playerSettings.playbackReportInterval,
|
||||
markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
|
||||
minimumPositionForReporting: playerSettings.minimumPositionForReporting,
|
||||
session: session,
|
||||
);
|
||||
ref.onDispose(reporter.dispose);
|
||||
return reporter;
|
||||
}
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
class PlayState extends _$PlayState {
|
||||
@override
|
||||
PlayerState build() {
|
||||
return PlayerState(false, ProcessingState.idle);
|
||||
}
|
||||
|
||||
void setState(PlayerState playerState) {
|
||||
state = playerState;
|
||||
}
|
||||
}
|
||||
|
||||
@riverpod
|
||||
core.BookChapter? currentChapter(Ref ref) {
|
||||
return ref.watch(playerProvider.select((v) => v.currentChapter));
|
||||
}
|
||||
|
||||
@Riverpod(keepAlive: true)
|
||||
Future<AbsAudioHandler> audioHandlerInit(Ref ref) async {
|
||||
// JustAudioMediaKit.ensureInitialized(windows: false);
|
||||
JustAudioMediaKit.ensureInitialized();
|
||||
final audioService = await AudioService.init(
|
||||
builder: () => AbsAudioHandler(ref),
|
||||
config: const AudioServiceConfig(
|
||||
androidNotificationChannelId: 'com.vaani.rang.channel.audio',
|
||||
androidNotificationChannelName: 'ABSPlayback',
|
||||
androidNotificationChannelDescription:
|
||||
'Needed to control audio from lock screen',
|
||||
androidNotificationOngoing: false,
|
||||
androidStopForegroundOnPause: false,
|
||||
androidNotificationIcon: 'drawable/ic_stat_logo',
|
||||
preloadArtwork: true,
|
||||
),
|
||||
);
|
||||
ref.read(sessionProvider).setAudioService(audioService);
|
||||
return audioService;
|
||||
}
|
||||
|
||||
// @Riverpod(keepAlive: true)
|
||||
// class PlaybackReporter extends _$PlaybackReporter {
|
||||
// @override
|
||||
// Future<core.PlaybackReporter> build() async {
|
||||
// final playerSettings = ref.watch(appSettingsProvider).playerSettings;
|
||||
// final player = ref.watch(playerProvider);
|
||||
// final session = ref.watch(sessionProvider.select((v) => v.session));
|
||||
// final api = ref.watch(authenticatedApiProvider);
|
||||
|
||||
// final reporter = core.PlaybackReporter(
|
||||
// player.player,
|
||||
// api,
|
||||
// reportingInterval: playerSettings.playbackReportInterval,
|
||||
// markCompleteWhenTimeLeft: playerSettings.markCompleteWhenTimeLeft,
|
||||
// minimumPositionForReporting: playerSettings.minimumPositionForReporting,
|
||||
// session: session,
|
||||
// );
|
||||
// ref.onDispose(reporter.dispose);
|
||||
// return reporter;
|
||||
// }
|
||||
// }
|
||||
|
||||
class PlaybackSyncError implements Exception {
|
||||
String message;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,40 +6,7 @@ part of 'session_provider.dart';
|
|||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$sessionHash() => r'ae97659a7772abaa3c97644f39af6b3f05c75faf';
|
||||
|
||||
/// See also [session].
|
||||
@ProviderFor(session)
|
||||
final sessionProvider = Provider<SessionPlayer>.internal(
|
||||
session,
|
||||
name: r'sessionProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product') ? null : _$sessionHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
typedef SessionRef = ProviderRef<SessionPlayer>;
|
||||
String _$currentChapterHash() => r'a2f43d62f77ce48e6ca34c89700443f67dbd78fe';
|
||||
|
||||
/// See also [currentChapter].
|
||||
@ProviderFor(currentChapter)
|
||||
final currentChapterProvider = AutoDisposeProvider<core.BookChapter?>.internal(
|
||||
currentChapter,
|
||||
name: r'currentChapterProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$currentChapterHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
typedef CurrentChapterRef = AutoDisposeProviderRef<core.BookChapter?>;
|
||||
String _$audioHandlerInitHash() => r'64bc78439049068ec6de6e19af657d410bde9581';
|
||||
String _$audioHandlerInitHash() => r'5677b2267f472b667ce7a63cc5c91c4320d630e8';
|
||||
|
||||
/// See also [audioHandlerInit].
|
||||
@ProviderFor(audioHandlerInit)
|
||||
|
|
@ -56,7 +23,7 @@ final audioHandlerInitProvider = FutureProvider<AbsAudioHandler>.internal(
|
|||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
typedef AudioHandlerInitRef = FutureProviderRef<AbsAudioHandler>;
|
||||
String _$playerHash() => r'41cc626fd4a3317ce7e1ffa3c5e03206a9819231';
|
||||
String _$playerHash() => r'9599b094cdd9eca614c27ec5bdf2d5259d20ac5f';
|
||||
|
||||
/// See also [Player].
|
||||
@ProviderFor(Player)
|
||||
|
|
@ -70,184 +37,52 @@ final playerProvider = NotifierProvider<Player, AbsAudioHandler>.internal(
|
|||
);
|
||||
|
||||
typedef _$Player = Notifier<AbsAudioHandler>;
|
||||
String _$sessionLoadingHash() => r'4688469dd8ac9f38063917ede032cfe1506a63a8';
|
||||
String _$sessionHash() => r'ce9405cc0b8247014924a005fa60fbc3bf92d5c6';
|
||||
|
||||
/// Copied from Dart SDK
|
||||
class _SystemHash {
|
||||
_SystemHash._();
|
||||
|
||||
static int combine(int hash, int value) {
|
||||
// ignore: parameter_assignments
|
||||
hash = 0x1fffffff & (hash + value);
|
||||
// ignore: parameter_assignments
|
||||
hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
|
||||
return hash ^ (hash >> 6);
|
||||
}
|
||||
|
||||
static int finish(int hash) {
|
||||
// ignore: parameter_assignments
|
||||
hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
|
||||
// ignore: parameter_assignments
|
||||
hash = hash ^ (hash >> 11);
|
||||
return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
|
||||
}
|
||||
}
|
||||
|
||||
abstract class _$SessionLoading extends BuildlessNotifier<bool> {
|
||||
late final String itemId;
|
||||
|
||||
bool build(
|
||||
String itemId,
|
||||
);
|
||||
}
|
||||
|
||||
/// See also [SessionLoading].
|
||||
@ProviderFor(SessionLoading)
|
||||
const sessionLoadingProvider = SessionLoadingFamily();
|
||||
|
||||
/// See also [SessionLoading].
|
||||
class SessionLoadingFamily extends Family<bool> {
|
||||
/// See also [SessionLoading].
|
||||
const SessionLoadingFamily();
|
||||
|
||||
/// See also [SessionLoading].
|
||||
SessionLoadingProvider call(
|
||||
String itemId,
|
||||
) {
|
||||
return SessionLoadingProvider(
|
||||
itemId,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
SessionLoadingProvider getProviderOverride(
|
||||
covariant SessionLoadingProvider provider,
|
||||
) {
|
||||
return call(
|
||||
provider.itemId,
|
||||
);
|
||||
}
|
||||
|
||||
static const Iterable<ProviderOrFamily>? _dependencies = null;
|
||||
|
||||
@override
|
||||
Iterable<ProviderOrFamily>? get dependencies => _dependencies;
|
||||
|
||||
static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
|
||||
|
||||
@override
|
||||
Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
|
||||
_allTransitiveDependencies;
|
||||
|
||||
@override
|
||||
String? get name => r'sessionLoadingProvider';
|
||||
}
|
||||
|
||||
/// See also [SessionLoading].
|
||||
class SessionLoadingProvider
|
||||
extends NotifierProviderImpl<SessionLoading, bool> {
|
||||
/// See also [SessionLoading].
|
||||
SessionLoadingProvider(
|
||||
String itemId,
|
||||
) : this._internal(
|
||||
() => SessionLoading()..itemId = itemId,
|
||||
from: sessionLoadingProvider,
|
||||
name: r'sessionLoadingProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$sessionLoadingHash,
|
||||
dependencies: SessionLoadingFamily._dependencies,
|
||||
allTransitiveDependencies:
|
||||
SessionLoadingFamily._allTransitiveDependencies,
|
||||
itemId: itemId,
|
||||
);
|
||||
|
||||
SessionLoadingProvider._internal(
|
||||
super._createNotifier, {
|
||||
required super.name,
|
||||
required super.dependencies,
|
||||
required super.allTransitiveDependencies,
|
||||
required super.debugGetCreateSourceHash,
|
||||
required super.from,
|
||||
required this.itemId,
|
||||
}) : super.internal();
|
||||
|
||||
final String itemId;
|
||||
|
||||
@override
|
||||
bool runNotifierBuild(
|
||||
covariant SessionLoading notifier,
|
||||
) {
|
||||
return notifier.build(
|
||||
itemId,
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
Override overrideWith(SessionLoading Function() create) {
|
||||
return ProviderOverride(
|
||||
origin: this,
|
||||
override: SessionLoadingProvider._internal(
|
||||
() => create()..itemId = itemId,
|
||||
from: from,
|
||||
name: null,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
debugGetCreateSourceHash: null,
|
||||
itemId: itemId,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@override
|
||||
NotifierProviderElement<SessionLoading, bool> createElement() {
|
||||
return _SessionLoadingProviderElement(this);
|
||||
}
|
||||
|
||||
@override
|
||||
bool operator ==(Object other) {
|
||||
return other is SessionLoadingProvider && other.itemId == itemId;
|
||||
}
|
||||
|
||||
@override
|
||||
int get hashCode {
|
||||
var hash = _SystemHash.combine(0, runtimeType.hashCode);
|
||||
hash = _SystemHash.combine(hash, itemId.hashCode);
|
||||
|
||||
return _SystemHash.finish(hash);
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated('Will be removed in 3.0. Use Ref instead')
|
||||
// ignore: unused_element
|
||||
mixin SessionLoadingRef on NotifierProviderRef<bool> {
|
||||
/// The parameter `itemId` of this provider.
|
||||
String get itemId;
|
||||
}
|
||||
|
||||
class _SessionLoadingProviderElement
|
||||
extends NotifierProviderElement<SessionLoading, bool>
|
||||
with SessionLoadingRef {
|
||||
_SessionLoadingProviderElement(super.provider);
|
||||
|
||||
@override
|
||||
String get itemId => (origin as SessionLoadingProvider).itemId;
|
||||
}
|
||||
|
||||
String _$playStateHash() => r'5256c4154c4254e406593035bc54d917a9a059bf';
|
||||
|
||||
/// See also [PlayState].
|
||||
@ProviderFor(PlayState)
|
||||
final playStateProvider = NotifierProvider<PlayState, PlayerState>.internal(
|
||||
PlayState.new,
|
||||
name: r'playStateProvider',
|
||||
/// See also [Session].
|
||||
@ProviderFor(Session)
|
||||
final sessionProvider =
|
||||
NotifierProvider<Session, core.PlaybackSessionExpanded?>.internal(
|
||||
Session.new,
|
||||
name: r'sessionProvider',
|
||||
debugGetCreateSourceHash:
|
||||
const bool.fromEnvironment('dart.vm.product') ? null : _$playStateHash,
|
||||
const bool.fromEnvironment('dart.vm.product') ? null : _$sessionHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$PlayState = Notifier<PlayerState>;
|
||||
typedef _$Session = Notifier<core.PlaybackSessionExpanded?>;
|
||||
String _$currentChapterHash() => r'0be02fbc4f65b30da4ce18964ee457a18c4d1073';
|
||||
|
||||
/// See also [CurrentChapter].
|
||||
@ProviderFor(CurrentChapter)
|
||||
final currentChapterProvider =
|
||||
NotifierProvider<CurrentChapter, core.BookChapter?>.internal(
|
||||
CurrentChapter.new,
|
||||
name: r'currentChapterProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$currentChapterHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$CurrentChapter = Notifier<core.BookChapter?>;
|
||||
String _$playbackReporterHash() => r'b9a2197a12e83f9760bd61ae2a1ad8dff82042e9';
|
||||
|
||||
/// See also [PlaybackReporter].
|
||||
@ProviderFor(PlaybackReporter)
|
||||
final playbackReporterProvider =
|
||||
AsyncNotifierProvider<PlaybackReporter, core.PlaybackReporter?>.internal(
|
||||
PlaybackReporter.new,
|
||||
name: r'playbackReporterProvider',
|
||||
debugGetCreateSourceHash: const bool.fromEnvironment('dart.vm.product')
|
||||
? null
|
||||
: _$playbackReporterHash,
|
||||
dependencies: null,
|
||||
allTransitiveDependencies: null,
|
||||
);
|
||||
|
||||
typedef _$PlaybackReporter = AsyncNotifier<core.PlaybackReporter?>;
|
||||
// ignore_for_file: type=lint
|
||||
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import 'package:vaani/constants/sizes.dart';
|
|||
import 'package:vaani/features/player/providers/session_provider.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/skip_start_end/player_skip_chapter_start_end.dart';
|
||||
import 'package:vaani/features/player/view/widgets/player_skip_chapter_start_end.dart';
|
||||
import 'package:vaani/features/sleep_timer/view/sleep_timer_button.dart';
|
||||
import 'package:vaani/shared/widgets/not_implemented.dart';
|
||||
import 'package:vaani/shared/widgets/shelves/book_shelf.dart';
|
||||
|
|
@ -26,7 +26,7 @@ class PlayerExpanded extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final session = ref.watch(sessionProvider).session;
|
||||
final session = ref.watch(sessionProvider);
|
||||
if (session == null) {
|
||||
return SizedBox.shrink();
|
||||
}
|
||||
|
|
@ -148,16 +148,14 @@ class PlayerExpanded extends HookConsumerWidget {
|
|||
),
|
||||
),
|
||||
|
||||
Expanded(
|
||||
child: SizedBox(
|
||||
width: imageSize,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
left: AppElementSizes.paddingRegular,
|
||||
right: AppElementSizes.paddingRegular,
|
||||
),
|
||||
child: const AudiobookProgressBar(),
|
||||
SizedBox(
|
||||
width: imageSize,
|
||||
child: Padding(
|
||||
padding: EdgeInsets.only(
|
||||
left: AppElementSizes.paddingRegular,
|
||||
right: AppElementSizes.paddingRegular,
|
||||
),
|
||||
child: const AudiobookProgressBar(),
|
||||
),
|
||||
),
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/constants/sizes.dart';
|
||||
|
|
@ -16,7 +17,7 @@ class PlayerMinimized extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final session = ref.watch(sessionProvider).session;
|
||||
final session = ref.watch(sessionProvider);
|
||||
if (session == null) {
|
||||
return SizedBox.shrink();
|
||||
}
|
||||
|
|
@ -57,14 +58,14 @@ class PlayerMinimized extends HookConsumerWidget {
|
|||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
// AutoScrollText(
|
||||
Text(
|
||||
PlatformText(
|
||||
'${session.displayTitle} - ${currentChapter?.title ?? ''}',
|
||||
maxLines: 1, overflow: TextOverflow.ellipsis,
|
||||
// velocity:
|
||||
// const Velocity(pixelsPerSecond: Offset(16, 0)),
|
||||
style: Theme.of(context).textTheme.bodyLarge,
|
||||
),
|
||||
Text(
|
||||
PlatformText(
|
||||
session.displayAuthor,
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
|
|
@ -83,7 +84,7 @@ class PlayerMinimized extends HookConsumerWidget {
|
|||
// rewind button
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(left: 8),
|
||||
child: IconButton(
|
||||
child: PlatformIconButton(
|
||||
icon: const Icon(
|
||||
Icons.replay_30,
|
||||
size: AppElementSizes.iconSizeSmall,
|
||||
|
|
@ -126,12 +127,10 @@ class PlayerMinimizedFramework extends HookConsumerWidget {
|
|||
SizedBox(
|
||||
height: AppElementSizes.barHeight,
|
||||
child: LinearProgressIndicator(
|
||||
// value: (progress.data ?? Duration.zero).inSeconds /
|
||||
// player.book!.duration.inSeconds,
|
||||
value: (progress.data ?? Duration.zero).inSeconds /
|
||||
(player.chapterDuration?.inSeconds ?? 1),
|
||||
color: Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
|
||||
// color: Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
// backgroundColor: Theme.of(context).colorScheme.primaryContainer,
|
||||
),
|
||||
),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/constants/sizes.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
|
||||
class AudiobookPlayerSeekButton extends HookConsumerWidget {
|
||||
const AudiobookPlayerSeekButton({
|
||||
|
|
@ -14,7 +14,7 @@ class AudiobookPlayerSeekButton extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final player = ref.watch(audiobookPlayerProvider);
|
||||
final player = ref.watch(playerProvider);
|
||||
return IconButton(
|
||||
icon: Icon(
|
||||
isForward ? Icons.forward_30 : Icons.replay_30,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/constants/sizes.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
|
||||
class AudiobookPlayerSeekChapterButton extends HookConsumerWidget {
|
||||
const AudiobookPlayerSeekChapterButton({
|
||||
|
|
@ -14,63 +14,26 @@ class AudiobookPlayerSeekChapterButton extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final player = ref.watch(audiobookPlayerProvider);
|
||||
|
||||
// // add a small offset so the display does not show the previous chapter for a split second
|
||||
// const offset = Duration(milliseconds: 10);
|
||||
|
||||
// /// time into the current chapter to determine if we should go to the previous chapter or the start of the current chapter
|
||||
// const doNotSeekBackIfLessThan = Duration(seconds: 5);
|
||||
|
||||
// /// seek forward to the next chapter
|
||||
// void seekForward() {
|
||||
// final index = player.book!.chapters.indexOf(player.currentChapter!);
|
||||
// if (index < player.book!.chapters.length - 1) {
|
||||
// player.seek(
|
||||
// player.book!.chapters[index + 1].start + offset,
|
||||
// );
|
||||
// } else {
|
||||
// player.seek(player.currentChapter!.end);
|
||||
// }
|
||||
// }
|
||||
|
||||
// /// seek backward to the previous chapter or the start of the current chapter
|
||||
// void seekBackward() {
|
||||
// final currentPlayingChapterIndex =
|
||||
// player.book!.chapters.indexOf(player.currentChapter!);
|
||||
// final chapterPosition =
|
||||
// player.positionInBook - player.currentChapter!.start;
|
||||
// BookChapter chapterToSeekTo;
|
||||
// // if player position is less than 5 seconds into the chapter, go to the previous chapter
|
||||
// if (chapterPosition < doNotSeekBackIfLessThan &&
|
||||
// currentPlayingChapterIndex > 0) {
|
||||
// chapterToSeekTo = player.book!.chapters[currentPlayingChapterIndex - 1];
|
||||
// } else {
|
||||
// chapterToSeekTo = player.currentChapter!;
|
||||
// }
|
||||
// player.seek(
|
||||
// chapterToSeekTo.start + offset,
|
||||
// );
|
||||
// }
|
||||
|
||||
final player = ref.watch(playerProvider);
|
||||
return IconButton(
|
||||
icon: Icon(
|
||||
isForward ? Icons.skip_next : Icons.skip_previous,
|
||||
size: AppElementSizes.iconSizeSmall,
|
||||
),
|
||||
onPressed: () {
|
||||
if (player.book == null) {
|
||||
if (player.session == null) {
|
||||
return;
|
||||
}
|
||||
// if chapter does not exist, go to the start or end of the book
|
||||
if (player.currentChapter == null) {
|
||||
player.seekInBook(isForward ? player.book!.duration : Duration.zero);
|
||||
player
|
||||
.seekInBook(isForward ? player.session!.duration : Duration.zero);
|
||||
return;
|
||||
}
|
||||
if (isForward) {
|
||||
player.seekToNext();
|
||||
player.skipToNext();
|
||||
} else {
|
||||
player.seekToPrevious();
|
||||
player.skipToPrevious();
|
||||
}
|
||||
},
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_animate/flutter_animate.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart'
|
||||
show audiobookPlayerProvider;
|
||||
import 'package:vaani/features/player/providers/currently_playing_provider.dart'
|
||||
show currentPlayingChapterProvider, currentlyPlayingBookProvider;
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
import 'package:vaani/features/player/view/player_expanded.dart'
|
||||
show pendingPlayerModals;
|
||||
import 'package:vaani/features/player/view/widgets/playing_indicator_icon.dart';
|
||||
import 'package:vaani/generated/l10n.dart';
|
||||
import 'package:vaani/globals.dart';
|
||||
import 'package:vaani/shared/extensions/chapter.dart' show ChapterDuration;
|
||||
import 'package:vaani/shared/extensions/duration_format.dart'
|
||||
|
|
@ -22,14 +20,14 @@ class ChapterSelectionButton extends HookConsumerWidget {
|
|||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return Tooltip(
|
||||
message: 'Chapters',
|
||||
message: S.of(context).chapters,
|
||||
child: IconButton(
|
||||
icon: const Icon(Icons.menu_book_rounded),
|
||||
onPressed: () async {
|
||||
pendingPlayerModals++;
|
||||
await showModalBottomSheet<bool>(
|
||||
context: context,
|
||||
barrierLabel: 'Select Chapter',
|
||||
barrierLabel: S.of(context).chapterSelect,
|
||||
constraints: BoxConstraints(
|
||||
// 40% of the screen height
|
||||
maxHeight: MediaQuery.of(context).size.height * 0.4,
|
||||
|
|
@ -55,9 +53,9 @@ class ChapterSelectionModal extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final currentChapter = ref.watch(currentPlayingChapterProvider);
|
||||
final currentBook = ref.watch(currentlyPlayingBookProvider);
|
||||
final notifier = ref.watch(audiobookPlayerProvider);
|
||||
final session = ref.watch(sessionProvider);
|
||||
final currentChapter = ref.watch(currentChapterProvider);
|
||||
|
||||
final currentChapterIndex = currentChapter?.id;
|
||||
final chapterKey = GlobalKey();
|
||||
scrollToCurrentChapter() async {
|
||||
|
|
@ -77,7 +75,7 @@ class ChapterSelectionModal extends HookConsumerWidget {
|
|||
children: [
|
||||
ListTile(
|
||||
title: Text(
|
||||
'Chapters${currentChapterIndex == null ? '' : ' (${currentChapterIndex + 1}/${currentBook?.chapters.length})'}',
|
||||
'${S.of(context).chapters} ${currentChapterIndex == null ? '' : ' (${currentChapterIndex + 1}/${session?.chapters.length})'}',
|
||||
),
|
||||
),
|
||||
// scroll to current chapter after opening the dialog
|
||||
|
|
@ -85,10 +83,10 @@ class ChapterSelectionModal extends HookConsumerWidget {
|
|||
child: Scrollbar(
|
||||
child: SingleChildScrollView(
|
||||
primary: true,
|
||||
child: currentBook?.chapters == null
|
||||
? const Text('No chapters found')
|
||||
child: session?.chapters == null
|
||||
? Text(S.of(context).chapterNotFound)
|
||||
: Column(
|
||||
children: currentBook!.chapters.map(
|
||||
children: session!.chapters.map(
|
||||
(chapter) {
|
||||
final isCurrent = currentChapterIndex == chapter.id;
|
||||
final isPlayed = currentChapterIndex != null &&
|
||||
|
|
@ -117,9 +115,9 @@ class ChapterSelectionModal extends HookConsumerWidget {
|
|||
key: isCurrent ? chapterKey : null,
|
||||
onTap: () {
|
||||
Navigator.of(context).pop();
|
||||
// notifier.seekInBook(chapter.start + 90.ms);
|
||||
notifier.skipToChapter(chapter.id);
|
||||
notifier.play();
|
||||
ref
|
||||
.read(playerProvider)
|
||||
.skipToChapter(chapter.id);
|
||||
},
|
||||
);
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:just_audio/just_audio.dart';
|
||||
import 'package:vaani/constants/sizes.dart';
|
||||
import 'package:vaani/features/player/core/player_status.dart';
|
||||
import 'package:vaani/features/player/providers/player_status_provider.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
|
||||
class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
|
||||
|
|
@ -14,42 +14,42 @@ class AudiobookPlayerPlayPauseButton extends HookConsumerWidget {
|
|||
final double iconSize;
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final playState = ref.watch(playStateProvider);
|
||||
final player = ref.read(playerProvider.notifier);
|
||||
final playPauseController = useAnimationController(
|
||||
duration: const Duration(milliseconds: 200),
|
||||
initialValue: 1,
|
||||
final playerStatus =
|
||||
ref.watch(playerStatusProvider.select((v) => v.playStatus));
|
||||
|
||||
return PlatformIconButton(
|
||||
icon: _getIcon(playerStatus, context),
|
||||
onPressed: () => _actionButtonPressed(playerStatus, ref),
|
||||
);
|
||||
if (playState.playing) {
|
||||
playPauseController.forward();
|
||||
} else {
|
||||
playPauseController.reverse();
|
||||
}
|
||||
|
||||
Widget _getIcon(PlayStatus playerStatus, BuildContext context) {
|
||||
switch (playerStatus) {
|
||||
case PlayStatus.playing:
|
||||
return Icon(size: iconSize, PlatformIcons(context).pause);
|
||||
case PlayStatus.paused:
|
||||
return Icon(size: iconSize, PlatformIcons(context).playArrow);
|
||||
case PlayStatus.loading:
|
||||
return PlatformCircularProgressIndicator();
|
||||
default:
|
||||
return Icon(size: iconSize, PlatformIcons(context).playArrow);
|
||||
}
|
||||
}
|
||||
|
||||
void _actionButtonPressed(PlayStatus playerStatus, WidgetRef ref) async {
|
||||
final player = ref.read(playerProvider);
|
||||
switch (playerStatus) {
|
||||
case PlayStatus.loading:
|
||||
break;
|
||||
case PlayStatus.playing:
|
||||
await player.pause();
|
||||
break;
|
||||
case PlayStatus.completed:
|
||||
await player.seekInBook(const Duration(seconds: 0));
|
||||
await player.play();
|
||||
break;
|
||||
default:
|
||||
await player.play();
|
||||
}
|
||||
return switch (playState.processingState) {
|
||||
ProcessingState.loading || ProcessingState.buffering => const Padding(
|
||||
padding: EdgeInsets.all(AppElementSizes.paddingRegular),
|
||||
child: CircularProgressIndicator(),
|
||||
),
|
||||
ProcessingState.completed => IconButton(
|
||||
onPressed: () async {
|
||||
await player.seekInBook(const Duration(seconds: 0));
|
||||
await player.play();
|
||||
},
|
||||
icon: const Icon(
|
||||
Icons.replay,
|
||||
),
|
||||
),
|
||||
ProcessingState.ready => IconButton(
|
||||
onPressed: () async {
|
||||
await player.togglePlayPause();
|
||||
},
|
||||
iconSize: iconSize,
|
||||
icon: AnimatedIcon(
|
||||
icon: AnimatedIcons.play_pause,
|
||||
progress: playPauseController,
|
||||
),
|
||||
),
|
||||
ProcessingState.idle => const SizedBox.shrink(),
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,9 @@
|
|||
import 'package:audio_video_progress_bar/audio_video_progress_bar.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/widgets.dart';
|
||||
import 'package:flutter_hooks/flutter_hooks.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/player/providers/currently_playing_provider.dart';
|
||||
import 'package:vaani/constants/sizes.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
|
||||
class AudiobookChapterProgressBar extends HookConsumerWidget {
|
||||
const AudiobookChapterProgressBar({
|
||||
|
|
@ -13,8 +12,8 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final player = ref.watch(audiobookPlayerProvider);
|
||||
final currentChapter = ref.watch(currentPlayingChapterProvider);
|
||||
final player = ref.watch(playerProvider);
|
||||
final currentChapter = ref.watch(currentChapterProvider);
|
||||
final position = useStream(
|
||||
player.positionStreamInBook,
|
||||
initialData: const Duration(seconds: 0),
|
||||
|
|
@ -38,7 +37,7 @@ class AudiobookChapterProgressBar extends HookConsumerWidget {
|
|||
progress:
|
||||
currentChapterProgress ?? position.data ?? const Duration(seconds: 0),
|
||||
total: currentChapter == null
|
||||
? player.book?.duration ?? const Duration(seconds: 0)
|
||||
? player.session?.duration ?? const Duration(seconds: 0)
|
||||
: currentChapter.end - currentChapter.start,
|
||||
// ! TODO add onSeek
|
||||
onSeek: (duration) {
|
||||
|
|
@ -64,19 +63,19 @@ class AudiobookProgressBar extends HookConsumerWidget {
|
|||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final player = ref.watch(audiobookPlayerProvider);
|
||||
final player = ref.watch(playerProvider);
|
||||
final position = useStream(
|
||||
player.slowPositionStreamInBook,
|
||||
initialData: const Duration(seconds: 0),
|
||||
);
|
||||
|
||||
return ProgressBar(
|
||||
progress: position.data ?? const Duration(seconds: 0),
|
||||
total: player.book?.duration ?? const Duration(seconds: 0),
|
||||
thumbRadius: 8,
|
||||
bufferedBarColor: Theme.of(context).colorScheme.secondary,
|
||||
timeLabelType: TimeLabelType.remainingTime,
|
||||
timeLabelLocation: TimeLabelLocation.below,
|
||||
return SizedBox(
|
||||
height: AppElementSizes.barHeightLarge,
|
||||
child: LinearProgressIndicator(
|
||||
value: (position.data ?? const Duration(seconds: 0)).inSeconds /
|
||||
(player.session?.duration ?? const Duration(seconds: 0)).inSeconds,
|
||||
borderRadius: BorderRadiusGeometry.all(Radius.circular(10)),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,109 @@
|
|||
import 'package:flutter/material.dart';
|
||||
import 'package:hooks_riverpod/hooks_riverpod.dart';
|
||||
import 'package:icons_plus/icons_plus.dart';
|
||||
import 'package:vaani/features/per_book_settings/providers/book_settings_provider.dart';
|
||||
import 'package:vaani/features/player/providers/audiobook_player.dart';
|
||||
import 'package:vaani/features/player/providers/session_provider.dart';
|
||||
import 'package:vaani/features/player/view/player_expanded.dart';
|
||||
import 'package:vaani/generated/l10n.dart';
|
||||
import 'package:vaani/settings/view/notification_settings_page.dart';
|
||||
|
||||
class SkipChapterStartEndButton extends HookConsumerWidget {
|
||||
const SkipChapterStartEndButton({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return Tooltip(
|
||||
message: S.of(context).chapterSkip,
|
||||
child: IconButton(
|
||||
// icon: const Icon(Icons.fast_forward_rounded),
|
||||
icon: const Icon(FontAwesome.arrow_right_to_bracket_solid),
|
||||
onPressed: () async {
|
||||
// show toast
|
||||
pendingPlayerModals++;
|
||||
await showModalBottomSheet<bool>(
|
||||
context: context,
|
||||
barrierLabel: S.of(context).chapterSkip,
|
||||
constraints: BoxConstraints(
|
||||
// 40% of the screen height
|
||||
maxHeight: MediaQuery.of(context).size.height * 0.4,
|
||||
),
|
||||
builder: (context) {
|
||||
return const Padding(
|
||||
padding: EdgeInsets.all(8.0),
|
||||
child: PlayerSkipChapterStartEnd(),
|
||||
);
|
||||
},
|
||||
);
|
||||
pendingPlayerModals--;
|
||||
},
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class PlayerSkipChapterStartEnd extends HookConsumerWidget {
|
||||
const PlayerSkipChapterStartEnd({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final session = ref.watch(sessionProvider);
|
||||
final bookId = session?.libraryItemId ?? '_';
|
||||
final bookSettings = ref.watch(bookSettingsProvider(bookId));
|
||||
return Scaffold(
|
||||
body: Column(
|
||||
children: [
|
||||
ListTile(
|
||||
title: Text(
|
||||
'${S.of(context).chapterSkipOpen}${bookSettings.playerSettings.skipChapterStart.inSeconds}s',
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: TimeIntervalSlider(
|
||||
defaultValue: bookSettings.playerSettings.skipChapterStart,
|
||||
// defaultValue: const Duration(seconds: 0),
|
||||
min: const Duration(seconds: 0),
|
||||
max: const Duration(seconds: 60),
|
||||
step: const Duration(seconds: 1),
|
||||
onChangedEnd: (interval) {
|
||||
ref
|
||||
.read(
|
||||
bookSettingsProvider(bookId).notifier,
|
||||
)
|
||||
.update(
|
||||
bookSettings.copyWith
|
||||
.playerSettings(skipChapterStart: interval),
|
||||
);
|
||||
ref.read(audiobookPlayerProvider).setClip(start: interval);
|
||||
},
|
||||
),
|
||||
),
|
||||
ListTile(
|
||||
title: Text(
|
||||
'${S.of(context).chapterSkipEnd}${bookSettings.playerSettings.skipChapterEnd.inSeconds}s',
|
||||
),
|
||||
),
|
||||
Expanded(
|
||||
child: TimeIntervalSlider(
|
||||
defaultValue: bookSettings.playerSettings.skipChapterEnd,
|
||||
// defaultValue: const Duration(seconds: 0),
|
||||
min: const Duration(seconds: 0),
|
||||
max: const Duration(seconds: 60),
|
||||
step: const Duration(seconds: 1),
|
||||
onChangedEnd: (interval) {
|
||||
ref
|
||||
.read(
|
||||
bookSettingsProvider(bookId).notifier,
|
||||
)
|
||||
.update(
|
||||
bookSettings.copyWith
|
||||
.playerSettings(skipChapterEnd: interval),
|
||||
);
|
||||
},
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue