refactor: move exporting patches to another section

ReVanced · Nov 9, 2022 · d545dfe · d545dfe
1 parent c571cf2
commit d545dfe
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 29 deletions.
diff --git a/assets/i18n/en_US.json b/assets/i18n/en_US.json
@@ -139,6 +139,7 @@
         "experimentalPatchesLabel": "Experimental Patch support",
         "experimentalPatchesHint": "Enable to use unsupported patches in any app version",
         "enabledExperimentalPatches": "Experimental patches enabled",
+        "exportSectionTitle": "Import/Export",
         "aboutLabel": "About",
         "snackbarMessage": "Copied to clipboard",
         "sentryLabel": "Sentry Logging",

diff --git a/lib/ui/views/settings/settings_view.dart b/lib/ui/views/settings/settings_view.dart
@@ -137,22 +137,22 @@ class SettingsView extends StatelessWidget {
                         onTap: () => model.showSourcesDialog(context),
                       ),
                       CustomSwitchTile(
-                          padding: const EdgeInsets.symmetric(horizontal: 20.0),
-                          title: I18nText(
-                            'settingsView.experimentalPatchesLabel',
-                            child: const Text(
-                              '',
-                              style: TextStyle(
-                                fontSize: 20,
-                                fontWeight: FontWeight.w500,
-                              ),
+                        padding: const EdgeInsets.symmetric(horizontal: 20.0),
+                        title: I18nText(
+                          'settingsView.experimentalPatchesLabel',
+                          child: const Text(
+                            '',
+                            style: TextStyle(
+                              fontSize: 20,
+                              fontWeight: FontWeight.w500,
                             ),
                           ),
-                          subtitle:
-                              I18nText('settingsView.experimentalPatchesHint'),
-                          value: model.areExperimentalPatchesEnabled(),
-                          onTap: (value) =>
-                              model.useExperimentalPatches(value)),
+                        ),
+                        subtitle:
+                            I18nText('settingsView.experimentalPatchesHint'),
+                        value: model.areExperimentalPatchesEnabled(),
+                        onTap: (value) => model.useExperimentalPatches(value),
+                      ),
                       ListTile(
                         contentPadding:
                             const EdgeInsets.symmetric(horizontal: 20.0),
@@ -187,9 +187,9 @@ class SettingsView extends StatelessWidget {
                       ),
                       ListTile(
                         contentPadding:
-                        const EdgeInsets.symmetric(horizontal: 20.0),
+                            const EdgeInsets.symmetric(horizontal: 20.0),
                         title: I18nText(
-                          'settingsView.exportPatchesLabel',
+                          'settingsView.deleteLogsLabel',
                           child: const Text(
                             '',
                             style: TextStyle(
@@ -198,14 +198,20 @@ class SettingsView extends StatelessWidget {
                             ),
                           ),
                         ),
-                        subtitle: I18nText('settingsView.exportPatchesHint'),
-                        onTap: () => model.exportPatches(),
+                        subtitle: I18nText('settingsView.deleteLogsHint'),
+                        onTap: () => model.deleteLogs(),
                       ),
+                    ],
+                  ),
+                  _settingsDivider,
+                  SettingsSection(
+                    title: 'settingsView.exportSectionTitle',
+                    children: <Widget>[
                       ListTile(
                         contentPadding:
-                        const EdgeInsets.symmetric(horizontal: 20.0),
+                            const EdgeInsets.symmetric(horizontal: 20.0),
                         title: I18nText(
-                          'settingsView.importPatchesLabel',
+                          'settingsView.exportPatchesLabel',
                           child: const Text(
                             '',
                             style: TextStyle(
@@ -214,14 +220,14 @@ class SettingsView extends StatelessWidget {
                             ),
                           ),
                         ),
-                        subtitle: I18nText('settingsView.importPatchesHint'),
-                        onTap: () => model.importPatches(),
+                        subtitle: I18nText('settingsView.exportPatchesHint'),
+                        onTap: () => model.exportPatches(),
                       ),
                       ListTile(
                         contentPadding:
-                        const EdgeInsets.symmetric(horizontal: 20.0),
+                            const EdgeInsets.symmetric(horizontal: 20.0),
                         title: I18nText(
-                          'settingsView.resetStoredPatchesLabel',
+                          'settingsView.importPatchesLabel',
                           child: const Text(
                             '',
                             style: TextStyle(
@@ -230,14 +236,14 @@ class SettingsView extends StatelessWidget {
                             ),
                           ),
                         ),
-                        subtitle: I18nText('settingsView.resetStoredPatchesHint'),
-                        onTap: () => model.resetSelectedPatches(),
+                        subtitle: I18nText('settingsView.importPatchesHint'),
+                        onTap: () => model.importPatches(),
                       ),
                       ListTile(
                         contentPadding:
                             const EdgeInsets.symmetric(horizontal: 20.0),
                         title: I18nText(
-                          'settingsView.deleteLogsLabel',
+                          'settingsView.resetStoredPatchesLabel',
                           child: const Text(
                             '',
                             style: TextStyle(
@@ -246,8 +252,9 @@ class SettingsView extends StatelessWidget {
                             ),
                           ),
                         ),
-                        subtitle: I18nText('settingsView.deleteLogsHint'),
-                        onTap: () => model.deleteLogs(),
+                        subtitle:
+                            I18nText('settingsView.resetStoredPatchesHint'),
+                        onTap: () => model.resetSelectedPatches(),
                       ),
                     ],
                   ),