Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Back up the newer settings and stop backing up bookmarks

Barnabasd493326f6739
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 50d3681e..d07448f6 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -3617,8 +3617,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
final accounts = data['accounts'] as List<dynamic>?;
final hasAccounts = accounts != null && accounts.isNotEmpty;
- final bookmarks = data['bookmarks'] as Map<String, dynamic>?;
- final hasBookmarks = bookmarks != null && bookmarks.isNotEmpty;
final hasCustomHeaders = data['customHeaders'] != null;
final createdAt = data['createdAt'] as String?;
final appVersion = data['appVersion'] as String?;
@@ -3647,7 +3645,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
const SizedBox(height: 12),
Text(details, style: TextStyle(color: cs.onSurfaceVariant, fontSize: 12)),
],
- if (hasAccounts || hasBookmarks || hasCustomHeaders) ...[
+ if (hasAccounts || hasCustomHeaders) ...[
const SizedBox(height: 12),
Wrap(
spacing: 8,
@@ -3655,8 +3653,6 @@ class _SettingsScreenState extends State<SettingsScreen> {
children: [
if (hasAccounts)
_restoreChip(Icons.people_rounded, l.restoreAccountsChip(accounts.length), cs),
- if (hasBookmarks)
- _restoreChip(Icons.bookmark_rounded, l.restoreBookmarksChip(bookmarks.length), cs),
if (hasCustomHeaders)
_restoreChip(Icons.vpn_key_rounded, l.restoreCustomHeadersChip, cs),
],
diff --git a/lib/services/backup_service.dart b/lib/services/backup_service.dart
index 72245b9a..5336ba57 100644
--- a/lib/services/backup_service.dart
+++ b/lib/services/backup_service.dart
@@ -101,6 +101,19 @@ class BackupService {
'queuePlaylistId': await PlayerSettings.getQueuePlaylistId(),
'coverSeedColor': await PlayerSettings.getCoverSeedColor(),
'speedPresets': await PlayerSettings.getSpeedPresets(),
+ 'cardBackground': await PlayerSettings.getCardBackground(),
+ 'lockSeekBar': await PlayerSettings.getLockSeekBar(),
+ 'mediaControlsSpeedBookmark': await PlayerSettings.getMediaControlsSpeedBookmark(),
+ 'progressTextScale': await PlayerSettings.getProgressTextScale(),
+ 'lockPortrait': await PlayerSettings.getLockPortrait(),
+ 'autoSeriesDownloadDefault': await PlayerSettings.getAutoSeriesDownloadDefault(),
+ 'statsGoalType': await PlayerSettings.getStatsGoalType(),
+ 'statsGoalMinutes': await PlayerSettings.getStatsGoalMinutes(),
+ 'statsBookGoal': await PlayerSettings.getStatsBookGoal(),
+ 'statsChartStyle': await PlayerSettings.getStatsChartStyle(),
+ 'statsChartRange': await PlayerSettings.getStatsChartRange(),
+ 'statsSectionOrder': await PlayerSettings.getStatsSectionOrder(),
+ 'statsHiddenSections': await PlayerSettings.getStatsHiddenSections(),
};
// AutoRewind (scoped)
@@ -153,17 +166,6 @@ class BackupService {
// Offline mode (global)
final offlineMode = prefs.getBool('manual_offline_mode') ?? false;
- // Bookmarks for current account (scoped)
- final bookmarks = <String, List<String>>{};
- final bmPrefix = scope.isNotEmpty ? '$scope:bookmarks_' : 'bookmarks_';
- for (final key in prefs.getKeys()) {
- if (key.startsWith(bmPrefix)) {
- final itemId = key.substring(bmPrefix.length);
- final list = prefs.getStringList(key);
- if (list != null && list.isNotEmpty) bookmarks[itemId] = list;
- }
- }
-
// Notes for current account (scoped)
final notes = <String, String>{};
final notesPrefix = scope.isNotEmpty ? '$scope:notes_' : 'notes_';
@@ -281,7 +283,6 @@ class BackupService {
'equalizer': equalizer,
'bookSpeeds': bookSpeeds,
'offlineMode': offlineMode,
- 'bookmarks': bookmarks,
'notes': notes,
'savedEbooks': savedEbooks,
'rollingDownloadSeries': rollingDownloadSeries,
@@ -455,6 +456,19 @@ class BackupService {
if (s['speedPresets'] is List) {
await PlayerSettings.setSpeedPresets((s['speedPresets'] as List).map((e) => (e as num).toDouble()).toList());
}
+ if (s['cardBackground'] != null) await PlayerSettings.setCardBackground(s['cardBackground'] as String);
+ if (s['lockSeekBar'] != null) await PlayerSettings.setLockSeekBar(s['lockSeekBar'] as bool);
+ if (s['mediaControlsSpeedBookmark'] != null) await PlayerSettings.setMediaControlsSpeedBookmark(s['mediaControlsSpeedBookmark'] as bool);
+ if (s['progressTextScale'] != null) await PlayerSettings.setProgressTextScale((s['progressTextScale'] as num).toDouble());
+ if (s['lockPortrait'] != null) await PlayerSettings.setLockPortrait(s['lockPortrait'] as bool);
+ if (s['autoSeriesDownloadDefault'] != null) await PlayerSettings.setAutoSeriesDownloadDefault(s['autoSeriesDownloadDefault'] as bool);
+ if (s['statsGoalType'] != null) await PlayerSettings.setStatsGoalType(s['statsGoalType'] as String);
+ if (s['statsGoalMinutes'] != null) await PlayerSettings.setStatsGoalMinutes(s['statsGoalMinutes'] as int);
+ if (s['statsBookGoal'] != null) await PlayerSettings.setStatsBookGoal(s['statsBookGoal'] as int);
+ if (s['statsChartStyle'] != null) await PlayerSettings.setStatsChartStyle(s['statsChartStyle'] as String);
+ if (s['statsChartRange'] != null) await PlayerSettings.setStatsChartRange(s['statsChartRange'] as int);
+ if (s['statsSectionOrder'] is List) await PlayerSettings.setStatsSectionOrder((s['statsSectionOrder'] as List).cast<String>());
+ if (s['statsHiddenSections'] is List) await PlayerSettings.setStatsHiddenSections((s['statsHiddenSections'] as List).cast<String>());
// AutoRewind (scoped via save())
final r = data['autoRewind'] as Map<String, dynamic>?;
@@ -511,15 +525,6 @@ class BackupService {
await prefs.setBool('manual_offline_mode', data['offlineMode'] as bool);
}
- // Bookmarks (scoped)
- final bookmarks = data['bookmarks'] as Map<String, dynamic>?;
- if (bookmarks != null) {
- for (final entry in bookmarks.entries) {
- final list = (entry.value as List<dynamic>).cast<String>();
- await ScopedPrefs.setStringList('bookmarks_${entry.key}', list);
- }
- }
-
// Notes (scoped)
final notes = data['notes'] as Map<String, dynamic>?;
if (notes != null) {