Merge pull request #5478 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -23,6 +23,7 @@
 - Replace Flipper with Chucker for network inspection
 - Update statin risk threshold to 20% for sri Lanka
 - Update smoking dialog to a multi-choice tobacco dialog
+- Bump AndroidX Room to v2.7.2
 
 ## 2025.05.20
 

app/src/main/java/org/simple/clinic/summary/compose/StatinNudgeView.kt

@@ -17,7 +17,10 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.foundation.text.TextAutoSize
 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
@@ -33,6 +36,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.rememberTextMeasurer
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
@@ -289,7 +293,7 @@ fun DescriptionText(
 
 @Composable
 fun StainNudgeAddButtons(
-    modifier: Modifier,
+    modifier: Modifier = Modifier,
     statinInfo: StatinInfo,
     isNonLabBasedStatinNudgeEnabled: Boolean,
     isLabBasedStatinNudgeEnabled: Boolean,
@@ -303,59 +307,67 @@ fun StainNudgeAddButtons(
         horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
       if (statinInfo.isSmoker == Answer.Unanswered) {
-        FilledButton(
+        StainNudgeAddButton(
+            text = stringResource(R.string.statin_alert_add_tobacco_use),
             modifier = Modifier
                 .testTag("STATIN_NUDGE_ADD_TOBACCO_USE")
-                .height(36.dp)
-                .fillMaxWidth()
-                .weight(1f)
-                .clip(RoundedCornerShape(50)),
-            onClick = { addTobaccoUseClicked.invoke() }
-        ) {
-          Text(
-              text = stringResource(R.string.statin_alert_add_tobacco_use),
-              fontSize = 14.sp,
-          )
-        }
+                .weight(1f),
+            onClick = addTobaccoUseClicked
+        )
       }
 
       if (isNonLabBasedStatinNudgeEnabled && statinInfo.bmiReading == null) {
-        FilledButton(
+        StainNudgeAddButton(
+            text = stringResource(R.string.statin_alert_add_bmi),
             modifier = Modifier
                 .testTag("STATIN_NUDGE_ADD_BMI")
-                .height(36.dp)
-                .fillMaxWidth()
-                .weight(1f)
-                .clip(RoundedCornerShape(50)),
-            onClick = { addBMIClick.invoke() }
-        ) {
-          Text(
-              text = stringResource(R.string.statin_alert_add_bmi),
-              fontSize = 14.sp,
-          )
-        }
+                .weight(1f),
+            onClick = addBMIClick
+        )
       }
 
       if (isLabBasedStatinNudgeEnabled && statinInfo.cholesterol == null) {
-        FilledButton(
+        StainNudgeAddButton(
+            text = stringResource(R.string.statin_alert_add_cholesterol),
             modifier = Modifier
                 .testTag("STATIN_NUDGE_ADD_CHOLESTEROL")
-                .height(36.dp)
-                .fillMaxWidth()
-                .weight(1f)
-                .clip(RoundedCornerShape(50)),
-            onClick = { addCholesterol() }
-        ) {
-          Text(
-              text = stringResource(R.string.statin_alert_add_cholesterol),
-              fontSize = 14.sp,
-          )
-        }
+                .weight(1f),
+            onClick = addCholesterol
+        )
       }
     }
   }
 }
 
+@Composable
+fun StainNudgeAddButton(
+    modifier: Modifier,
+    text: String,
+    onClick: () -> Unit,
+) {
+  FilledButton(
+      modifier = modifier
+          .height(36.dp)
+          .fillMaxWidth()
+          .clip(RoundedCornerShape(50)),
+      onClick = onClick
+  ) {
+    BasicText(
+        text = text,
+        maxLines = 1,
+        overflow = TextOverflow.Ellipsis,
+        autoSize = TextAutoSize.StepBased(
+            minFontSize = 10.sp,
+            maxFontSize = 14.sp
+        ),
+        style = SimpleTheme.typography.buttonBig.copy(
+            textAlign = TextAlign.Center,
+            color = MaterialTheme.colors.onPrimary
+        )
+    )
+  }
+}
+
 fun getOffsets(cvdRiskRange: CVDRiskRange?, size: Size): Pair<Float, Float> {
   val riskRanges = listOf(
       0..4,    // LOW
@@ -409,3 +421,16 @@ fun StatinNudgePreview() {
     )
   }
 }
+
+@Preview
+@Composable
+fun StatinNudgeButtonsPreview() {
+  StainNudgeAddButtons(
+      statinInfo = StatinInfo(canShowStatinNudge = true),
+      isNonLabBasedStatinNudgeEnabled = true,
+      isLabBasedStatinNudgeEnabled = false,
+      addTobaccoUseClicked = {},
+      addBMIClick = {},
+      addCholesterol = {},
+  )
+}

gradle/libs.versions.toml

@@ -4,7 +4,7 @@ agp = "8.8.2"
 androidx-cameraView = "1.4.2"
 androidx-camera = "1.4.2"
 androidx-paging = "3.3.6"
-androidx-room = "2.7.1"
+androidx-room = "2.7.2"
 androidx-work = "2.10.1"
 androidx-security-crypto = "1.1.0-alpha07"
 androidx-viewmodel = "2.8.7"
@@ -36,7 +36,7 @@ coroutines = "1.10.2"
 
 compose-compiler = "1.5.13"
 
-androidx-compose-bom = "2023.07.00-alpha02"
+androidx-compose-bom = "2025.07.00"
 
 composeThemeAdapter = "0.36.0"
 
@@ -203,7 +203,7 @@ zxing = "com.google.zxing:core:3.3.3"
 
 apache-commons-math = "org.apache.commons:commons-math3:3.6.1"
 
-androidx-compose-bom = { module = "dev.chrisbanes.compose:compose-bom", version.ref = "androidx-compose-bom" }
+androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "androidx-compose-bom" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview" }
@@ -230,7 +230,7 @@ kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref =
 kotlin-compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
 google-services = { id = "com.google.gms.google-services", version = "4.4.2" }
-sentry = { id = "io.sentry.android.gradle", version = "5.1.0" }
+sentry = { id = "io.sentry.android.gradle", version = "5.8.0" }
 
 [bundles]
 androidx-camera = ["androidx-camera-core", "androidx-camera-camera2", "androidx-camera-view", "androidx-camera-lifecycle"]