Hide navigation bar in SetupWizard for more visual consistency
This commit is contained in:
parent
3cdd381b51
commit
65905a7160
5 changed files with 17 additions and 1 deletions
|
@ -19,6 +19,8 @@ class RestoreActivity : RequireProvisioningActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
if (isSetupWizard) hideSystemUI()
|
||||||
|
|
||||||
setContentView(R.layout.activity_fragment_container)
|
setContentView(R.layout.activity_fragment_container)
|
||||||
|
|
||||||
viewModel.displayFragment.observeEvent(this, LiveEventHandler { fragment ->
|
viewModel.displayFragment.observeEvent(this, LiveEventHandler { fragment ->
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
package com.stevesoltys.seedvault.ui
|
package com.stevesoltys.seedvault.ui
|
||||||
|
|
||||||
import android.view.MenuItem
|
import android.view.MenuItem
|
||||||
|
import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
||||||
import androidx.annotation.CallSuper
|
import androidx.annotation.CallSuper
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
|
@ -24,4 +25,8 @@ abstract class BackupActivity : AppCompatActivity() {
|
||||||
fragmentTransaction.commit()
|
fragmentTransaction.commit()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected fun hideSystemUI() {
|
||||||
|
window.decorView.systemUiVisibility = SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@ private val TAG = RequireProvisioningActivity::class.java.name
|
||||||
*/
|
*/
|
||||||
abstract class RequireProvisioningActivity : BackupActivity() {
|
abstract class RequireProvisioningActivity : BackupActivity() {
|
||||||
|
|
||||||
private val isSetupWizard: Boolean
|
protected val isSetupWizard: Boolean
|
||||||
get() = intent?.action == ACTION_SETUP_WIZARD
|
get() = intent?.action == ACTION_SETUP_WIZARD
|
||||||
|
|
||||||
protected abstract fun getViewModel(): RequireProvisioningViewModel
|
protected abstract fun getViewModel(): RequireProvisioningViewModel
|
||||||
|
|
|
@ -5,6 +5,7 @@ import android.view.MenuItem
|
||||||
import com.stevesoltys.seedvault.R
|
import com.stevesoltys.seedvault.R
|
||||||
import com.stevesoltys.seedvault.ui.BackupActivity
|
import com.stevesoltys.seedvault.ui.BackupActivity
|
||||||
import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
|
import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_RESTORE
|
||||||
|
import com.stevesoltys.seedvault.ui.INTENT_EXTRA_IS_SETUP_WIZARD
|
||||||
import com.stevesoltys.seedvault.ui.LiveEventHandler
|
import com.stevesoltys.seedvault.ui.LiveEventHandler
|
||||||
import org.koin.androidx.viewmodel.ext.android.viewModel
|
import org.koin.androidx.viewmodel.ext.android.viewModel
|
||||||
|
|
||||||
|
@ -15,6 +16,8 @@ class RecoveryCodeActivity : BackupActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
if (isSetupWizard()) hideSystemUI()
|
||||||
|
|
||||||
setContentView(R.layout.activity_recovery_code)
|
setContentView(R.layout.activity_recovery_code)
|
||||||
|
|
||||||
viewModel.isRestore = isRestore()
|
viewModel.isRestore = isRestore()
|
||||||
|
@ -62,4 +65,8 @@ class RecoveryCodeActivity : BackupActivity() {
|
||||||
return intent?.getBooleanExtra(INTENT_EXTRA_IS_RESTORE, false) ?: false
|
return intent?.getBooleanExtra(INTENT_EXTRA_IS_RESTORE, false) ?: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun isSetupWizard(): Boolean {
|
||||||
|
return intent?.getBooleanExtra(INTENT_EXTRA_IS_SETUP_WIZARD, false) ?: false
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,6 +22,8 @@ class StorageActivity : BackupActivity() {
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
super.onCreate(savedInstanceState)
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
if (isSetupWizard()) hideSystemUI()
|
||||||
|
|
||||||
setContentView(R.layout.activity_fragment_container)
|
setContentView(R.layout.activity_fragment_container)
|
||||||
|
|
||||||
viewModel = if (isRestore()) {
|
viewModel = if (isRestore()) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue