Merge pull request #5417 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -24,6 +24,9 @@
 - Bump Coroutines to v1.10.2
 - Skip Sentry config during app startup in the debug mode
 - Show spanish language option in non-production builds only
+- Increase lab based risk threshold to 20%
+- Update manifest payload to move countries to top level and add version field
+- Bump Open CSV to v5.11
 
 ### Features
 
@@ -33,6 +36,10 @@
 
 - Display only languages supported by the selected country in the settings screen
 
+### Fixes
+
+- Fix crash when displaying large statin risk percentage text
+
 ## 2025.04.07
 
 ### Internal

app/src/main/java/org/simple/clinic/appconfig/AppConfigRepository.kt

@@ -54,7 +54,7 @@ class AppConfigRepository @Inject constructor(
     return manifestFetchApi
         .fetchManifest()
         .map { it.supportedCountries }
-        .map { FetchSucceeded(it.countries) }
+        .map { FetchSucceeded(it) }
         .cast(ManifestFetchResult::class.java)
         .onErrorReturn { cause -> FetchError(ErrorResolver.resolve(cause)) }
   }

app/src/main/java/org/simple/clinic/appconfig/CountriesPayload.kt

@@ -6,6 +6,9 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class Manifest(
 
-    @Json(name = "v2")
-    val supportedCountries: CountriesPayload
+    @Json(name = "version")
+    val version: String,
+
+    @Json(name = "countries")
+    val supportedCountries: List<Country>
 )

app/src/main/java/org/simple/clinic/appconfig/Manifest.kt

@@ -47,7 +47,7 @@ import org.simple.clinic.cvdrisk.StatinInfo
 import org.simple.clinic.medicalhistory.Answer
 import org.simple.clinic.util.toAnnotatedString
 
-private const val LAB_BASED_MIN_REQ_MAX_RISK_RANGE = 10
+private const val LAB_BASED_MIN_REQ_MAX_RISK_RANGE = 20
 private const val MIN_AGE_FOR_STATIN = 40
 
 @Composable
@@ -157,10 +157,13 @@ fun RiskText(
   val totalTextWidth = textWidth + with(LocalDensity.current) { 8.dp.toPx() * 2 }
 
   val calculatedOffsetX = midpoint - (totalTextWidth / 2)
-  val clampedOffsetX = calculatedOffsetX.coerceIn(
-      0f,
-      parentWidth - totalTextWidth - parentPadding
-  )
+  val maxOffsetX = parentWidth - totalTextWidth - parentPadding
+  val clampedOffsetX = if (maxOffsetX >= 0f) {
+    calculatedOffsetX.coerceIn(0f, maxOffsetX)
+  } else {
+    0f
+  }
+
 
   Text(
       modifier = Modifier

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

@@ -2,16 +2,16 @@ package org.simple.clinic.appconfig
 
 import com.f2prateek.rx.preferences2.Preference
 import com.google.common.truth.Truth.assertThat
+import io.reactivex.Single
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.ResponseBody.Companion.toResponseBody
+import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
 import org.mockito.kotlin.whenever
-import io.reactivex.Single
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.ResponseBody.Companion.toResponseBody
-import org.junit.Test
 import org.simple.clinic.TestData
 import org.simple.clinic.appconfig.StatesResult.StatesFetched
 import org.simple.clinic.appconfig.api.ManifestFetchApi
@@ -43,7 +43,7 @@ class AppConfigRepositoryTest {
   @Test
   fun `successful network calls to fetch the app manifest should return the app manifest`() {
     // given
-    val countriesV2 = listOf(
+    val countries = listOf(
         Country(
             isoCountryCode = "IN",
             displayName = "India",
@@ -56,16 +56,19 @@ class AppConfigRepositoryTest {
             )
         )
     )
-    val countriesPayload = CountriesPayload(countriesV2)
+    val manifestPayload = Manifest(
+        version = "3",
+        supportedCountries = countries
+    )
 
-    whenever(manifestFetchApi.fetchManifest()).doReturn(Single.just(Manifest(countriesPayload)))
+    whenever(manifestFetchApi.fetchManifest()).doReturn(Single.just(manifestPayload))
 
     // then
 
     repository
         .fetchAppManifest()
         .test()
-        .assertValue(FetchSucceeded(countriesV2))
+        .assertValue(FetchSucceeded(countries))
         .assertNoErrors()
   }
 

app/src/test/java/org/simple/clinic/appconfig/AppConfigRepositoryTest.kt

@@ -26,7 +26,7 @@ android.experimental.enableTestFixturesKotlinSupport=true
 # Manifest URL endpoint
 # These are currently the same as the API endpoints declared earlier. Those will be removed later
 # once the country selection feature is complete.
-manifestEndpoint=https://api-qa.simple.org/api/
+manifestEndpoint=https://manifest.simple.org/sandbox/
 # Needed to switch NDK versions on the CI server since they have different
 # NDK versions on macOS and Linux environments. Gradle plugin 3.6+ requires
 # us to pin an NDK version if we package native libs.

gradle.properties

@@ -156,7 +156,7 @@ moshi-moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }
 okhttp-okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" }
 okhttp-interceptor-logging = { module = "com.squareup.okhttp3:logging-interceptor", version.ref = "okhttp" }
 
-openCsv = "com.opencsv:opencsv:5.10"
+openCsv = "com.opencsv:opencsv:5.11"
 
 play-app-update = "com.google.android.play:app-update-ktx:2.1.0"
 play-services-auth = "com.google.android.gms:play-services-auth:21.3.0"