Fix blood sugar saving twice when blood sugar measurement unit is changed (simpledotorg#4716)

* Override view effect handler in `BloodSugarUnitSelectionViewEffectHandler`

* Handle button action in `onResume`

This is done to prevent dialog automatically closing when an action button is clicked. Instead we will close it after the unit selection is updated in preferences

* Update CHANGELOG

* Remove unused code from `BloodSugarUnitSelectionDialog`

Author: msasikanth

CHANGELOG.md

@@ -9,6 +9,10 @@
 - Remove firebase remote config `questionnaires_enabled` logic for loading questionnaire's api.
 - Remove DPH/TamilNadu build variant
 
+### Fixes
+
+- Fix blood sugar saving twice when blood sugar measurement unit is changed
+
 ## 2023-06-08-8751
 
 ### Internal

app/src/main/java/org/simple/clinic/bloodsugar/unitselection/BloodSugarUnitSelectionDialog.kt

@@ -1,15 +1,14 @@
 package org.simple.clinic.bloodsugar.unitselection
 
 import android.app.Dialog
+import android.app.Dialog.BUTTON_POSITIVE
 import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.FragmentManager
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.jakewharton.rxbinding3.widget.checkedChanges
 import com.spotify.mobius.functions.Consumer
 import io.reactivex.Observable
 import io.reactivex.rxkotlin.cast
@@ -43,34 +42,6 @@ class BloodSugarUnitSelectionDialog : BaseDialog<
   @Inject
   lateinit var router: Router
 
-  companion object {
-
-    private const val FRAGMENT_TAG = "blood_sugar_unit_selection_tag"
-    private const val KEY_UNIT_PREF = "bloodSugarUnitSelection"
-
-    fun show(fragmentManager: FragmentManager, bloodSugarUnitPreference: BloodSugarUnitPreference) {
-      val existingFragment = fragmentManager.findFragmentByTag(FRAGMENT_TAG)
-
-      if (existingFragment != null) {
-        fragmentManager
-            .beginTransaction()
-            .remove(existingFragment)
-            .commitNowAllowingStateLoss()
-      }
-
-      val arguments = Bundle()
-      arguments.putSerializable(KEY_UNIT_PREF, bloodSugarUnitPreference)
-
-      val fragment = BloodSugarUnitSelectionDialog()
-      fragment.arguments = arguments
-
-      fragmentManager
-          .beginTransaction()
-          .add(fragment, FRAGMENT_TAG)
-          .commitNowAllowingStateLoss()
-    }
-  }
-
   override fun bindView(
       layoutInflater: LayoutInflater,
       container: ViewGroup?
@@ -86,6 +57,8 @@ class BloodSugarUnitSelectionDialog : BaseDialog<
       viewEffectsConsumer = viewEffectsConsumer
   ).build()
 
+  override fun viewEffectHandler() = BloodSugarUnitSelectionViewEffectHandler(this)
+
   override fun events(): Observable<BloodSugarUnitSelectionEvent> = hotEvents.cast()
 
   override fun onAttach(context: Context) {
@@ -94,38 +67,33 @@ class BloodSugarUnitSelectionDialog : BaseDialog<
   }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-    val radioIdToBloodSugarUnits = mapOf(
-        R.id.bloodSugarUnitMg to BloodSugarUnitPreference.Mg,
-        R.id.bloodSugarUnitMmol to BloodSugarUnitPreference.Mmol
-    )
-
     return MaterialAlertDialogBuilder(requireContext())
         .setTitle(R.string.blood_sugar_unit_selection_choose)
-        .setPositiveButton(R.string.blood_sugar_unit_selection_done) { _, _ ->
-          val bloodSugarUnitSelectionValue = radioIdToBloodSugarUnits.getValue(bloodSugarUnitGroup.checkedRadioButtonId)
-          hotEvents.onNext(DoneClicked(bloodSugarUnitSelectionValue))
-        }
+        .setPositiveButton(R.string.blood_sugar_unit_selection_done, null)
         .create()
   }
 
+  override fun onResume() {
+    super.onResume()
+    if (dialog != null) {
+      val radioIdToBloodSugarUnits = mapOf(
+          R.id.bloodSugarUnitMg to BloodSugarUnitPreference.Mg,
+          R.id.bloodSugarUnitMmol to BloodSugarUnitPreference.Mmol
+      )
+      val alertDialog = (dialog as AlertDialog)
+      alertDialog.getButton(BUTTON_POSITIVE).setOnClickListener {
+        val bloodSugarUnitSelectionValue = radioIdToBloodSugarUnits.getValue(bloodSugarUnitGroup.checkedRadioButtonId)
+        hotEvents.onNext(DoneClicked(bloodSugarUnitSelectionValue))
+      }
+    }
+  }
+
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
     val view = super.onCreateView(inflater, container, savedInstanceState)
     (dialog as? AlertDialog)?.setView(view)
     return view
   }
 
-  private fun radioButtonClicks(): Observable<BloodSugarUnitSelectionEvent> {
-    return bloodSugarUnitGroup
-        .checkedChanges()
-        .map { checkedId ->
-          when (checkedId) {
-            R.id.bloodSugarUnitMg -> SaveBloodSugarUnitPreference(BloodSugarUnitPreference.Mg)
-            R.id.bloodSugarUnitMmol -> SaveBloodSugarUnitPreference(BloodSugarUnitPreference.Mmol)
-            else -> SaveBloodSugarUnitPreference(BloodSugarUnitPreference.Mg)
-          }
-        }
-  }
-
   override fun closeDialog() {
     router.pop()
   }