[fenix] Hide toolbar in activity and remove label from home fragment

pull/600/head
Emily Kager 5 years ago committed by Emily Kager
parent ff410a0f95
commit e744af696c

@ -73,6 +73,7 @@ open class HomeActivity : AppCompatActivity() {
val navigationToolbar = findViewById<Toolbar>(R.id.navigationToolbar) val navigationToolbar = findViewById<Toolbar>(R.id.navigationToolbar)
setSupportActionBar(navigationToolbar) setSupportActionBar(navigationToolbar)
NavigationUI.setupWithNavController(navigationToolbar, navHost.navController, appBarConfiguration) NavigationUI.setupWithNavController(navigationToolbar, navHost.navController, appBarConfiguration)
supportActionBar?.hide()
intent intent
?.let { SafeIntent(it) } ?.let { SafeIntent(it) }

@ -246,8 +246,9 @@ class HomeFragment : Fragment(), CoroutineScope, AccountObserver {
homeViewModel?.layoutManagerState?.also { parcelable -> homeViewModel?.layoutManagerState?.also { parcelable ->
sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable) sessionControlComponent.view.layoutManager?.onRestoreInstanceState(parcelable)
} }
val progress = homeViewModel?.motionLayoutProgress
homeLayout?.progress = 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 homeViewModel?.layoutManagerState = null
} }
} }

@ -18,7 +18,6 @@
<fragment <fragment
android:id="@+id/homeFragment" android:id="@+id/homeFragment"
android:name="org.mozilla.fenix.home.HomeFragment" android:name="org.mozilla.fenix.home.HomeFragment"
android:label="fragment_home"
tools:layout="@layout/fragment_home"> tools:layout="@layout/fragment_home">
<action <action
android:id="@+id/action_homeFragment_to_turnOnSyncFragment" android:id="@+id/action_homeFragment_to_turnOnSyncFragment"

Loading…
Cancel
Save