From 0127dcdf664b5b6007ac38bb6a15eff7869c0bb6 Mon Sep 17 00:00:00 2001
From: Aayush Gupta <aayushgupta219@gmail.com>
Date: Thu, 7 Nov 2024 11:36:32 +0530
Subject: [PATCH] Switch from sharedViewModel to activityViewModel
sharedViewModel was deprecated in favor of activityViewModel
Ref: https://insert-koin.io/docs/reference/koin-android/viewmodel/#activity-shared-viewmodel
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
---
.../com/stevesoltys/seedvault/restore/AppSelectionFragment.kt | 4 ++--
.../stevesoltys/seedvault/restore/FilesSelectionFragment.kt | 4 ++--
.../stevesoltys/seedvault/restore/RecycleBackupFragment.kt | 4 ++--
.../com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt | 4 ++--
.../stevesoltys/seedvault/restore/RestoreProgressFragment.kt | 4 ++--
.../com/stevesoltys/seedvault/restore/RestoreSetFragment.kt | 4 ++--
.../seedvault/restore/install/InstallProgressFragment.kt | 4 ++--
.../com/stevesoltys/seedvault/settings/AppStatusFragment.kt | 4 ++--
.../stevesoltys/seedvault/settings/ExpertSettingsFragment.kt | 4 ++--
.../com/stevesoltys/seedvault/settings/SchedulingFragment.kt | 4 ++--
.../com/stevesoltys/seedvault/settings/SettingsFragment.kt | 4 ++--
.../stevesoltys/seedvault/ui/files/FileSelectionFragment.kt | 4 ++--
.../seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt | 4 ++--
.../seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt | 4 ++--
14 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
index d19cbacd..fcf2be16 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/AppSelectionFragment.kt
@@ -13,11 +13,11 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.checkbox.MaterialCheckBox
import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class AppSelectionFragment : Fragment() {
- private val viewModel: RestoreViewModel by sharedViewModel()
+ private val viewModel: RestoreViewModel by activityViewModel()
private val layoutManager = LinearLayoutManager(context)
private val adapter = AppSelectionAdapter(lifecycleScope, this::loadIcon) { item ->
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
index 656be0a9..5fd3923b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/FilesSelectionFragment.kt
@@ -14,11 +14,11 @@ import android.widget.Button
import com.stevesoltys.seedvault.R
import org.calyxos.backup.storage.ui.restore.FileSelectionFragment
import org.calyxos.backup.storage.ui.restore.FilesItem
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
internal class FilesSelectionFragment : FileSelectionFragment() {
- override val viewModel: RestoreViewModel by sharedViewModel()
+ override val viewModel: RestoreViewModel by activityViewModel()
private lateinit var button: Button
override fun onCreateView(
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
index cf054368..8c85f144 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RecycleBackupFragment.kt
@@ -13,11 +13,11 @@ import android.widget.Button
import android.widget.TextView
import androidx.fragment.app.Fragment
import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class RecycleBackupFragment : Fragment() {
- private val viewModel: RestoreViewModel by sharedViewModel()
+ private val viewModel: RestoreViewModel by activityViewModel()
override fun onCreateView(
inflater: LayoutInflater,
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
index e3e9187b..a35cae7f 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreFilesFragment.kt
@@ -17,10 +17,10 @@ import androidx.fragment.app.Fragment
import com.stevesoltys.seedvault.R
import org.calyxos.backup.storage.api.SnapshotItem
import org.calyxos.backup.storage.ui.restore.SnapshotFragment
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
internal class RestoreFilesFragment : SnapshotFragment() {
- override val viewModel: RestoreViewModel by sharedViewModel()
+ override val viewModel: RestoreViewModel by activityViewModel()
override fun onCreateView(
inflater: LayoutInflater,
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
index 1f32eb76..32f7b3ff 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
@@ -22,11 +22,11 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.ui.AppBackupState.FAILED_NOT_INSTALLED
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class RestoreProgressFragment : Fragment() {
- private val viewModel: RestoreViewModel by sharedViewModel()
+ private val viewModel: RestoreViewModel by activityViewModel()
private val layoutManager = LinearLayoutManager(context)
private val adapter = RestoreProgressAdapter(lifecycleScope, this::loadIcon)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
index c445125f..f7701302 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreSetFragment.kt
@@ -18,11 +18,11 @@ import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.RecyclerView
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.transport.restore.RestorableBackup
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class RestoreSetFragment : Fragment() {
- private val viewModel: RestoreViewModel by sharedViewModel()
+ private val viewModel: RestoreViewModel by activityViewModel()
private lateinit var listView: RecyclerView
private lateinit var progressBar: ProgressBar
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
index 014f198c..829c4b0b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
@@ -26,11 +26,11 @@ import androidx.recyclerview.widget.RecyclerView
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.restore.RestoreViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class InstallProgressFragment : Fragment(), InstallItemListener {
- private val viewModel: RestoreViewModel by sharedViewModel()
+ private val viewModel: RestoreViewModel by activityViewModel()
private val layoutManager = LinearLayoutManager(context)
private val adapter = InstallProgressAdapter(lifecycleScope, this::loadIcon, this)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
index dc91cb96..8b8126c8 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/AppStatusFragment.kt
@@ -18,7 +18,7 @@ import androidx.fragment.app.Fragment
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.stevesoltys.seedvault.R
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
internal interface AppStatusToggleListener {
fun onAppStatusToggled(status: AppStatus)
@@ -26,7 +26,7 @@ internal interface AppStatusToggleListener {
class AppStatusFragment : Fragment(), AppStatusToggleListener {
- private val viewModel: SettingsViewModel by sharedViewModel()
+ private val viewModel: SettingsViewModel by activityViewModel()
private val layoutManager = LinearLayoutManager(context)
private val adapter = AppStatusAdapter(this)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
index 8a3f1de7..879a5acf 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/ExpertSettingsFragment.kt
@@ -20,11 +20,11 @@ import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.permitDiskReads
import com.stevesoltys.seedvault.transport.backup.PackageService
import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class ExpertSettingsFragment : PreferenceFragmentCompat() {
- private val viewModel: SettingsViewModel by sharedViewModel()
+ private val viewModel: SettingsViewModel by activityViewModel()
private val packageService: PackageService by inject()
private val backupManager: IBackupManager by inject()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
index e30556e6..3ebe7e41 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
@@ -21,12 +21,12 @@ import com.stevesoltys.seedvault.backend.BackendManager
import com.stevesoltys.seedvault.permitDiskReads
import com.stevesoltys.seedvault.settings.preference.M3ListPreference
import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class SchedulingFragment : PreferenceFragmentCompat(),
SharedPreferences.OnSharedPreferenceChangeListener {
- private val viewModel: SettingsViewModel by sharedViewModel()
+ private val viewModel: SettingsViewModel by activityViewModel()
private val settingsManager: SettingsManager by inject()
private val backendManager: BackendManager by inject()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
index c33a47d3..26d2bc52 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
@@ -31,14 +31,14 @@ import com.stevesoltys.seedvault.ui.notification.BackupNotificationManager
import com.stevesoltys.seedvault.ui.toRelativeTime
import org.calyxos.seedvault.core.backends.BackendProperties
import org.koin.android.ext.android.inject
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
import java.util.concurrent.TimeUnit
private val TAG = SettingsFragment::class.java.name
class SettingsFragment : PreferenceFragmentCompat() {
- private val viewModel: SettingsViewModel by sharedViewModel()
+ private val viewModel: SettingsViewModel by activityViewModel()
private val backendManager: BackendManager by inject()
private val backupStateManager: BackupStateManager by inject()
private val backupManager: IBackupManager by inject()
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
index 1a659b58..17c7df22 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/files/FileSelectionFragment.kt
@@ -11,13 +11,13 @@ import androidx.appcompat.widget.Toolbar
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.settings.SettingsViewModel
import org.calyxos.backup.storage.ui.backup.BackupContentFragment
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
import org.koin.androidx.viewmodel.ext.android.viewModel
class FileSelectionFragment : BackupContentFragment() {
override val viewModel by viewModel<FileSelectionViewModel>()
- private val settingsViewModel by sharedViewModel<SettingsViewModel>()
+ private val settingsViewModel by activityViewModel<SettingsViewModel>()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
index 77ec609d..72f8a62b 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
@@ -39,14 +39,14 @@ import com.google.android.material.textfield.MaterialAutoCompleteTextView
import com.google.android.material.textfield.TextInputLayout
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.isDebugBuild
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
import java.util.Locale
internal const val ARG_FOR_NEW_CODE = "forStoringNewCode"
class RecoveryCodeInputFragment : Fragment() {
- private val viewModel: RecoveryCodeViewModel by sharedViewModel()
+ private val viewModel: RecoveryCodeViewModel by activityViewModel()
private lateinit var introText: TextView
private lateinit var doneButton: Button
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
index 9c8263ce..c618a164 100644
--- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
+++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeOutputFragment.kt
@@ -18,11 +18,11 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.isDebugBuild
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
+import org.koin.androidx.viewmodel.ext.android.activityViewModel
class RecoveryCodeOutputFragment : Fragment() {
- private val viewModel: RecoveryCodeViewModel by sharedViewModel()
+ private val viewModel: RecoveryCodeViewModel by activityViewModel()
private lateinit var wordList: RecyclerView
private lateinit var confirmCodeButton: Button