Enable edge-to-edge support on all versions of Android (#5428)

msasikanth · web-flow · commit d9946bbd20fc · 2025-05-22T09:37:40.000Z
**Story:** https://app.shortcut.com/simpledotorg/story/15545/enable-edge-to-edge-support-on-all-versions-of-android  --- This is **part 2 of 2 in a stack** made with GitButler: - <kbd>&nbsp;2&nbsp;</kbd> #5428 👈 - <kbd>&nbsp;1&nbsp;</kbd> #5408
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### 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
 
diff --git a/app/build.gradle.kts b/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)
 
diff --git a/app/src/main/java/org/simple/clinic/drugs/search/DrugsSearchScreen.kt b/app/src/main/java/org/simple/clinic/drugs/search/DrugsSearchScreen.kt
@@ -29,6 +29,7 @@ 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
@@ -105,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?
diff --git a/app/src/main/java/org/simple/clinic/editpatient/EditPatientScreen.kt b/app/src/main/java/org/simple/clinic/editpatient/EditPatientScreen.kt
@@ -87,6 +87,7 @@ import org.simple.clinic.util.afterTextChangedWatcher
 import org.simple.clinic.util.applyInsetsBottomPadding
 import org.simple.clinic.util.applyStatusBarPadding
 import org.simple.clinic.util.exhaustive
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.resolveColor
 import org.simple.clinic.util.setFragmentResultListener
 import org.simple.clinic.util.unsafeLazy
@@ -375,6 +376,16 @@ class EditPatientScreen : BaseScreen<
     context.injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     handleScanIdentifierResult()
diff --git a/app/src/main/java/org/simple/clinic/facility/change/FacilityChangeScreen.kt b/app/src/main/java/org/simple/clinic/facility/change/FacilityChangeScreen.kt
@@ -21,6 +21,7 @@ import org.simple.clinic.navigation.v2.ScreenKey
 import org.simple.clinic.navigation.v2.Succeeded
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
 import org.simple.clinic.activity.permissions.RuntimePermissions
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.setFragmentResultListener
 import org.simple.clinic.widgets.UiEvent
 import java.util.Locale
@@ -88,6 +89,16 @@ class FacilityChangeScreen :
     }
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     setupUiComponents()
diff --git a/app/src/main/java/org/simple/clinic/home/overdue/search/OverdueSearchScreen.kt b/app/src/main/java/org/simple/clinic/home/overdue/search/OverdueSearchScreen.kt
@@ -56,6 +56,7 @@ import org.simple.clinic.util.RuntimeNetworkStatus
 import org.simple.clinic.util.UserClock
 import org.simple.clinic.util.applyInsetsBottomPadding
 import org.simple.clinic.util.applyStatusBarPadding
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.unsafeLazy
 import org.simple.clinic.widgets.PagingItemAdapter
 import org.simple.clinic.widgets.UiEvent
@@ -217,6 +218,16 @@ class OverdueSearchScreen : 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?): ScreenOverdueSearchBinding {
     return ScreenOverdueSearchBinding.inflate(layoutInflater, container, false)
   }
diff --git a/app/src/main/java/org/simple/clinic/instantsearch/InstantSearchScreen.kt b/app/src/main/java/org/simple/clinic/instantsearch/InstantSearchScreen.kt
@@ -56,6 +56,7 @@ import org.simple.clinic.summary.PatientSummaryScreenKey
 import org.simple.clinic.util.UtcClock
 import org.simple.clinic.util.applyInsetsBottomPadding
 import org.simple.clinic.util.applyStatusBarPadding
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.setFragmentResultListener
 import org.simple.clinic.widgets.PagingItemAdapter
 import org.simple.clinic.widgets.UiEvent
@@ -204,7 +205,6 @@ class InstantSearchScreen :
 
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
-
     appbar.applyStatusBarPadding()
     newPatientContainer.applyInsetsBottomPadding()
 
@@ -226,6 +226,16 @@ class InstantSearchScreen :
     lifecycleEvents.onNext(InstantSearchScreenShown)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onDestroyView() {
     super.onDestroyView()
     subscriptions.clear()
diff --git a/app/src/main/java/org/simple/clinic/main/TheActivity.kt b/app/src/main/java/org/simple/clinic/main/TheActivity.kt
@@ -4,8 +4,11 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Bundle
 import android.view.WindowManager
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.work.ExistingWorkPolicy.REPLACE
 import androidx.work.WorkManager
@@ -184,6 +187,10 @@ class TheActivity : AppCompatActivity(), TheActivityUi {
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge(
+        statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
+        navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT)
+    )
     super.onCreate(savedInstanceState)
     router.onReady(savedInstanceState)
     delegate.onRestoreInstanceState(savedInstanceState)
diff --git a/app/src/main/java/org/simple/clinic/newentry/PatientEntryScreen.kt b/app/src/main/java/org/simple/clinic/newentry/PatientEntryScreen.kt
@@ -66,6 +66,7 @@ import org.simple.clinic.platform.crash.CrashReporter
 import org.simple.clinic.registration.phone.PhoneNumberValidator
 import org.simple.clinic.util.applyInsetsBottomPadding
 import org.simple.clinic.util.applyStatusBarPadding
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.toOptional
 import org.simple.clinic.util.unsafeLazy
 import org.simple.clinic.widgets.ProgressMaterialButton
@@ -303,6 +304,16 @@ class PatientEntryScreen : BaseScreen<
     colonyOrVillageEditText.setAdapter(villageTypeAheadAdapter)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun setupUi(inputFields: InputFields) {
     // Not sure why, but setting android:nextFocusDown in XML isn't working,
     // so doing this manually here.
diff --git a/app/src/main/java/org/simple/clinic/onboarding/OnboardingScreen.kt b/app/src/main/java/org/simple/clinic/onboarding/OnboardingScreen.kt
@@ -39,6 +39,7 @@ import org.simple.clinic.di.injector
 import org.simple.clinic.mobius.DisposableViewEffect
 import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.ScreenKey
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.util.unsafeLazy
 import javax.inject.Inject
 
@@ -60,6 +61,16 @@ class OnboardingScreen : Fragment(), OnboardingUi {
     context.injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
     return ComposeView(requireContext()).apply {
       setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
diff --git a/app/src/main/java/org/simple/clinic/registerorlogin/AuthenticationActivity.kt b/app/src/main/java/org/simple/clinic/registerorlogin/AuthenticationActivity.kt
@@ -3,7 +3,10 @@ package org.simple.clinic.registerorlogin
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Bundle
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import io.github.inflationx.viewpump.ViewPumpContextWrapper
 import io.reactivex.Observable
@@ -78,6 +81,10 @@ class AuthenticationActivity : AppCompatActivity(), AuthenticationUiActions {
   private lateinit var component: AuthenticationActivityComponent
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge(
+        statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
+        navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT)
+    )
     super.onCreate(savedInstanceState)
     router.onReady(savedInstanceState)
     delegate.onRestoreInstanceState(savedInstanceState)
diff --git a/app/src/main/java/org/simple/clinic/registration/facility/RegistrationFacilitySelectionScreen.kt b/app/src/main/java/org/simple/clinic/registration/facility/RegistrationFacilitySelectionScreen.kt
@@ -25,6 +25,7 @@ import org.simple.clinic.registration.confirmfacility.ConfirmFacilitySheet
 import org.simple.clinic.registration.register.RegistrationLoadingScreen
 import org.simple.clinic.user.OngoingRegistrationEntry
 import org.simple.clinic.util.extractSuccessful
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.widgets.UiEvent
 import java.util.UUID
 import javax.inject.Inject
@@ -87,6 +88,16 @@ class RegistrationFacilitySelectionScreen : BaseScreen<
     context.injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     facilityPickerView.backClicked = { router.pop() }
diff --git a/app/src/main/java/org/simple/clinic/scheduleappointment/facilityselection/FacilitySelectionScreen.kt b/app/src/main/java/org/simple/clinic/scheduleappointment/facilityselection/FacilitySelectionScreen.kt
@@ -19,6 +19,7 @@ import org.simple.clinic.navigation.v2.Router
 import org.simple.clinic.navigation.v2.ScreenKey
 import org.simple.clinic.navigation.v2.Succeeded
 import org.simple.clinic.navigation.v2.fragments.BaseScreen
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.widgets.UiEvent
 import java.util.Locale
 import javax.inject.Inject
@@ -54,6 +55,16 @@ class FacilitySelectionScreen :
     requireContext().injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     facilityPickerView.backClicked = { router.pop() }
diff --git a/app/src/main/java/org/simple/clinic/settings/changelanguage/ChangeLanguageScreen.kt b/app/src/main/java/org/simple/clinic/settings/changelanguage/ChangeLanguageScreen.kt
@@ -24,6 +24,7 @@ import org.simple.clinic.settings.Language
 import org.simple.clinic.settings.changelanguage.ChangeLanguageListItem.Event.ListItemClicked
 import org.simple.clinic.util.applyInsetsBottomMargin
 import org.simple.clinic.util.applyStatusBarPadding
+import org.simple.clinic.util.lightStatusBar
 import org.simple.clinic.widgets.ItemAdapter
 import javax.inject.Inject
 
@@ -91,6 +92,16 @@ class ChangeLanguageScreen : BaseScreen<
     context.injector<Injector>().inject(this)
   }
 
+  override fun onResume() {
+    super.onResume()
+    lightStatusBar(enabled = true)
+  }
+
+  override fun onStop() {
+    lightStatusBar(enabled = false)
+    super.onStop()
+  }
+
   override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
     super.onViewCreated(view, savedInstanceState)
     appbar.applyStatusBarPadding()
diff --git a/app/src/main/java/org/simple/clinic/setup/SetupActivity.kt b/app/src/main/java/org/simple/clinic/setup/SetupActivity.kt
@@ -3,8 +3,11 @@ package org.simple.clinic.setup
 import android.content.Context
 import android.content.Intent
 import android.content.res.Configuration
+import android.graphics.Color
 import android.os.Bundle
 import android.view.WindowManager
+import androidx.activity.SystemBarStyle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import io.github.inflationx.viewpump.ViewPumpContextWrapper
@@ -78,6 +81,10 @@ class SetupActivity : AppCompatActivity(), UiActions {
   private lateinit var binding: ActivitySetupBinding
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    enableEdgeToEdge(
+        statusBarStyle = SystemBarStyle.dark(Color.TRANSPARENT),
+        navigationBarStyle = SystemBarStyle.dark(Color.TRANSPARENT)
+    )
     super.onCreate(savedInstanceState)
     @Suppress("ConstantConditionIf")
     if (BuildConfig.DISABLE_SCREENSHOT) {
diff --git a/app/src/main/java/org/simple/clinic/util/FragmentExt.kt b/app/src/main/java/org/simple/clinic/util/FragmentExt.kt
@@ -2,6 +2,7 @@ package org.simple.clinic.util
 
 import android.os.Parcelable
 import androidx.core.os.bundleOf
+import androidx.core.view.WindowCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.setFragmentResultListener
@@ -39,3 +40,8 @@ fun FragmentManager.setFragmentResult(requestKey: Parcelable, result: ScreenResu
       requestKeyName to result
   ))
 }
+
+fun Fragment.lightStatusBar(enabled: Boolean = false) {
+  val window = requireActivity().window
+  WindowCompat.getInsetsController(window, window.decorView).isAppearanceLightStatusBars = enabled
+}
diff --git a/app/src/main/java/org/simple/clinic/widgets/BottomSheetActivity.kt b/app/src/main/java/org/simple/clinic/widgets/BottomSheetActivity.kt
@@ -68,11 +68,11 @@ abstract class BottomSheetActivity : AppCompatActivity() {
     LayoutInflater.from(this).inflate(layoutResId, contentContainer)
   }
 
-  override fun setContentView(view: View) {
+  override fun setContentView(view: View?) {
     contentContainer.addView(view)
   }
 
-  override fun setContentView(view: View, params: ViewGroup.LayoutParams?) {
+  override fun setContentView(view: View?, params: ViewGroup.LayoutParams?) {
     contentContainer.addView(view, params)
   }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,6 +9,7 @@ androidx-work = "2.10.1"
 androidx-security-crypto = "1.1.0-alpha07"
 androidx-viewmodel = "2.8.7"
 androidx-lifecycle = "2.8.7"
+androidx-activity = "1.10.1"
 
 dagger = "2.56.2"
 
@@ -61,6 +62,7 @@ androidx-fragment = "androidx.fragment:fragment-ktx:1.8.6"
 androidx-preference = "androidx.preference:preference:1.2.1"
 androidx-recyclerview = "androidx.recyclerview:recyclerview:1.4.0"
 androidx-viewpager2 = "androidx.viewpager2:viewpager2:1.1.0"
+androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity" }
 
 androidx-camera-core = { module = "androidx.camera:camera-core", version.ref = "androidx-camera" }
 androidx-camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "androidx-camera" }
