Moved CSV import from settings to import/export settings.

mateusz-bak · May 29, 2022 · 04652d7 · 04652d7
1 parent 4e9bc35
commit 04652d7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 16 deletions.
diff --git a/...src/main/java/software/mdev/bookstracker/ui/bookslist/fragments/SettingsBackupFragment.kt b/...src/main/java/software/mdev/bookstracker/ui/bookslist/fragments/SettingsBackupFragment.kt
@@ -3,7 +3,6 @@ package software.mdev.bookstracker.ui.bookslist.fragments
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import android.os.Bundle
-import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat
 import androidx.preference.Preference
@@ -26,6 +25,7 @@ class SettingsBackupFragment : PreferenceFragmentCompat(), OnSharedPreferenceCha
         var preferenceExport = findPreference<Preference>(Constants.KEY_EXPORT)
         var preferenceExportLocal = findPreference<Preference>(Constants.KEY_EXPORT_LOCAL)
         var preferenceImport = findPreference<Preference>(Constants.KEY_IMPORT)
+        val preferenceCsvImport = findPreference<Preference>(Constants.KEY_CSV_IMPORT)
 
         if (preferenceExport != null) {
             preferenceExport.onPreferenceClickListener = Preference.OnPreferenceClickListener {
@@ -47,6 +47,13 @@ class SettingsBackupFragment : PreferenceFragmentCompat(), OnSharedPreferenceCha
                 true
             }
         }
+
+        if (preferenceCsvImport != null) {
+            preferenceCsvImport.onPreferenceClickListener = Preference.OnPreferenceClickListener {
+                Backup().runImporterCSV(activity as ListActivity)
+                true
+            }
+        }
     }
 
     override fun onResume() {

diff --git a/app/src/main/java/software/mdev/bookstracker/ui/bookslist/fragments/SettingsFragment.kt b/app/src/main/java/software/mdev/bookstracker/ui/bookslist/fragments/SettingsFragment.kt
@@ -19,7 +19,6 @@ import software.mdev.bookstracker.ui.bookslist.viewmodel.BooksViewModel
 import android.content.Intent
 import android.net.Uri
 import android.os.Build
-import software.mdev.bookstracker.other.Backup
 
 
 class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeListener {
@@ -35,7 +34,6 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
         val preferenceChangelog = findPreference<Preference>(Constants.KEY_CHANGELOG)
         val preferenceBackup = findPreference<Preference>(Constants.KEY_BACKUP)
         val preferenceFeedback = findPreference<Preference>(Constants.KEY_FEEDBACK)
-        val preferenceCsvImport = findPreference<Preference>(Constants.KEY_CSV_IMPORT)
 
         if (preferenceCheckForUpdates != null) {
             val updater = Updater()
@@ -75,13 +73,6 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
                 true
             }
         }
-
-        if (preferenceCsvImport != null) {
-            preferenceCsvImport.onPreferenceClickListener = Preference.OnPreferenceClickListener {
-                Backup().runImporterCSV(activity as ListActivity)
-                true
-            }
-        }
     }
 
     override fun onResume() {

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
@@ -28,12 +28,6 @@
         android:summary="@string/backup_summary"
         android:title="@string/backup_title" />
 
-    <Preference
-        android:icon="@drawable/ic_iconscout_file_import_24"
-        android:key="KEY_CSV_IMPORT"
-        android:summary="@string/import_csv_summary"
-        android:title="@string/import_csv_title" />
-
     <PreferenceCategory
         android:key="customization"
         android:title="@string/customization">

diff --git a/app/src/main/res/xml/preferences_backup.xml b/app/src/main/res/xml/preferences_backup.xml
@@ -24,6 +24,12 @@
             android:summary="@string/import_summary"
             android:title="@string/import_title" />
 
+        <Preference
+            android:icon="@drawable/ic_iconscout_file_import_24"
+            android:key="KEY_CSV_IMPORT"
+            android:summary="@string/import_csv_summary"
+            android:title="@string/import_csv_title" />
+
     </PreferenceCategory>
 
 </PreferenceScreen>