ProfileSwitchDialog -> jetpack

app/src/main/java/info/nightscout/androidaps/dialogs/ProfileSwitchDialog.kt

@@ -8,6 +8,7 @@ import android.widget.ArrayAdapter
 import com.google.common.base.Joiner
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
+import info.nightscout.androidaps.databinding.DialogProfileswitchBinding
 import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
@@ -15,46 +16,51 @@ import info.nightscout.androidaps.utils.DateUtil
 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_profileswitch.*
-import kotlinx.android.synthetic.main.notes.*
-import kotlinx.android.synthetic.main.okcancel.*
 import java.text.DecimalFormat
 import java.util.*
 import javax.inject.Inject
 
 class ProfileSwitchDialog : DialogFragmentWithDate() {
+
     @Inject lateinit var resourceHelper: ResourceHelper
     @Inject lateinit var profileFunction: ProfileFunction
     @Inject lateinit var treatmentsPlugin: TreatmentsPlugin
     @Inject lateinit var activePlugin: ActivePluginProvider
 
-    var profileIndex: Int? = null
+    private var profileIndex: Int? = null
+
+    private var _binding: DialogProfileswitchBinding? = 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_profileswitch_duration", overview_profileswitch_duration.value)
+        savedInstanceState.putDouble("duration", binding.duration.value)
-        savedInstanceState.putDouble("overview_profileswitch_percentage", overview_profileswitch_percentage.value)
+        savedInstanceState.putDouble("percentage", binding.percentage.value)
-        savedInstanceState.putDouble("overview_profileswitch_timeshift", overview_profileswitch_timeshift.value)
+        savedInstanceState.putDouble("timeshift", binding.timeshift.value)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? {
+                              savedInstanceState: Bundle?): View {
         onCreateViewGeneral()
         arguments?.let { bundle ->
             profileIndex = bundle.getInt("profileIndex", 0)
         }
-        return inflater.inflate(R.layout.dialog_profileswitch, container, false)
+        _binding = DialogProfileswitchBinding.inflate(inflater, container, false)
+        return binding.root
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        overview_profileswitch_duration.setParams(savedInstanceState?.getDouble("overview_profileswitch_duration")
+        binding.duration.setParams(savedInstanceState?.getDouble("duration")
-            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, ok)
+            ?: 0.0, 0.0, Constants.MAX_PROFILE_SWITCH_DURATION, 10.0, DecimalFormat("0"), false, binding.okcancel.ok)
-        overview_profileswitch_percentage.setParams(savedInstanceState?.getDouble("overview_profileswitch_percentage")
+        binding.percentage.setParams(savedInstanceState?.getDouble("percentage")
-            ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0, DecimalFormat("0"), false, ok)
+            ?: 100.0, Constants.CPP_MIN_PERCENTAGE.toDouble(), Constants.CPP_MAX_PERCENTAGE.toDouble(), 5.0, DecimalFormat("0"), false, binding.okcancel.ok)
-        overview_profileswitch_timeshift.setParams(savedInstanceState?.getDouble("overview_profileswitch_timeshift")
+        binding.timeshift.setParams(savedInstanceState?.getDouble("timeshift")
-            ?: 0.0, Constants.CPP_MIN_TIMESHIFT.toDouble(), Constants.CPP_MAX_TIMESHIFT.toDouble(), 1.0, DecimalFormat("0"), false, ok)
+            ?: 0.0, Constants.CPP_MIN_TIMESHIFT.toDouble(), Constants.CPP_MAX_TIMESHIFT.toDouble(), 1.0, DecimalFormat("0"), false, binding.okcancel.ok)
 
         // profile
         context?.let { context ->
@@ -62,54 +68,60 @@ class ProfileSwitchDialog : DialogFragmentWithDate() {
                 ?: return
             val profileList = profileStore.getProfileList()
             val adapter = ArrayAdapter(context, R.layout.spinner_centered, profileList)
-            overview_profileswitch_profile.adapter = adapter
+            binding.profile.adapter = adapter
             // set selected to actual profile
             if (profileIndex != null)
-                overview_profileswitch_profile.setSelection(profileIndex as Int)
+                binding.profile.setSelection(profileIndex as Int)
             else
                 for (p in profileList.indices)
                     if (profileList[p] == profileFunction.getProfileName(false))
-                        overview_profileswitch_profile.setSelection(p)
+                        binding.profile.setSelection(p)
         } ?: return
 
         treatmentsPlugin.getProfileSwitchFromHistory(DateUtil.now())?.let { ps ->
             if (ps.isCPP) {
-                overview_profileswitch_reuselayout.visibility = View.VISIBLE
+                binding.reuselayout.visibility = View.VISIBLE
-                overview_profileswitch_reusebutton.text = resourceHelper.gs(R.string.reuse) + " " + ps.percentage + "% " + ps.timeshift + "h"
+                binding.reusebutton.text = resourceHelper.gs(R.string.reuse_profile_pct_hours, ps.percentage, ps.timeshift)
-                overview_profileswitch_reusebutton.setOnClickListener {
+                binding.reusebutton.setOnClickListener {
-                    overview_profileswitch_percentage.value = ps.percentage.toDouble()
+                    binding.percentage.value = ps.percentage.toDouble()
-                    overview_profileswitch_timeshift.value = ps.timeshift.toDouble()
+                    binding.timeshift.value = ps.timeshift.toDouble()
                 }
             } else {
-                overview_profileswitch_reuselayout.visibility = View.GONE
+                binding.reuselayout.visibility = View.GONE
             }
         }
     }
 
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
     override fun submit(): Boolean {
+        if (_binding == null) return false
         val profileStore = activePlugin.activeProfileInterface.profile
             ?: return false
 
         val actions: LinkedList<String> = LinkedList()
-        val duration = overview_profileswitch_duration?.value?.toInt() ?: return false
+        val duration = binding.duration.value?.toInt() ?: return false
         if (duration > 0)
             actions.add(resourceHelper.gs(R.string.duration) + ": " + resourceHelper.gs(R.string.format_mins, duration))
-        val profile = overview_profileswitch_profile.selectedItem.toString()
+        val profile = binding.profile.selectedItem.toString()
         actions.add(resourceHelper.gs(R.string.profile) + ": " + profile)
-        val percent = overview_profileswitch_percentage.value.toInt()
+        val percent = binding.percentage.value.toInt()
         if (percent != 100)
             actions.add(resourceHelper.gs(R.string.percent) + ": " + percent + "%")
-        val timeShift = overview_profileswitch_timeshift.value.toInt()
+        val timeShift = binding.timeshift.value.toInt()
         if (timeShift != 0)
             actions.add(resourceHelper.gs(R.string.careportal_newnstreatment_timeshift_label) + ": " + resourceHelper.gs(R.string.format_hours, timeShift.toDouble()))
-        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)
         if (eventTimeChanged)
             actions.add(resourceHelper.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
 
         activity?.let { activity ->
-            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), Runnable {
+            OKDialog.showConfirmation(activity, resourceHelper.gs(R.string.careportal_profileswitch), HtmlHelper.fromHtml(Joiner.on("<br/>").join(actions)), {
                 aapsLogger.debug("USER ENTRY: PROFILE SWITCH $profile percent: $percent timeshift: $timeShift duration: $duration")
                 treatmentsPlugin.doProfileSwitch(profileStore, profile, duration, percent, timeShift, eventTime)
             })

app/src/main/res/layout/dialog_profileswitch.xml

@@ -64,7 +64,7 @@
                 android:textStyle="bold" />
 
             <Spinner
-                android:id="@+id/overview_profileswitch_profile"
+                android:id="@+id/profile"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical" />
@@ -72,7 +72,7 @@
         </LinearLayout>
 
         <LinearLayout
-            android:id="@+id/overview_profileswitch_reuselayout"
+            android:id="@+id/reuselayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
@@ -90,10 +90,10 @@
                 android:textStyle="bold" />
 
             <Button
-                android:id="@+id/overview_profileswitch_reusebutton"
+                android:id="@+id/reusebutton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="@string/reuse" />
+                android:text="@string/reuse_profile_pct_hours" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -125,7 +125,7 @@
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.MinutesNumberPicker
-                android:id="@+id/overview_profileswitch_duration"
+                android:id="@+id/duration"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
 
@@ -159,7 +159,7 @@
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
-                android:id="@+id/overview_profileswitch_percentage"
+                android:id="@+id/percentage"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
 
@@ -193,7 +193,7 @@
                 android:textStyle="bold" />
 
             <info.nightscout.androidaps.utils.ui.NumberPicker
-                android:id="@+id/overview_profileswitch_timeshift"
+                android:id="@+id/timeshift"
                 android:layout_width="130dp"
                 android:layout_height="40dp" />
 
@@ -210,11 +210,17 @@
 
         </LinearLayout>
 
-        <include layout="@layout/notes" />
+        <include
+            android:id="@+id/notes_layout"
+            layout="@layout/notes" />
 
-        <include layout="@layout/datetime" />
+        <include
+            android:id="@+id/datetime"
+            layout="@layout/datetime" />
 
-        <include layout="@layout/okcancel" />
+        <include
+            android:id="@+id/okcancel"
+            layout="@layout/okcancel" />
 
     </LinearLayout>
 

app/src/main/res/values/strings.xml

@@ -588,7 +588,7 @@
     <string name="activity_target">activity target</string>
     <string name="hypo_duration">hypo duration</string>
     <string name="hypo_target">hypo target</string>
-    <string name="reuse">reuse</string>
+    <string name="reuse_profile_pct_hours">Reuse %1$d%% %2$dh</string>
     <string name="wearcontrol_title">Controls from Watch</string>
     <string name="wearcontrol_summary">Set Temp-Targets and enter Treatments from the watch.</string>
     <string name="food">Food</string>