Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Add sleep timer shake sensitivity setting (#185)

Barnabas7774685cb309
diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
index 3522cf1b..84802359 100644
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@@ -331,6 +331,12 @@
"shakeAdds": "Shake adds",
"shakeAddsValue": "{minutes} min",
"@shakeAddsValue": { "placeholders": { "minutes": { "type": "int" } } },
+ "shakeSensitivity": "Shake sensitivity",
+ "shakeSensitivityVeryLow": "Very low",
+ "shakeSensitivityLow": "Low",
+ "shakeSensitivityMedium": "Medium",
+ "shakeSensitivityHigh": "High",
+ "shakeSensitivityVeryHigh": "Very high",
"resetTimerOnPause": "Reset timer on pause",
"resetTimerOnPauseOnSubtitle": "Timer restarts from full duration when you resume",
"resetTimerOnPauseOffSubtitle": "Timer continues from where it left off",
diff --git a/lib/l10n/app_localizations.dart b/lib/l10n/app_localizations.dart
index d9476c89..54c59c60 100644
--- a/lib/l10n/app_localizations.dart
+++ b/lib/l10n/app_localizations.dart
@@ -1844,6 +1844,42 @@ abstract class AppLocalizations {
/// **'{minutes} min'**
String shakeAddsValue(int minutes);
+ /// No description provided for @shakeSensitivity.
+ ///
+ /// In en, this message translates to:
+ /// **'Shake sensitivity'**
+ String get shakeSensitivity;
+
+ /// No description provided for @shakeSensitivityVeryLow.
+ ///
+ /// In en, this message translates to:
+ /// **'Very low'**
+ String get shakeSensitivityVeryLow;
+
+ /// No description provided for @shakeSensitivityLow.
+ ///
+ /// In en, this message translates to:
+ /// **'Low'**
+ String get shakeSensitivityLow;
+
+ /// No description provided for @shakeSensitivityMedium.
+ ///
+ /// In en, this message translates to:
+ /// **'Medium'**
+ String get shakeSensitivityMedium;
+
+ /// No description provided for @shakeSensitivityHigh.
+ ///
+ /// In en, this message translates to:
+ /// **'High'**
+ String get shakeSensitivityHigh;
+
+ /// No description provided for @shakeSensitivityVeryHigh.
+ ///
+ /// In en, this message translates to:
+ /// **'Very high'**
+ String get shakeSensitivityVeryHigh;
+
/// No description provided for @resetTimerOnPause.
///
/// In en, this message translates to:
diff --git a/lib/l10n/app_localizations_en.dart b/lib/l10n/app_localizations_en.dart
index 686ee45c..fe0fa1c7 100644
--- a/lib/l10n/app_localizations_en.dart
+++ b/lib/l10n/app_localizations_en.dart
@@ -961,6 +961,24 @@ class AppLocalizationsEn extends AppLocalizations {
return '$minutes min';
}
+ @override
+ String get shakeSensitivity => 'Shake sensitivity';
+
+ @override
+ String get shakeSensitivityVeryLow => 'Very low';
+
+ @override
+ String get shakeSensitivityLow => 'Low';
+
+ @override
+ String get shakeSensitivityMedium => 'Medium';
+
+ @override
+ String get shakeSensitivityHigh => 'High';
+
+ @override
+ String get shakeSensitivityVeryHigh => 'Very high';
+
@override
String get resetTimerOnPause => 'Reset timer on pause';
diff --git a/lib/l10n/app_localizations_zh.dart b/lib/l10n/app_localizations_zh.dart
index 70566a67..dbdd8a4e 100644
--- a/lib/l10n/app_localizations_zh.dart
+++ b/lib/l10n/app_localizations_zh.dart
@@ -933,6 +933,24 @@ class AppLocalizationsZh extends AppLocalizations {
return '$minutes 分钟';
}
+ @override
+ String get shakeSensitivity => '摇一摇灵敏度';
+
+ @override
+ String get shakeSensitivityVeryLow => '非常低';
+
+ @override
+ String get shakeSensitivityLow => '低';
+
+ @override
+ String get shakeSensitivityMedium => '中';
+
+ @override
+ String get shakeSensitivityHigh => '高';
+
+ @override
+ String get shakeSensitivityVeryHigh => '非常高';
+
@override
String get resetTimerOnPause => '暂停时重置定时器';
diff --git a/lib/l10n/app_zh.arb b/lib/l10n/app_zh.arb
index 5ad0b8a3..d1ed18b4 100644
--- a/lib/l10n/app_zh.arb
+++ b/lib/l10n/app_zh.arb
@@ -331,6 +331,12 @@
"shakeAdds": "摇一摇添加",
"shakeAddsValue": "{minutes} 分钟",
"@shakeAddsValue": { "placeholders": { "minutes": { "type": "int" } } },
+ "shakeSensitivity": "摇一摇灵敏度",
+ "shakeSensitivityVeryLow": "非常低",
+ "shakeSensitivityLow": "低",
+ "shakeSensitivityMedium": "中",
+ "shakeSensitivityHigh": "高",
+ "shakeSensitivityVeryHigh": "非常高",
"resetTimerOnPause": "暂停时重置定时器",
"resetTimerOnPauseOnSubtitle": "恢复播放时,定时器从完整时长重新开始",
"resetTimerOnPauseOffSubtitle": "定时器从上次停止的位置继续",
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index ddc409a5..22555112 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -59,6 +59,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
bool _sleepChime = false;
double _sleepChimeVolume = 0.7;
int _shakeAddMinutes = 5;
+ String _shakeSensitivity = 'medium';
String _bookQueueMode = 'off';
String _podcastQueueMode = 'off';
// Returns the more restrictive of the two modes so the merged control
@@ -196,6 +197,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
PlayerSettings.getSleepFadeDuration(), // 45
PlayerSettings.getSleepChime(), // 46
PlayerSettings.getSleepChimeVolume(), // 47
+ PlayerSettings.getShakeSensitivity(), // 48
]);
final s = results[0] as AutoRewindSettings;
final speed = results[1] as double;
@@ -242,6 +244,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
final fadeDur = results[42] as int;
final chime = results[43] as bool;
final chimeVol = results[44] as double;
+ final shakeSens = results[45] as String;
if (mounted) setState(() {
_rewindSettings = s;
_defaultSpeed = speed;
@@ -292,12 +295,34 @@ class _SettingsScreenState extends State<SettingsScreen> {
_sleepFadeDuration = fadeDur;
_sleepChime = chime;
_sleepChimeVolume = chimeVol;
+ _shakeSensitivity = shakeSens;
_canPickDownloadLocation = !_isPlayStoreBuild;
_loaded = true;
});
}
+ static const _shakeSensitivityKeys = ['veryLow', 'low', 'medium', 'high', 'veryHigh'];
+
+ int _shakeSensitivityIndex(String key) {
+ final i = _shakeSensitivityKeys.indexOf(key);
+ return i < 0 ? 2 : i;
+ }
+
+ String _shakeSensitivityKey(int index) =>
+ _shakeSensitivityKeys[index.clamp(0, _shakeSensitivityKeys.length - 1)];
+
+ String _shakeSensitivityLabel(AppLocalizations l, String key) {
+ switch (key) {
+ case 'veryLow': return l.shakeSensitivityVeryLow;
+ case 'low': return l.shakeSensitivityLow;
+ case 'high': return l.shakeSensitivityHigh;
+ case 'veryHigh': return l.shakeSensitivityVeryHigh;
+ case 'medium':
+ default: return l.shakeSensitivityMedium;
+ }
+ }
+
Widget _infoIcon(String title, String content) {
final cs = Theme.of(context).colorScheme;
final l = AppLocalizations.of(context)!;
@@ -1141,10 +1166,36 @@ class _SettingsScreenState extends State<SettingsScreen> {
onSelectionChanged: _loaded ? (v) {
setState(() => _shakeMode = v.first);
PlayerSettings.setShakeMode(v.first);
+ SleepTimerService().restartShakeDetection();
} : null,
),
),
),
+ if (_shakeMode != 'off') ...[
+ const Divider(height: 1, indent: 16, endIndent: 16),
+ Padding(
+ padding: const EdgeInsets.fromLTRB(16, 12, 16, 4),
+ child: Row(
+ mainAxisAlignment: MainAxisAlignment.spaceBetween,
+ children: [
+ Text(l.shakeSensitivity, style: tt.bodyMedium?.copyWith(color: cs.onSurfaceVariant)),
+ Text(_shakeSensitivityLabel(l, _shakeSensitivity),
+ style: tt.bodyMedium?.copyWith(fontWeight: FontWeight.w600, color: cs.primary)),
+ ],
+ ),
+ ),
+ AbsorbSlider(
+ value: _shakeSensitivityIndex(_shakeSensitivity).toDouble(),
+ min: 0, max: 4, divisions: 4,
+ onChanged: _loaded ? (v) {
+ final key = _shakeSensitivityKey(v.round());
+ setState(() => _shakeSensitivity = key);
+ PlayerSettings.setShakeSensitivity(key);
+ SleepTimerService().restartShakeDetection();
+ } : null,
+ ),
+ const SizedBox(height: 4),
+ ],
if (_shakeMode == 'addTime') ...[
const Divider(height: 1, indent: 16, endIndent: 16),
Padding(
diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart
index f821e3c3..ce72234e 100644
--- a/lib/services/backup_service.dart
+++ b/lib/services/backup_service.dart
@@ -29,6 +29,7 @@ class BackupService {
'backSkip': await PlayerSettings.getBackSkip(),
'shakeMode': await PlayerSettings.getShakeMode(),
'shakeAddMinutes': await PlayerSettings.getShakeAddMinutes(),
+ 'shakeSensitivity': await PlayerSettings.getShakeSensitivity(),
'resetSleepOnPause': await PlayerSettings.getResetSleepOnPause(),
'sleepFadeOut': await PlayerSettings.getSleepFadeOut(),
'sleepFadeDuration': await PlayerSettings.getSleepFadeDuration(),
@@ -236,6 +237,7 @@ class BackupService {
PlayerSettings.setShakeMode(s['shakeToResetSleep'] as bool ? 'addTime' : 'off');
}
if (s['shakeAddMinutes'] != null) PlayerSettings.setShakeAddMinutes(s['shakeAddMinutes'] as int);
+ if (s['shakeSensitivity'] != null) PlayerSettings.setShakeSensitivity(s['shakeSensitivity'] as String);
if (s['resetSleepOnPause'] != null) PlayerSettings.setResetSleepOnPause(s['resetSleepOnPause'] as bool);
if (s['sleepFadeOut'] != null) PlayerSettings.setSleepFadeOut(s['sleepFadeOut'] as bool);
if (s['sleepFadeDuration'] != null) PlayerSettings.setSleepFadeDuration(s['sleepFadeDuration'] as int);
diff --git a/lib/services/player_settings.dart b/lib/services/player_settings.dart
index a7733a9d..4b26b047 100644
--- a/lib/services/player_settings.dart
+++ b/lib/services/player_settings.dart
@@ -199,6 +199,23 @@ class PlayerSettings {
static Future<int> getShakeAddMinutes() => _get('shakeAddMinutes', 5);
static Future<void> setShakeAddMinutes(int minutes) => _set('shakeAddMinutes', minutes);
+ // 'veryLow', 'low', 'medium', 'high', 'veryHigh'
+ static Future<String> getShakeSensitivity() => _get('shakeSensitivity', 'medium');
+ static Future<void> setShakeSensitivity(String value) => _set('shakeSensitivity', value);
+
+ /// Linear-acceleration threshold (m/s², gravity excluded) that a shake must
+ /// exceed to be registered. Lower = more sensitive.
+ static double shakeThresholdFor(String sensitivity) {
+ switch (sensitivity) {
+ case 'veryHigh': return 8.0;
+ case 'high': return 13.0;
+ case 'low': return 23.0;
+ case 'veryLow': return 28.0;
+ case 'medium':
+ default: return 18.0;
+ }
+ }
+
static Future<int> getSleepTimerMinutes() => _get('sleepTimerMinutes', 30);
static Future<void> setSleepTimerMinutes(int minutes) => _set('sleepTimerMinutes', minutes);
diff --git a/lib/services/sleep_timer_service.dart b/lib/services/sleep_timer_service.dart
index 1c2718e1..7cab4052 100644
--- a/lib/services/sleep_timer_service.dart
+++ b/lib/services/sleep_timer_service.dart
@@ -119,7 +119,7 @@ class SleepTimerService extends ChangeNotifier {
String _shakeMode = 'addTime'; // 'off', 'addTime', 'resetTimer'
StreamSubscription? _accelSub;
DateTime _lastShake = DateTime(2000);
- static const _shakeThreshold = 20.0; // m/s² of linear acceleration (gravity excluded)
+ double _shakeThreshold = 18.0; // m/s² of linear acceleration (gravity excluded); loaded from settings
static const _shakeCooldown = Duration(seconds: 3);
// Wind-down warning & fade
@@ -437,9 +437,12 @@ class SleepTimerService extends ChangeNotifier {
Future<void> _startShakeDetection() async {
_shakeMode = await PlayerSettings.getShakeMode();
if (_shakeMode == 'off') return;
-
+
+ final sensitivity = await PlayerSettings.getShakeSensitivity();
+ _shakeThreshold = PlayerSettings.shakeThresholdFor(sensitivity);
+
_accelSub?.cancel();
- debugPrint('[Battery] Accelerometer stream STARTED (shakeMode=$_shakeMode)');
+ debugPrint('[Battery] Accelerometer stream STARTED (shakeMode=$_shakeMode, sensitivity=$sensitivity, threshold=$_shakeThreshold)');
_accelSub = userAccelerometerEventStream(
samplingPeriod: const Duration(milliseconds: 100),
).listen((event) {
@@ -616,6 +619,14 @@ class SleepTimerService extends ChangeNotifier {
}
}
+ /// Re-read shake settings and restart the accelerometer stream. Call when
+ /// the user changes shake mode or sensitivity from settings UI.
+ Future<void> restartShakeDetection() async {
+ _accelSub?.cancel();
+ _accelSub = null;
+ if (isActive) await _startShakeDetection();
+ }
+
/// Pause battery-intensive operations when app is backgrounded.
/// Only pauses shake detection if nothing is playing (user might shake
/// with screen off to extend sleep timer).