[MBL-18831] Implement edge-to-edge rendering with landscape support

apps/parent/src/main/java/com/instructure/parentapp/features/addstudent/qr/QrPairingScreen.kt

@@ -40,6 +40,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.CanvasAppBar
@@ -57,6 +58,7 @@ fun QrPairingScreen(
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 CanvasAppBar(
                     title = stringResource(

apps/parent/src/main/java/com/instructure/parentapp/features/alerts/details/AnnouncementDetailsScreen.kt

@@ -50,6 +50,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.models.Attachment
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.canvasapi2.utils.DateHelper
@@ -88,6 +89,7 @@ fun AnnouncementDetailsScreen(
 
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 CanvasThemedAppBar(
                     title = uiState.pageTitle.orEmpty(),

apps/parent/src/main/java/com/instructure/parentapp/features/alerts/list/AlertsScreen.kt

@@ -61,6 +61,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.models.AlertType
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.canvasapi2.utils.DateHelper
@@ -84,6 +85,7 @@ fun AlertsScreen(
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             content = { padding ->
                 val pullRefreshState = rememberPullRefreshState(
                     refreshing = uiState.isRefreshing,

apps/parent/src/main/java/com/instructure/parentapp/features/alerts/settings/AlertSettingsScreen.kt

@@ -72,6 +72,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.models.AlertType
 import com.instructure.canvasapi2.models.ThresholdWorkflowState
 import com.instructure.canvasapi2.models.User
@@ -102,6 +103,7 @@ fun AlertSettingsScreen(
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 CanvasAppBar(
                     title = stringResource(id = R.string.alertSettingsTitle),

apps/parent/src/main/java/com/instructure/parentapp/features/courses/details/CourseDetailsScreen.kt

@@ -18,8 +18,12 @@
 package com.instructure.parentapp.features.courses.details
 
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBars
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.material.FloatingActionButton
@@ -48,6 +52,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
@@ -198,6 +203,7 @@ private fun CourseDetailsScreenContent(
 
     Scaffold(
         backgroundColor = colorResource(id = R.color.backgroundLightest),
+        contentWindowInsets = WindowInsets(0, 0, 0, 0),
         snackbarHost = {
             SnackbarHost(
                 hostState = snackbarHostState,
@@ -260,7 +266,8 @@ private fun CourseDetailsScreenContent(
                 backgroundColor = Color(uiState.studentColor),
                 onClick = {
                     actionHandler(CourseDetailsAction.SendAMessage)
-                }
+                },
+                modifier = Modifier.windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom + WindowInsetsSides.Horizontal))
             ) {
                 Icon(
                     painter = painterResource(id = R.drawable.ic_chat),

apps/parent/src/main/java/com/instructure/parentapp/features/courses/list/CoursesScreen.kt

@@ -47,6 +47,7 @@ import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
 import com.instructure.pandautils.compose.composables.EmptyContent
@@ -64,6 +65,7 @@ internal fun CoursesScreen(
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             content = { padding ->
                 val pullRefreshState = rememberPullRefreshState(
                     refreshing = uiState.isLoading,

apps/parent/src/main/java/com/instructure/parentapp/features/dashboard/DashboardFragment.kt

@@ -60,7 +60,9 @@ import com.instructure.pandautils.utils.ThemePrefs
 import com.instructure.pandautils.utils.ViewStyler
 import com.instructure.pandautils.utils.animateCircularBackgroundColorChange
 import com.instructure.pandautils.utils.announceAccessibilityText
+import com.instructure.pandautils.utils.applyHorizontalSystemBarInsets
 import com.instructure.pandautils.utils.applyTheme
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.collectDistinctUntilChanged
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.getDrawableCompat
@@ -189,6 +191,7 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.applyHorizontalSystemBarInsets()
 
         setupNavigation()
 
@@ -275,6 +278,7 @@ class DashboardFragment : BaseCanvasFragment(), NavigationCallbacks {
     }
 
     private fun setupToolbar() {
+        binding.toolbar.applyTopSystemBarInsets()
         binding.navigationButtonHolder.contentDescription = getString(R.string.navigation_drawer_open)
         binding.navigationButtonHolder.onClick {
             openNavigationDrawer()

apps/parent/src/main/java/com/instructure/parentapp/features/login/createaccount/CreateAccountScreen.kt

@@ -74,6 +74,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.models.TermsOfService
 import com.instructure.pandares.R
 import com.instructure.pandautils.compose.CanvasTheme
@@ -98,6 +99,7 @@ internal fun CreateAccountScreen(
 
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             snackbarHost = { SnackbarHost(hostState = snackbarHostState) },
             content = { padding ->
                 Column(

apps/parent/src/main/java/com/instructure/parentapp/features/managestudents/ManageStudentsScreen.kt

@@ -23,11 +23,15 @@ import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.WindowInsetsSides
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.windowInsetsPadding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.rememberScrollState
@@ -64,6 +68,7 @@ import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.foundation.layout.WindowInsets
 import com.instructure.canvasapi2.utils.ContextKeeper
 import com.instructure.pandautils.R
 import com.instructure.pandautils.compose.CanvasTheme
@@ -84,6 +89,7 @@ internal fun ManageStudentsScreen(
     CanvasTheme {
         Scaffold(
             backgroundColor = colorResource(id = R.color.backgroundLightest),
+            contentWindowInsets = WindowInsets(0, 0, 0, 0),
             topBar = {
                 CanvasThemedAppBar(
                     title = stringResource(id = R.string.screenTitleManageStudents),
@@ -125,7 +131,9 @@ internal fun ManageStudentsScreen(
             },
             floatingActionButton = {
                 FloatingActionButton(
-                    modifier = Modifier.testTag("addStudentButton"),
+                    modifier = Modifier
+                        .testTag("addStudentButton")
+                        .windowInsetsPadding(WindowInsets.systemBars.only(WindowInsetsSides.Bottom + WindowInsetsSides.Horizontal)),
                     backgroundColor = Color(ThemePrefs.buttonColor),
                     onClick = {
                         actionHandler(ManageStudentsAction.AddStudent)

apps/parent/src/main/java/com/instructure/parentapp/features/webview/SimpleWebViewFragment.kt

@@ -38,6 +38,8 @@ import com.instructure.pandautils.mvvm.ViewState
 import com.instructure.pandautils.utils.Const
 import com.instructure.pandautils.utils.NullableStringArg
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyHorizontalSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.collectOneOffEvents
 import com.instructure.pandautils.utils.enableAlgorithmicDarkening
 import com.instructure.pandautils.utils.launchCustomTab
@@ -75,6 +77,7 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        view.applyHorizontalSystemBarInsets()
         applyTheme()
         lifecycleScope.collectOneOffEvents(viewModel.events, ::handleAction)
         lifecycleScope.launch {
@@ -116,6 +119,7 @@ class SimpleWebViewFragment : BaseCanvasFragment(), NavigationCallbacks {
     }
 
     private fun applyTheme() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
         toolbar.title = title.orEmpty()
         toolbar.setupAsBackButton(this@SimpleWebViewFragment)
         ViewStyler.themeToolbarColored(

apps/parent/src/main/res/layout/fragment_dashboard.xml

@@ -58,6 +58,7 @@
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:minHeight="?android:attr/actionBarSize"
                     app:contentInsetStart="0dp"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent">

apps/parent/src/main/res/values/themes.xml

@@ -33,6 +33,5 @@
         <item name="android:editTextStyle">@style/NoGifEditText</item>
         <item name="editTextStyle">@style/NoGifEditText</item>
         <item name="fontFamily">@font/lato_font_family</item>
-        <item name="android:windowOptOutEdgeToEdgeEnforcement">true</item>
     </style>
 </resources>

apps/student/src/main/java/com/instructure/student/AnnotationComments/AnnotationCommentListFragment.kt

@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialog
 import androidx.core.content.ContextCompat
+import androidx.core.view.updatePadding
 import androidx.recyclerview.widget.DefaultItemAnimator
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -41,15 +42,31 @@ import com.instructure.interactions.router.Route
 import com.instructure.pandautils.analytics.SCREEN_VIEW_ANNOTATION_COMMENT_LIST
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
-import com.instructure.pandautils.utils.*
+import com.instructure.pandautils.utils.BooleanArg
+import com.instructure.pandautils.utils.LongArg
+import com.instructure.pandautils.utils.ParcelableArg
+import com.instructure.pandautils.utils.ParcelableArrayListArg
+import com.instructure.pandautils.utils.StringArg
+import com.instructure.pandautils.utils.ThemePrefs
+import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyHorizontalSystemBarInsets
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
+import com.instructure.pandautils.utils.hideKeyboard
+import com.instructure.pandautils.utils.onClickWithRequireNetwork
+import com.instructure.pandautils.utils.onTextChanged
+import com.instructure.pandautils.utils.setGone
+import com.instructure.pandautils.utils.setInvisible
+import com.instructure.pandautils.utils.setVisible
+import com.instructure.pandautils.utils.setupAsCloseButton
+import com.instructure.pandautils.utils.withArgs
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentAnnotationCommentListBinding
 import com.instructure.student.fragment.ParentFragment
 import com.instructure.student.mobius.assignmentDetails.submissionDetails.content.PdfStudentSubmissionView
 import kotlinx.coroutines.Job
 import okhttp3.ResponseBody
 import org.greenrobot.eventbus.EventBus
-import java.util.*
+import java.util.Locale
 
 @ScreenView(SCREEN_VIEW_ANNOTATION_COMMENT_LIST)
 class AnnotationCommentListFragment : ParentFragment() {
@@ -75,6 +92,7 @@ class AnnotationCommentListFragment : ParentFragment() {
         with (binding) {
             toolbar.title = title()
             toolbar.setupAsCloseButton(this@AnnotationCommentListFragment)
+            toolbar.applyTopSystemBarInsets()
             ViewStyler.themeToolbarLight(requireActivity(), toolbar)
         }
     }
@@ -84,6 +102,7 @@ class AnnotationCommentListFragment : ParentFragment() {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
+        view?.applyHorizontalSystemBarInsets()
         recyclerAdapter = AnnotationCommentListRecyclerAdapter(requireContext(), docSession, { annotation, position ->
             AnnotationCommentDialog.getInstance(requireFragmentManager(), annotation.contents ?: "", requireContext().getString(R.string.editComment)) { cancelled, text ->
                 if(!cancelled) {
@@ -111,6 +130,7 @@ class AnnotationCommentListFragment : ParentFragment() {
         configureRecyclerView()
         applyTheme()
         setupCommentInput()
+        setupWindowInsets()
 
         if(recyclerAdapter?.size() == 0) {
             recyclerAdapter?.addAll(annotations)
@@ -156,6 +176,24 @@ class AnnotationCommentListFragment : ParentFragment() {
         }
     }
 
+    private fun setupWindowInsets() = with(binding) {
+        toolbar.applyTopSystemBarInsets()
+
+        androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(annotationCommentsRecyclerView) { view, insets ->
+            val ime = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.ime())
+            val systemBars = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = maxOf(ime.bottom, systemBars.bottom))
+            insets
+        }
+
+        androidx.core.view.ViewCompat.setOnApplyWindowInsetsListener(commentInputContainer) { view, insets ->
+            val ime = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.ime())
+            val systemBars = insets.getInsets(androidx.core.view.WindowInsetsCompat.Type.systemBars())
+            view.updatePadding(bottom = maxOf(ime.bottom, systemBars.bottom))
+            insets
+        }
+    }
+
     private fun showSendingStatus() = with(binding) {
         sendCommentButton.setInvisible()
         sendingProgressBar.setVisible()

apps/student/src/main/java/com/instructure/student/activity/NavigationActivity.kt

@@ -43,6 +43,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.view.GravityCompat
 import androidx.core.view.MenuItemCompat
+import com.instructure.pandautils.utils.applyBottomSystemBarInsets
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.lifecycleScope
@@ -98,6 +99,7 @@ import com.instructure.pandautils.typeface.TypefaceBehavior
 import com.instructure.pandautils.update.UpdateManager
 import com.instructure.pandautils.utils.ActivityResult
 import com.instructure.pandautils.utils.Const
+import com.instructure.pandautils.utils.EdgeToEdgeHelper
 import com.instructure.pandautils.utils.LocaleUtils
 import com.instructure.pandautils.utils.NetworkStateProvider
 import com.instructure.pandautils.utils.OnActivityResults
@@ -353,12 +355,17 @@ class NavigationActivity : BaseRouterActivity(), Navigation, MasqueradingDialog.
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        EdgeToEdgeHelper.enableEdgeToEdge(this)
         RouteMatcher.offlineDb = offlineDatabase
         RouteMatcher.networkStateProvider = networkStateProvider
         RouteMatcher.enabledTabs = enabledCourseTabs
         navigationDrawerBinding = NavigationDrawerBinding.bind(binding.root)
         canvasLoadingBinding = LoadingCanvasViewBinding.bind(binding.root)
         setContentView(binding.root)
+
+        binding.bottomBar.applyBottomSystemBarInsets()
+        binding.bottomBarDivider.applyBottomSystemBarInsets()
+
         val masqueradingUserId: Long = intent.getLongExtra(Const.QR_CODE_MASQUERADE_ID, 0L)
         if (masqueradingUserId != 0L) {
             MasqueradeHelper.startMasquerading(masqueradingUserId, ApiPrefs.domain, NavigationActivity::class.java)

apps/student/src/main/java/com/instructure/student/activity/NothingToSeeHereFragment.kt

@@ -24,6 +24,7 @@ import com.instructure.pandautils.analytics.SCREEN_VIEW_NOTHING_TO_SEE_HERE
 import com.instructure.pandautils.analytics.ScreenView
 import com.instructure.pandautils.binding.viewBinding
 import com.instructure.pandautils.utils.ViewStyler
+import com.instructure.pandautils.utils.applyTopSystemBarInsets
 import com.instructure.pandautils.utils.setupAsBackButton
 import com.instructure.student.R
 import com.instructure.student.databinding.FragmentNothingToSeeHereBinding
@@ -46,6 +47,7 @@ class NothingToSeeHereFragment : ParentFragment() {
 
     override fun applyTheme() {
         binding.toolbar.setupAsBackButton(this)
+        binding.toolbar.applyTopSystemBarInsets()
         ViewStyler.themeToolbarLight(requireActivity(), binding.toolbar)
     }