Skip to content

Re-enable TTS settings in the example app #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
m-abs wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Re-enable TTS settings in the example app #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions flutter_readium/example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,23 @@ Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();

HydratedBloc.storage = await HydratedStorage.build(
storageDirectory:
kIsWeb ? HydratedStorageDirectory.web : HydratedStorageDirectory((await getTemporaryDirectory()).path),
storageDirectory: kIsWeb
? HydratedStorageDirectory.web
: HydratedStorageDirectory((await getTemporaryDirectory()).path),
);

runApp(
MultiBlocProvider(
providers: [
BlocProvider(
create: (final _) => PublicationBloc(),
lazy: false,
),
BlocProvider(create: (final _) => PublicationBloc(), lazy: false),
BlocProvider(
create: (final _) {
final bloc = TextSettingsBloc();
bloc.setDefaultPreferences();
return bloc;
},
),
// BlocProvider(
// create: (final _) => TtsSettingsBloc(),
// lazy: false,
// ),
BlocProvider(create: (final _) => TtsSettingsBloc(), lazy: false),
BlocProvider(create: (final _) => PlayerControlsBloc()),
],
child: MyApp(),
Expand Down
29 changes: 13 additions & 16 deletions flutter_readium/example/lib/pages/player.page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,21 @@ class _PlayerPageState extends State<PlayerPage> with RestorationMixin {
);

List<Widget> _buildActionButtons() => <Widget>[
// IconButton(
// icon: const Icon(Icons.headphones),
// onPressed: () {
// context.read<TtsSettingsBloc>().add(GetTtsVoicesEvent());
IconButton(
icon: const Icon(Icons.headphones),
onPressed: () {
context.read<TtsSettingsBloc>().add(GetTtsVoicesEvent());

// final pubLang =
// context.read<PublicationBloc>().state.publication?.metadata.language ?? ['en'];
final pubLang = context.read<PublicationBloc>().state.publication?.metadata.languages ?? ['en'];

// showModalBottomSheet(
// context: context,
// isScrollControlled: true,
// builder: (final context) => TtsSettingsWidget(
// pubLang: pubLang,
// ),
// );
// },
// tooltip: 'Open tts settings',
// ),
showModalBottomSheet(
context: context,
isScrollControlled: true,
builder: (final context) => TtsSettingsWidget(pubLang: pubLang),
);
},
tooltip: 'Open tts settings',
),
IconButton(
icon: const Icon(Icons.format_paint),
onPressed: () {
Expand Down
106 changes: 48 additions & 58 deletions flutter_readium/example/lib/state/player_controls_bloc.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,81 +8,96 @@ import 'package:collection/collection.dart';

import 'package:flutter_readium/flutter_readium.dart';

abstract class PlayerControlsEvent {}
@immutable
abstract class PlayerControlsEvent {
const PlayerControlsEvent();
}

@immutable
class PlayTTS extends PlayerControlsEvent {
PlayTTS({this.fromLocator});
const PlayTTS({this.fromLocator, this.ttsPreferences});

Locator? fromLocator;
final Locator? fromLocator;
final TTSPreferences? ttsPreferences;
}

@immutable
class Play extends PlayerControlsEvent {
Play({this.fromLocator});
const Play({this.fromLocator, this.audioPreferences});

Locator? fromLocator;
final Locator? fromLocator;
final AudioPreferences? audioPreferences;
}

@immutable
class Pause extends PlayerControlsEvent {}

@immutable
class Stop extends PlayerControlsEvent {}

@immutable
class TogglePlayingState extends PlayerControlsEvent {
TogglePlayingState({required this.isPlaying});
bool isPlaying;
const TogglePlayingState({required this.isPlaying});
final bool isPlaying;
}

class SkipToNext extends PlayerControlsEvent {}
@immutable
class SkipToNext extends PlayerControlsEvent {
const SkipToNext();
}

class SkipToPrevious extends PlayerControlsEvent {}
@immutable
class SkipToPrevious extends PlayerControlsEvent {
const SkipToPrevious();
}

class SkipToNextChapter extends PlayerControlsEvent {}
@immutable
class SkipToNextChapter extends PlayerControlsEvent {
const SkipToNextChapter();
}

@immutable
class SkipToPreviousChapter extends PlayerControlsEvent {}

@immutable
class SkipToNextPage extends PlayerControlsEvent {}

@immutable
class SkipToPreviousPage extends PlayerControlsEvent {}

@immutable
class GoToLocator extends PlayerControlsEvent {
GoToLocator(this.locator);
const GoToLocator(this.locator);

final Locator locator;
}

class GetAvailableVoices extends PlayerControlsEvent {}

@immutable
class PlayerControlsState {
PlayerControlsState({required this.playing, required this.ttsEnabled, required this.audioEnabled});
const PlayerControlsState({required this.playing, required this.ttsEnabled, required this.audioEnabled});

final bool playing;
final bool ttsEnabled;
final bool audioEnabled;

Future<PlayerControlsState> togglePlay(final bool playing) async {
final newState = PlayerControlsState(playing: playing, ttsEnabled: ttsEnabled, audioEnabled: audioEnabled);

return newState;
return copyWith(playing: playing);
}

Future<PlayerControlsState> toggleTTSEnabled(final bool ttsEnabled) async {
final newState = PlayerControlsState(
playing: ttsEnabled && playing,
ttsEnabled: ttsEnabled,
audioEnabled: audioEnabled,
);

return newState;
return copyWith(ttsEnabled: ttsEnabled, playing: ttsEnabled && playing);
}

Future<PlayerControlsState> toggleAudioEnabled(final bool audioEnabled) async {
final newState = PlayerControlsState(
playing: audioEnabled && playing,
ttsEnabled: ttsEnabled,
audioEnabled: audioEnabled,
);

return newState;
return copyWith(audioEnabled: audioEnabled, playing: audioEnabled && playing);
}

PlayerControlsState copyWith({final bool? playing, final bool? ttsEnabled, final bool? audioEnabled}) =>
PlayerControlsState(
playing: playing ?? this.playing,
ttsEnabled: ttsEnabled ?? this.ttsEnabled,
audioEnabled: audioEnabled ?? this.audioEnabled,
);
}

class PlayerControlsBloc extends Bloc<PlayerControlsEvent, PlayerControlsState> {
Expand Down Expand Up @@ -121,7 +136,7 @@ class PlayerControlsBloc extends Bloc<PlayerControlsEvent, PlayerControlsState>

on<PlayTTS>((final event, final emit) async {
if (!state.ttsEnabled) {
await instance.ttsEnable(TTSPreferences(speed: 1.2));
await instance.ttsEnable(event.ttsPreferences ?? TTSPreferences(speed: 1.2));
await instance.play(event.fromLocator);
emit(await state.toggleTTSEnabled(true));
} else {
Expand All @@ -132,7 +147,7 @@ class PlayerControlsBloc extends Bloc<PlayerControlsEvent, PlayerControlsState>
on<Play>((final event, final emit) async {
if (!state.audioEnabled) {
await instance.audioEnable(
prefs: AudioPreferences(speed: 1.5, seekInterval: 10),
prefs: event.audioPreferences ?? AudioPreferences(speed: 1.5, seekInterval: 10),
fromLocator: event.fromLocator,
);
emit(await state.toggleAudioEnabled(true));
Expand Down Expand Up @@ -170,31 +185,6 @@ class PlayerControlsBloc extends Bloc<PlayerControlsEvent, PlayerControlsState>

on<GoToLocator>((event, emit) => instance.goToLocator(event.locator));

on<GetAvailableVoices>((final event, final emit) async {
final voices = await instance.ttsGetAvailableVoices();

// Sort by identifer
voices.sortBy((v) => v.identifier);

for (final i in voices.groupListsBy((v) => v.language).entries) {
debugPrint('Language: ${i.key}');
debugPrint(' Available voices:');
for (final v in i.value) {
debugPrint(
' - ${v.identifier},name=${v.name},quality=${v.quality?.name},gender=${v.gender.name},active=${v.active},networkRequired=${v.networkRequired}',
);
}
}

final dkVoices = voices.where((v) => v.language == "da-DK").toList();

// TODO: Demo: change to first voice matching "da-DK" language.
final daVoice = dkVoices.lastOrNull;
if (daVoice != null) {
await instance.ttsSetVoice(daVoice.identifier, daVoice.language);
}
});

@override
// ignore: unused_element
Future<void> close() async {
Expand Down
Loading