blallo
/
fenix
1
0
Fork 0
Code Releases Activity

Closes #1030 - Fixes navigation, white screen after back button

master
ekager 2019-03-18 19:52:17 -07:00 committed by Colin Lee
parent fb8c82b1bd
commit fcda84dce7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/mozilla/fenix/HomeActivity.kt
View File

@ -124,11 +124,7 @@ open class HomeActivity : AppCompatActivity() {
val host = supportFragmentManager.findFragmentById(R.id.container) as NavHostFragment
val directions = when (from) {
BrowserDirection.FromGlobal -> {
NavGraphDirections.actionGlobalBrowser(sessionId).apply {
host.navController.popBackStack()
}
}
BrowserDirection.FromGlobal -> NavGraphDirections.actionGlobalBrowser(sessionId)
BrowserDirection.FromHome -> HomeFragmentDirections.actionHomeFragmentToBrowserFragment(sessionId)
BrowserDirection.FromSearch -> SearchFragmentDirections.actionSearchFragmentToBrowserFragment(sessionId)
BrowserDirection.FromSettings ->

6
app/src/main/res/navigation/nav_graph.xml
View File

@ -7,7 +7,9 @@
<action
android:id="@+id/action_global_browser"
app:destination="@id/browserFragment" />
app:destination="@id/browserFragment"
app:popUpTo="@id/nav_graph"
app:popUpToInclusive="true" />
<fragment
android:id="@+id/homeFragment"
@ -47,7 +49,7 @@
<action
android:id="@+id/action_browserFragment_to_homeFragment"
app:destination="@id/homeFragment"
app:popUpTo="@+id/homeFragment"
app:popUpTo="@+id/nav_graph"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_browserFragment_to_searchFragment"