refactor: Apply changes from suggestion

TheAabedKhan · Oct 23, 2024 · 94a728f · 94a728f
1 parent 8021b9f
commit 94a728f
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 20 deletions.
diff --git a/assets/i18n/strings.i18n.json b/assets/i18n/strings.i18n.json
@@ -198,12 +198,12 @@
     "deleteTempDirLabel": "Delete temporary files",
     "deleteTempDirHint": "Delete unused temporary files",
     "deletedTempDir": "Temporary files deleted",
-    "exportManagerSettingsLabel": "Export manager settings",
-    "exportManagerSettingsHint": "Export manager settings to a JSON file",
-    "exportedManagerSettings": "Manager settings exported",
-    "importManagerSettingsLabel": "Import manager settings",
-    "importManagerSettingsHint": "Import manager settings from a JSON file",
-    "importedManagerSettings": "Manager settings imported",
+    "exportSettingsLabel": "Export settings",
+    "exportSettingsHint": "Export settings to a JSON file",
+    "exportedSettings": "Settings exported",
+    "importSettingsLabel": "Import settings",
+    "importSettingsHint": "Import settings from a JSON file",
+    "importedSettings": "Settings imported",
     "exportPatchesLabel": "Export patch selection",
     "exportPatchesHint": "Export patch selection to a JSON file",
     "exportedPatches": "Patch selection exported",

diff --git a/docs/2_4_settings.md b/docs/2_4_settings.md
@@ -50,6 +50,7 @@ Learn how to configure ReVanced Manager.
   - 🔑 Keystore used to sign patched apps
   - 📄 Remembered selection of patches for each app
   - ⚙️ Remembered patch options
+  - 🛠️ Remembered settings
 
   > ℹ️ Note  
   > These can be used to backup and restore or reset settings to default in case of issues.

diff --git a/lib/services/manager_api.dart b/lib/services/manager_api.dart
@@ -817,7 +817,7 @@ class ManagerAPI {
     return jsonDecode(string);
   }
 
-  String exportManagerSettings() {
+  String exportSettings() {
     final Map<String, dynamic> settings = _prefs
         .getKeys()
         .fold<Map<String, dynamic>>({}, (Map<String, dynamic> map, String key) {
@@ -827,7 +827,7 @@ class ManagerAPI {
     return jsonEncode(settings);
   }
 
-  Future<void> importManagerSettings(String settings) async {
+  Future<void> importSettings(String settings) async {
     final Map<String, dynamic> settingsMap = jsonDecode(settings);
     settingsMap.forEach((key, value) {
       if (value is bool) {

diff --git a/lib/ui/views/settings/settings_viewmodel.dart b/lib/ui/views/settings/settings_viewmodel.dart
@@ -222,9 +222,9 @@ class SettingsViewModel extends BaseViewModel {
     notifyListeners();
   }
 
-  Future<void> exportManagerSettings() async {
+  Future<void> exportSettings() async {
     try {
-      final String settings = _managerAPI.exportManagerSettings();
+      final String settings = _managerAPI.exportSettings();
       final Directory tempDir = await getTemporaryDirectory();
       final String filePath = '${tempDir.path}/manager_settings.json';
       final File file = File(filePath);
@@ -237,7 +237,7 @@ class SettingsViewModel extends BaseViewModel {
         ),
       );
       if (result != null) {
-        _toast.showBottom(t.settingsView.exportedManagerSettings);
+        _toast.showBottom(t.settingsView.exportedSettings);
       }
     } on Exception catch (e) {
       if (kDebugMode) {
@@ -246,7 +246,7 @@ class SettingsViewModel extends BaseViewModel {
     }
   }
 
-  Future<void> importManagerSettings() async {
+  Future<void> importSettings() async {
     try {
       final String? result = await FlutterFileDialog.pickFile(
         params: const OpenFileDialogParams(
@@ -257,8 +257,8 @@ class SettingsViewModel extends BaseViewModel {
         final File inFile = File(result);
         final String settings = inFile.readAsStringSync();
         inFile.delete();
-        _managerAPI.importManagerSettings(settings);
-        _toast.showBottom(t.settingsView.importedManagerSettings);
+        _managerAPI.importSettings(settings);
+        _toast.showBottom(t.settingsView.importedSettings);
         _toast.showBottom(t.settingsView.restartAppForChanges);
       }
     } on Exception catch (e) {

diff --git a/lib/ui/widgets/settingsView/settings_export_section.dart b/lib/ui/widgets/settingsView/settings_export_section.dart
@@ -17,26 +17,26 @@ class SExportSection extends StatelessWidget {
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: Text(
-            t.settingsView.exportManagerSettingsLabel,
+            t.settingsView.exportSettingsLabel,
             style: const TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.w500,
             ),
           ),
-          subtitle: Text(t.settingsView.exportManagerSettingsHint),
-          onTap: () => _settingsViewModel.exportManagerSettings(),
+          subtitle: Text(t.settingsView.exportSettingsHint),
+          onTap: () => _settingsViewModel.exportSettings(),
         ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),
           title: Text(
-            t.settingsView.importManagerSettingsLabel,
+            t.settingsView.importSettingsLabel,
             style: const TextStyle(
               fontSize: 20,
               fontWeight: FontWeight.w500,
             ),
           ),
-          subtitle: Text(t.settingsView.importManagerSettingsHint),
-          onTap: () => _settingsViewModel.importManagerSettings(),
+          subtitle: Text(t.settingsView.importSettingsHint),
+          onTap: () => _settingsViewModel.importSettings(),
         ),
         ListTile(
           contentPadding: const EdgeInsets.symmetric(horizontal: 20.0),