Create two-pane schedule layout

- Add SlidingPaneLayout and create ScheduleTwoPaneFragment.
- Make two new navigation graphs, one for each pane.
  - List pane can show the Schedule and Search destinations.
  - Detail pane can show Session Detail and Speaker destinations.
- Create a ViewModel that scopes to the ScheduleTwoPaneFragment and
  have the various other fragments acquire it.
- Route session selection and starring through the new ViewModel.
- Pull the SnackBar logic up into ScheduleTwoPaneFragment and its
  ViewModel.

Bug: 182714988
Change-Id: I0ce4a4c51adf410774d32692ba705be596f987ab

Author: jdkoren

buildSrc/src/main/java/Libs.kt

@@ -80,6 +80,7 @@ object Libs {
     const val ROOM_RUNTIME = "androidx.room:room-runtime"
     const val RULES = "androidx.test:rules"
     const val RUNNER = "androidx.test:runner"
+    const val SLIDING_PANE_LAYOUT = "androidx.slidingpanelayout:slidingpanelayout"
     const val THREETENABP = "com.jakewharton.threetenabp:threetenabp"
     const val THREETENBP = "org.threeten:threetenbp"
     const val TIMBER = "com.jakewharton.timber:timber"

depconstraints/build.gradle.kts

@@ -64,6 +64,7 @@ val playCore = "1.6.5"
 val room = "2.2.5"
 val rules = "1.1.1"
 val runner = "1.2.0"
+val slidingpanelayout = "1.2.0-alpha01"
 val threetenabp = "1.0.5"
 val timber = "4.7.1"
 val viewpager2 = "1.0.0"
@@ -136,6 +137,7 @@ dependencies {
         api("${Libs.INK_PAGE_INDICATOR}:$pageIndicator")
         api("${Libs.RULES}:$rules")
         api("${Libs.RUNNER}:$runner")
+        api("${Libs.SLIDING_PANE_LAYOUT}:$slidingpanelayout")
         api("${Libs.THREETENABP}:$threetenabp")
         api("${Libs.THREETENBP}:${Versions.THREETENBP}")
         api("${Libs.TIMBER}:$timber")

mobile/build.gradle.kts

@@ -192,6 +192,7 @@ dependencies {
     implementation(Libs.FLEXBOX)
     implementation(Libs.LOTTIE)
     implementation(Libs.INK_PAGE_INDICATOR)
+    implementation(Libs.SLIDING_PANE_LAYOUT)
 
     // Architecture Components
     implementation(Libs.LIFECYCLE_LIVE_DATA_KTX)

mobile/src/androidTest/java/com/google/samples/apps/iosched/tests/ui/ScheduleTest.kt

@@ -32,6 +32,7 @@ import com.google.samples.apps.iosched.tests.SetPreferencesRule
 import com.google.samples.apps.iosched.ui.sessioncommon.SessionViewHolder
 import dagger.hilt.android.testing.HiltAndroidRule
 import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -66,6 +67,10 @@ class ScheduleTest {
     }
 
     @Test
+    @Ignore(
+        "Session Details are shown in another pane owned by a parent fragment. This test runs in " +
+            "a test Activity that does not include the other pane, so it will never pass."
+    )
     fun clickOnFirstItem_detailsShown() {
         onView(withId(R.id.recyclerview_schedule))
             .perform(RecyclerViewActions.actionOnItemAtPosition<SessionViewHolder>(0, click()))

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

@@ -34,8 +34,6 @@ import com.google.samples.apps.iosched.model.SessionId
 import com.google.samples.apps.iosched.shared.analytics.AnalyticsHelper
 import com.google.samples.apps.iosched.ui.MainActivityViewModel
 import com.google.samples.apps.iosched.ui.MainNavigationFragment
-import com.google.samples.apps.iosched.ui.feed.FeedFragmentDirections.Companion.toSchedule
-import com.google.samples.apps.iosched.ui.feed.FeedFragmentDirections.Companion.toSessionDetail
 import com.google.samples.apps.iosched.ui.feed.FeedNavigationAction.NavigateAction
 import com.google.samples.apps.iosched.ui.feed.FeedNavigationAction.NavigateToScheduleAction
 import com.google.samples.apps.iosched.ui.feed.FeedNavigationAction.NavigateToSession
@@ -144,7 +142,8 @@ class FeedFragment : MainNavigationFragment() {
             model.navigationActions.collect { action ->
                 when (action) {
                     is NavigateAction -> findNavController().navigate(action.directions)
-                    is NavigateToScheduleAction -> openSchedule(action.showOnlyPinnedSessions)
+                    NavigateToScheduleAction ->
+                        findNavController().navigate(FeedFragmentDirections.toSchedule())
                     is NavigateToSession -> openSessionDetail(action.sessionId)
                     is OpenLiveStreamAction -> openLiveStreamUrl(action.url)
                     OpenSignInDialogAction -> openSignInDialog()
@@ -154,15 +153,8 @@ class FeedFragment : MainNavigationFragment() {
     }
 
     private fun openSessionDetail(id: SessionId) {
-        findNavController().navigate(toSessionDetail(id))
-    }
-
-    private fun openSchedule(withPinnedSessions: Boolean) {
-        if (withPinnedSessions) {
-            findNavController().navigate(toSchedule(showPinnedEvents = true))
-        } else {
-            findNavController().navigate(toSchedule(showAllEvents = true))
-        }
+        // TODO support opening a session detail
+        // findNavController().navigate(toSessionDetail(id))
     }
 
     private fun showFeedItems(recyclerView: RecyclerView, list: List<Any>?) {

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

@@ -49,7 +49,6 @@ import com.google.samples.apps.iosched.shared.util.tryOffer
 import com.google.samples.apps.iosched.ui.messages.SnackbarMessage
 import com.google.samples.apps.iosched.ui.messages.SnackbarMessageManager
 import com.google.samples.apps.iosched.ui.sessioncommon.EventActions
-import com.google.samples.apps.iosched.ui.sessiondetail.SessionDetailFragmentDirections
 import com.google.samples.apps.iosched.ui.signin.SignInViewModelDelegate
 import com.google.samples.apps.iosched.ui.theme.ThemedActivityDelegate
 import com.google.samples.apps.iosched.util.WhileViewSubscribed
@@ -277,9 +276,7 @@ class FeedViewModel @Inject constructor(
 
     override fun openSchedule(showOnlyPinnedSessions: Boolean) {
         analyticsHelper.logUiEvent("Home to Schedule", AnalyticsActions.HOME_TO_SCHEDULE)
-        _navigationActions.tryOffer(
-            FeedNavigationAction.NavigateToScheduleAction(showOnlyPinnedSessions)
-        )
+        _navigationActions.tryOffer(FeedNavigationAction.NavigateToScheduleAction)
     }
 
     override fun onStarClicked(userSession: UserSession) {
@@ -295,7 +292,7 @@ class FeedViewModel @Inject constructor(
         analyticsHelper.logUiEvent(moment.title.toString(), AnalyticsActions.HOME_TO_MAP)
         _navigationActions.tryOffer(
             FeedNavigationAction.NavigateAction(
-                SessionDetailFragmentDirections.toMap(
+                FeedFragmentDirections.toMap(
                     featureId = moment.featureId,
                     startTime = moment.startTime.toEpochMilli()
                 )
@@ -310,7 +307,7 @@ class FeedViewModel @Inject constructor(
 
     override fun openMapForSession(session: Session) {
         analyticsHelper.logUiEvent(session.id, AnalyticsActions.HOME_TO_MAP)
-        val directions = SessionDetailFragmentDirections.toMap(
+        val directions = FeedFragmentDirections.toMap(
             featureId = session.room?.id,
             startTime = session.startTime.toEpochMilli()
         )
@@ -338,5 +335,5 @@ sealed class FeedNavigationAction {
     class NavigateAction(val directions: NavDirections) : FeedNavigationAction()
     object OpenSignInDialogAction : FeedNavigationAction()
     class OpenLiveStreamAction(val url: String) : FeedNavigationAction()
-    class NavigateToScheduleAction(val showOnlyPinnedSessions: Boolean) : FeedNavigationAction()
+    object NavigateToScheduleAction : FeedNavigationAction()
 }

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

@@ -34,7 +34,6 @@ import androidx.recyclerview.widget.RecyclerView.RecycledViewPool
 import com.google.samples.apps.iosched.R
 import com.google.samples.apps.iosched.databinding.FragmentScheduleBinding
 import com.google.samples.apps.iosched.model.ConferenceDay
-import com.google.samples.apps.iosched.model.SessionId
 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.SearchScheduleEnabledFlag
@@ -43,14 +42,10 @@ import com.google.samples.apps.iosched.shared.util.TimeUtils
 import com.google.samples.apps.iosched.ui.MainActivityViewModel
 import com.google.samples.apps.iosched.ui.MainNavigationFragment
 import com.google.samples.apps.iosched.ui.messages.SnackbarMessageManager
-import com.google.samples.apps.iosched.ui.schedule.ScheduleFragmentDirections.Companion.toSearch
-import com.google.samples.apps.iosched.ui.schedule.ScheduleFragmentDirections.Companion.toSessionDetail
-import com.google.samples.apps.iosched.ui.schedule.ScheduleNavigationAction.NavigateToSession
 import com.google.samples.apps.iosched.ui.schedule.ScheduleNavigationAction.NavigateToSignInDialogAction
 import com.google.samples.apps.iosched.ui.schedule.ScheduleNavigationAction.NavigateToSignOutDialogAction
 import com.google.samples.apps.iosched.ui.schedule.ScheduleNavigationAction.ShowScheduleUiHints
 import com.google.samples.apps.iosched.ui.sessioncommon.SessionsAdapter
-import com.google.samples.apps.iosched.ui.messages.setupSnackbarManager
 import com.google.samples.apps.iosched.ui.signin.NotificationsPreferenceDialogFragment
 import com.google.samples.apps.iosched.ui.signin.NotificationsPreferenceDialogFragment.Companion.DIALOG_NOTIFICATIONS_PREFERENCE
 import com.google.samples.apps.iosched.ui.signin.SignInDialogFragment
@@ -98,6 +93,7 @@ class ScheduleFragment : MainNavigationFragment() {
     lateinit var snackbarMessageManager: SnackbarMessageManager
 
     private val scheduleViewModel: ScheduleViewModel by viewModels()
+    private val scheduleTwoPaneViewModel: ScheduleTwoPaneViewModel by activityViewModels()
     private val mainActivityViewModel: MainActivityViewModel by activityViewModels()
 
     private lateinit var snackbar: FadingSnackbar
@@ -149,9 +145,6 @@ class ScheduleFragment : MainNavigationFragment() {
             }
         }
 
-        // Snackbar configuration
-        setupSnackbarManager(snackbarMessageManager, snackbar)
-
         binding.includeScheduleAppbar.toolbar.setupProfileMenuItem(mainActivityViewModel, this)
 
         // Pad the bottom of the RecyclerView so that the content scrolls up above the nav bar
@@ -161,11 +154,11 @@ class ScheduleFragment : MainNavigationFragment() {
 
         // Session list configuration
         sessionsAdapter = SessionsAdapter(
-            scheduleViewModel,
+            scheduleTwoPaneViewModel,
             tagViewPool,
             scheduleViewModel.showReservations,
             scheduleViewModel.timeZoneId,
-            this
+            viewLifecycleOwner
         )
         scheduleRecyclerView.apply {
             adapter = sessionsAdapter
@@ -219,7 +212,6 @@ class ScheduleFragment : MainNavigationFragment() {
             launch {
                 scheduleViewModel.navigationActions.collect {
                     when (it) {
-                        is NavigateToSession -> openSessionDetail(it.sessionId)
                         is NavigateToSignInDialogAction -> openSignInDialog()
                         is NavigateToSignOutDialogAction -> openSignOutDialog()
                         is ShowScheduleUiHints -> openScheduleUiHintsDialog()
@@ -252,16 +244,6 @@ class ScheduleFragment : MainNavigationFragment() {
                 },
                 500
             )
-
-            // Process arguments to set initial filters
-            arguments?.let {
-                if (ScheduleFragmentArgs.fromBundle(it).showMySchedule) {
-                    scheduleViewModel.showMySchedule()
-                }
-                if (ScheduleFragmentArgs.fromBundle(it).showAllEvents) {
-                    scheduleViewModel.showAllEvents()
-                }
-            }
         }
         analyticsHelper.sendScreenView("Schedule", requireActivity())
     }
@@ -344,12 +326,8 @@ class ScheduleFragment : MainNavigationFragment() {
         scheduleViewModel.userHasInteracted = true
     }
 
-    private fun openSessionDetail(id: SessionId) {
-        findNavController().navigate(toSessionDetail(id))
-    }
-
     private fun openSearch() {
-        findNavController().navigate(toSearch())
+        findNavController().navigate(ScheduleFragmentDirections.toSearch())
     }
 
     private fun openSignInDialog() {

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

@@ -16,11 +16,8 @@
 
 package com.google.samples.apps.iosched.ui.schedule
 
-import com.google.samples.apps.iosched.model.SessionId
-
 sealed class ScheduleNavigationAction {
     object NavigateToSignInDialogAction : ScheduleNavigationAction()
     object NavigateToSignOutDialogAction : ScheduleNavigationAction()
-    class NavigateToSession(val sessionId: SessionId) : ScheduleNavigationAction()
     object ShowScheduleUiHints : ScheduleNavigationAction()
 }

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

@@ -0,0 +1,93 @@
+/*
+ * 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.schedule
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.activityViewModels
+import androidx.navigation.NavController
+import androidx.navigation.fragment.NavHostFragment
+import com.google.samples.apps.iosched.R
+import com.google.samples.apps.iosched.ScheduleDetailNavGraphDirections
+import com.google.samples.apps.iosched.databinding.FragmentScheduleTwoPaneBinding
+import com.google.samples.apps.iosched.shared.result.EventObserver
+import com.google.samples.apps.iosched.ui.MainNavigationFragment
+import com.google.samples.apps.iosched.ui.messages.SnackbarMessageManager
+import com.google.samples.apps.iosched.ui.messages.setupSnackbarManager
+import com.google.samples.apps.iosched.ui.signin.SignInDialogFragment
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class ScheduleTwoPaneFragment : MainNavigationFragment() {
+
+    @Inject
+    lateinit var snackbarMessageManager: SnackbarMessageManager
+
+    private val scheduleTwoPaneViewModel: ScheduleTwoPaneViewModel by activityViewModels()
+
+    private lateinit var binding: FragmentScheduleTwoPaneBinding
+
+    private lateinit var listPaneNavController: NavController
+    private lateinit var detailPaneNavController: NavController
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        binding = FragmentScheduleTwoPaneBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        setupSnackbarManager(snackbarMessageManager, binding.snackbar)
+
+        childFragmentManager.run {
+            listPaneNavController =
+                (findFragmentById(R.id.list_pane) as NavHostFragment).navController
+            detailPaneNavController =
+                (findFragmentById(R.id.detail_pane) as NavHostFragment).navController
+        }
+
+        scheduleTwoPaneViewModel.navigateToSessionAction.observe(
+            viewLifecycleOwner,
+            EventObserver { sessionId ->
+                detailPaneNavController.navigate(
+                    ScheduleDetailNavGraphDirections.toSessionDetail(sessionId)
+                )
+            }
+        )
+
+        scheduleTwoPaneViewModel.navigateToSignInDialogAction.observe(
+            viewLifecycleOwner,
+            EventObserver {
+                openSignInDialog()
+            }
+        )
+    }
+
+    // TODO convert this to a dialog destination in the nav graph
+    private fun openSignInDialog() {
+        val dialog = SignInDialogFragment()
+        dialog.show(requireActivity().supportFragmentManager, SignInDialogFragment.DIALOG_SIGN_IN)
+    }
+}

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

@@ -0,0 +1,28 @@
+/*
+ * 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.schedule
+
+import androidx.lifecycle.ViewModel
+import com.google.samples.apps.iosched.ui.sessioncommon.EventActionsViewModelDelegate
+import dagger.hilt.android.lifecycle.HiltViewModel
+import javax.inject.Inject
+
+// Note: clients should obtain this from the Activity.
+@HiltViewModel
+class ScheduleTwoPaneViewModel @Inject constructor(
+    eventActionsViewModelDelegate: EventActionsViewModelDelegate
+) : ViewModel(), EventActionsViewModelDelegate by eventActionsViewModelDelegate