Merge pull request #5462 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -14,6 +14,9 @@
 - Migrate blood pressure summary view to Jetpack Compose
 - Migrate blood sugar summary view to Jetpack Compose
 - Migrate medical history summary view to Jetpack Compose
+- Migrate assigned facility view to Jetpack Compose
+- Migrate next appointment view to Jetpack Compose
+- Migrate patient status view to Jetpack Compose
 
 ## 2025.05.20
 

app/src/main/java/org/simple/clinic/summary/PatientSummaryScreen.kt

@@ -16,6 +16,9 @@ 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 androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.dynamicanimation.animation.DynamicAnimation
 import androidx.transition.AutoTransition
@@ -77,6 +80,7 @@ import org.simple.clinic.util.messagesender.WhatsAppMessageSender
 import org.simple.clinic.util.setFragmentResultListener
 import org.simple.clinic.util.toLocalDateAtZone
 import org.simple.clinic.widgets.UiEvent
+import org.simple.clinic.widgets.compose.PatientStatusView
 import org.simple.clinic.widgets.hideKeyboard
 import org.simple.clinic.widgets.scrollToChild
 import org.simple.clinic.widgets.spring
@@ -147,17 +151,14 @@ class PatientSummaryScreen :
   private val doneButtonFrame
     get() = binding.doneButtonFrame
 
-  private val patientDiedStatusView
-    get() = binding.patientDiedStatusView
-
   private val nextAppointmentFacilityView
     get() = binding.nextAppointmentFacilityView
 
   private val clinicalDecisionSupportAlertView
     get() = binding.clinicalDecisionSupportBpHighAlert.rootView
 
-  private val statinComposeView
-    get() = binding.statinComposeView
+  private val composeView
+    get() = binding.composeView
 
   @Inject
   lateinit var router: Router
@@ -197,6 +198,8 @@ class PatientSummaryScreen :
 
   private var statinInfo by mutableStateOf(StatinInfo.default())
 
+  private var showPatientDiedStatusView by mutableStateOf(false)
+
   override fun defaultModel(): PatientSummaryModel {
     return PatientSummaryModel.from(screenKey.intention, screenKey.patientUuid)
   }
@@ -295,7 +298,7 @@ class PatientSummaryScreen :
 
     subscriptions.add(setupChildViewVisibility())
 
-    statinComposeView.apply {
+    composeView.apply {
       setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
       setContent {
         SimpleTheme {
@@ -308,6 +311,18 @@ class PatientSummaryScreen :
               addBMIClick = { additionalEvents.notify(AddBMIClicked) },
               addCholesterol = { additionalEvents.notify(AddCholesterolClicked) }
           )
+
+          if (showPatientDiedStatusView) {
+            PatientStatusView(
+                modifier = Modifier.padding(
+                    start = dimensionResource(R.dimen.spacing_8),
+                    end = dimensionResource(R.dimen.spacing_8),
+                    top = dimensionResource(R.dimen.spacing_8),
+                ),
+                text = stringResource(R.string.patient_status_died),
+                icon = painterResource(R.drawable.ic_patient_dead_32dp)
+            )
+          }
         }
       }
     }
@@ -708,11 +723,11 @@ class PatientSummaryScreen :
   }
 
   override fun hidePatientDiedStatus() {
-    patientDiedStatusView.visibility = GONE
+    showPatientDiedStatusView = false
   }
 
   override fun showPatientDiedStatus() {
-    patientDiedStatusView.visibility = VISIBLE
+    showPatientDiedStatusView = true
   }
 
   override fun showNextAppointmentCard() {

app/src/main/java/org/simple/clinic/summary/assignedfacility/AssignedFacilityView.kt

@@ -4,10 +4,14 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Parcelable
 import android.util.AttributeSet
-import android.view.LayoutInflater
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.ViewCompositionStrategy
 import com.google.android.material.card.MaterialCardView
 import io.reactivex.Observable
-import org.simple.clinic.databinding.PatientsummaryAssignedFacilityContentBinding
+import org.simple.clinic.common.ui.theme.SimpleTheme
 import org.simple.clinic.di.injector
 import org.simple.clinic.facility.Facility
 import org.simple.clinic.mobius.DeferredEventSource
@@ -17,6 +21,7 @@ import org.simple.clinic.navigation.v2.keyprovider.ScreenKeyProvider
 import org.simple.clinic.summary.PatientSummaryChildView
 import org.simple.clinic.summary.PatientSummaryModelUpdateCallback
 import org.simple.clinic.summary.PatientSummaryScreenKey
+import org.simple.clinic.summary.assignedfacility.ui.AssignedFacility
 import org.simple.clinic.util.unsafeLazy
 import javax.inject.Inject
 
@@ -31,18 +36,7 @@ class AssignedFacilityView(
   var changeAssignedFacilityClicks: ChangeAssignedFacilityClicked? = null
   var assignedFacilityChanges: AssignedFacilityChanges? = null
 
-  private var binding: PatientsummaryAssignedFacilityContentBinding? = null
-
-  private val assignedFacilityTextView
-    get() = binding!!.assignedFacilityTextView
-
-  private val changeAssignedFacilityButton
-    get() = binding!!.changeAssignedFacilityButton
-
-  init {
-    val layoutInflater = LayoutInflater.from(context)
-    binding = PatientsummaryAssignedFacilityContentBinding.inflate(layoutInflater, this, true)
-  }
+  private var assignedFacilityName by mutableStateOf("")
 
   @Inject
   lateinit var router: Router
@@ -83,9 +77,20 @@ class AssignedFacilityView(
     }
 
     context.injector<Injector>().inject(this)
-    changeAssignedFacilityButton.setOnClickListener {
-      changeAssignedFacilityClicks?.invoke()
-    }
+
+    addView(ComposeView(context).apply {
+      setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnDetachedFromWindow)
+
+      setContent {
+        SimpleTheme {
+          AssignedFacility(
+              facilityName = assignedFacilityName
+          ) {
+            changeAssignedFacilityClicks?.invoke()
+          }
+        }
+      }
+    })
   }
 
   override fun onAttachedToWindow() {
@@ -107,7 +112,7 @@ class AssignedFacilityView(
   }
 
   override fun renderAssignedFacilityName(facilityName: String) {
-    assignedFacilityTextView.text = facilityName
+    assignedFacilityName = facilityName
   }
 
   override fun registerSummaryModelUpdateCallback(callback: PatientSummaryModelUpdateCallback?) {

app/src/main/java/org/simple/clinic/summary/assignedfacility/ui/AssignedFacility.kt

@@ -0,0 +1,86 @@
+package org.simple.clinic.summary.assignedfacility.ui
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Card
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.dimensionResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import org.simple.clinic.R
+import org.simple.clinic.common.ui.components.ButtonSize
+import org.simple.clinic.common.ui.components.TextButton
+import org.simple.clinic.common.ui.theme.SimpleTheme
+
+@Composable
+fun AssignedFacility(
+    modifier: Modifier = Modifier,
+    facilityName: String,
+    onChangeClick: () -> Unit,
+) {
+  Card(
+      modifier = modifier,
+      backgroundColor = MaterialTheme.colors.surface
+  )
+  {
+    Column(
+        modifier = Modifier.padding(
+            start = dimensionResource(R.dimen.spacing_16),
+            bottom = dimensionResource(R.dimen.spacing_12)
+        )
+    ) {
+
+      Row(
+          modifier = Modifier.padding(
+              top = dimensionResource(R.dimen.spacing_4),
+              end = dimensionResource(R.dimen.spacing_8)
+          ),
+          verticalAlignment = Alignment.CenterVertically,
+          horizontalArrangement = Arrangement.spacedBy(dimensionResource(R.dimen.spacing_8))
+      ) {
+        Text(
+            modifier = Modifier.weight(1f),
+            text = stringResource(R.string.assigned_facility_view_title),
+            style = SimpleTheme.typography.subtitle1Medium,
+            color = MaterialTheme.colors.onSurface,
+        )
+
+        TextButton(
+            buttonSize = ButtonSize.ExtraSmall,
+            onClick = onChangeClick
+        ) {
+          Text(
+              text = stringResource(R.string.assigned_facility_view_change).uppercase(),
+              style = MaterialTheme.typography.button,
+          )
+        }
+      }
+
+      Text(
+          modifier = Modifier
+                  .offset(y = (-dimensionResource(R.dimen.spacing_4)))
+                  .padding(end = dimensionResource(R.dimen.spacing_16)),
+          text = facilityName,
+          style = MaterialTheme.typography.body1,
+          color = MaterialTheme.colors.onSurface,
+      )
+    }
+  }
+}
+
+@Preview
+@Composable
+fun AssignedFacilityPreview(modifier: Modifier = Modifier) {
+  SimpleTheme {
+    AssignedFacility(
+        facilityName = "UHC Khardi"
+    ) { }
+  }
+}