Collapse to single Activity

app/build.gradle

@@ -119,7 +119,10 @@ android {
     }
 
     buildFeatures {
+        // We need to keep this enabled because submodules use it
         dataBinding true
+
+        viewBinding true
     }
 
     testOptions {
@@ -211,6 +214,7 @@ dependencies {
     implementation Libs.Coroutines.android
 
     implementation Libs.Hilt.library
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     kapt Libs.Hilt.compiler
 
     implementation Libs.AndroidX.Hilt.work

app/src/main/AndroidManifest.xml

@@ -31,7 +31,7 @@
         android:theme="@style/Theme.Tivi">
 
         <activity
-            android:name=".home.HomeActivity"
+            android:name=".home.MainActivity"
             android:launchMode="singleTask"
             android:theme="@style/Theme.Tivi.Home">
             <intent-filter>
@@ -40,15 +40,6 @@
             </intent-filter>
         </activity>
 
-        <activity
-            android:name=".showdetails.ShowDetailsActivity"
-            android:parentActivityName=".home.HomeActivity"
-            android:theme="@style/Theme.Tivi.ShowDetails">
-
-            <nav-graph android:value="@navigation/show_details_nav_graph" />
-
-        </activity>
-
         <activity
             android:name="net.openid.appauth.RedirectUriReceiverActivity"
             tools:node="replace">

app/src/main/java/app/tivi/home/ActivityAppNavigator.kt

@@ -75,7 +75,7 @@ class ActivityAppNavigator @Inject constructor(
     }
 
     private fun provideAuthHandleResponseIntent(requestCode: Int): PendingIntent {
-        val intent = Intent(activity, HomeActivity::class.java).apply {
+        val intent = Intent(activity, MainActivity::class.java).apply {
             action = TraktConstants.INTENT_ACTION_HANDLE_AUTH_RESPONSE
         }
         return PendingIntent.getActivity(activity, requestCode, intent, 0)

app/src/main/java/app/tivi/home/HomeActivity.kt → app/src/main/java/app/tivi/home/MainActivity.kt

@@ -19,24 +19,25 @@ package app.tivi.home
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.viewModels
-import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.observe
 import androidx.navigation.NavController
 import app.tivi.AppNavigator
 import app.tivi.R
 import app.tivi.TiviActivity
-import app.tivi.databinding.ActivityHomeBinding
+import app.tivi.databinding.ActivityMainBinding
 import app.tivi.extensions.hideSoftInput
 import app.tivi.extensions.setupWithNavController
 import app.tivi.trakt.TraktConstants
 import dagger.hilt.android.AndroidEntryPoint
+import dev.chrisbanes.insetter.Insetter
+import dev.chrisbanes.insetter.Side
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class HomeActivity : TiviActivity() {
+class MainActivity : TiviActivity() {
     private val viewModel: HomeActivityViewModel by viewModels()
 
-    private lateinit var binding: ActivityHomeBinding
+    private lateinit var binding: ActivityMainBinding
 
     private var currentNavController: NavController? = null
 
@@ -45,7 +46,20 @@ class HomeActivity : TiviActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        binding = DataBindingUtil.setContentView(this, R.layout.activity_home)
+        binding = ActivityMainBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        Insetter.builder()
+            .applySystemWindowInsetsToPadding(Side.LEFT or Side.RIGHT)
+            .applyToView(binding.root)
+
+        Insetter.builder()
+            .applySystemWindowInsetsToPadding(Side.BOTTOM)
+            // TODO: enable selective consumption when insetter has it
+            // .consumeSystemWindowInsets(true)
+            .applyToView(binding.homeBottomNavigation)
+
+        Insetter.setEdgeToEdgeSystemUiFlags(binding.homeRoot, true)
 
         if (savedInstanceState == null) {
             setupBottomNavigationBar()

app/src/main/res/layout/activity_main.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright 2017 Google, Inc.
+  ~
+  ~ 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
+  ~
+  ~     http://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.
+  ~
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/home_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".home.MainActivity">
+
+    <!-- This needs to the best the first child to be able to consume insets -->
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/home_bottom_navigation"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:labelVisibilityMode="labeled"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/home_bottomnav" />
+
+    <FrameLayout
+        android:id="@+id/home_nav_container"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@id/home_bottom_navigation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/navigation/show_details_nav_graph.xml

@@ -17,7 +17,6 @@
 
 <navigation xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/navigation_show_details"
     app:startDestination="@id/navigation_show_details">
 
@@ -29,18 +28,6 @@
             android:name="show_id"
             app:argType="long" />
 
-    </fragment>
-
-    <activity
-        android:id="@id/activity_show_details"
-        android:name="app.tivi.showdetails.ShowDetailsActivity"
-        android:label="activity_show_details"
-        tools:layout="@layout/activity_show_details">
-
-        <argument
-            android:name="show_id"
-            app:argType="long" />
-
         <argument
             android:name="episode_id"
             app:argType="long" />
@@ -51,6 +38,20 @@
         <deepLink
             app:uri="app.tivi://show/{show_id}/episode/{episode_id}" />
 
-    </activity>
+    </fragment>
+
+    <dialog
+        android:id="@id/navigation_episode_details"
+        android:name="app.tivi.episodedetails.EpisodeDetailsFragment"
+        android:label="@string/episode_navigation_title">
+
+        <argument
+            android:name="episode_id"
+            app:argType="long" />
+
+        <deepLink
+            app:uri="app.tivi://episode/{episode_id}" />
+
+    </dialog>
 
 </navigation>