Update Refer to diagnosis option visibility based on feature flag Screening (#5659)

https://app.shortcut.com/simpledotorg/story/17239/add-a-flipper-flag-to-handle-suspected-feature

---------

Co-authored-by: sagarwal <[email protected]>

Author: siddh1004

CHANGELOG.md

@@ -35,6 +35,7 @@
 
 - Hide next button when registration is going
 - Add Suspected option to hypertension and diabetes questions
+- Handle Screening feature visibility based on feature flag `Screening`
 
 ## 2025.09.09
 

app/src/main/java/org/simple/clinic/feature/Feature.kt

@@ -25,5 +25,6 @@ enum class Feature(
   PatientReassignment(false, "patient_reassignment_v0"),
   PatientStatinNudge(false, "patient_statin_nudge_v0"),
   NonLabBasedStatinNudge(false, "non_lab_based_statin_nudge"),
-  LabBasedStatinNudge(false, "lab_based_statin_nudge")
+  LabBasedStatinNudge(false, "lab_based_statin_nudge"),
+  Screening(false, "screening_feature_v0")
 }

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

@@ -22,6 +22,7 @@ data class NewMedicalHistoryModel(
     val hasShownChangeDiagnosisError: Boolean,
     val showIsSmokingQuestion: Boolean,
     val showSmokelessTobaccoQuestion: Boolean,
+    val isScreeningFeatureEnabled: Boolean,
 ) : Parcelable {
 
   val hasLoadedPatientEntry: Boolean
@@ -76,7 +77,8 @@ data class NewMedicalHistoryModel(
     fun default(
         country: Country,
         showIsSmokingQuestion: Boolean,
-        showSmokelessTobaccoQuestion: Boolean
+        showSmokelessTobaccoQuestion: Boolean,
+        isScreeningFeatureEnabled: Boolean,
     ): NewMedicalHistoryModel = NewMedicalHistoryModel(
         country = country,
         ongoingPatientEntry = null,
@@ -85,7 +87,8 @@ data class NewMedicalHistoryModel(
         nextButtonState = null,
         hasShownChangeDiagnosisError = false,
         showIsSmokingQuestion = showIsSmokingQuestion,
-        showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion
+        showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion,
+        isScreeningFeatureEnabled = isScreeningFeatureEnabled,
     )
   }
 

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

@@ -22,7 +22,8 @@ class NewMedicalHistoryViewModel(
         country = country,
         showIsSmokingQuestion = features.isEnabled(Feature.NonLabBasedStatinNudge) ||
             features.isEnabled(Feature.LabBasedStatinNudge),
-        showSmokelessTobaccoQuestion = country.isoCountryCode != Country.ETHIOPIA
+        showSmokelessTobaccoQuestion = country.isoCountryCode != Country.ETHIOPIA,
+        isScreeningFeatureEnabled = features.isEnabled(Feature.Screening),
     ),
     init = NewMedicalHistoryInit(),
     loopFactoryProvider = { viewEffectsConsumer ->

app/src/main/java/org/simple/clinic/medicalhistory/ui/DiagnosisContainer.kt

@@ -21,6 +21,7 @@ fun DiagnosisContainer(
     hypertensionAnswer: Answer?,
     diabetesAnswer: Answer?,
     showDiabetesDiagnosisView: Boolean,
+    isScreeningFeatureEnabled: Boolean,
     modifier: Modifier = Modifier,
     onAnswerChange: (MedicalHistoryQuestion, Answer) -> Unit,
 ) {
@@ -30,10 +31,16 @@ fun DiagnosisContainer(
             .padding(dimensionResource(R.dimen.spacing_16))
     ) {
 
+      val options = if (isScreeningFeatureEnabled) {
+        listOf(Answer.Yes, Answer.No, Answer.Suspected)
+      } else {
+        listOf(Answer.Yes, Answer.No)
+      }
+
       MedicalHistoryDiagnosisQuestionItem(
           header = stringResource(R.string.medicalhistorysummaryview_hypertension_diagnosis),
           question = MedicalHistoryQuestion.DiagnosedWithHypertension,
-          options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
+          options = options,
           selectedAnswer = hypertensionAnswer,
           onAnswerChange = onAnswerChange
       )
@@ -49,7 +56,7 @@ fun DiagnosisContainer(
         MedicalHistoryDiagnosisQuestionItem(
             header = stringResource(R.string.medicalhistorysummaryview_diabetes_diagnosis),
             question = MedicalHistoryQuestion.DiagnosedWithDiabetes,
-            options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
+            options = options,
             selectedAnswer = diabetesAnswer,
             onAnswerChange = onAnswerChange
         )
@@ -66,6 +73,7 @@ fun DiagnosisContainerPreview(modifier: Modifier = Modifier) {
         hypertensionAnswer = Answer.Yes,
         diabetesAnswer = Answer.No,
         showDiabetesDiagnosisView = true,
+        isScreeningFeatureEnabled = true,
         modifier = modifier,
         onAnswerChange = { _, _ -> }
     )

app/src/main/java/org/simple/clinic/medicalhistory/ui/MedicalHistoryDiagnosisWithTreatment.kt

@@ -29,6 +29,7 @@ fun MedicalHistoryDiagnosisWithTreatment(
     treatmentQuestion: MedicalHistoryQuestion,
     treatmentAnswer: Answer?,
     showTreatmentQuestion: Boolean,
+    isScreeningFeatureEnabled: Boolean,
     modifier: Modifier = Modifier,
     onSelectionChange: (MedicalHistoryQuestion, Answer) -> Unit,
 ) {
@@ -43,10 +44,16 @@ fun MedicalHistoryDiagnosisWithTreatment(
         modifier = Modifier.padding(dimensionResource(R.dimen.spacing_16))
     ) {
 
+      val options = if (isScreeningFeatureEnabled) {
+        listOf(Answer.Yes, Answer.No, Answer.Suspected)
+      } else {
+        listOf(Answer.Yes, Answer.No)
+      }
+
       MedicalHistoryDiagnosisQuestionItem(
           header = diagnosisLabel,
           question = diagnosisQuestion,
-          options = listOf(Answer.Yes, Answer.No, Answer.Suspected),
+          options = options,
           selectedAnswer = diagnosisAnswer,
           onAnswerChange = onSelectionChange
       )
@@ -85,6 +92,7 @@ private fun MedicalHistoryDiagnosisWithTreatmentPreview() {
         treatmentQuestion = IsOnHypertensionTreatment(Country.INDIA),
         treatmentAnswer = Answer.Unanswered,
         showTreatmentQuestion = true,
+        isScreeningFeatureEnabled = true,
         onSelectionChange = { _, _ -> }
     )
   }

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

@@ -94,6 +94,7 @@ fun NewMedicalHistoryUi(
             treatmentQuestion = IsOnHypertensionTreatment(model.country.isoCountryCode),
             treatmentAnswer = model.ongoingMedicalHistoryEntry.isOnHypertensionTreatment,
             showTreatmentQuestion = model.showOngoingHypertensionTreatment,
+            isScreeningFeatureEnabled = model.isScreeningFeatureEnabled,
             onSelectionChange = onSelectionChange
         )
         if (showDiabetesDiagnosis) {
@@ -104,6 +105,7 @@ fun NewMedicalHistoryUi(
               treatmentQuestion = IsOnDiabetesTreatment,
               treatmentAnswer = model.ongoingMedicalHistoryEntry.isOnDiabetesTreatment,
               showTreatmentQuestion = model.showOngoingDiabetesTreatment,
+              isScreeningFeatureEnabled = model.isScreeningFeatureEnabled,
               onSelectionChange = onSelectionChange
           )
         }
@@ -141,7 +143,8 @@ private val previewMedicalHistoryModel = NewMedicalHistoryModel(
     nextButtonState = null,
     hasShownChangeDiagnosisError = true,
     showIsSmokingQuestion = true,
-    showSmokelessTobaccoQuestion = true
+    showSmokelessTobaccoQuestion = true,
+    isScreeningFeatureEnabled = true
 )
 
 @Preview

app/src/main/java/org/simple/clinic/summary/medicalhistory/MedicalHistorySummaryView.kt

@@ -122,7 +122,8 @@ class MedicalHistorySummaryView(
                 isUsingSmokelessTobaccoAnswer = medicalHistory?.isUsingSmokelessTobacco,
                 diabetesManagementEnabled = diabetesManagementEnabled,
                 showSmokerQuestion = showSmokerQuestion,
-                showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion
+                showSmokelessTobaccoQuestion = showSmokelessTobaccoQuestion,
+                isScreeningFeatureEnabled = features.isEnabled(Feature.Screening)
             ) { question, answer ->
               answerToggled(question, answer)
             }

app/src/main/java/org/simple/clinic/summary/medicalhistory/ui/MedicalHistorySummary.kt

@@ -28,6 +28,7 @@ fun MedicalHistorySummary(
     diabetesManagementEnabled: Boolean,
     showSmokerQuestion: Boolean,
     showSmokelessTobaccoQuestion: Boolean,
+    isScreeningFeatureEnabled: Boolean,
     modifier: Modifier = Modifier,
     onAnswerChange: (MedicalHistoryQuestion, Answer) -> Unit,
 ) {
@@ -42,6 +43,7 @@ fun MedicalHistorySummary(
         hypertensionAnswer = hypertensionAnswer,
         diabetesAnswer = diabetesAnswer,
         showDiabetesDiagnosisView = diabetesManagementEnabled,
+        isScreeningFeatureEnabled = isScreeningFeatureEnabled,
         onAnswerChange = onAnswerChange,
     )
 
@@ -80,6 +82,7 @@ private fun MedicalHistorySummaryPreview() {
         diabetesManagementEnabled = true,
         showSmokerQuestion = false,
         showSmokelessTobaccoQuestion = false,
+        isScreeningFeatureEnabled = true,
         onAnswerChange = { _, _ ->
           // no-op
         }
@@ -102,6 +105,7 @@ private fun MedicalHistorySummaryNoDiabetesManagementPreview() {
         diabetesManagementEnabled = false,
         showSmokerQuestion = false,
         showSmokelessTobaccoQuestion = false,
+        isScreeningFeatureEnabled = true,
         onAnswerChange = { _, _ ->
           // no-op
         }
@@ -124,6 +128,7 @@ private fun MedicalHistorySummarySmokerPreview() {
         diabetesManagementEnabled = true,
         showSmokerQuestion = true,
         showSmokelessTobaccoQuestion = false,
+        isScreeningFeatureEnabled = true,
         onAnswerChange = { _, _ ->
           // no-op
         }
@@ -146,6 +151,7 @@ private fun MedicalHistorySummaryTobaccoUsePreview() {
         diabetesManagementEnabled = true,
         showSmokerQuestion = true,
         showSmokelessTobaccoQuestion = true,
+        isScreeningFeatureEnabled = true,
         onAnswerChange = { _, _ ->
           // no-op
         }

app/src/test/java/org/simple/clinic/medicalhistory/newentry/NewMedicalHistoryInitTest.kt

@@ -14,7 +14,8 @@ class NewMedicalHistoryInitTest {
   private val defaultModel = NewMedicalHistoryModel.default(
       country = country,
       showIsSmokingQuestion = false,
-      showSmokelessTobaccoQuestion = false
+      showSmokelessTobaccoQuestion = false,
+      isScreeningFeatureEnabled = true,
   )
 
   private val initSpec = InitSpec(NewMedicalHistoryInit())