diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt index db4bdc08..4e924214 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreActivity.kt @@ -21,8 +21,6 @@ class RestoreActivity : RequireProvisioningActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (isSetupWizard) hideSystemUiNavigation() - setContentView(R.layout.activity_fragment_container) viewModel.displayFragment.observeEvent(this, { fragment -> diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt index acb56a0b..40d35fba 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/BackupActivity.kt @@ -1,7 +1,6 @@ package com.stevesoltys.seedvault.ui import android.view.MenuItem -import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION import androidx.annotation.CallSuper import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.Fragment @@ -25,8 +24,4 @@ abstract class BackupActivity : AppCompatActivity() { fragmentTransaction.commit() } - protected fun hideSystemUiNavigation() { - window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION - } - } diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt index 8aceedcf..aceacaab 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/RequireProvisioningActivity.kt @@ -23,6 +23,7 @@ abstract class RequireProvisioningActivity : BackupActivity() { private val recoveryCodeRequest = registerForActivityResult(StartActivityForResult()) { result -> + setResult(result.resultCode) if (result.resultCode != RESULT_OK) { Log.w(TAG, "Error in activity result for requesting recovery code") if (!getViewModel().recoveryCodeIsSet()) { @@ -32,6 +33,7 @@ abstract class RequireProvisioningActivity : BackupActivity() { } private val requestLocation = registerForActivityResult(StartActivityForResult()) { result -> + setResult(result.resultCode) if (result.resultCode != RESULT_OK) { Log.w(TAG, "Error in activity result for requesting location") if (!getViewModel().validLocationIsSet()) { diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt index d851b688..a6b3d3ed 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeActivity.kt @@ -6,7 +6,6 @@ import android.view.WindowManager.LayoutParams.FLAG_SECURE import com.stevesoltys.seedvault.R import com.stevesoltys.seedvault.ui.BackupActivity import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE -import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD import org.koin.androidx.viewmodel.ext.android.viewModel class RecoveryCodeActivity : BackupActivity() { @@ -16,7 +15,6 @@ class RecoveryCodeActivity : BackupActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (isSetupWizard()) hideSystemUiNavigation() window.addFlags(FLAG_SECURE) setContentView(R.layout.activity_recovery_code) @@ -66,8 +64,4 @@ class RecoveryCodeActivity : BackupActivity() { return intent?.getBooleanExtra(INTENT_EXTRA_IS_RESTORE, false) ?: false } - private fun isSetupWizard(): Boolean { - return intent?.getBooleanExtra(INTENT_EXTRA_IS_SETUP_WIZARD, false) ?: false - } - } 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 f6b15105..f0bc993a 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 @@ -46,7 +46,6 @@ class RecoveryCodeInputFragment : Fragment() { private lateinit var introText: TextView private lateinit var doneButton: Button private lateinit var newCodeButton: Button - private lateinit var backView: TextView private lateinit var wordLayout1: TextInputLayout private lateinit var wordLayout2: TextInputLayout private lateinit var wordLayout3: TextInputLayout @@ -76,7 +75,6 @@ class RecoveryCodeInputFragment : Fragment() { introText = v.findViewById(R.id.introText) doneButton = v.findViewById(R.id.doneButton) newCodeButton = v.findViewById(R.id.newCodeButton) - backView = v.findViewById(R.id.backView) wordLayout1 = v.findViewById(R.id.wordLayout1) wordLayout2 = v.findViewById(R.id.wordLayout2) wordLayout3 = v.findViewById(R.id.wordLayout3) @@ -105,8 +103,6 @@ class RecoveryCodeInputFragment : Fragment() { if (viewModel.isRestore) { introText.setText(R.string.recovery_code_input_intro) - backView.visibility = VISIBLE - backView.setOnClickListener { requireActivity().finishAfterTransition() } } val adapterLayout = android.R.layout.simple_list_item_1 diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt index 08472ea8..7c49f1b6 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt @@ -47,8 +47,6 @@ class StorageActivity : BackupActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - if (isSetupWizard()) hideSystemUiNavigation() - setContentView(R.layout.activity_fragment_container) viewModel = if (isRestore()) { diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt index f2e852ea..61439e7c 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageRootsFragment.kt @@ -21,6 +21,7 @@ import androidx.activity.result.contract.ActivityResultContracts.OpenDocumentTre import androidx.annotation.RequiresPermission import androidx.fragment.app.Fragment import androidx.recyclerview.widget.RecyclerView +import com.google.android.setupcompat.util.ResultCodes.RESULT_SKIP import com.stevesoltys.seedvault.R import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE import org.koin.androidx.viewmodel.ext.android.getSharedViewModel @@ -45,7 +46,7 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener { private lateinit var divider: View private lateinit var listView: RecyclerView private lateinit var progressBar: ProgressBar - private lateinit var backView: TextView + private lateinit var skipView: TextView private val adapter by lazy { StorageRootAdapter(viewModel.isRestoreOperation, this) } @@ -62,7 +63,7 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener { divider = v.findViewById(R.id.divider) listView = v.findViewById(R.id.listView) progressBar = v.findViewById(R.id.progressBar) - backView = v.findViewById(R.id.backView) + skipView = v.findViewById(R.id.skipView) return v } @@ -78,8 +79,11 @@ internal class StorageRootsFragment : Fragment(), StorageRootClickedListener { if (viewModel.isRestoreOperation) { titleView.text = getString(R.string.storage_fragment_restore_title) - backView.visibility = VISIBLE - backView.setOnClickListener { requireActivity().finishAfterTransition() } + skipView.visibility = VISIBLE + skipView.setOnClickListener { + requireActivity().setResult(RESULT_SKIP) + requireActivity().finishAfterTransition() + } } else { warningIcon.visibility = VISIBLE if (viewModel.hasStorageSet) { diff --git a/app/src/main/res/layout/fragment_recovery_code_input.xml b/app/src/main/res/layout/fragment_recovery_code_input.xml index 52d4ce97..10f51f55 100644 --- a/app/src/main/res/layout/fragment_recovery_code_input.xml +++ b/app/src/main/res/layout/fragment_recovery_code_input.xml @@ -71,23 +71,6 @@ app:layout_constraintEnd_toStartOf="@+id/newCodeButton" app:layout_constraintStart_toStartOf="parent" /> - -