Update navigation views

This removes the DrawerLayout and replaces it with BottomNavigationView
or NavigationRailView depending on screen width.

Fix: 187299099
Change-Id: Iab8632aa3703e20118f9e4c849f5625d6dd85744

Author: jdkoren

depconstraints/build.gradle.kts

@@ -54,7 +54,7 @@ val junit = "4.13"
 val junitExt = "1.1.1"
 val lifecycle = "2.3.0"
 val lottie = "3.0.0"
-val material = "1.3.0"
+val material = "1.4.0-beta01"
 val mockito = "3.3.1"
 val mockitoKotlin = "1.5.0"
 val okhttp = "3.10.0"

mobile/build.gradle.kts

@@ -105,6 +105,7 @@ android {
     }
 
     buildFeatures {
+        viewBinding = true
         dataBinding = true
         compose = true
     }

mobile/src/main/java/com/google/samples/apps/iosched/ui/MainActivity.kt

@@ -20,25 +20,19 @@ import android.app.Activity
 import android.content.Intent
 import android.net.ConnectivityManager
 import android.os.Bundle
-import android.view.View
-import android.widget.FrameLayout
+import android.view.Menu
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
-import androidx.core.view.GravityCompat
-import androidx.core.view.updatePadding
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.lifecycle.Observer
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.ui.AppBarConfiguration
 import androidx.navigation.ui.setupWithNavController
-import androidx.recyclerview.widget.RecyclerView
 import com.firebase.ui.auth.IdpResponse
-import com.google.android.material.navigation.NavigationView
 import com.google.samples.apps.iosched.R
 import com.google.samples.apps.iosched.ar.ArActivity
-import com.google.samples.apps.iosched.databinding.NavigationHeaderBinding
+import com.google.samples.apps.iosched.databinding.ActivityMainBinding
 import com.google.samples.apps.iosched.shared.analytics.AnalyticsActions
 import com.google.samples.apps.iosched.shared.analytics.AnalyticsHelper
 import com.google.samples.apps.iosched.shared.di.CodelabsEnabledFlag
@@ -50,14 +44,8 @@ import com.google.samples.apps.iosched.ui.messages.SnackbarMessageManager
 import com.google.samples.apps.iosched.ui.signin.SignInDialogFragment
 import com.google.samples.apps.iosched.ui.signin.SignOutDialogFragment
 import com.google.samples.apps.iosched.util.HeightTopWindowInsetsListener
-import com.google.samples.apps.iosched.util.NoopWindowInsetsListener
-import com.google.samples.apps.iosched.util.doOnApplyWindowInsets
-import com.google.samples.apps.iosched.util.navigationItemBackground
-import com.google.samples.apps.iosched.util.shouldCloseDrawerFromBackPress
 import com.google.samples.apps.iosched.util.signin.FirebaseAuthErrorCodeConverter
 import com.google.samples.apps.iosched.util.updateForTheme
-import com.google.samples.apps.iosched.widget.HashtagIoDecoration
-import com.google.samples.apps.iosched.widget.NavigationBarContentFrameLayout
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 import java.util.UUID
@@ -112,15 +100,10 @@ class MainActivity : AppCompatActivity(), NavigationHost {
 
     private val viewModel: MainActivityViewModel by viewModels()
 
-    private lateinit var content: FrameLayout
-    private lateinit var drawer: DrawerLayout
-    private lateinit var navigation: NavigationView
-    private lateinit var navHeaderBinding: NavigationHeaderBinding
+    private lateinit var binding: ActivityMainBinding
+
     private lateinit var navController: NavController
     private lateinit var navHostFragment: NavHostFragment
-
-    private lateinit var statusScrim: View
-
     private var currentNavId = NAV_ID_NONE
 
     // For sending pinned sessions as JSON to the AR module
@@ -133,111 +116,36 @@ class MainActivity : AppCompatActivity(), NavigationHost {
         // Update for Dark Mode straight away
         updateForTheme(viewModel.currentTheme)
 
-        setContentView(R.layout.activity_main)
-
-        val drawerContainer: NavigationBarContentFrameLayout = findViewById(R.id.drawer_container)
-        // Let's consume any
-        drawerContainer.setOnApplyWindowInsetsListener { v, insets ->
-            // Let the view draw it's navigation bar divider
-            v.onApplyWindowInsets(insets)
-
-            // Consume any horizontal insets and pad all content in. There's not much we can do
-            // with horizontal insets
-            v.updatePadding(
-                left = insets.systemWindowInsetLeft,
-                right = insets.systemWindowInsetRight
-            )
-            insets.replaceSystemWindowInsets(
-                0, insets.systemWindowInsetTop,
-                0, insets.systemWindowInsetBottom
-            )
-        }
-
-        content = findViewById(R.id.content_container)
-        content.systemUiVisibility = View.SYSTEM_UI_FLAG_LAYOUT_STABLE or
-            View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or
-            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-        // Make the content ViewGroup ignore insets so that it does not use the default padding
-        content.setOnApplyWindowInsetsListener(NoopWindowInsetsListener)
-
-        statusScrim = findViewById(R.id.status_bar_scrim)
-        statusScrim.setOnApplyWindowInsetsListener(HeightTopWindowInsetsListener)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
 
-        drawer = findViewById(R.id.drawer)
-
-        navHeaderBinding = NavigationHeaderBinding.inflate(layoutInflater).apply {
-            lifecycleOwner = this@MainActivity
-        }
+        binding.statusBarScrim.setOnApplyWindowInsetsListener(HeightTopWindowInsetsListener)
 
         navHostFragment = supportFragmentManager
             .findFragmentById(R.id.nav_host_fragment) as NavHostFragment
 
         navController = navHostFragment.navController
         navController.addOnDestinationChangedListener { _, destination, _ ->
             currentNavId = destination.id
-            val isTopLevelDestination = TOP_LEVEL_DESTINATIONS.contains(destination.id)
-            val lockMode = if (isTopLevelDestination) {
-                DrawerLayout.LOCK_MODE_UNLOCKED
-            } else {
-                DrawerLayout.LOCK_MODE_LOCKED_CLOSED
-            }
-            drawer.setDrawerLockMode(lockMode)
+            // TODO: hide nav if not a top-level destination?
         }
 
-        navigation = findViewById(R.id.navigation)
-        navigation.apply {
-            // Add the #io19 decoration
-            val menuView = findViewById<RecyclerView>(R.id.design_navigation_view)?.apply {
-                addItemDecoration(HashtagIoDecoration(context))
-            }
-            // Update the Navigation header view to pad itself down
-            navHeaderBinding.root.doOnApplyWindowInsets { v, insets, padding ->
-                v.updatePadding(top = padding.top + insets.systemWindowInsetTop)
-                // NavigationView doesn't dispatch insets to the menu view, so pad the bottom here.
-                menuView?.updatePadding(bottom = insets.systemWindowInsetBottom)
-            }
-            addHeaderView(navHeaderBinding.root)
-
-            itemBackground = navigationItemBackground(context)
-
-            menu.findItem(R.id.navigation_map).isVisible = mapFeatureEnabled
-            menu.findItem(R.id.navigation_codelabs).isVisible = codelabsFeatureEnabled
-            menu.findItem(R.id.navigation_explore_ar).apply {
-                // Handle launching new activities, otherwise assume the destination is handled
-                // by the nav graph. We want to launch a new Activity for only the AR menu
-                isVisible = exploreArFeatureEnabled
-                setOnMenuItemClickListener {
-                    if (connectivityManager.activeNetworkInfo?.isConnected == true) {
-                        if (viewModel.arCoreAvailability.value?.isSupported == true) {
-                            analyticsHelper
-                                .logUiEvent(
-                                    "Navigate to Explore I/O ARCore supported",
-                                    AnalyticsActions.CLICK
-                                )
-                            openExploreAr()
-                        } else {
-                            analyticsHelper
-                                .logUiEvent(
-                                    "Navigate to Explore I/O ARCore NOT supported",
-                                    AnalyticsActions.CLICK
-                                )
-                            openArCoreNotSupported()
-                        }
-                    } else {
-                        openNoConnection()
-                    }
-                    closeDrawer()
-                    true
-                }
-            }
+        // Either of two different navigation views might exist depending on the configuration.
+        binding.bottomNavigation?.apply {
+            configureNavMenu(menu)
             setupWithNavController(navController)
+            setOnItemReselectedListener { } // prevent navigating to the same item
+        }
+        binding.navigationRail?.apply {
+            configureNavMenu(menu)
+            setupWithNavController(navController)
+            setOnItemReselectedListener { } // prevent navigating to the same item
         }
 
         if (savedInstanceState == null) {
-            // default to showing Home
-            val initialNavId = intent.getIntExtra(EXTRA_NAVIGATION_ID, R.id.navigation_feed)
-            navigation.setCheckedItem(initialNavId) // doesn't trigger listener
-            navigateTo(initialNavId)
+            currentNavId = navController.graph.startDestination
+            val requestedNavId = intent.getIntExtra(EXTRA_NAVIGATION_ID, currentNavId)
+            navigateTo(requestedNavId)
         }
 
         viewModel.theme.observe(this, Observer(::updateForTheme))
@@ -278,14 +186,44 @@ class MainActivity : AppCompatActivity(), NavigationHost {
         )
     }
 
+    private fun configureNavMenu(menu: Menu) {
+        menu.findItem(R.id.navigation_map)?.isVisible = mapFeatureEnabled
+        menu.findItem(R.id.navigation_codelabs)?.isVisible = codelabsFeatureEnabled
+        menu.findItem(R.id.navigation_explore_ar)?.apply {
+            // Handle launching new activities, otherwise assume the destination is handled
+            // by the nav graph. We want to launch a new Activity for only the AR menu item.
+            isVisible = exploreArFeatureEnabled
+            setOnMenuItemClickListener {
+                if (connectivityManager.activeNetworkInfo?.isConnected == true) {
+                    if (viewModel.arCoreAvailability.value?.isSupported == true) {
+                        analyticsHelper.logUiEvent(
+                            "Navigate to Explore I/O ARCore supported",
+                            AnalyticsActions.CLICK
+                        )
+                        openExploreAr()
+                    } else {
+                        analyticsHelper.logUiEvent(
+                            "Navigate to Explore I/O ARCore NOT supported",
+                            AnalyticsActions.CLICK
+                        )
+                        openArCoreNotSupported()
+                    }
+                } else {
+                    openNoConnection()
+                }
+                true
+            }
+        }
+    }
+
     override fun registerToolbarWithNavigation(toolbar: Toolbar) {
-        val appBarConfiguration = AppBarConfiguration(TOP_LEVEL_DESTINATIONS, drawer)
+        val appBarConfiguration = AppBarConfiguration(TOP_LEVEL_DESTINATIONS)
         toolbar.setupWithNavController(navController, appBarConfiguration)
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         super.onRestoreInstanceState(savedInstanceState)
-        currentNavId = navigation.checkedItem?.itemId ?: NAV_ID_NONE
+        currentNavId = navController.currentDestination?.id ?: NAV_ID_NONE
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
@@ -304,32 +242,15 @@ class MainActivity : AppCompatActivity(), NavigationHost {
         }
     }
 
-    override fun onBackPressed() {
-        /**
-         * If the drawer is open, the behavior changes based on the API level.
-         * When gesture nav is enabled (Q+), we want back to exit when the drawer is open.
-         * When button navigation is enabled (on Q or pre-Q) we want to close the drawer on back.
-         */
-        if (drawer.isDrawerOpen(navigation) && drawer.shouldCloseDrawerFromBackPress()) {
-            closeDrawer()
-        } else {
-            super.onBackPressed()
-        }
-    }
-
-    private fun closeDrawer() {
-        drawer.closeDrawer(GravityCompat.START)
-    }
-
     override fun onUserInteraction() {
         super.onUserInteraction()
         getCurrentFragment()?.onUserInteraction()
     }
 
     private fun getCurrentFragment(): MainNavigationFragment? {
         return navHostFragment
-            ?.childFragmentManager
-            ?.primaryNavigationFragment as? MainNavigationFragment
+            .childFragmentManager
+            .primaryNavigationFragment as? MainNavigationFragment
     }
 
     private fun navigateTo(navId: Int) {

mobile/src/main/java/com/google/samples/apps/iosched/ui/NavigationExtensions.kt

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.samples.apps.iosched.ui
+
+import android.os.Bundle
+import androidx.core.view.forEach
+import androidx.navigation.NavController
+import androidx.navigation.NavDestination
+import androidx.navigation.ui.NavigationUI.onNavDestinationSelected
+import com.google.android.material.navigationrail.NavigationRailView
+import java.lang.ref.WeakReference
+
+/**
+ * Like BottomNavigationView.setupWithnavController, but for NavigationRailView.
+ * TODO(jdkoren): A future release of material will combine the listeners (since both views have a
+ * common superclass), which will make this unnecessary.
+ */
+fun NavigationRailView.setupWithNavController(navController: NavController) {
+    setOnItemSelectedListener { item ->
+        onNavDestinationSelected(item, navController)
+    }
+    val weakRef = WeakReference(this)
+    val listener = object : NavController.OnDestinationChangedListener {
+        override fun onDestinationChanged(
+            controller: NavController,
+            destination: NavDestination,
+            arguments: Bundle?
+        ) {
+            val view = weakRef.get()
+            if (view == null) {
+                navController.removeOnDestinationChangedListener(this)
+            } else {
+                view.menu.forEach { item ->
+                    if (matchNavDestination(destination, item.itemId)) {
+                        item.isChecked = true
+                    }
+                }
+            }
+        }
+    }
+    navController.addOnDestinationChangedListener(listener)
+}
+
+/**
+ * Copy of package-private method in NavigationUI. TODO(jdkoren): remove when the above is removed.
+ */
+private fun matchNavDestination(destination: NavDestination, id: Int): Boolean {
+    var currentDestination = destination
+    while (currentDestination.id != id && currentDestination.parent != null) {
+        currentDestination = currentDestination.parent as NavDestination
+    }
+    return currentDestination.id == id
+}