Merge pull request #5433 from simpledotorg/master

Author: tramline-github[bot]

CHANGELOG.md

@@ -4,6 +4,13 @@
 
 ### Internal
 
+- Handle window insets when displaying app content in edge-to-edge
+- Enable edge-to-edge support on all versions of Android
+
+## 2025.05.20
+
+### Internal
+
 - Bump Gson to v2.13.1
 - Bump AndroidX Camera to v1.4.2
 - Bump AndroidX Paging to v3.3.6
@@ -27,6 +34,7 @@
 - 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
+- Update lab based statin translations for `si-LK`, `ta-LK`
 
 ### Features
 

app/build.gradle.kts

@@ -302,6 +302,7 @@ dependencies {
   implementation(libs.androidx.recyclerview)
   implementation(libs.androidx.viewpager2)
   implementation(libs.androidx.security.crypto)
+  implementation(libs.androidx.activity)
 
   implementation(libs.bundles.androidx.camera)
 

app/src/main/java/org/simple/clinic/bloodsugar/history/BloodSugarHistoryScreen.kt

@@ -41,6 +41,7 @@ import org.simple.clinic.summary.TYPE_PICKER_SHEET
 import org.simple.clinic.summary.bloodsugar.BloodSugarSummaryConfig
 import org.simple.clinic.util.UserClock
 import org.simple.clinic.util.UtcClock
+import org.simple.clinic.util.applyStatusBarPadding
 import org.simple.clinic.util.extractSuccessful
 import org.simple.clinic.widgets.DividerItemDecorator
 import org.simple.clinic.widgets.PagingItemAdapter
@@ -90,6 +91,9 @@ class BloodSugarHistoryScreen : BaseScreen<
   @Inject
   lateinit var screenKeyProvider: ScreenKeyProvider
 
+  private val appbar
+    get() = binding.appbar
+
   private val toolbar
     get() = binding.toolbar
 
@@ -145,6 +149,7 @@ class BloodSugarHistoryScreen : BaseScreen<
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    appbar.applyStatusBarPadding()
 
     openEntrySheetAfterTypeIsSelected()
     handleToolbarBackClick()

app/src/main/java/org/simple/clinic/bp/history/BloodPressureHistoryScreen.kt

@@ -34,6 +34,7 @@ import org.simple.clinic.patient.displayLetterRes
 import org.simple.clinic.summary.PatientSummaryConfig
 import org.simple.clinic.util.UserClock
 import org.simple.clinic.util.UtcClock
+import org.simple.clinic.util.applyStatusBarPadding
 import org.simple.clinic.widgets.DividerItemDecorator
 import org.simple.clinic.widgets.PagingItemAdapter
 import org.simple.clinic.widgets.dp
@@ -91,6 +92,9 @@ class BloodPressureHistoryScreen : BaseScreen<
   private val bpHistoryList
     get() = binding.bpHistoryList
 
+  private val appbar
+    get() = binding.appbar
+
   private val toolbar
     get() = binding.toolbar
 
@@ -133,6 +137,7 @@ class BloodPressureHistoryScreen : BaseScreen<
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    appbar.applyStatusBarPadding()
 
     setupBloodPressureHistoryList()
     handleToolbarBackClick()

app/src/main/java/org/simple/clinic/consent/onboarding/OnboardingConsentScreen.kt

@@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
+import androidx.compose.foundation.layout.statusBarsPadding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Card
@@ -136,6 +137,7 @@ private fun OnboardingConsentScreen(
                 drawContent()
               }
             }
+            .statusBarsPadding()
     ) {
       Image(
           modifier = Modifier

app/src/main/java/org/simple/clinic/deniedaccess/AccessDeniedScreen.kt

@@ -9,6 +9,7 @@ import androidx.appcompat.app.AppCompatActivity
 import org.simple.clinic.databinding.ScreenAccessDeniedBinding
 import org.simple.clinic.di.injector
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
+import org.simple.clinic.util.applyStatusBarPadding
 import javax.inject.Inject
 
 class AccessDeniedScreen : BaseScreen<
@@ -22,6 +23,9 @@ class AccessDeniedScreen : BaseScreen<
   @Inject
   lateinit var activity: AppCompatActivity
 
+  private val outerContainer
+    get() = binding.outerContainer
+
   private val userFullNameText
     get() = binding.userFullNameText
 
@@ -37,6 +41,8 @@ class AccessDeniedScreen : BaseScreen<
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    outerContainer.applyStatusBarPadding()
+
     userFullNameText.text = screenKey.fullName
   }
 }

app/src/main/java/org/simple/clinic/drugs/search/DrugsSearchScreen.kt

@@ -27,7 +27,9 @@ import org.simple.clinic.drugs.selection.custom.drugfrequency.country.DrugFreque
 import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.ScreenKey
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
+import org.simple.clinic.util.applyStatusBarPadding
 import org.simple.clinic.util.debounce
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.widgets.PagingItemAdapter
 import org.simple.clinic.widgets.UiEvent
 import org.simple.clinic.widgets.showKeyboard
@@ -68,6 +70,9 @@ class DrugsSearchScreen : BaseScreen<
       )
   )
 
+  private val appbar
+    get() = binding.drugSearchAppBar
+
   private val drugSearchToolbar
     get() = binding.drugSearchToolbar
 
@@ -101,6 +106,16 @@ class DrugsSearchScreen : BaseScreen<
     context.injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun bindView(
       layoutInflater: LayoutInflater,
       container: ViewGroup?
@@ -109,6 +124,7 @@ class DrugsSearchScreen : BaseScreen<
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
 
+    appbar.applyStatusBarPadding()
     drugSearchToolbar.setNavigationOnClickListener {
       router.pop()
     }

app/src/main/java/org/simple/clinic/drugs/selection/EditMedicinesScreen.kt

@@ -49,6 +49,8 @@ import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
 import org.simple.clinic.util.UserClock
 import org.simple.clinic.util.UtcClock
+import org.simple.clinic.util.applyInsetsBottomPadding
+import org.simple.clinic.util.applyStatusBarPadding
 import org.simple.clinic.util.unsafeLazy
 import org.simple.clinic.widgets.ItemAdapter
 import org.simple.clinic.widgets.UiEvent
@@ -83,12 +85,18 @@ class EditMedicinesScreen :
   @Inject
   lateinit var features: Features
 
+  private val appbar
+    get() = binding.prescribeddrugsAppbar
+
   private val toolbar
     get() = binding.prescribeddrugsToolbar
 
   private val recyclerView
     get() = binding.prescribeddrugsRecyclerview
 
+  private val buttonFrame
+    get() = binding.buttonFrame
+
   private val doneButton
     get() = binding.prescribeddrugsDone
 
@@ -153,7 +161,11 @@ class EditMedicinesScreen :
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    appbar.applyStatusBarPadding()
+    buttonFrame.applyInsetsBottomPadding()
+
     toolbar.setNavigationOnClickListener { router.pop() }
+
     recyclerView.setHasFixedSize(false)
     recyclerView.layoutManager = LinearLayoutManager(requireContext())
 

app/src/main/java/org/simple/clinic/drugs/selection/custom/CustomDrugEntrySheet.kt

@@ -85,7 +85,7 @@ class CustomDrugEntrySheet : BaseBottomSheet<
 
   private val saveButtonFrame
     get() = binding.saveButtonFrame
-    
+
   private val progressIndicator
     get() = binding.progressIndicator
 

app/src/main/java/org/simple/clinic/drugstockreminders/enterdrugstock/EnterDrugStockScreen.kt

@@ -13,6 +13,7 @@ import org.simple.clinic.di.injector
 import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.ScreenKey
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
+import org.simple.clinic.util.applyStatusBarPadding
 import javax.inject.Inject
 
 class EnterDrugStockScreen : BaseScreen<
@@ -29,6 +30,9 @@ class EnterDrugStockScreen : BaseScreen<
   @Inject
   lateinit var effectHandler: EnterDrugStockEffectHandler
 
+  private val appbar
+    get() = binding.appbar
+
   private val toolbar
     get() = binding.toolbar
 
@@ -56,6 +60,7 @@ class EnterDrugStockScreen : BaseScreen<
   @SuppressLint("SetJavaScriptEnabled")
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
+    appbar.applyStatusBarPadding()
     toolbar.setNavigationOnClickListener { router.pop() }
 
     webView.settings.javaScriptEnabled = true