Update handling of window insets across the app

jdkoren · jdkoren · commit 12d9fa88d553 · 2021-05-13T14:12:21.000-07:00
Change-Id: Ia5af3006cd28c40597180ac3b5298df3ffb2cd4c
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/MainActivity.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/MainActivity.kt
@@ -24,6 +24,12 @@ import android.view.Menu
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.Insets
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.isVisible
+import androidx.core.view.updatePadding
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
@@ -115,6 +121,7 @@ class MainActivity : AppCompatActivity(), NavigationHost {
 
         // Update for Dark Mode straight away
         updateForTheme(viewModel.currentTheme)
+        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         binding = ActivityMainBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -178,6 +185,37 @@ class MainActivity : AppCompatActivity(), NavigationHost {
                 }
             }
         }
+
+        binding.navigationRail?.let {
+            ViewCompat.setOnApplyWindowInsetsListener(it) { view, insets ->
+                // Pad the Navigation Rail so its content is not behind system bars.
+                val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+                view.updatePadding(top = systemBars.top, bottom = systemBars.bottom)
+                insets
+            }
+        }
+        ViewCompat.setOnApplyWindowInsetsListener(binding.rootContainer) { view, insets ->
+            // Hide the bottom navigation view whenever the keyboard is visible.
+            val imeVisible = insets.isVisible(WindowInsetsCompat.Type.ime())
+            binding.bottomNavigation?.isVisible = !imeVisible
+
+            // If we're showing the bottom navigation, add bottom padding. Also, add left and right
+            // padding since there's no better we can do with horizontal insets.
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            val bottomPadding = if (binding.bottomNavigation?.isVisible == true) {
+                systemBars.bottom
+            } else 0
+            view.updatePadding(
+                left = systemBars.left,
+                right = systemBars.right,
+                bottom = bottomPadding
+            )
+            // Consume the insets we've used.
+            WindowInsetsCompat.Builder(insets).setInsets(
+                WindowInsetsCompat.Type.systemBars(),
+                Insets.of(0, systemBars.top, 0, systemBars.bottom - bottomPadding)
+            ).build()
+        }
     }
 
     private fun configureNavMenu(menu: Menu) {
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/agenda/AgendaFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/agenda/AgendaFragment.kt
@@ -21,7 +21,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.updatePadding
 import androidx.databinding.BindingAdapter
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -54,10 +54,10 @@ class AgendaFragment : MainNavigationFragment() {
         }
         // Pad the bottom of the RecyclerView so that the content scrolls up above the nav bar
         binding.recyclerView.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(
-                bottom =
-                padding.bottom + insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
             )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
         return binding.root
     }
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/codelabs/CodelabsFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/codelabs/CodelabsFragment.kt
@@ -21,6 +21,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -92,7 +93,10 @@ class CodelabsFragment : MainNavigationFragment(), CodelabsActionsHandler {
 
         // Pad the bottom of the RecyclerView so that the content scrolls up above the nav bar
         binding.codelabsList.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePadding(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         launchAndRepeatWithViewLifecycle {
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/AnnouncementsFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/AnnouncementsFragment.kt
@@ -20,8 +20,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.Observer
@@ -69,15 +70,19 @@ class AnnouncementsFragment : MainNavigationFragment() {
         binding.toolbar.setupProfileMenuItem(mainActivityViewModel, viewLifecycleOwner)
 
         binding.root.doOnApplyWindowInsets { _, insets, _ ->
+            val systemInsets = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             binding.statusBar.run {
-                layoutParams.height = insets.systemWindowInsetTop
+                layoutParams.height = systemInsets.top
                 isVisible = layoutParams.height > 0
                 requestLayout()
             }
         }
 
         binding.recyclerView.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         model.announcements.observe(
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/FeedFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/feed/FeedFragment.kt
@@ -20,9 +20,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.isVisible
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.updatePadding
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
@@ -102,8 +103,9 @@ class FeedFragment : MainNavigationFragment() {
         binding.toolbar.setupProfileMenuItem(mainActivityViewModel, viewLifecycleOwner)
 
         binding.root.doOnApplyWindowInsets { _, insets, _ ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             binding.statusBar.run {
-                layoutParams.height = insets.systemWindowInsetTop
+                layoutParams.height = systemBars.top
                 isVisible = layoutParams.height > 0
                 requestLayout()
             }
@@ -121,11 +123,17 @@ class FeedFragment : MainNavigationFragment() {
         }
 
         binding.recyclerView.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         binding.snackbar.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         setupSnackbarManager(snackbarMessageManager, binding.snackbar)
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/filters/FiltersFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/filters/FiltersFragment.kt
@@ -22,10 +22,11 @@ import android.view.View
 import android.view.ViewGroup
 import android.view.ViewGroup.MarginLayoutParams
 import androidx.activity.OnBackPressedCallback
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.doOnLayout
 import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.updatePadding
 import androidx.databinding.ObservableFloat
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
@@ -99,7 +100,10 @@ abstract class FiltersFragment : Fragment() {
 
         // Pad the bottom of the RecyclerView so that the content scrolls up above the nav bar
         binding.recyclerviewFilters.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         return binding.root
@@ -137,12 +141,12 @@ abstract class FiltersFragment : Fragment() {
         val peekHeight = behavior.peekHeight
         val marginBottom = binding.root.marginBottom
         binding.root.doOnApplyWindowInsets { v, insets, _ ->
-            val gestureInsets = insets.systemGestureInsets
+            val gestureInsets = insets.getInsets(WindowInsetsCompat.Type.systemGestures())
             // Update the peek height so that it is above the navigation bar
             behavior.peekHeight = gestureInsets.bottom + peekHeight
 
             v.updateLayoutParams<MarginLayoutParams> {
-                bottomMargin = marginBottom + insets.systemWindowInsetTop
+                bottomMargin = marginBottom + gestureInsets.top
             }
         }
 
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/EventFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/EventFragment.kt
@@ -25,7 +25,8 @@ import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.TextView
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.databinding.BindingAdapter
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -70,7 +71,10 @@ class EventFragment : Fragment() {
 
         // Pad the bottom of the content so that it is above the nav bar
         binding.content.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
 
         val snackbarLayout = requireActivity().findViewById<FadingSnackbar>(R.id.snackbar)
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/FaqFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/FaqFragment.kt
@@ -20,7 +20,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import com.google.samples.apps.iosched.R
 import com.google.samples.apps.iosched.util.doOnApplyWindowInsets
@@ -40,9 +41,12 @@ class FaqFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        // Pad the bottom of the ScrollView so that it scrolls up above the nav bar
+        // Pad the bottom of the ScrollView so that the content scrolls up past any system bars.
         view.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
     }
 }
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/InfoFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/InfoFragment.kt
@@ -20,7 +20,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.viewpager2.adapter.FragmentStateAdapter
@@ -54,7 +55,10 @@ class InfoFragment : MainNavigationFragment() {
             lifecycleOwner = viewLifecycleOwner
         }
         binding.viewpager.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
         return binding.root
     }
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/TravelFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/info/TravelFragment.kt
@@ -20,7 +20,8 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.Fragment
 import com.google.samples.apps.iosched.R
 import com.google.samples.apps.iosched.util.doOnApplyWindowInsets
@@ -42,7 +43,10 @@ class TravelFragment : Fragment() {
 
         // Pad the bottom of the ScrollView so that it scrolls up above the nav bar
         view.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePaddingRelative(bottom = padding.bottom + insets.systemWindowInsetBottom)
+            val systemInsets = insets.getInsets(
+                WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()
+            )
+            v.updatePadding(bottom = padding.bottom + systemInsets.bottom)
         }
     }
 }
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/map/MapFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/map/MapFragment.kt
@@ -28,10 +28,11 @@ import android.view.ViewGroup.MarginLayoutParams
 import androidx.activity.addCallback
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.isVisible
 import androidx.core.view.marginBottom
 import androidx.core.view.updateLayoutParams
-import androidx.core.view.updatePaddingRelative
+import androidx.core.view.updatePadding
 import androidx.core.widget.NestedScrollView
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.activityViewModels
@@ -221,29 +222,28 @@ class MapFragment : MainNavigationFragment() {
 
         val originalPeekHeight = bottomSheetBehavior.peekHeight
         binding.root.doOnApplyWindowInsets { _, insets, _ ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
             binding.statusBar.updateLayoutParams<ConstraintLayout.LayoutParams> {
-                height = insets.systemWindowInsetTop
+                height = systemBars.top
             }
             binding.statusBar.isVisible = true
             binding.statusBar.requestLayout()
 
             // Update the Map padding so that the copyright, etc is not displayed in nav bar
             viewLifecycleOwner.lifecycleScope.launch {
                 val map = binding.map.awaitMap()
-                map.setPadding(0, 0, 0, insets.systemWindowInsetBottom)
+                map.setPadding(0, 0, 0, systemBars.bottom)
             }
 
             binding.mapModeFab.updateLayoutParams<MarginLayoutParams> {
-                bottomMargin = fabBaseMarginBottom + insets.systemWindowInsetBottom
+                bottomMargin = fabBaseMarginBottom + systemBars.bottom
             }
 
-            binding.descriptionScrollview.updatePaddingRelative(
-                bottom = insets.systemWindowInsetBottom
-            )
+            binding.descriptionScrollview.updatePadding(bottom = systemBars.bottom)
 
             // The peek height should use the bottom system gesture inset since it is a scrolling
             // widget
-            val gestureInsets = insets.systemGestureInsets
+            val gestureInsets = insets.getInsets(WindowInsetsCompat.Type.systemGestures())
             bottomSheetBehavior.peekHeight = gestureInsets.bottom + originalPeekHeight
         }
 
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/onboarding/OnboardingActivity.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/onboarding/OnboardingActivity.kt
@@ -17,10 +17,11 @@
 package com.google.samples.apps.iosched.ui.onboarding
 
 import android.os.Bundle
-import android.view.View
 import android.widget.FrameLayout
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
 import androidx.core.view.updatePadding
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
@@ -42,16 +43,12 @@ class OnboardingActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_onboarding)
 
-        // immersive mode so images can draw behind the status bar
-        val decor = window.decorView
-        val flags = decor.systemUiVisibility or
-            View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
-        decor.systemUiVisibility = flags
+        WindowCompat.setDecorFitsSystemWindows(window, false)
 
         val container: FrameLayout = findViewById(R.id.fragment_container)
         container.doOnApplyWindowInsets { v, insets, padding ->
-            v.updatePadding(top = padding.top + insets.systemWindowInsetTop)
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.updatePadding(top = padding.top + systemBars.top)
         }
 
         if (savedInstanceState == null) {
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/schedule/ScheduleFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/schedule/ScheduleFragment.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/search/SearchFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/search/SearchFragment.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/sessiondetail/SessionDetailFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/sessiondetail/SessionDetailFragment.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/settings/SettingsFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/settings/SettingsFragment.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/ui/speaker/SpeakerFragment.kt b/mobile/src/main/java/com/google/samples/apps/iosched/ui/speaker/SpeakerFragment.kt
diff --git a/mobile/src/main/java/com/google/samples/apps/iosched/util/Extensions.kt b/mobile/src/main/java/com/google/samples/apps/iosched/util/Extensions.kt

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import android.view.LayoutInflater`
`21`	`21`	`import android.view.View`
`22`	`22`	`import android.view.ViewGroup`
`23`	`23`	`import androidx.core.view.WindowInsetsCompat`
`24`		`-import androidx.core.view.updatePaddingRelative`
	`24`	`+import androidx.core.view.updatePadding`
`25`	`25`	`import androidx.databinding.BindingAdapter`
`26`	`26`	`import androidx.fragment.app.activityViewModels`
`27`	`27`	`import androidx.fragment.app.viewModels`
`@@ -54,10 +54,10 @@ class AgendaFragment : MainNavigationFragment() {`
`54`	`54`	`}`
`55`	`55`	`// Pad the bottom of the RecyclerView so that the content scrolls up above the nav bar`
`56`	`56`	`binding.recyclerView.doOnApplyWindowInsets { v, insets, padding ->`
`57`		`- v.updatePaddingRelative(`
`58`		`- bottom =`
`59`		`- padding.bottom + insets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom`
	`57`	`+ val systemInsets = insets.getInsets(`
	`58`	`+ WindowInsetsCompat.Type.systemBars() or WindowInsetsCompat.Type.ime()`
`60`	`59`	`)`
	`60`	`+ v.updatePadding(bottom = padding.bottom + systemInsets.bottom)`
`61`	`61`	`}`
`62`	`62`	`return binding.root`
`63`	`63`	`}`