caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Bugfix in Omnipod wizard

Browse source
This commit is contained in:
Bart Sopers 2021-02-21 22:38:25 +01:00
parent 567c215388
commit b3cc8e86bf
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/activation/fragment/action/PodActivationActionFragmentBase.kt
View file

@ -23,7 +23,7 @@ abstract class PodActivationActionFragmentBase : ActionFragmentBase() {
} }
override fun onFailure() { override fun onFailure() {
(actionViewModel as? PodActivationActionViewModelBase)?.let { viewModel -> (viewModel as? PodActivationActionViewModelBase)?.let { viewModel ->
if (viewModel.isPodDeactivatable() and (viewModel.isPodInAlarm() or viewModel.isPodActivationTimeExceeded())) { if (viewModel.isPodDeactivatable() and (viewModel.isPodInAlarm() or viewModel.isPodActivationTimeExceeded())) {
view?.let { view?.let {
it.findViewById<Button>(R.id.omnipod_wizard_button_retry)?.visibility = View.GONE it.findViewById<Button>(R.id.omnipod_wizard_button_retry)?.visibility = View.GONE

6
omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/common/fragment/ActionFragmentBase.kt
View file

@ -8,13 +8,13 @@ import android.widget.ProgressBar
import android.widget.TextView import android.widget.TextView
import androidx.annotation.LayoutRes import androidx.annotation.LayoutRes
import info.nightscout.androidaps.plugins.pump.omnipod.common.R import info.nightscout.androidaps.plugins.pump.omnipod.common.R
import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.activation.viewmodel.action.PodActivationActionViewModelBase import info.nightscout.androidaps.plugins.pump.omnipod.common.ui.wizard.common.viewmodel.ActionViewModelBase
import info.nightscout.androidaps.utils.extensions.toVisibility import info.nightscout.androidaps.utils.extensions.toVisibility
abstract class ActionFragmentBase : WizardFragmentBase() { abstract class ActionFragmentBase : WizardFragmentBase() {
val actionViewModel: PodActivationActionViewModelBase val actionViewModel: ActionViewModelBase
get() = viewModel as PodActivationActionViewModelBase get() = viewModel as ActionViewModelBase
@SuppressLint("CutPasteId") @SuppressLint("CutPasteId")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {

2
omnipod-common/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/common/ui/wizard/deactivation/fragment/action/DeactivatePodFragment.kt
View file

@ -38,7 +38,7 @@ class DeactivatePodFragment : ActionFragmentBase() {
.setTitle(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod)) .setTitle(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod))
.setMessage(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod_confirmation)) .setMessage(getString(R.string.omnipod_common_pod_deactivation_wizard_discard_pod_confirmation))
.setPositiveButton(getString(R.string.omnipod_common_yes)) { _, _ -> .setPositiveButton(getString(R.string.omnipod_common_yes)) { _, _ ->
(actionViewModel as DeactivatePodViewModel).discardPod() (viewModel as DeactivatePodViewModel).discardPod()
findNavController().navigate(R.id.action_deactivatePodFragment_to_podDiscardedFragment) findNavController().navigate(R.id.action_deactivatePodFragment_to_podDiscardedFragment)
} }
.setNegativeButton(getString(R.string.omnipod_common_no), null) .setNegativeButton(getString(R.string.omnipod_common_no), null)