Skip to content

Commit bc1f1b8

Browse files
author
sagarwal
committed
Remove diabetesManagementEnabled from SelectDiagnosisErrorDialog
1 parent 9c46cb2 commit bc1f1b8

File tree

4 files changed

+8
-26
lines changed

4 files changed

+8
-26
lines changed

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

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,17 @@ class SelectDiagnosisErrorDialog : AppCompatDialogFragment() {
1212
companion object {
1313

1414
private const val FRAGMENT_TAG = "select_diagnosis_error_alert"
15-
private const val KEY_DIABETES_MANAGEMENT_ENABLED = "key_diabetes_management_enabled"
16-
17-
fun show(fragmentManager: FragmentManager, diabetesManagementEnabled: Boolean) {
18-
val fragment = SelectDiagnosisErrorDialog().apply {
19-
arguments = Bundle().apply {
20-
putBoolean(KEY_DIABETES_MANAGEMENT_ENABLED, diabetesManagementEnabled)
21-
}
22-
}
15+
fun show(fragmentManager: FragmentManager) {
16+
val fragment = SelectDiagnosisErrorDialog()
2317

2418
fragment.show(fragmentManager, FRAGMENT_TAG)
2519
}
2620
}
2721

2822
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
29-
val diabetesManagementEnabled =
30-
arguments?.getBoolean(KEY_DIABETES_MANAGEMENT_ENABLED) ?: false
31-
32-
val messageRes = if (diabetesManagementEnabled) {
33-
R.string.select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes
34-
} else {
35-
R.string.select_diagnosis_error_enter_diagnosis_hypertension
36-
}
37-
3823
return MaterialAlertDialogBuilder(requireContext())
3924
.setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
40-
.setMessage(getString(messageRes))
25+
.setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_both_hypertension_diabetes))
4126
.setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
4227
.create()
4328
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class SelectHypertensionDiagnosisErrorDialog : AppCompatDialogFragment() {
1414
private const val FRAGMENT_TAG = "select_hypertension_diagnosis_error_alert"
1515

1616
fun show(fragmentManager: FragmentManager) {
17-
val fragment = SelectDiagnosisErrorDialog()
17+
val fragment = SelectHypertensionDiagnosisErrorDialog()
1818

1919
fragment.show(fragmentManager, FRAGMENT_TAG)
2020
}

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.simple.clinic.appconfig.Country
1919
import org.simple.clinic.di.injector
2020
import org.simple.clinic.feature.Features
2121
import org.simple.clinic.medicalhistory.SelectDiagnosisErrorDialog
22+
import org.simple.clinic.medicalhistory.SelectHypertensionDiagnosisErrorDialog
2223
import org.simple.clinic.medicalhistory.SelectOngoingDiabetesTreatmentErrorDialog
2324
import org.simple.clinic.medicalhistory.SelectOngoingHypertensionTreatmentErrorDialog
2425
import org.simple.clinic.medicalhistory.ui.NewMedicalHistoryUi
@@ -110,15 +111,11 @@ class NewMedicalHistoryScreen : Fragment(), NewMedicalHistoryUiActions, HandlesB
110111
}
111112

112113
override fun showDiagnosisRequiredErrorDialog() {
113-
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, true)
114+
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager)
114115
}
115116

116117
override fun showHypertensionDiagnosisRequiredErrorDialog() {
117-
MaterialAlertDialogBuilder(requireContext())
118-
.setTitle(getString(R.string.select_diagnosis_error_diagnosis_required))
119-
.setMessage(getString(R.string.select_diagnosis_error_enter_diagnosis_hypertension))
120-
.setPositiveButton(getString(R.string.select_diagnosis_error_ok), null)
121-
.show()
118+
SelectHypertensionDiagnosisErrorDialog.show(activity.supportFragmentManager)
122119
}
123120

124121
override fun showChangeDiagnosisErrorDialog() {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class MedicalHistorySummaryView(
187187
}
188188

189189
fun showDiagnosisError() {
190-
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager, true)
190+
SelectDiagnosisErrorDialog.show(activity.supportFragmentManager)
191191
}
192192

193193
fun showHypertensionDiagnosisError() {

0 commit comments

Comments
 (0)