From 895ba021e74e91e0dcdd8f2ce8b10bd4b5ce8dfc Mon Sep 17 00:00:00 2001
From: Emily Kager <ekager@mozilla.com>
Date: Thu, 23 May 2019 13:05:30 -0700
Subject: [PATCH] Hide toolbar in activity and remove label from home fragment

---
 app/src/main/java/org/mozilla/fenix/HomeActivity.kt      | 1 +
 app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 3 ++-
 app/src/main/res/navigation/nav_graph.xml                | 1 -
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 20b91d783..8914f8c49 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -73,6 +73,7 @@ open class HomeActivity : AppCompatActivity() {
         val navigationToolbar = findViewById<Toolbar>(R.id.navigationToolbar)
         setSupportActionBar(navigationToolbar)
         NavigationUI.setupWithNavController(navigationToolbar, navHost.navController, appBarConfiguration)
+        supportActionBar?.hide()
 
         intent
             ?.let { SafeIntent(it) }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
index f1bb40c52..5f33d340b 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt
@@ -246,8 +246,9 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
                             homeViewModel?.layoutManagerState?.also { parcelable ->
                                 sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
                             }
+                            val progress = homeViewModel?.motionLayoutProgress
                             homeLayout?.progress =
-                                if (homeViewModel?.motionLayoutProgress ?: 0F > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f
+                                if (progress ?: 0F > MOTION_LAYOUT_PROGRESS_ROUND_POINT) 1.0f else 0f
                             homeViewModel?.layoutManagerState = null
                         }
                     }
diff --git a/app/src/main/res/navigation/nav_graph.xml b/app/src/main/res/navigation/nav_graph.xml
index ca0f7f89d..92b044f11 100644
--- a/app/src/main/res/navigation/nav_graph.xml
+++ b/app/src/main/res/navigation/nav_graph.xml
@@ -18,7 +18,6 @@
     <fragment
         android:id="@+id/homeFragment"
         android:name="org.mozilla.fenix.home.HomeFragment"
-        android:label="fragment_home"
         tools:layout="@layout/fragment_home">
         <action
             android:id="@+id/action_homeFragment_to_turnOnSyncFragment"