From 0e563cec189f9c835112a8fe4d05e06cc4a4ecca Mon Sep 17 00:00:00 2001
From: Nikolas Rimikis <rimikis.nikolas@gmail.com>
Date: Tue, 29 Aug 2023 17:13:34 +0200
Subject: [PATCH] refactor(neon,neon_files,neon_news,neon_notes): make
 Option.key unique

Signed-off-by: Nikolas Rimikis <rimikis.nikolas@gmail.com>
---
 packages/neon/neon/lib/settings.dart          |  1 +
 .../neon/lib/src/settings/models/option.dart  |  2 +-
 .../src/settings/models/select_option.dart    |  8 ++--
 .../neon/lib/src/settings/models/storage.dart |  7 ++-
 .../src/settings/models/toggle_option.dart    |  8 ++--
 .../neon/lib/src/utils/account_options.dart   | 11 ++++-
 .../neon/lib/src/utils/global_options.dart    | 44 ++++++++++++++-----
 .../lib/src/utils/settings_export_helper.dart |  2 +-
 packages/neon/neon/test/option_test.dart      | 31 ++++++++-----
 packages/neon/neon_files/lib/options.dart     | 29 +++++++++---
 packages/neon/neon_news/lib/options.dart      | 41 ++++++++++++-----
 packages/neon/neon_notes/lib/options.dart     | 26 ++++++++---
 12 files changed, 151 insertions(+), 59 deletions(-)

diff --git a/packages/neon/neon/lib/settings.dart b/packages/neon/neon/lib/settings.dart
index 8a1e4d8e..13193417 100644
--- a/packages/neon/neon/lib/settings.dart
+++ b/packages/neon/neon/lib/settings.dart
@@ -2,5 +2,6 @@ export 'package:neon/src/models/label_builder.dart';
 export 'package:neon/src/settings/models/nextcloud_app_options.dart';
 export 'package:neon/src/settings/models/options_category.dart';
 export 'package:neon/src/settings/models/select_option.dart';
+export 'package:neon/src/settings/models/storage.dart' show Storable;
 export 'package:neon/src/settings/models/toggle_option.dart';
 export 'package:neon/src/settings/widgets/settings_list.dart';
diff --git a/packages/neon/neon/lib/src/settings/models/option.dart b/packages/neon/neon/lib/src/settings/models/option.dart
index 4d33bfb3..ac954b4d 100644
--- a/packages/neon/neon/lib/src/settings/models/option.dart
+++ b/packages/neon/neon/lib/src/settings/models/option.dart
@@ -38,7 +38,7 @@ abstract class Option<T> extends ChangeNotifier implements ValueListenable<T> {
   }
 
   final SettingsStorage storage;
-  final String key;
+  final Storable key;
   final LabelBuilder label;
   final T defaultValue;
   final OptionsCategory? category;
diff --git a/packages/neon/neon/lib/src/settings/models/select_option.dart b/packages/neon/neon/lib/src/settings/models/select_option.dart
index 0cc0b9e2..6139cbe5 100644
--- a/packages/neon/neon/lib/src/settings/models/select_option.dart
+++ b/packages/neon/neon/lib/src/settings/models/select_option.dart
@@ -21,7 +21,7 @@ class SelectOption<T> extends Option<T> {
     super.category,
     super.enabled,
   })  : _values = values,
-        super(initialValue: loadValue(values, storage.getString(key), forceLoad: forceLoadValue));
+        super(initialValue: loadValue(values, storage.getString(key.value), forceLoad: forceLoadValue));
 
   /// Creates a SelectOption depending on the State of another [Option].
   SelectOption.depend({
@@ -39,7 +39,7 @@ class SelectOption<T> extends Option<T> {
     final bool forceLoadValue = true,
     super.category,
   })  : _values = values,
-        super.depend(initialValue: loadValue(values, storage.getString(key), forceLoad: forceLoadValue));
+        super.depend(initialValue: loadValue(values, storage.getString(key.value), forceLoad: forceLoadValue));
 
   static T? loadValue<T>(final Map<T, LabelBuilder> vs, final String? stored, {final bool forceLoad = true}) {
     if (forceLoad && vs.isEmpty && stored is T) {
@@ -51,7 +51,7 @@ class SelectOption<T> extends Option<T> {
 
   @override
   void reset() {
-    unawaited(storage.remove(key));
+    unawaited(storage.remove(key.value));
 
     super.reset();
   }
@@ -63,7 +63,7 @@ class SelectOption<T> extends Option<T> {
     super.value = value;
 
     if (value != null) {
-      unawaited(storage.setString(key, serialize()!));
+      unawaited(storage.setString(key.value, serialize()!));
     }
   }
 
diff --git a/packages/neon/neon/lib/src/settings/models/storage.dart b/packages/neon/neon/lib/src/settings/models/storage.dart
index 76575fc8..74a52862 100644
--- a/packages/neon/neon/lib/src/settings/models/storage.dart
+++ b/packages/neon/neon/lib/src/settings/models/storage.dart
@@ -16,8 +16,12 @@ abstract interface class SettingsStorage {
   Future<bool> remove(final String key);
 }
 
+abstract interface class Storable {
+  String get value;
+}
+
 @internal
-enum StorageKeys {
+enum StorageKeys implements Storable {
   apps._('app'),
   accounts._('accounts'),
   global._('global'),
@@ -28,6 +32,7 @@ enum StorageKeys {
 
   const StorageKeys._(this.value);
 
+  @override
   final String value;
 }
 
diff --git a/packages/neon/neon/lib/src/settings/models/toggle_option.dart b/packages/neon/neon/lib/src/settings/models/toggle_option.dart
index e3ef5397..9b3ae94b 100644
--- a/packages/neon/neon/lib/src/settings/models/toggle_option.dart
+++ b/packages/neon/neon/lib/src/settings/models/toggle_option.dart
@@ -11,7 +11,7 @@ class ToggleOption extends Option<bool> {
     required final bool defaultValue,
     super.category,
     super.enabled,
-  }) : super(defaultValue: storage.getBool(key) ?? defaultValue);
+  }) : super(defaultValue: storage.getBool(key.value) ?? defaultValue);
 
   /// Creates a ToggleOption depending on the State of another [Option].
   ToggleOption.depend({
@@ -22,12 +22,12 @@ class ToggleOption extends Option<bool> {
     required super.enabled,
     super.category,
   }) : super.depend(
-          defaultValue: storage.getBool(key) ?? defaultValue,
+          defaultValue: storage.getBool(key.value) ?? defaultValue,
         );
 
   @override
   void reset() {
-    unawaited(storage.remove(key));
+    unawaited(storage.remove(key.value));
 
     super.reset();
   }
@@ -36,7 +36,7 @@ class ToggleOption extends Option<bool> {
   set value(final bool value) {
     super.value = value;
 
-    unawaited(storage.setBool(key, serialize()));
+    unawaited(storage.setBool(key.value, serialize()));
   }
 
   @override
diff --git a/packages/neon/neon/lib/src/utils/account_options.dart b/packages/neon/neon/lib/src/utils/account_options.dart
index 6125009d..61c2c5cc 100644
--- a/packages/neon/neon/lib/src/utils/account_options.dart
+++ b/packages/neon/neon/lib/src/utils/account_options.dart
@@ -47,9 +47,18 @@ class AccountSpecificOptions {
 
   late final initialApp = SelectOption<String?>(
     storage: _storage,
-    key: 'initial-app',
+    key: AccountOptionKeys.initialApp,
     label: (final context) => AppLocalizations.of(context).accountOptionsInitialApp,
     defaultValue: null,
     values: {},
   );
 }
+
+enum AccountOptionKeys implements Storable {
+  initialApp._('initial-app');
+
+  const AccountOptionKeys._(this.value);
+
+  @override
+  final String value;
+}
diff --git a/packages/neon/neon/lib/src/utils/global_options.dart b/packages/neon/neon/lib/src/utils/global_options.dart
index ca31d8c5..e7081fef 100644
--- a/packages/neon/neon/lib/src/utils/global_options.dart
+++ b/packages/neon/neon/lib/src/utils/global_options.dart
@@ -125,7 +125,7 @@ class GlobalOptions {
 
   late final themeMode = SelectOption<ThemeMode>(
     storage: _storage,
-    key: 'theme-mode',
+    key: GlobalOptionKeys.themeMode,
     label: (final context) => AppLocalizations.of(context).globalOptionsThemeMode,
     defaultValue: ThemeMode.system,
     values: {
@@ -137,28 +137,28 @@ class GlobalOptions {
 
   late final themeOLEDAsDark = ToggleOption(
     storage: _storage,
-    key: 'theme-oled-as-dark',
+    key: GlobalOptionKeys.themeOledAsDark,
     label: (final context) => AppLocalizations.of(context).globalOptionsThemeOLEDAsDark,
     defaultValue: false,
   );
 
   late final themeKeepOriginalAccentColor = ToggleOption(
     storage: _storage,
-    key: 'theme-keep-original-accent-color',
+    key: GlobalOptionKeys.themeKeepOriginalAccentColor,
     label: (final context) => AppLocalizations.of(context).globalOptionsThemeKeepOriginalAccentColor,
     defaultValue: false,
   );
 
   late final pushNotificationsEnabled = ToggleOption(
     storage: _storage,
-    key: 'push-notifications-enabled',
+    key: GlobalOptionKeys.pushNotificationsEnabled,
     label: (final context) => AppLocalizations.of(context).globalOptionsPushNotificationsEnabled,
     defaultValue: false,
   );
 
   late final pushNotificationsDistributor = SelectOption<String?>.depend(
     storage: _storage,
-    key: 'push-notifications-distributor',
+    key: GlobalOptionKeys.pushNotificationsDistributor,
     label: (final context) => AppLocalizations.of(context).globalOptionsPushNotificationsDistributor,
     defaultValue: null,
     values: {},
@@ -167,14 +167,14 @@ class GlobalOptions {
 
   late final startupMinimized = ToggleOption(
     storage: _storage,
-    key: 'startup-minimized',
+    key: GlobalOptionKeys.startupMinimized,
     label: (final context) => AppLocalizations.of(context).globalOptionsStartupMinimized,
     defaultValue: false,
   );
 
   late final startupMinimizeInsteadOfExit = ToggleOption(
     storage: _storage,
-    key: 'startup-minimize-instead-of-exit',
+    key: GlobalOptionKeys.startupMinimizeInsteadOfExit,
     label: (final context) => AppLocalizations.of(context).globalOptionsStartupMinimizeInsteadOfExit,
     defaultValue: false,
   );
@@ -183,14 +183,14 @@ class GlobalOptions {
 
   late final systemTrayEnabled = ToggleOption(
     storage: _storage,
-    key: 'systemtray-enabled',
+    key: GlobalOptionKeys.systemtrayEnabled,
     label: (final context) => AppLocalizations.of(context).globalOptionsSystemTrayEnabled,
     defaultValue: false,
   );
 
   late final systemTrayHideToTrayWhenMinimized = ToggleOption.depend(
     storage: _storage,
-    key: 'systemtray-hide-to-tray-when-minimized',
+    key: GlobalOptionKeys.systemtrayHideToTrayWhenMinimized,
     label: (final context) => AppLocalizations.of(context).globalOptionsSystemTrayHideToTrayWhenMinimized,
     defaultValue: true,
     enabled: systemTrayEnabled,
@@ -198,14 +198,14 @@ class GlobalOptions {
 
   late final rememberLastUsedAccount = ToggleOption(
     storage: _storage,
-    key: 'remember-last-used-account',
+    key: GlobalOptionKeys.rememberLastUsedAccount,
     label: (final context) => AppLocalizations.of(context).globalOptionsAccountsRememberLastUsedAccount,
     defaultValue: true,
   );
 
   late final initialAccount = SelectOption<String?>(
     storage: _storage,
-    key: 'initial-account',
+    key: GlobalOptionKeys.initialAccount,
     label: (final context) => AppLocalizations.of(context).globalOptionsAccountsInitialAccount,
     defaultValue: null,
     values: {},
@@ -213,7 +213,7 @@ class GlobalOptions {
 
   late final navigationMode = SelectOption<NavigationMode>(
     storage: _storage,
-    key: 'navigation-mode',
+    key: GlobalOptionKeys.navigationMode,
     label: (final context) => AppLocalizations.of(context).globalOptionsNavigationMode,
     defaultValue: Platform.isAndroid || Platform.isIOS ? NavigationMode.drawer : NavigationMode.drawerAlwaysVisible,
     values: {
@@ -228,6 +228,26 @@ class GlobalOptions {
   );
 }
 
+enum GlobalOptionKeys implements Storable {
+  themeMode._('theme-mode'),
+  themeOledAsDark._('theme-oled-as-dark'),
+  themeKeepOriginalAccentColor._('theme-keep-original-accent-color'),
+  pushNotificationsEnabled._('push-notifications-enabled'),
+  pushNotificationsDistributor._('push-notifications-distributor'),
+  startupMinimized._('startup-minimized'),
+  startupMinimizeInsteadOfExit._('startup-minimize-instead-of-exit'),
+  systemtrayEnabled._('systemtray-enabled'),
+  systemtrayHideToTrayWhenMinimized._('systemtray-hide-to-tray-when-minimized'),
+  rememberLastUsedAccount._('remember-last-used-account'),
+  initialAccount._('initial-account'),
+  navigationMode._('navigation-mode');
+
+  const GlobalOptionKeys._(this.value);
+
+  @override
+  final String value;
+}
+
 enum NavigationMode {
   drawer,
   drawerAlwaysVisible,
diff --git a/packages/neon/neon/lib/src/utils/settings_export_helper.dart b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
index 3fe86dfa..d402eb5b 100644
--- a/packages/neon/neon/lib/src/utils/settings_export_helper.dart
+++ b/packages/neon/neon/lib/src/utils/settings_export_helper.dart
@@ -53,7 +53,7 @@ class SettingsExportHelper {
   Future _applyOptionsMapToOptions(final List<Option> options, final Map<String, dynamic> data) async {
     for (final optionKey in data.keys) {
       for (final option in options) {
-        if (option.key == optionKey) {
+        if (option.key.value == optionKey) {
           final Object? value = data[optionKey];
 
           if (value != null) {
diff --git a/packages/neon/neon/test/option_test.dart b/packages/neon/neon/test/option_test.dart
index e28fb695..d3e28036 100644
--- a/packages/neon/neon/test/option_test.dart
+++ b/packages/neon/neon/test/option_test.dart
@@ -15,6 +15,15 @@ class MockCallbackFunction extends Mock {
   FutureOr<void> call();
 }
 
+enum StorageKey implements Storable {
+  key._('storage-key');
+
+  const StorageKey._(this.value);
+
+  @override
+  final String value;
+}
+
 enum SelectValues {
   first,
   second,
@@ -23,7 +32,7 @@ enum SelectValues {
 
 void main() {
   final storage = MockStorage();
-  const key = 'storage-key';
+  const key = StorageKey.key;
   String labelBuilder(final _) => 'label';
 
   group('SelectOption', () {
@@ -36,8 +45,8 @@ void main() {
     late SelectOption<SelectValues> option;
 
     setUp(() {
-      when(() => storage.setString(key, any())).thenAnswer((final _) async {});
-      when(() => storage.remove(key)).thenAnswer((final _) async => true);
+      when(() => storage.setString(key.value, any())).thenAnswer((final _) async {});
+      when(() => storage.remove(key.value)).thenAnswer((final _) async => true);
 
       option = SelectOption<SelectValues>(
         storage: storage,
@@ -56,7 +65,7 @@ void main() {
     test('Create', () {
       expect(option.value, option.defaultValue, reason: 'Should default to defaultValue.');
 
-      when(() => storage.getString(key)).thenReturn('SelectValues.second');
+      when(() => storage.getString(key.value)).thenReturn('SelectValues.second');
 
       option = SelectOption<SelectValues>(
         storage: storage,
@@ -96,7 +105,7 @@ void main() {
         ..value = SelectValues.third;
 
       verify(callback.call).called(1);
-      verify(() => storage.setString(key, 'SelectValues.third')).called(1);
+      verify(() => storage.setString(key.value, 'SelectValues.third')).called(1);
       expect(option.value, SelectValues.third, reason: 'Should update the value.');
 
       option.value = SelectValues.third;
@@ -150,7 +159,7 @@ void main() {
       option.reset();
 
       verify(callback.call).called(1);
-      verify(() => storage.remove(key)).called(1);
+      verify(() => storage.remove(key.value)).called(1);
       expect(option.value, option.defaultValue, reason: 'Should reset the value.');
     });
 
@@ -171,8 +180,8 @@ void main() {
     late ToggleOption option;
 
     setUp(() {
-      when(() => storage.setBool(key, any())).thenAnswer((final _) async {});
-      when(() => storage.remove(key)).thenAnswer((final _) async => true);
+      when(() => storage.setBool(key.value, any())).thenAnswer((final _) async {});
+      when(() => storage.remove(key.value)).thenAnswer((final _) async => true);
 
       option = ToggleOption(
         storage: storage,
@@ -190,7 +199,7 @@ void main() {
     test('Create', () {
       expect(option.value, option.defaultValue, reason: 'Should default to defaultValue.');
 
-      when(() => storage.getBool(key)).thenReturn(true);
+      when(() => storage.getBool(key.value)).thenReturn(true);
 
       option = ToggleOption(
         storage: storage,
@@ -228,7 +237,7 @@ void main() {
         ..value = false;
 
       verify(callback.call).called(1);
-      verify(() => storage.setBool(key, false)).called(1);
+      verify(() => storage.setBool(key.value, false)).called(1);
       expect(option.value, false, reason: 'Should update the value.');
 
       option.value = false;
@@ -262,7 +271,7 @@ void main() {
       option.reset();
 
       verify(callback.call).called(1);
-      verify(() => storage.remove(key)).called(1);
+      verify(() => storage.remove(key.value)).called(1);
       expect(option.value, option.defaultValue, reason: 'Should reset the value.');
     });
   });
diff --git a/packages/neon/neon_files/lib/options.dart b/packages/neon/neon_files/lib/options.dart
index ebbe7803..5e9d7f7e 100644
--- a/packages/neon/neon_files/lib/options.dart
+++ b/packages/neon/neon_files/lib/options.dart
@@ -23,7 +23,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final filesSortPropertyOption = SelectOption<FilesSortProperty>(
     storage: super.storage,
     category: generalCategory,
-    key: 'files-sort-property',
+    key: FilesOptionKeys.sortProperty,
     label: (final context) => AppLocalizations.of(context).optionsFilesSortProperty,
     defaultValue: FilesSortProperty.name,
     values: {
@@ -37,7 +37,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final filesSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: generalCategory,
-    key: 'files-sort-box-order',
+    key: FilesOptionKeys.sortOrder,
     label: (final context) => AppLocalizations.of(context).optionsFilesSortOrder,
     defaultValue: SortBoxOrder.ascending,
     values: sortBoxOrderOptionValues,
@@ -46,7 +46,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final showPreviewsOption = ToggleOption(
     storage: super.storage,
     category: generalCategory,
-    key: 'show-previews',
+    key: FilesOptionKeys.showPreviews,
     label: (final context) => AppLocalizations.of(context).optionsShowPreviews,
     defaultValue: true,
   );
@@ -54,7 +54,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final uploadQueueParallelism = SelectOption<int>(
     storage: storage,
     category: generalCategory,
-    key: 'upload-queue-parallelism',
+    key: FilesOptionKeys.uploadQueueParallelism,
     label: (final context) => AppLocalizations.of(context).optionsUploadQueueParallelism,
     defaultValue: 4,
     values: {
@@ -67,7 +67,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final downloadQueueParallelism = SelectOption<int>(
     storage: storage,
     category: generalCategory,
-    key: 'download-queue-parallelism',
+    key: FilesOptionKeys.downloadQueueParallelism,
     label: (final context) => AppLocalizations.of(context).optionsDownloadQueueParallelism,
     defaultValue: 4,
     values: {
@@ -97,7 +97,7 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final uploadSizeWarning = SelectOption<int?>(
     storage: storage,
     category: generalCategory,
-    key: 'upload-size-warning',
+    key: FilesOptionKeys.uploadQueueParallelism,
     label: (final context) => AppLocalizations.of(context).optionsUploadSizeWarning,
     defaultValue: _mb(10),
     values: _sizeWarningValues,
@@ -106,13 +106,28 @@ class FilesAppSpecificOptions extends NextcloudAppOptions {
   late final downloadSizeWarning = SelectOption<int?>(
     storage: storage,
     category: generalCategory,
-    key: 'download-size-warning',
+    key: FilesOptionKeys.downloadSizeWarning,
     label: (final context) => AppLocalizations.of(context).optionsDownloadSizeWarning,
     defaultValue: _mb(10),
     values: _sizeWarningValues,
   );
 }
 
+enum FilesOptionKeys implements Storable {
+  sortProperty._('files-sort-property'),
+  sortOrder._('files-sort-box-order'),
+  showPreviews._('show-previews'),
+  uploadQueueParallelism._('upload-queue-parallelism'),
+  downloadQueueParallelism._('download-queue-parallelism'),
+  uploadSizeWarning._('upload-size-warning'),
+  downloadSizeWarning._('download-size-warning');
+
+  const FilesOptionKeys._(this.value);
+
+  @override
+  final String value;
+}
+
 enum FilesSortProperty {
   name,
   modifiedDate,
diff --git a/packages/neon/neon_news/lib/options.dart b/packages/neon/neon_news/lib/options.dart
index 6e5baf18..e1c442b8 100644
--- a/packages/neon/neon_news/lib/options.dart
+++ b/packages/neon/neon_news/lib/options.dart
@@ -42,7 +42,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final defaultCategoryOption = SelectOption<DefaultCategory>(
     storage: super.storage,
     category: generalCategory,
-    key: 'default-category',
+    key: NewsOptionKeys.defaultCategory,
     label: (final context) => AppLocalizations.of(context).optionsDefaultCategory,
     defaultValue: DefaultCategory.articles,
     values: {
@@ -55,7 +55,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final articleViewTypeOption = SelectOption<ArticleViewType>(
     storage: super.storage,
     category: articlesCategory,
-    key: 'article-view-type',
+    key: NewsOptionKeys.articleViewType,
     label: (final context) => AppLocalizations.of(context).optionsArticleViewType,
     defaultValue: ArticleViewType.direct,
     values: {
@@ -71,7 +71,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final articleDisableMarkAsReadTimeoutOption = ToggleOption(
     storage: super.storage,
     category: articlesCategory,
-    key: 'article-disable-mark-as-read-timeout',
+    key: NewsOptionKeys.articleDisableMarkAsReadTimeout,
     label: (final context) => AppLocalizations.of(context).optionsArticleDisableMarkAsReadTimeout,
     defaultValue: false,
   );
@@ -79,7 +79,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final defaultArticlesFilterOption = SelectOption<FilterType>(
     storage: super.storage,
     category: articlesCategory,
-    key: 'default-articles-filter',
+    key: NewsOptionKeys.defaultArticlesFilter,
     label: (final context) => AppLocalizations.of(context).optionsDefaultArticlesFilter,
     defaultValue: FilterType.unread,
     values: {
@@ -92,7 +92,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final articlesSortPropertyOption = SelectOption<ArticlesSortProperty>(
     storage: super.storage,
     category: articlesCategory,
-    key: 'articles-sort-property',
+    key: NewsOptionKeys.articlesSortProperty,
     label: (final context) => AppLocalizations.of(context).optionsArticlesSortProperty,
     defaultValue: ArticlesSortProperty.publishDate,
     values: {
@@ -107,7 +107,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final articlesSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: articlesCategory,
-    key: 'articles-sort-box-order',
+    key: NewsOptionKeys.articlesSortBoxOrder,
     label: (final context) => AppLocalizations.of(context).optionsArticlesSortOrder,
     defaultValue: SortBoxOrder.descending,
     values: sortBoxOrderOptionValues,
@@ -116,7 +116,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final foldersSortPropertyOption = SelectOption<FoldersSortProperty>(
     storage: super.storage,
     category: foldersCategory,
-    key: 'folders-sort-property',
+    key: NewsOptionKeys.foldersSortProperty,
     label: (final context) => AppLocalizations.of(context).optionsFoldersSortProperty,
     defaultValue: FoldersSortProperty.alphabetical,
     values: {
@@ -130,7 +130,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final foldersSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: foldersCategory,
-    key: 'folders-sort-box-order',
+    key: NewsOptionKeys.foldersSortBoxOrder,
     label: (final context) => AppLocalizations.of(context).optionsFoldersSortOrder,
     defaultValue: SortBoxOrder.ascending,
     values: sortBoxOrderOptionValues,
@@ -139,7 +139,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final defaultFolderViewTypeOption = SelectOption<DefaultFolderViewType>(
     storage: super.storage,
     category: foldersCategory,
-    key: 'default-folder-view-type',
+    key: NewsOptionKeys.defaultFolderViewType,
     label: (final context) => AppLocalizations.of(context).optionsDefaultFolderViewType,
     defaultValue: DefaultFolderViewType.articles,
     values: {
@@ -151,7 +151,7 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final feedsSortPropertyOption = SelectOption<FeedsSortProperty>(
     storage: super.storage,
     category: feedsCategory,
-    key: 'feeds-sort-property',
+    key: NewsOptionKeys.feedsSortProperty,
     label: (final context) => AppLocalizations.of(context).optionsFeedsSortProperty,
     defaultValue: FeedsSortProperty.alphabetical,
     values: {
@@ -165,13 +165,32 @@ class NewsAppSpecificOptions extends NextcloudAppOptions {
   late final feedsSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: feedsCategory,
-    key: 'feeds-sort-box-order',
+    key: NewsOptionKeys.feedsSortBoxOrder,
     label: (final context) => AppLocalizations.of(context).optionsFeedsSortOrder,
     defaultValue: SortBoxOrder.ascending,
     values: sortBoxOrderOptionValues,
   );
 }
 
+enum NewsOptionKeys implements Storable {
+  defaultCategory._('default-category'),
+  articleViewType._('article-view-type'),
+  articleDisableMarkAsReadTimeout._('article-disable-mark-as-read-timeout'),
+  defaultArticlesFilter._('default-articles-filter'),
+  articlesSortProperty._('articles-sort-property'),
+  articlesSortBoxOrder._('articles-sort-box-order'),
+  foldersSortProperty._('folders-sort-property'),
+  foldersSortBoxOrder._('folders-sort-box-order'),
+  defaultFolderViewType._('default-folder-view-type'),
+  feedsSortProperty._('feeds-sort-property'),
+  feedsSortBoxOrder._('feeds-sort-box-order');
+
+  const NewsOptionKeys._(this.value);
+
+  @override
+  final String value;
+}
+
 enum DefaultCategory {
   articles,
   folders,
diff --git a/packages/neon/neon_notes/lib/options.dart b/packages/neon/neon_notes/lib/options.dart
index f7ac1957..ccebe9db 100644
--- a/packages/neon/neon_notes/lib/options.dart
+++ b/packages/neon/neon_notes/lib/options.dart
@@ -32,7 +32,7 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final defaultCategoryOption = SelectOption<DefaultCategory>(
     storage: super.storage,
     category: generalCategory,
-    key: 'default-category',
+    key: NotesOptionKeys.defaultCategory,
     label: (final context) => AppLocalizations.of(context).optionsDefaultCategory,
     defaultValue: DefaultCategory.notes,
     values: {
@@ -44,7 +44,7 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final defaultNoteViewTypeOption = SelectOption<DefaultNoteViewType>(
     storage: super.storage,
     category: generalCategory,
-    key: 'default-note-view-type',
+    key: NotesOptionKeys.defaultNoteViewType,
     label: (final context) => AppLocalizations.of(context).optionsDefaultNoteViewType,
     defaultValue: DefaultNoteViewType.preview,
     values: {
@@ -56,7 +56,7 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final notesSortPropertyOption = SelectOption<NotesSortProperty>(
     storage: super.storage,
     category: notesCategory,
-    key: 'notes-sort-property',
+    key: NotesOptionKeys.notesSortProperty,
     label: (final context) => AppLocalizations.of(context).optionsNotesSortProperty,
     defaultValue: NotesSortProperty.lastModified,
     values: {
@@ -70,7 +70,7 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final notesSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: notesCategory,
-    key: 'notes-sort-box-order',
+    key: NotesOptionKeys.notesSortBoxOrder,
     label: (final context) => AppLocalizations.of(context).optionsNotesSortOrder,
     defaultValue: SortBoxOrder.descending,
     values: sortBoxOrderOptionValues,
@@ -79,7 +79,7 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final categoriesSortPropertyOption = SelectOption<CategoriesSortProperty>(
     storage: super.storage,
     category: categoriesCategory,
-    key: 'categories-sort-property',
+    key: NotesOptionKeys.categoriesSortProperty,
     label: (final context) => AppLocalizations.of(context).optionsCategoriesSortProperty,
     defaultValue: CategoriesSortProperty.alphabetical,
     values: {
@@ -93,13 +93,27 @@ class NotesAppSpecificOptions extends NextcloudAppOptions {
   late final categoriesSortBoxOrderOption = SelectOption<SortBoxOrder>(
     storage: super.storage,
     category: categoriesCategory,
-    key: 'categories-sort-box-order',
+    key: NotesOptionKeys.categoriesSortBoxOrder,
     label: (final context) => AppLocalizations.of(context).optionsCategoriesSortOrder,
     defaultValue: SortBoxOrder.ascending,
     values: sortBoxOrderOptionValues,
   );
 }
 
+enum NotesOptionKeys implements Storable {
+  defaultCategory._('default-category'),
+  defaultNoteViewType._('default-note-view-type'),
+  notesSortProperty._('notes-sort-property'),
+  notesSortBoxOrder._('notes-sort-box-order'),
+  categoriesSortProperty._('categories-sort-property'),
+  categoriesSortBoxOrder._('categories-sort-box-order');
+
+  const NotesOptionKeys._(this.value);
+
+  @override
+  final String value;
+}
+
 enum DefaultNoteViewType {
   preview,
   edit,