groove/Vaani
1
0
Fork 0
mirror of https://github.com/Dr-Blank/Vaani.git synced 2026-07-06 17:31:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: add shake detector settings page

Browse source
This commit is contained in:
Dr-Blank 2024-09-27 23:47:52 -04:00
parent 30919e2a5e
commit 17cf946469
No known key found for this signature in database
GPG key ID: 7452CC63F210A266
14 changed files with 613 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/features/shake_detection/core/shake_detector.dart
View file

@ -36,7 +36,7 @@ class ShakeDetector {
_accelerometerSubscription =
userAccelerometerEventStream(samplingPeriod: _settings.samplingPeriod)
.listen((event) {
if (event.rms > (_settings.force?.threshold ?? _settings.threshold)) {
if (event.rms > _settings.threshold) {
_currentShakeCount++;
if (_currentShakeCount >= _settings.shakeTriggerCount &&

4
lib/features/shake_detection/providers/shake_detector.dart
View file

@ -65,7 +65,7 @@ class ShakeDetector extends _$ShakeDetector {
}) {
final player = ref.watch(simpleAudiobookPlayerProvider);
switch (shakeAction) {
case ShakeAction.sleepTimerReset:
case ShakeAction.resetSleepTimer:
_logger.fine('Resetting sleep timer');
ref.read(sleepTimerProvider.notifier).restartTimer();
break;
@ -133,6 +133,6 @@ extension on ShakeDetectionSettings {
}
bool get shouldActOnSleepTimer {
return {ShakeAction.sleepTimerReset}.contains(shakeAction);
return {ShakeAction.resetSleepTimer}.contains(shakeAction);
}
}

2
lib/features/shake_detection/providers/shake_detector.g.dart
View file

@ -6,7 +6,7 @@ part of 'shake_detector.dart';
// RiverpodGenerator
// **************************************************************************
String _$shakeDetectorHash() => r'2b04fe1be82c48f4c3feb9a2c450f382f6839d05';
String _$shakeDetectorHash() => r'7bfbdd22f2f43ef3e3858d226d1eb78923e8114d';
/// See also [ShakeDetector].
@ProviderFor(ShakeDetector)

5
lib/router/constants.dart
View file

@ -42,6 +42,11 @@ class Routes {
name: 'playerSettings',
parentRoute: settings,
);
static const shakeDetectorSettings = _SimpleRoute(
pathName: 'shakeDetector',
name: 'shakeDetectorSettings',
parentRoute: settings,
);
// search and explore
static const search = _SimpleRoute(

8
lib/router/router.dart
View file

@ -14,6 +14,7 @@ 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/notification_settings_page.dart';
import 'package:vaani/settings/view/player_settings_page.dart';
import 'package:vaani/settings/view/shake_detector_settings_page.dart';
import 'scaffold_with_nav_bar.dart';
import 'transitions/slide.dart';
@ -195,6 +196,13 @@ class MyAppRouter {
pageBuilder:
defaultPageBuilder(const PlayerSettingsPage()),
),
GoRoute(
path: Routes.shakeDetectorSettings.pathName,
name: Routes.shakeDetectorSettings.name,
pageBuilder: defaultPageBuilder(
const ShakeDetectorSettingsPage(),
),
),
],
),
GoRoute(

36
lib/settings/models/app_settings.dart
View file

@ -195,11 +195,10 @@ class ShakeDetectionSettings with _$ShakeDetectionSettings {
const factory ShakeDetectionSettings({
@Default(true) bool isEnabled,
@Default(ShakeDirection.horizontal) ShakeDirection direction,
@Default(6) double threshold,
@Default(ShakeForce.medium) ShakeForce? force,
@Default(ShakeAction.sleepTimerReset) ShakeAction shakeAction,
@Default([ShakeDetectedFeedback.vibrate, ShakeDetectedFeedback.beep])
List<ShakeDetectedFeedback> feedback,
@Default(5) double threshold,
@Default(ShakeAction.resetSleepTimer) ShakeAction shakeAction,
@Default({ShakeDetectedFeedback.vibrate, ShakeDetectedFeedback.beep})
Set<ShakeDetectedFeedback> feedback,
@Default(0.5) double beepVolume,
/// the duration to wait before the shake detection is enabled again
@ -218,37 +217,12 @@ class ShakeDetectionSettings with _$ShakeDetectionSettings {
enum ShakeDirection { horizontal, vertical }
enum ShakeForce {
low(2.5),
medium(10),
high(15),
leafRustle(3),
breeze(7),
storm(12),
hurricane(18),
earthquake(25),
meteorShower(30),
supernova(40),
blackHole(50);
const ShakeForce(this.threshold);
final double threshold;
String get properName {
return name
.replaceAllMapped(RegExp(r'([A-Z])'), (match) => ' ${match.group(0)}')
.trim();
}
}
enum ShakeAction {
none,
playPause,
sleepTimerReset,
resetSleepTimer,
fastForward,
rewind,
custom,
}
enum ShakeDetectedFeedback { vibrate, beep }

55
lib/settings/models/app_settings.freezed.dart
View file

@ -2429,10 +2429,8 @@ mixin _$ShakeDetectionSettings {
bool get isEnabled => throw _privateConstructorUsedError;
ShakeDirection get direction => throw _privateConstructorUsedError;
double get threshold => throw _privateConstructorUsedError;
ShakeForce? get force => throw _privateConstructorUsedError;
ShakeAction get shakeAction => throw _privateConstructorUsedError;
List<ShakeDetectedFeedback> get feedback =>
throw _privateConstructorUsedError;
Set<ShakeDetectedFeedback> get feedback => throw _privateConstructorUsedError;
double get beepVolume => throw _privateConstructorUsedError;
/// the duration to wait before the shake detection is enabled again
@ -2464,9 +2462,8 @@ abstract class $ShakeDetectionSettingsCopyWith<$Res> {
{bool isEnabled,
ShakeDirection direction,
double threshold,
ShakeForce? force,
ShakeAction shakeAction,
List<ShakeDetectedFeedback> feedback,
Set<ShakeDetectedFeedback> feedback,
double beepVolume,
Duration shakeTriggerCoolDown,
int shakeTriggerCount,
@ -2492,7 +2489,6 @@ class _$ShakeDetectionSettingsCopyWithImpl<$Res,
Object? isEnabled = null,
Object? direction = null,
Object? threshold = null,
Object? force = freezed,
Object? shakeAction = null,
Object? feedback = null,
Object? beepVolume = null,
@ -2513,10 +2509,6 @@ class _$ShakeDetectionSettingsCopyWithImpl<$Res,
? _value.threshold
: threshold // ignore: cast_nullable_to_non_nullable
as double,
force: freezed == force
? _value.force
: force // ignore: cast_nullable_to_non_nullable
as ShakeForce?,
shakeAction: null == shakeAction
? _value.shakeAction
: shakeAction // ignore: cast_nullable_to_non_nullable
@ -2524,7 +2516,7 @@ class _$ShakeDetectionSettingsCopyWithImpl<$Res,
feedback: null == feedback
? _value.feedback
: feedback // ignore: cast_nullable_to_non_nullable
as List<ShakeDetectedFeedback>,
as Set<ShakeDetectedFeedback>,
beepVolume: null == beepVolume
? _value.beepVolume
: beepVolume // ignore: cast_nullable_to_non_nullable
@ -2558,9 +2550,8 @@ abstract class _$$ShakeDetectionSettingsImplCopyWith<$Res>
{bool isEnabled,
ShakeDirection direction,
double threshold,
ShakeForce? force,
ShakeAction shakeAction,
List<ShakeDetectedFeedback> feedback,
Set<ShakeDetectedFeedback> feedback,
double beepVolume,
Duration shakeTriggerCoolDown,
int shakeTriggerCount,
@ -2585,7 +2576,6 @@ class __$$ShakeDetectionSettingsImplCopyWithImpl<$Res>
Object? isEnabled = null,
Object? direction = null,
Object? threshold = null,
Object? force = freezed,
Object? shakeAction = null,
Object? feedback = null,
Object? beepVolume = null,
@ -2606,10 +2596,6 @@ class __$$ShakeDetectionSettingsImplCopyWithImpl<$Res>
? _value.threshold
: threshold // ignore: cast_nullable_to_non_nullable
as double,
force: freezed == force
? _value.force
: force // ignore: cast_nullable_to_non_nullable
as ShakeForce?,
shakeAction: null == shakeAction
? _value.shakeAction
: shakeAction // ignore: cast_nullable_to_non_nullable
@ -2617,7 +2603,7 @@ class __$$ShakeDetectionSettingsImplCopyWithImpl<$Res>
feedback: null == feedback
? _value._feedback
: feedback // ignore: cast_nullable_to_non_nullable
as List<ShakeDetectedFeedback>,
as Set<ShakeDetectedFeedback>,
beepVolume: null == beepVolume
? _value.beepVolume
: beepVolume // ignore: cast_nullable_to_non_nullable
@ -2644,13 +2630,12 @@ class _$ShakeDetectionSettingsImpl implements _ShakeDetectionSettings {
const _$ShakeDetectionSettingsImpl(
{this.isEnabled = true,
this.direction = ShakeDirection.horizontal,
this.threshold = 6,
this.force = ShakeForce.medium,
this.shakeAction = ShakeAction.sleepTimerReset,
final List<ShakeDetectedFeedback> feedback = const [
this.threshold = 5,
this.shakeAction = ShakeAction.resetSleepTimer,
final Set<ShakeDetectedFeedback> feedback = const {
ShakeDetectedFeedback.vibrate,
ShakeDetectedFeedback.beep
],
},
this.beepVolume = 0.5,
this.shakeTriggerCoolDown = const Duration(seconds: 5),
this.shakeTriggerCount = 2,
@ -2671,17 +2656,14 @@ class _$ShakeDetectionSettingsImpl implements _ShakeDetectionSettings {
final double threshold;
@override
@JsonKey()
final ShakeForce? force;
@override
@JsonKey()
final ShakeAction shakeAction;
final List<ShakeDetectedFeedback> _feedback;
final Set<ShakeDetectedFeedback> _feedback;
@override
@JsonKey()
List<ShakeDetectedFeedback> get feedback {
if (_feedback is EqualUnmodifiableListView) return _feedback;
Set<ShakeDetectedFeedback> get feedback {
if (_feedback is EqualUnmodifiableSetView) return _feedback;
// ignore: implicit_dynamic_type
return EqualUnmodifiableListView(_feedback);
return EqualUnmodifiableSetView(_feedback);
}
@override
@ -2705,7 +2687,7 @@ class _$ShakeDetectionSettingsImpl implements _ShakeDetectionSettings {
@override
String toString() {
return 'ShakeDetectionSettings(isEnabled: $isEnabled, direction: $direction, threshold: $threshold, force: $force, shakeAction: $shakeAction, feedback: $feedback, beepVolume: $beepVolume, shakeTriggerCoolDown: $shakeTriggerCoolDown, shakeTriggerCount: $shakeTriggerCount, samplingPeriod: $samplingPeriod)';
return 'ShakeDetectionSettings(isEnabled: $isEnabled, direction: $direction, threshold: $threshold, shakeAction: $shakeAction, feedback: $feedback, beepVolume: $beepVolume, shakeTriggerCoolDown: $shakeTriggerCoolDown, shakeTriggerCount: $shakeTriggerCount, samplingPeriod: $samplingPeriod)';
}
@override
@ -2719,7 +2701,6 @@ class _$ShakeDetectionSettingsImpl implements _ShakeDetectionSettings {
other.direction == direction) &&
(identical(other.threshold, threshold) ||
other.threshold == threshold) &&
(identical(other.force, force) || other.force == force) &&
(identical(other.shakeAction, shakeAction) ||
other.shakeAction == shakeAction) &&
const DeepCollectionEquality().equals(other._feedback, _feedback) &&
@ -2740,7 +2721,6 @@ class _$ShakeDetectionSettingsImpl implements _ShakeDetectionSettings {
isEnabled,
direction,
threshold,
force,
shakeAction,
const DeepCollectionEquality().hash(_feedback),
beepVolume,
@ -2770,9 +2750,8 @@ abstract class _ShakeDetectionSettings implements ShakeDetectionSettings {
{final bool isEnabled,
final ShakeDirection direction,
final double threshold,
final ShakeForce? force,
final ShakeAction shakeAction,
final List<ShakeDetectedFeedback> feedback,
final Set<ShakeDetectedFeedback> feedback,
final double beepVolume,
final Duration shakeTriggerCoolDown,
final int shakeTriggerCount,
@ -2788,11 +2767,9 @@ abstract class _ShakeDetectionSettings implements ShakeDetectionSettings {
@override
double get threshold;
@override
ShakeForce? get force;
@override
ShakeAction get shakeAction;
@override
List<ShakeDetectedFeedback> get feedback;
Set<ShakeDetectedFeedback> get feedback;
@override
double get beepVolume;

28
lib/settings/models/app_settings.g.dart
View file

@ -287,16 +287,14 @@ _$ShakeDetectionSettingsImpl _$$ShakeDetectionSettingsImplFromJson(
direction:
$enumDecodeNullable(_$ShakeDirectionEnumMap, json['direction']) ??
ShakeDirection.horizontal,
threshold: (json['threshold'] as num?)?.toDouble() ?? 6,
force: $enumDecodeNullable(_$ShakeForceEnumMap, json['force']) ??
ShakeForce.medium,
threshold: (json['threshold'] as num?)?.toDouble() ?? 5,
shakeAction:
$enumDecodeNullable(_$ShakeActionEnumMap, json['shakeAction']) ??
ShakeAction.sleepTimerReset,
ShakeAction.resetSleepTimer,
feedback: (json['feedback'] as List<dynamic>?)
?.map((e) => $enumDecode(_$ShakeDetectedFeedbackEnumMap, e))
.toList() ??
const [ShakeDetectedFeedback.vibrate, ShakeDetectedFeedback.beep],
.toSet() ??
const {ShakeDetectedFeedback.vibrate, ShakeDetectedFeedback.beep},
beepVolume: (json['beepVolume'] as num?)?.toDouble() ?? 0.5,
shakeTriggerCoolDown: json['shakeTriggerCoolDown'] == null
? const Duration(seconds: 5)
@ -314,7 +312,6 @@ Map<String, dynamic> _$$ShakeDetectionSettingsImplToJson(
'isEnabled': instance.isEnabled,
'direction': _$ShakeDirectionEnumMap[instance.direction]!,
'threshold': instance.threshold,
'force': _$ShakeForceEnumMap[instance.force],
'shakeAction': _$ShakeActionEnumMap[instance.shakeAction]!,
'feedback': instance.feedback
.map((e) => _$ShakeDetectedFeedbackEnumMap[e]!)
@ -330,27 +327,12 @@ const _$ShakeDirectionEnumMap = {
ShakeDirection.vertical: 'vertical',
};
const _$ShakeForceEnumMap = {
ShakeForce.low: 'low',
ShakeForce.medium: 'medium',
ShakeForce.high: 'high',
ShakeForce.leafRustle: 'leafRustle',
ShakeForce.breeze: 'breeze',
ShakeForce.storm: 'storm',
ShakeForce.hurricane: 'hurricane',
ShakeForce.earthquake: 'earthquake',
ShakeForce.meteorShower: 'meteorShower',
ShakeForce.supernova: 'supernova',
ShakeForce.blackHole: 'blackHole',
};
const _$ShakeActionEnumMap = {
ShakeAction.none: 'none',
ShakeAction.playPause: 'playPause',
ShakeAction.sleepTimerReset: 'sleepTimerReset',
ShakeAction.resetSleepTimer: 'resetSleepTimer',
ShakeAction.fastForward: 'fastForward',
ShakeAction.rewind: 'rewind',
ShakeAction.custom: 'custom',
};
const _$ShakeDetectedFeedbackEnumMap = {

115
lib/settings/view/app_settings_page.dart
View file

@ -12,6 +12,7 @@ import 'package:vaani/router/router.dart';
import 'package:vaani/settings/app_settings_provider.dart';
import 'package:vaani/settings/models/app_settings.dart' as model;
import 'package:vaani/settings/view/simple_settings_page.dart';
import 'package:vaani/settings/view/widgets/navigation_with_switch_tile.dart';
class AppSettingsPage extends HookConsumerWidget {
const AppSettingsPage({
@ -30,39 +31,6 @@ class AppSettingsPage extends HookConsumerWidget {
return SimpleSettingsPage(
title: const Text('App Settings'),
sections: [
// General section
SettingsSection(
margin: const EdgeInsetsDirectional.symmetric(
horizontal: 16.0,
vertical: 8.0,
),
title: Text(
'General',
style: Theme.of(context).textTheme.titleLarge,
),
tiles: [
SettingsTile(
title: const Text('Notification Media Player'),
leading: const Icon(Icons.play_lesson),
description: const Text(
'Customize the media player in notifications',
),
onPressed: (context) {
context.pushNamed(Routes.notificationSettings.name);
},
),
SettingsTile(
title: const Text('Player Settings'),
leading: const Icon(Icons.play_arrow),
description: const Text(
'Customize the player settings',
),
onPressed: (context) {
context.pushNamed(Routes.playerSettings.name);
},
),
],
),
// Appearance section
SettingsSection(
margin: const EdgeInsetsDirectional.symmetric(
@ -106,20 +74,19 @@ class AppSettingsPage extends HookConsumerWidget {
],
),
// Sleep Timer section
// General section
SettingsSection(
margin: const EdgeInsetsDirectional.symmetric(
horizontal: 16.0,
vertical: 8.0,
),
title: Text(
'Sleep Timer',
'General',
style: Theme.of(context).textTheme.titleLarge,
),
tiles: [
SettingsTile.navigation(
// initialValue: sleepTimerSettings.autoTurnOnTimer,
title: const Text('Auto Turn On Timer'),
NavigationWithSwitchTile(
title: const Text('Auto Turn On Sleep Timer'),
description: const Text(
'Automatically turn on the sleep timer based on the time of day',
),
@ -127,39 +94,57 @@ class AppSettingsPage extends HookConsumerWidget {
? const Icon(Icons.timer)
: const Icon(Icons.timer_off),
onPressed: (context) {
// push the sleep timer settings page
context.pushNamed(Routes.autoSleepTimerSettings.name);
},
// a switch to enable or disable the auto turn off time
trailing: IntrinsicHeight(
child: Row(
children: [
VerticalDivider(
color: Theme.of(context).dividerColor.withOpacity(0.5),
indent: 8.0,
endIndent: 8.0,
// width: 8.0,
// thickness: 2.0,
// height: 24.0,
),
Switch(
value: sleepTimerSettings.autoTurnOnTimer,
onChanged: (value) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.playerSettings
.sleepTimerSettings(
autoTurnOnTimer: value,
),
);
},
),
],
),
value: sleepTimerSettings.autoTurnOnTimer,
onToggle: (value) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.playerSettings.sleepTimerSettings(
autoTurnOnTimer: value,
),
);
},
),
SettingsTile(
title: const Text('Notification Media Player'),
leading: const Icon(Icons.play_lesson),
description: const Text(
'Customize the media player in notifications',
),
onPressed: (context) {
context.pushNamed(Routes.notificationSettings.name);
},
),
SettingsTile(
title: const Text('Player Settings'),
leading: const Icon(Icons.play_arrow),
description: const Text(
'Customize the player settings',
),
onPressed: (context) {
context.pushNamed(Routes.playerSettings.name);
},
),
NavigationWithSwitchTile(
title: const Text('Shake Detector'),
leading: const Icon(Icons.vibration),
description: const Text(
'Customize the shake detector settings',
),
value: appSettings.shakeDetectionSettings.isEnabled,
onPressed: (context) {
context.pushNamed(Routes.shakeDetectorSettings.name);
},
onToggle: (value) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.shakeDetectionSettings(
isEnabled: value,
),
);
},
),
],
),
// Backup and Restore section
SettingsSection(
margin: const EdgeInsetsDirectional.symmetric(

62
lib/settings/view/notification_settings_page.dart
View file

@ -6,6 +6,7 @@ import 'package:vaani/settings/app_settings_provider.dart';
import 'package:vaani/settings/models/app_settings.dart';
import 'package:vaani/settings/view/buttons.dart';
import 'package:vaani/settings/view/simple_settings_page.dart';
import 'package:vaani/shared/extensions/enum.dart';
class NotificationSettingsPage extends HookConsumerWidget {
const NotificationSettingsPage({
@ -16,7 +17,7 @@ class NotificationSettingsPage extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final appSettings = ref.watch(appSettingsProvider);
final notificationSettings = appSettings.notificationSettings;
final primaryColor = Theme.of(context).colorScheme.primary;
return SimpleSettingsPage(
title: const Text('Notification Settings'),
sections: [
@ -37,7 +38,10 @@ class NotificationSettingsPage extends HookConsumerWidget {
children: [
TextSpan(
text: notificationSettings.primaryTitle,
style: const TextStyle(fontWeight: FontWeight.bold),
style: TextStyle(
fontWeight: FontWeight.bold,
color: primaryColor,
),
),
],
),
@ -72,7 +76,10 @@ class NotificationSettingsPage extends HookConsumerWidget {
children: [
TextSpan(
text: notificationSettings.secondaryTitle,
style: const TextStyle(fontWeight: FontWeight.bold),
style: TextStyle(
fontWeight: FontWeight.bold,
color: primaryColor,
),
),
],
),
@ -151,19 +158,17 @@ class NotificationSettingsPage extends HookConsumerWidget {
title: const Text('Media Controls'),
leading: const Icon(Icons.control_camera),
// description: const Text('Select the media controls to display'),
description: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Text('Select the media controls to display'),
Wrap(
spacing: 8.0,
children: notificationSettings.mediaControls
.map(
(control) => Icon(control.icon),
)
.toList(),
),
],
description: const Text('Select the media controls to display'),
trailing: Wrap(
spacing: 8.0,
children: notificationSettings.mediaControls
.map(
(control) => Icon(
control.icon,
color: primaryColor,
),
)
.toList(),
),
onPressed: (context) async {
final selectedControls =
@ -235,14 +240,8 @@ class MediaControlsPicker extends HookConsumerWidget {
children: NotificationMediaControl.values
.map(
(control) => ChoiceChip(
label: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(control.icon),
const SizedBox(width: 4.0),
Text(control.name),
],
),
avatar: Icon(control.icon),
label: Text(control.pascalCase),
selected: selectedMediaControls.value.contains(control),
onSelected: (selected) {
if (selected) {
@ -362,7 +361,7 @@ class NotificationTitlePicker extends HookConsumerWidget {
children: NotificationTitleType.values
.map(
(type) => ActionChip(
label: Text(type.name),
label: Text(type.pascalCase),
onPressed: () {
final text = controller.text;
final newText = '$text\$${type.name}';
@ -378,16 +377,3 @@ class NotificationTitlePicker extends HookConsumerWidget {
);
}
}
Future<String?> showNotificationTitlePicker(
BuildContext context, {
required String initialValue,
required String title,
}) async {
return showDialog<String>(
context: context,
builder: (context) {
return NotificationTitlePicker(initialValue: initialValue, title: title);
},
);
}

24
lib/settings/view/player_settings_page.dart
View file

@ -17,6 +17,7 @@ class PlayerSettingsPage extends HookConsumerWidget {
Widget build(BuildContext context, WidgetRef ref) {
final appSettings = ref.watch(appSettingsProvider);
final playerSettings = appSettings.playerSettings;
final primaryColor = Theme.of(context).colorScheme.primary;
return SimpleSettingsPage(
title: const Text('Player Settings'),
@ -47,7 +48,11 @@ class PlayerSettingsPage extends HookConsumerWidget {
// preferred default speed
SettingsTile(
title: const Text('Default Speed'),
description: Text('${playerSettings.preferredDefaultSpeed}x'),
trailing: Text(
'${playerSettings.preferredDefaultSpeed}x',
style:
TextStyle(color: primaryColor, fontWeight: FontWeight.bold),
),
leading: const Icon(Icons.speed),
onPressed: (context) async {
final newSpeed = await showDialog(
@ -70,6 +75,8 @@ class PlayerSettingsPage extends HookConsumerWidget {
title: const Text('Speed Options'),
description: Text(
playerSettings.speedOptions.map((e) => '${e}x').join(', '),
style:
TextStyle(fontWeight: FontWeight.bold, color: primaryColor),
),
leading: const Icon(Icons.speed),
onPressed: (context) async {
@ -104,7 +111,10 @@ class PlayerSettingsPage extends HookConsumerWidget {
TextSpan(
text: playerSettings
.minimumPositionForReporting.smartBinaryFormat,
style: const TextStyle(fontWeight: FontWeight.bold),
style: TextStyle(
fontWeight: FontWeight.bold,
color: primaryColor,
),
),
const TextSpan(text: ' of the book'),
],
@ -141,7 +151,10 @@ class PlayerSettingsPage extends HookConsumerWidget {
TextSpan(
text: playerSettings
.markCompleteWhenTimeLeft.smartBinaryFormat,
style: const TextStyle(fontWeight: FontWeight.bold),
style: TextStyle(
fontWeight: FontWeight.bold,
color: primaryColor,
),
),
const TextSpan(text: ' left in the book'),
],
@ -178,7 +191,10 @@ class PlayerSettingsPage extends HookConsumerWidget {
TextSpan(
text: playerSettings
.playbackReportInterval.smartBinaryFormat,
style: const TextStyle(fontWeight: FontWeight.bold),
style: TextStyle(
fontWeight: FontWeight.bold,
color: primaryColor,
),
),
const TextSpan(text: ' to the server'),
],

395
lib/settings/view/shake_detector_settings_page.dart Normal file
View file

@ -0,0 +1,395 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_settings_ui/flutter_settings_ui.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:vaani/settings/app_settings_provider.dart';
import 'package:vaani/settings/models/app_settings.dart';
import 'package:vaani/settings/view/buttons.dart';
import 'package:vaani/settings/view/simple_settings_page.dart';
import 'package:vaani/shared/extensions/enum.dart';
class ShakeDetectorSettingsPage extends HookConsumerWidget {
const ShakeDetectorSettingsPage({
super.key,
});
@override
Widget build(BuildContext context, WidgetRef ref) {
final appSettings = ref.watch(appSettingsProvider);
final shakeDetectionSettings = appSettings.shakeDetectionSettings;
final isShakeDetectionEnabled = shakeDetectionSettings.isEnabled;
final selectedValueColor = isShakeDetectionEnabled
? Theme.of(context).colorScheme.primary
: Theme.of(context).disabledColor;
return SimpleSettingsPage(
title: const Text('Shake Detector Settings'),
sections: [
SettingsSection(
margin: const EdgeInsetsDirectional.symmetric(
horizontal: 16.0,
vertical: 8.0,
),
tiles: [
SettingsTile.switchTile(
leading: shakeDetectionSettings.isEnabled
? const Icon(Icons.vibration)
: const Icon(Icons.not_interested),
title: const Text('Enable Shake Detection'),
description: const Text(
'Enable shake detection to do various actions',
),
initialValue: shakeDetectionSettings.isEnabled,
onToggle: (value) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.shakeDetectionSettings(
isEnabled: value,
),
);
},
),
],
),
// Shake Detection Settings
SettingsSection(
tiles: [
SettingsTile(
enabled: isShakeDetectionEnabled,
leading: const Icon(Icons.flag_circle),
title: const Text('Shake Activation Threshold'),
description: const Text(
'The higher the threshold, the harder you need to shake',
),
trailing: Text(
'${shakeDetectionSettings.threshold} m/s²',
style: TextStyle(
color: selectedValueColor,
fontWeight: FontWeight.bold,
),
),
onPressed: (context) async {
final newThreshold = await showDialog<double>(
context: context,
builder: (context) => ShakeForceSelector(
initialValue: shakeDetectionSettings.threshold,
),
);
if (newThreshold != null) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.shakeDetectionSettings(
threshold: newThreshold,
),
);
}
},
),
// shake action
SettingsTile(
enabled: isShakeDetectionEnabled,
leading: const Icon(Icons.directions_run),
title: const Text('Shake Action'),
description: const Text(
'The action to perform when a shake is detected',
),
trailing: Icon(
shakeDetectionSettings.shakeAction.icon,
color: selectedValueColor,
),
onPressed: (context) async {
final newShakeAction = await showDialog<ShakeAction>(
context: context,
builder: (context) => ShakeActionSelector(
initialValue: shakeDetectionSettings.shakeAction,
),
);
if (newShakeAction != null) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.shakeDetectionSettings(
shakeAction: newShakeAction,
),
);
}
},
),
// shake feedback
SettingsTile(
enabled: isShakeDetectionEnabled,
leading: const Icon(Icons.feedback),
title: const Text('Shake Feedback'),
description: const Text(
'The feedback to give when a shake is detected',
),
trailing: shakeDetectionSettings.feedback.isEmpty
? Icon(
Icons.not_interested,
color: Theme.of(context).disabledColor,
)
: Wrap(
spacing: 8.0,
children: shakeDetectionSettings.feedback.map(
(feedback) {
return Icon(
feedback.icon,
color: selectedValueColor,
);
},
).toList(),
),
onPressed: (context) async {
final newFeedback =
await showDialog<Set<ShakeDetectedFeedback>>(
context: context,
builder: (context) => ShakeFeedbackSelector(
initialValue: shakeDetectionSettings.feedback,
),
);
if (newFeedback != null) {
ref.read(appSettingsProvider.notifier).update(
appSettings.copyWith.shakeDetectionSettings(
feedback: newFeedback,
),
);
}
},
),
],
),
],
);
}
}
class ShakeFeedbackSelector extends HookConsumerWidget {
const ShakeFeedbackSelector({
super.key,
this.initialValue = const {ShakeDetectedFeedback.vibrate},
});
final Set<ShakeDetectedFeedback> initialValue;
@override
Widget build(BuildContext context, WidgetRef ref) {
final feedback = useState(initialValue);
return AlertDialog(
title: const Text('Select Shake Feedback'),
content: Wrap(
spacing: 8.0,
runSpacing: 8.0,
children: ShakeDetectedFeedback.values
.map(
(feedbackType) => ChoiceChip(
avatar: Icon(feedbackType.icon),
label: Text(feedbackType.pascalCase),
tooltip: feedbackType.description,
onSelected: (val) {
if (feedback.value.contains(feedbackType)) {
feedback.value = feedback.value
.where((element) => element != feedbackType)
.toSet();
} else {
feedback.value = {...feedback.value, feedbackType};
}
},
selected: feedback.value.contains(feedbackType),
),
)
.toList(),
),
actions: [
const CancelButton(),
OkButton(
onPressed: () {
Navigator.of(context).pop(feedback.value);
},
),
],
);
}
}
class ShakeActionSelector extends HookConsumerWidget {
const ShakeActionSelector({
super.key,
this.initialValue = ShakeAction.resetSleepTimer,
});
final ShakeAction initialValue;
@override
Widget build(BuildContext context, WidgetRef ref) {
final shakeAction = useState(initialValue);
return AlertDialog(
title: const Text('Select Shake Action'),
content: Wrap(
spacing: 8.0,
runSpacing: 8.0,
children: ShakeAction.values
.map(
// chips with radio buttons as one of the options can be selected
(action) => ChoiceChip(
avatar: Icon(action.icon),
label: Text(action.pascalCase),
onSelected: (val) {
shakeAction.value = action;
},
selected: shakeAction.value == action,
),
)
.toList(),
),
actions: [
const CancelButton(),
OkButton(
onPressed: () {
Navigator.of(context).pop(shakeAction.value);
},
),
],
);
}
}
class ShakeForceSelector extends HookConsumerWidget {
const ShakeForceSelector({
super.key,
this.initialValue = 6,
});
final double initialValue;
@override
Widget build(BuildContext context, WidgetRef ref) {
final shakeForce = useState(initialValue);
final controller = useTextEditingController(text: initialValue.toString());
return AlertDialog(
title: const Text('Select Shake Activation Threshold'),
content: Column(
mainAxisSize: MainAxisSize.min,
children: [
TextField(
autofocus: true,
controller: controller,
onChanged: (value) {
final newThreshold = double.tryParse(value);
if (newThreshold != null) {
shakeForce.value = newThreshold;
}
},
keyboardType: TextInputType.number,
decoration: InputDecoration(
// clear button
suffix: IconButton(
icon: const Icon(Icons.clear),
onPressed: () {
controller.clear();
shakeForce.value = 0;
},
),
helper: const Text(
'Enter a number to set the threshold in m/s²',
),
),
),
Wrap(
spacing: 8.0,
runSpacing: 8.0,
children: ShakeForce.values
.map(
(force) => ChoiceChip(
label: Text(force.pascalCase),
onSelected: (val) {
controller.text = force.threshold.toString();
shakeForce.value = force.threshold;
},
selected: shakeForce.value == force.threshold,
),
)
.toList(),
),
],
),
actions: [
const CancelButton(),
OkButton(
onPressed: () {
Navigator.of(context).pop(shakeForce.value);
},
),
],
);
}
}
enum ShakeForce {
whisper(0.5),
low(2.5),
medium(5),
high(7.5),
storm(10),
hurricane(15),
earthquake(20),
meteorShower(30),
supernova(40),
blackHole(50);
const ShakeForce(this.threshold);
final double threshold;
}
extension ShakeActionIcon on ShakeAction {
IconData? get icon {
switch (this) {
case ShakeAction.none:
return Icons.not_interested;
case ShakeAction.resetSleepTimer:
return Icons.timer;
case ShakeAction.playPause:
return Icons.play_arrow;
// case ShakeAction.nextChapter:
// return Icons.skip_next;
// case ShakeAction.previousChapter:
// return Icons.skip_previous;
// case ShakeAction.volumeUp:
// return Icons.volume_up;
// case ShakeAction.volumeDown:
// return Icons.volume_down;
case ShakeAction.fastForward:
return Icons.fast_forward;
case ShakeAction.rewind:
return Icons.fast_rewind;
default:
return Icons.question_mark;
}
}
}
extension on ShakeDetectedFeedback {
IconData? get icon {
switch (this) {
case ShakeDetectedFeedback.vibrate:
return Icons.vibration;
case ShakeDetectedFeedback.beep:
return Icons.volume_up;
default:
return Icons.question_mark;
}
}
String get description {
switch (this) {
case ShakeDetectedFeedback.vibrate:
return 'Vibrate the device';
case ShakeDetectedFeedback.beep:
return 'Play a beep sound';
default:
return 'Unknown';
}
}
}

56
lib/settings/view/widgets/navigation_with_switch_tile.dart Normal file
View file

@ -0,0 +1,56 @@
import 'package:flutter/material.dart';
import 'package:flutter_settings_ui/flutter_settings_ui.dart';
class NavigationWithSwitchTile extends AbstractSettingsTile {
const NavigationWithSwitchTile({
this.leading,
// this.trailing,
required this.value,
required this.title,
this.description,
this.descriptionInlineIos = false,
this.onPressed,
this.enabled = true,
this.backgroundColor,
super.key,
this.onToggle,
});
final Widget title;
final Widget? description;
final Color? backgroundColor;
final bool descriptionInlineIos;
final bool enabled;
final Widget? leading;
final Function(BuildContext)? onPressed;
final bool value;
final Function(bool)? onToggle;
@override
Widget build(BuildContext context) {
return SettingsTile.navigation(
title: title,
description: description,
backgroundColor: backgroundColor,
descriptionInlineIos: descriptionInlineIos,
enabled: enabled,
leading: leading,
onPressed: onPressed,
trailing: IntrinsicHeight(
child: Row(
children: [
VerticalDivider(
color: Theme.of(context).dividerColor.withOpacity(0.5),
indent: 8.0,
endIndent: 8.0,
),
Switch.adaptive(
value: value,
onChanged: onToggle,
),
],
),
),
);
}
}

25
lib/shared/extensions/enum.dart Normal file
View file

@ -0,0 +1,25 @@
extension TitleCase on Enum {
String get properName {
final name = toString().split('.').last;
return name[0].toUpperCase() + name.substring(1);
}
String get titleCase {
return name
.replaceAllMapped(RegExp(r'([A-Z])'), (match) => ' ${match.group(0)}')
.trim();
}
String get pascalCase {
// capitalize the first letter of each word
return name
.replaceAllMapped(
RegExp(r'([A-Z])'),
(match) => ' ${match.group(0)}',
)
.trim()
.split(' ')
.map((word) => word[0].toUpperCase() + word.substring(1))
.join(' ');
}
}