Update UI to include Smokeless tobacco option in medical history questions (#5532)

Author: siddh1004

app/src/androidTest/java/org/simple/clinic/medicalhistory/MedicalHistoryRepositoryAndroidTest.kt

@@ -54,6 +54,7 @@ class MedicalHistoryRepositoryAndroidTest {
         hasHadKidneyDisease = Yes,
         hasDiabetes = No,
         isSmoking = No,
+        isUsingSmokelessTobacco = No,
     )
 
     repository.save(

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistory.kt

@@ -22,6 +22,7 @@ import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAStroke
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnDiabetesTreatment
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnHypertensionTreatment
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsSmoking
+import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsUsingSmokelessTobacco
 import org.simple.clinic.patient.PatientUuid
 import org.simple.clinic.patient.SyncStatus
 import java.time.Instant
@@ -91,6 +92,7 @@ data class MedicalHistory(
       is IsOnHypertensionTreatment -> copy(isOnHypertensionTreatment = answer)
       IsOnDiabetesTreatment -> copy(isOnDiabetesTreatment = answer)
       IsSmoking -> copy(isSmoking = answer)
+      IsUsingSmokelessTobacco -> copy(isUsingSmokelessTobacco = answer)
     }
   }
 

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistoryQuestion.kt

@@ -22,5 +22,6 @@ sealed class MedicalHistoryQuestion(
   )
 
   object IsOnDiabetesTreatment : MedicalHistoryQuestion(R.string.medicalhistory_question_is_on_diabetes_treatment)
-  data object IsSmoking : MedicalHistoryQuestion(R.string.medicalhistory_question_is_current_smoker)
+  data object IsSmoking : MedicalHistoryQuestion(R.string.medicalhistory_question_is_smoking)
+  data object IsUsingSmokelessTobacco : MedicalHistoryQuestion(R.string.medicalhistory_question_is_using_smokeless_tobacco)
 }

app/src/main/java/org/simple/clinic/medicalhistory/MedicalHistoryRepository.kt

@@ -101,7 +101,7 @@ class MedicalHistoryRepository @Inject constructor(
         hasHadKidneyDisease = historyEntry.hasHadKidneyDisease,
         diagnosedWithDiabetes = historyEntry.hasDiabetes,
         isSmoking = historyEntry.isSmoking,
-        isUsingSmokelessTobacco = Unanswered,
+        isUsingSmokelessTobacco = historyEntry.isUsingSmokelessTobacco,
         cholesterol = null,
         syncStatus = SyncStatus.PENDING,
         createdAt = Instant.now(utcClock),

app/src/main/java/org/simple/clinic/medicalhistory/OngoingMedicalHistoryEntry.kt

@@ -11,6 +11,7 @@ import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAStroke
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnDiabetesTreatment
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnHypertensionTreatment
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsSmoking
+import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsUsingSmokelessTobacco
 
 @Parcelize
 data class OngoingMedicalHistoryEntry(
@@ -22,6 +23,7 @@ data class OngoingMedicalHistoryEntry(
     val isOnDiabetesTreatment: Answer = Unanswered,
     val hasDiabetes: Answer = Unanswered,
     val isSmoking: Answer = Unanswered,
+    val isUsingSmokelessTobacco: Answer = Unanswered,
 ) : Parcelable {
 
   fun answerChanged(question: MedicalHistoryQuestion, answer: Answer): OngoingMedicalHistoryEntry {
@@ -34,6 +36,7 @@ data class OngoingMedicalHistoryEntry(
       is IsOnHypertensionTreatment -> copy(isOnHypertensionTreatment = answer)
       IsOnDiabetesTreatment -> copy(isOnDiabetesTreatment = answer)
       IsSmoking -> copy(isSmoking = answer)
+      IsUsingSmokelessTobacco -> copy(isUsingSmokelessTobacco = answer)
     }
   }
 }

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryModel.kt

@@ -21,6 +21,7 @@ data class NewMedicalHistoryModel(
     val nextButtonState: ButtonState?,
     val hasShownChangeDiagnosisError: Boolean,
     val showIsSmokingQuestion: Boolean,
+    val showSmokelessTobaccoQuestion: Boolean,
 ) : Parcelable {
 
   val hasLoadedPatientEntry: Boolean
@@ -72,14 +73,19 @@ data class NewMedicalHistoryModel(
     get() = facilityDiabetesManagementEnabled && !hasShownChangeDiagnosisError && hasNoHypertension && hasNoDiabetes
 
   companion object {
-    fun default(country: Country, showIsSmokingQuestion: Boolean): NewMedicalHistoryModel = NewMedicalHistoryModel(
+    fun default(
+        country: Country,
+        showIsSmokingQuestion: Boolean,
+        showSmokelessTobaccoQuestion: Boolean
+    ): NewMedicalHistoryModel = NewMedicalHistoryModel(
         country = country,
         ongoingPatientEntry = null,
         ongoingMedicalHistoryEntry = OngoingMedicalHistoryEntry(),
         currentFacility = null,
         nextButtonState = null,
         hasShownChangeDiagnosisError = false,
-        showIsSmokingQuestion = showIsSmokingQuestion
+        showIsSmokingQuestion = showIsSmokingQuestion,
+        showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion
     )
   }
 

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryScreen.kt

@@ -8,6 +8,15 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.dimensionResource
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.jakewharton.rxbinding3.view.clicks
 import com.spotify.mobius.functions.Consumer
@@ -19,6 +28,7 @@ import kotlinx.parcelize.Parcelize
 import org.simple.clinic.R
 import org.simple.clinic.ReportAnalyticsEvents
 import org.simple.clinic.appconfig.Country
+import org.simple.clinic.common.ui.theme.SimpleTheme
 import org.simple.clinic.databinding.ScreenNewMedicalHistoryBinding
 import org.simple.clinic.di.injector
 import org.simple.clinic.feature.Feature
@@ -32,10 +42,10 @@ import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAKidneyDise
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAStroke
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnDiabetesTreatment
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsOnHypertensionTreatment
-import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsSmoking
 import org.simple.clinic.medicalhistory.SelectDiagnosisErrorDialog
 import org.simple.clinic.medicalhistory.SelectOngoingDiabetesTreatmentErrorDialog
 import org.simple.clinic.medicalhistory.SelectOngoingHypertensionTreatmentErrorDialog
+import org.simple.clinic.medicalhistory.ui.TobaccoQuestion
 import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.ScreenKey
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
@@ -100,27 +110,27 @@ class NewMedicalHistoryScreen : BaseScreen<
   private val diabetesQuestionView
     get() = binding.diabetesQuestionView
 
-  private val scrollView
-    get() = binding.scrollView
-
   private val hypertensionDiagnosis
     get() = binding.hypertensionDiagnosis
 
   private val diabetesDiagnosis
     get() = binding.diabetesDiagnosis
 
-  private val currentSmokerQuestionContainer
-    get() = binding.currentSmokerQuestionContainer
+  private var showSmokerQuestion by mutableStateOf(false)
+  private var isSmoking by mutableStateOf<Answer>(Answer.Unanswered)
+  private var showSmokelessTobaccoQuestion by mutableStateOf(false)
+  private var isUsingSmokelessTobacco by mutableStateOf<Answer>(Answer.Unanswered)
 
-  private val currentSmokerQuestionView
-    get() = binding.currentSmokerQuestionView
+  private val composeView
+    get() = binding.composeView
 
   private val hotEvents: Subject<NewMedicalHistoryEvent> = PublishSubject.create()
 
   override fun defaultModel() = NewMedicalHistoryModel.default(
       country = country,
       showIsSmokingQuestion = features.isEnabled(Feature.NonLabBasedStatinNudge) ||
-          features.isEnabled(Feature.LabBasedStatinNudge)
+          features.isEnabled(Feature.LabBasedStatinNudge),
+      showSmokelessTobaccoQuestion = country.isoCountryCode != Country.ETHIOPIA
   )
 
   override fun bindView(
@@ -164,6 +174,31 @@ class NewMedicalHistoryScreen : BaseScreen<
     toolbar.setNavigationOnClickListener {
       router.pop()
     }
+
+    composeView.apply {
+      setViewCompositionStrategy(
+          ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed
+      )
+      setContent {
+        SimpleTheme {
+          Column(
+              modifier = Modifier
+                  .fillMaxWidth()
+                  .padding(dimensionResource(R.dimen.spacing_8)),
+          ) {
+            if (showSmokerQuestion) {
+              TobaccoQuestion(
+                  isSmokingAnswer = isSmoking,
+                  isUsingSmokelessTobaccoAnswer = isUsingSmokelessTobacco,
+                  showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion,
+              ) { question, answer ->
+                hotEvents.onNext(NewMedicalHistoryAnswerToggled(question, answer))
+              }
+            }
+          }
+        }
+      }
+    }
   }
 
   private fun saveClicks() = nextButton
@@ -184,13 +219,20 @@ class NewMedicalHistoryScreen : BaseScreen<
       HasHadAStroke -> strokeQuestionView
       HasHadAKidneyDisease -> kidneyDiseaseQuestionView
       DiagnosedWithDiabetes -> diabetesQuestionView
-      IsSmoking -> currentSmokerQuestionView
       else -> null
     }
 
     view?.render(question, answer) { questionForView, newAnswer ->
       hotEvents.onNext(NewMedicalHistoryAnswerToggled(questionForView, newAnswer))
     }
+
+    if (question == MedicalHistoryQuestion.IsSmoking) {
+      isSmoking = answer
+    }
+
+    if (question == MedicalHistoryQuestion.IsUsingSmokelessTobacco) {
+      isUsingSmokelessTobacco = answer
+    }
   }
 
   override fun showDiabetesDiagnosisView() {
@@ -268,12 +310,19 @@ class NewMedicalHistoryScreen : BaseScreen<
   }
 
   override fun showCurrentSmokerQuestion() {
-    currentSmokerQuestionContainer.visibility = VISIBLE
-    currentSmokerQuestionView.hideDivider()
+    showSmokerQuestion = true
   }
 
   override fun hideCurrentSmokerQuestion() {
-    currentSmokerQuestionContainer.visibility = GONE
+    showSmokerQuestion = false
+  }
+
+  override fun showSmokelessTobaccoQuestion() {
+    showSmokelessTobaccoQuestion = true
+  }
+
+  override fun hideSmokelessTobaccoQuestion() {
+    showSmokelessTobaccoQuestion = false
   }
 
   override fun showOngoingHypertensionTreatmentErrorDialog() {

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUi.kt

@@ -19,4 +19,6 @@ interface NewMedicalHistoryUi {
   fun hideDiabetesTreatmentQuestion()
   fun showCurrentSmokerQuestion()
   fun hideCurrentSmokerQuestion()
+  fun showSmokelessTobaccoQuestion()
+  fun hideSmokelessTobaccoQuestion()
 }

app/src/main/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryUiRenderer.kt

@@ -6,6 +6,7 @@ import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAHeartAttac
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAKidneyDisease
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.HasHadAStroke
 import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsSmoking
+import org.simple.clinic.medicalhistory.MedicalHistoryQuestion.IsUsingSmokelessTobacco
 import org.simple.clinic.mobius.ViewRenderer
 
 class NewMedicalHistoryUiRenderer(
@@ -26,6 +27,7 @@ class NewMedicalHistoryUiRenderer(
     }
 
     renderSmokingQuestion(model)
+    renderSmokelessTobaccoQuestion(model)
 
     renderNextButton(model)
   }
@@ -82,6 +84,15 @@ class NewMedicalHistoryUiRenderer(
     }
   }
 
+  private fun renderSmokelessTobaccoQuestion(model: NewMedicalHistoryModel) {
+    if (model.showSmokelessTobaccoQuestion) {
+      ui.showSmokelessTobaccoQuestion()
+      ui.renderAnswerForQuestion(IsUsingSmokelessTobacco, model.ongoingMedicalHistoryEntry.isUsingSmokelessTobacco)
+    } else {
+      ui.hideSmokelessTobaccoQuestion()
+    }
+  }
+
   private fun renderNextButton(model: NewMedicalHistoryModel) {
     if (model.registeringPatient) {
       ui.showNextButtonProgress()