diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt index afa1a69efa..54657373b3 100644 --- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt +++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempTargetDialog.kt @@ -4,30 +4,29 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView import android.widget.ArrayAdapter import com.google.common.base.Joiner import com.google.common.collect.Lists import info.nightscout.androidaps.Constants import info.nightscout.androidaps.R import info.nightscout.androidaps.data.Profile +import info.nightscout.androidaps.databinding.DialogTemptargetBinding import info.nightscout.androidaps.db.Source import info.nightscout.androidaps.db.TempTarget import info.nightscout.androidaps.interfaces.ActivePluginProvider -import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.interfaces.ProfileFunction +import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin import info.nightscout.androidaps.utils.DefaultValueHelper import info.nightscout.androidaps.utils.HtmlHelper import info.nightscout.androidaps.utils.alertDialogs.OKDialog import info.nightscout.androidaps.utils.resources.ResourceHelper -import kotlinx.android.synthetic.main.dialog_temptarget.* -import kotlinx.android.synthetic.main.okcancel.* import java.text.DecimalFormat import java.util.* import javax.inject.Inject class TempTargetDialog : DialogFragmentWithDate() { + @Inject lateinit var constraintChecker: ConstraintChecker @Inject lateinit var resourceHelper: ResourceHelper @Inject lateinit var profileFunction: ProfileFunction @@ -37,44 +36,51 @@ class TempTargetDialog : DialogFragmentWithDate() { lateinit var reasonList: List + private var _binding: DialogTemptargetBinding? = 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("overview_temptarget_duration", overview_temptarget_duration.value) - savedInstanceState.putDouble("overview_temptarget_temptarget", overview_temptarget_temptarget.value) + savedInstanceState.putDouble("duration", binding.duration.value) + savedInstanceState.putDouble("temptarget", binding.temptarget.value) } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, - savedInstanceState: Bundle?): View? { + savedInstanceState: Bundle?): View { onCreateViewGeneral() - return inflater.inflate(R.layout.dialog_temptarget, container, false) + _binding = DialogTemptargetBinding.inflate(inflater, container, false) + return binding.root } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - overview_temptarget_duration.setParams(savedInstanceState?.getDouble("overview_temptarget_duration") - ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok) + binding.duration.setParams(savedInstanceState?.getDouble("duration") + ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok) if (profileFunction.getUnits() == Constants.MMOL) - overview_temptarget_temptarget.setParams( - savedInstanceState?.getDouble("overview_temptarget_temptarget") + binding.temptarget.setParams( + savedInstanceState?.getDouble("temptarget") ?: 8.0, - Constants.MIN_TT_MMOL, Constants.MAX_TT_MMOL, 0.1, DecimalFormat("0.0"), false, ok) + Constants.MIN_TT_MMOL, Constants.MAX_TT_MMOL, 0.1, DecimalFormat("0.0"), false, binding.okcancel.ok) else - overview_temptarget_temptarget.setParams( - savedInstanceState?.getDouble("overview_temptarget_temptarget") + binding.temptarget.setParams( + savedInstanceState?.getDouble("temptarget") ?: 144.0, - Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1.0, DecimalFormat("0"), false, ok) + Constants.MIN_TT_MGDL, Constants.MAX_TT_MGDL, 1.0, DecimalFormat("0"), false, binding.okcancel.ok) val units = profileFunction.getUnits() - overview_temptarget_units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl) + binding.units.text = if (units == Constants.MMOL) resourceHelper.gs(R.string.mmol) else resourceHelper.gs(R.string.mgdl) // temp target context?.let { context -> if (activePlugin.activeTreatments.tempTargetFromHistory != null) - overview_temptarget_cancel?.visibility = View.VISIBLE + binding.targetCancel.visibility = View.VISIBLE else - overview_temptarget_cancel?.visibility = View.GONE + binding.targetCancel.visibility = View.GONE reasonList = Lists.newArrayList( resourceHelper.gs(R.string.manual), @@ -83,59 +89,67 @@ class TempTargetDialog : DialogFragmentWithDate() { resourceHelper.gs(R.string.hypo) ) val adapterReason = ArrayAdapter(context, R.layout.spinner_centered, reasonList) - overview_temptarget_reason.adapter = adapterReason + binding.reason.adapter = adapterReason - overview_temptarget_cancel?.setOnClickListener { shortClick(it) } - overview_temptarget_eating_soon?.setOnClickListener { shortClick(it) } - overview_temptarget_activity?.setOnClickListener { shortClick(it) } - overview_temptarget_hypo?.setOnClickListener { shortClick(it) } + binding.targetCancel.setOnClickListener { shortClick(it) } + binding.eatingSoon.setOnClickListener { shortClick(it) } + binding.activity.setOnClickListener { shortClick(it) } + binding.hypo.setOnClickListener { shortClick(it) } - overview_temptarget_eating_soon?.setOnLongClickListener { + binding.eatingSoon.setOnLongClickListener { longClick(it) return@setOnLongClickListener true } - overview_temptarget_activity?.setOnLongClickListener { + binding.activity.setOnLongClickListener { longClick(it) return@setOnLongClickListener true } - overview_temptarget_hypo?.setOnLongClickListener { + binding.hypo.setOnLongClickListener { longClick(it) return@setOnLongClickListener true } } } - private fun shortClick(v:View){ + private fun shortClick(v: View) { v.performLongClick() if (submit()) dismiss() } - private fun longClick(v:View) { + private fun longClick(v: View) { when (v.id) { - R.id.overview_temptarget_eating_soon -> { - overview_temptarget_temptarget.value = defaultValueHelper.determineEatingSoonTT() - overview_temptarget_duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble() - overview_temptarget_reason.setSelection(reasonList.indexOf( resourceHelper.gs(R.string.eatingsoon))) + R.id.eating_soon -> { + binding.temptarget.value = defaultValueHelper.determineEatingSoonTT() + binding.duration.value = defaultValueHelper.determineEatingSoonTTDuration().toDouble() + binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.eatingsoon))) } - R.id.overview_temptarget_activity -> { - overview_temptarget_temptarget.value = defaultValueHelper.determineActivityTT() - overview_temptarget_duration.value = defaultValueHelper.determineActivityTTDuration().toDouble() - overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.activity))) + + R.id.activity -> { + binding.temptarget.value = defaultValueHelper.determineActivityTT() + binding.duration.value = defaultValueHelper.determineActivityTTDuration().toDouble() + binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.activity))) } - R.id.overview_temptarget_hypo -> { - overview_temptarget_temptarget.value = defaultValueHelper.determineHypoTT() - overview_temptarget_duration.value = defaultValueHelper.determineHypoTTDuration().toDouble() - overview_temptarget_reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.hypo))) + + R.id.hypo -> { + binding.temptarget.value = defaultValueHelper.determineHypoTT() + binding.duration.value = defaultValueHelper.determineHypoTTDuration().toDouble() + binding.reason.setSelection(reasonList.indexOf(resourceHelper.gs(R.string.hypo))) } } } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + override fun submit(): Boolean { + if (_binding == null) return false val actions: LinkedList = LinkedList() - val reason = overview_temptarget_reason?.selectedItem?.toString() ?: return false + val reason = binding.reason.selectedItem?.toString() ?: return false val unitResId = if (profileFunction.getUnits() == Constants.MGDL) R.string.mgdl else R.string.mmol - val target = overview_temptarget_temptarget.value - val duration = overview_temptarget_duration.value.toInt() + val target = binding.temptarget.value + val duration = binding.duration.value.toInt() if (target != 0.0 && duration != 0) { actions.add(resourceHelper.gs(R.string.reason) + ": " + reason) actions.add(resourceHelper.gs(R.string.target_label) + ": " + Profile.toCurrentUnitsString(profileFunction, target) + " " + resourceHelper.gs(unitResId)) @@ -147,7 +161,7 @@ class TempTargetDialog : DialogFragmentWithDate() { actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime)) activity?.let { activity -> - OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), Runnable { + OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_temporarytarget), HtmlHelper.fromHtml(Joiner.on("
").join(actions)), { aapsLogger.debug("USER ENTRY: TEMP TARGET $target duration: $duration") if (target == 0.0 || duration == 0) { val tempTarget = TempTarget() diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml index 370fdd1821..7a53ea8496 100644 --- a/app/src/main/res/layout/dialog_temptarget.xml +++ b/app/src/main/res/layout/dialog_temptarget.xml @@ -64,13 +64,13 @@ android:textStyle="bold" /> @@ -132,12 +132,12 @@ android:textStyle="bold" /> + android:paddingRight="5dp" /> @@ -149,67 +149,69 @@ android:orientation="horizontal"> - +