Fix #5940: Add edge-to-edge window insets for drawer-based activities

app/src/main/java/org/oppia/android/app/administratorcontrols/AdministratorControlsActivityPresenter.kt

@@ -1,8 +1,13 @@
 package org.oppia.android.app.administratorcontrols
 
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.administratorcontrols.appversion.AppVersionFragment
@@ -17,14 +22,17 @@ import org.oppia.android.app.settings.profile.ProfileListFragment
 import org.oppia.android.app.translation.AppLanguageResourceHandler
 import org.oppia.android.app.ui.R
 import org.oppia.android.util.extensions.putProto
+import org.oppia.android.util.platformparameter.EnableEdgeToEdge
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import org.oppia.android.util.profile.CurrentUserProfileIdIntentDecorator.decorateWithUserProfileId
 import javax.inject.Inject
 
 /** The presenter for [AdministratorControlsActivity]. */
 @ActivityScope
 class AdministratorControlsActivityPresenter @Inject constructor(
   private val activity: AppCompatActivity,
-  private val resourceHandler: AppLanguageResourceHandler
+  private val resourceHandler: AppLanguageResourceHandler,
+  @EnableEdgeToEdge private val enableEdgeToEdge: PlatformParameterValue<Boolean>
 ) {
   private lateinit var navigationDrawerFragment: NavigationDrawerFragment
   private var isMultipane = false
@@ -47,6 +55,9 @@ class AdministratorControlsActivityPresenter @Inject constructor(
       R.layout.administrator_controls_activity
     )
     setUpNavigationDrawer()
+    if (enableEdgeToEdge.value) {
+      applyEdgeToEdgeInsets()
+    }
     this.lastLoadedFragment = lastLoadedFragment
     this.selectedProfileId = selectedProfileId
     this.isProfileDeletionDialogVisible = isProfileDeletionDialogVisible
@@ -199,6 +210,42 @@ class AdministratorControlsActivityPresenter @Inject constructor(
     binding.extraControlsTitle?.text = title
   }
 
+  private fun applyEdgeToEdgeInsets() {
+    val toolbar = binding.administratorControlsActivityToolbar
+    val contentLayout = toolbar.parent as android.widget.LinearLayout
+    val statusBarBackground = View(activity).apply {
+      setBackgroundColor(
+        ContextCompat.getColor(
+          activity,
+          R.color.component_color_shared_activity_status_bar_color
+        )
+      )
+    }
+    contentLayout.addView(statusBarBackground, 0)
+    ViewCompat.setOnApplyWindowInsetsListener(statusBarBackground) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.layoutParams.height = systemBars.top
+      view.requestLayout()
+      insets
+    }
+    ViewCompat.setOnApplyWindowInsetsListener(
+      binding.administratorControlsActivityDrawerLayout
+    ) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.updatePadding(bottom = systemBars.bottom)
+      insets
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      activity.window.isNavigationBarContrastEnforced = false
+    }
+  }
+
   /** Saves the state of the views on configuration changes. */
   fun handleOnSaveInstanceState(outState: Bundle) {
     val titleTextView = binding.extraControlsTitle

app/src/main/java/org/oppia/android/app/classroom/ClassroomListActivityPresenter.kt

@@ -1,18 +1,28 @@
 package org.oppia.android.app.classroom
 
+import android.os.Build
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.drawerlayout.widget.DrawerLayout
 import org.oppia.android.app.drawer.NavigationDrawerFragment
 import org.oppia.android.app.ui.R
+import org.oppia.android.util.platformparameter.EnableEdgeToEdge
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 
 /** Tag for identifying the [ClassroomListFragment] in transactions. */
 private const val TAG_CLASSROOM_LIST_FRAGMENT = "CLASSROOM_LIST_FRAGMENT"
 
 /** The presenter for [ClassroomListActivity]. */
-class ClassroomListActivityPresenter @Inject constructor(private val activity: AppCompatActivity) {
+class ClassroomListActivityPresenter @Inject constructor(
+  private val activity: AppCompatActivity,
+  @EnableEdgeToEdge private val enableEdgeToEdge: PlatformParameterValue<Boolean>
+) {
   private var navigationDrawerFragment: NavigationDrawerFragment? = null
 
   /**
@@ -22,6 +32,9 @@ class ClassroomListActivityPresenter @Inject constructor(private val activity: A
   fun handleOnCreate() {
     activity.setContentView(R.layout.classroom_list_activity)
     setUpNavigationDrawer()
+    if (enableEdgeToEdge.value) {
+      applyEdgeToEdgeInsets()
+    }
     if (getClassroomListFragment() == null) {
       activity.supportFragmentManager.beginTransaction().add(
         R.id.classroom_list_fragment_placeholder,
@@ -51,4 +64,43 @@ class ClassroomListActivityPresenter @Inject constructor(private val activity: A
       R.id.classroom_list_fragment_placeholder
     ) as ClassroomListFragment?
   }
+
+  private fun applyEdgeToEdgeInsets() {
+    val toolbar = activity.findViewById<Toolbar>(
+      R.id.classroom_list_activity_toolbar
+    )
+    val contentLayout = toolbar.parent as android.widget.LinearLayout
+    val statusBarBackground = View(activity).apply {
+      setBackgroundColor(
+        ContextCompat.getColor(
+          activity,
+          R.color.component_color_shared_activity_status_bar_color
+        )
+      )
+    }
+    contentLayout.addView(statusBarBackground, 0)
+    ViewCompat.setOnApplyWindowInsetsListener(statusBarBackground) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.layoutParams.height = systemBars.top
+      view.requestLayout()
+      insets
+    }
+    val drawerLayout = activity.findViewById<DrawerLayout>(
+      R.id.classroom_list_activity_drawer_layout
+    )
+    ViewCompat.setOnApplyWindowInsetsListener(drawerLayout) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.updatePadding(bottom = systemBars.bottom)
+      insets
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      activity.window.isNavigationBarContrastEnforced = false
+    }
+  }
 }

app/src/main/java/org/oppia/android/app/devoptions/DeveloperOptionsActivityPresenter.kt

@@ -1,13 +1,21 @@
 package org.oppia.android.app.devoptions
 
 import android.content.Intent
+import android.os.Build
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.databinding.DataBindingUtil
 import org.oppia.android.app.activity.ActivityScope
 import org.oppia.android.app.databinding.databinding.DeveloperOptionsActivityBinding
 import org.oppia.android.app.drawer.NavigationDrawerFragment
 import org.oppia.android.app.splash.SplashActivity
 import org.oppia.android.app.ui.R
+import org.oppia.android.util.platformparameter.EnableEdgeToEdge
+import org.oppia.android.util.platformparameter.PlatformParameterValue
 import javax.inject.Inject
 import kotlin.system.exitProcess
 
@@ -17,7 +25,8 @@ const val TAG_FORCE_DOWNLOAD_DIALOG = "FORCE_DOWNLOAD_DIALOG_TAG"
 /** The presenter for [DeveloperOptionsActivity]. */
 @ActivityScope
 class DeveloperOptionsActivityPresenter @Inject constructor(
-  private val activity: AppCompatActivity
+  private val activity: AppCompatActivity,
+  @EnableEdgeToEdge private val enableEdgeToEdge: PlatformParameterValue<Boolean>
 ) {
   private lateinit var navigationDrawerFragment: NavigationDrawerFragment
   private lateinit var binding: DeveloperOptionsActivityBinding
@@ -28,6 +37,9 @@ class DeveloperOptionsActivityPresenter @Inject constructor(
       R.layout.developer_options_activity
     )
     setUpNavigationDrawer()
+    if (enableEdgeToEdge.value) {
+      applyEdgeToEdgeInsets()
+    }
     val previousFragment = getDeveloperOptionsFragment()
     if (previousFragment == null) {
       activity.supportFragmentManager.beginTransaction().add(
@@ -71,6 +83,42 @@ class DeveloperOptionsActivityPresenter @Inject constructor(
     dialog.showNow(activity.supportFragmentManager, TAG_FORCE_DOWNLOAD_DIALOG)
   }
 
+  private fun applyEdgeToEdgeInsets() {
+    val toolbar = binding.developerOptionsActivityToolbar
+    val contentLayout = toolbar.parent as android.widget.LinearLayout
+    val statusBarBackground = View(activity).apply {
+      setBackgroundColor(
+        ContextCompat.getColor(
+          activity,
+          R.color.component_color_shared_activity_status_bar_color
+        )
+      )
+    }
+    contentLayout.addView(statusBarBackground, 0)
+    ViewCompat.setOnApplyWindowInsetsListener(statusBarBackground) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.layoutParams.height = systemBars.top
+      view.requestLayout()
+      insets
+    }
+    ViewCompat.setOnApplyWindowInsetsListener(
+      binding.developerOptionsActivityDrawerLayout
+    ) { view, insets ->
+      val systemBars = insets.getInsets(
+        WindowInsetsCompat.Type.systemBars() or
+          WindowInsetsCompat.Type.displayCutout()
+      )
+      view.updatePadding(bottom = systemBars.bottom)
+      insets
+    }
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+      activity.window.isNavigationBarContrastEnforced = false
+    }
+  }
+
   /** Called when restart is triggered by [ForceDownloadRemoteParametersDialogFragment]. */
   fun restartApp() {
     val intent = Intent(activity, SplashActivity::class.java).also {