From 83c709e2bc07c9275f9f6a5ab68d8729a44e6304 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Thu, 21 Jan 2021 20:21:25 +0100 Subject: [PATCH] FillDialog -> jetpack --- .../androidaps/dialogs/FillDialog.kt | 64 +++++++++++-------- app/src/main/res/layout/dialog_fill.xml | 12 +++- 2 files changed, 47 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt index 167ee2cd84..d55a4e5944 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt @@ -10,6 +10,7 @@ import com.google.common.base.Joiner import info.nightscout.androidaps.R import info.nightscout.androidaps.activities.ErrorHelperActivity import info.nightscout.androidaps.data.DetailedBolusInfo +import info.nightscout.androidaps.databinding.DialogFillBinding import info.nightscout.androidaps.db.CareportalEvent import info.nightscout.androidaps.db.Source import info.nightscout.androidaps.interfaces.ActivePluginProvider @@ -24,14 +25,12 @@ import info.nightscout.androidaps.utils.SafeParse import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.extensions.formatColor import info.nightscout.androidaps.utils.resources.ResourceHelper -import kotlinx.android.synthetic.main.dialog_fill.* -import kotlinx.android.synthetic.main.notes.* -import kotlinx.android.synthetic.main.okcancel.* import java.util.* import javax.inject.Inject import kotlin.math.abs class FillDialog : DialogFragmentWithDate() { + @Inject lateinit var constraintChecker: ConstraintChecker @Inject lateinit var resourceHelper: ResourceHelper @Inject lateinit var ctx: Context @@ -39,15 +38,22 @@ class FillDialog : DialogFragmentWithDate() { @Inject lateinit var commandQueue: CommandQueueProvider @Inject lateinit var activePlugin: ActivePluginProvider + private var _binding: DialogFillBinding? = null + + // This property is only valid between onCreateView and + // onDestroyView. + private val binding get() = _binding!! + override fun onSaveInstanceState(savedInstanceState: Bundle) { super.onSaveInstanceState(savedInstanceState) - savedInstanceState.putDouble("fill_insulin_amount", fill_insulinamount.value) + savedInstanceState.putDouble("fill_insulin_amount", binding.fillInsulinamount.value) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { + savedInstanceState: Bundle?): View { onCreateViewGeneral() - return inflater.inflate(R.layout.dialog_fill, container, false) + _binding = DialogFillBinding.inflate(inflater, container, false) + return binding.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { @@ -55,37 +61,43 @@ class FillDialog : DialogFragmentWithDate() { val maxInsulin = constraintChecker.getMaxBolusAllowed().value() val bolusStep = activePlugin.activePump.pumpDescription.bolusStep - fill_insulinamount.setParams(savedInstanceState?.getDouble("fill_insulin_amount") - ?: 0.0, 0.0, maxInsulin, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), true, ok) + binding.fillInsulinamount.setParams(savedInstanceState?.getDouble("fill_insulin_amount") + ?: 0.0, 0.0, maxInsulin, bolusStep, DecimalFormatter.pumpSupportedBolusFormat(activePlugin.activePump), true, binding.okcancel.ok) val amount1 = sp.getDouble("fill_button1", 0.3) if (amount1 > 0) { - fill_preset_button1.visibility = View.VISIBLE - fill_preset_button1.text = DecimalFormatter.toPumpSupportedBolus(amount1, activePlugin.activePump) // + "U"); - fill_preset_button1.setOnClickListener { fill_insulinamount.value = amount1 } + binding.fillPresetButton1.visibility = View.VISIBLE + binding.fillPresetButton1.text = DecimalFormatter.toPumpSupportedBolus(amount1, activePlugin.activePump) // + "U"); + binding.fillPresetButton1.setOnClickListener { binding.fillInsulinamount.value = amount1 } } else { - fill_preset_button1.visibility = View.GONE + binding.fillPresetButton1.visibility = View.GONE } val amount2 = sp.getDouble("fill_button2", 0.0) if (amount2 > 0) { - fill_preset_button2.visibility = View.VISIBLE - fill_preset_button2.text = DecimalFormatter.toPumpSupportedBolus(amount2, activePlugin.activePump) // + "U"); - fill_preset_button2.setOnClickListener { fill_insulinamount.value = amount2 } + binding.fillPresetButton2.visibility = View.VISIBLE + binding.fillPresetButton2.text = DecimalFormatter.toPumpSupportedBolus(amount2, activePlugin.activePump) // + "U"); + binding.fillPresetButton2.setOnClickListener { binding.fillInsulinamount.value = amount2 } } else { - fill_preset_button2.visibility = View.GONE + binding.fillPresetButton2.visibility = View.GONE } val amount3 = sp.getDouble("fill_button3", 0.0) if (amount3 > 0) { - fill_preset_button3.visibility = View.VISIBLE - fill_preset_button3.text = DecimalFormatter.toPumpSupportedBolus(amount3, activePlugin.activePump) // + "U"); - fill_preset_button3.setOnClickListener { fill_insulinamount.value = amount3 } + binding.fillPresetButton3.visibility = View.VISIBLE + binding.fillPresetButton3.text = DecimalFormatter.toPumpSupportedBolus(amount3, activePlugin.activePump) // + "U"); + binding.fillPresetButton3.setOnClickListener { binding.fillInsulinamount.value = amount3 } } else { - fill_preset_button3.visibility = View.GONE + binding.fillPresetButton3.visibility = View.GONE } } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun submit(): Boolean { - val insulin = SafeParse.stringToDouble(fill_insulinamount?.text ?: return false) + if (_binding == null) return false + val insulin = SafeParse.stringToDouble(binding.fillInsulinamount.text ?: return false) val actions: LinkedList = LinkedList() val insulinAfterConstraints = constraintChecker.applyBolusConstraints(Constraint(insulin)).value() @@ -96,13 +108,13 @@ class FillDialog : DialogFragmentWithDate() { if (abs(insulinAfterConstraints - insulin) > 0.01) actions.add(resourceHelper.gs(R.string.bolusconstraintappliedwarn, insulin, insulinAfterConstraints).formatColor(resourceHelper, R.color.warning)) } - val siteChange = fill_catheter_change.isChecked + val siteChange = binding.fillCatheterChange.isChecked if (siteChange) actions.add(resourceHelper.gs(R.string.record_pump_site_change).formatColor(resourceHelper, R.color.actionsConfirm)) - val insulinChange = fill_cartridge_change.isChecked + val insulinChange = binding.fillCatheterChange.isChecked if (insulinChange) actions.add(resourceHelper.gs(R.string.record_insulin_cartridge_change).formatColor(resourceHelper, R.color.actionsConfirm)) - val notes = notes.text.toString() + val notes = binding.notesLayout.notes.text.toString() if (notes.isNotEmpty()) actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_notes_label) + ": " + notes) eventTime -= eventTime % 1000 @@ -110,9 +122,9 @@ class FillDialog : DialogFragmentWithDate() { if (eventTimeChanged) actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) - if (insulinAfterConstraints > 0 || fill_catheter_change.isChecked || fill_cartridge_change.isChecked) { + if (insulinAfterConstraints > 0 || binding.fillCatheterChange.isChecked || binding.fillCatheterChange.isChecked) { activity?.let { activity -> - OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), Runnable { + OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.primefill), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { if (insulinAfterConstraints > 0) { aapsLogger.debug("USER ENTRY: PRIME BOLUS $insulinAfterConstraints") requestPrimeBolus(insulinAfterConstraints, notes) diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml index 8c2f1bda63..40d01124c1 100644 --- a/app/src/main/res/layout/dialog_fill.xml +++ b/app/src/main/res/layout/dialog_fill.xml @@ -126,11 +126,17 @@ - + - + - +