Archives/iceraven-browser
2
0
Fork 0
mirror of https://github.com/fork-maintainers/iceraven-browser synced 2024-11-15 18:12:54 +00:00
Code Issues Releases Wiki Activity

Bug 1830083 - Make action_home local to JunoOnboardingFragment

Browse Source
This commit is contained in:
rahulsainani 2023-05-15 18:04:53 +02:00 committed by mergify[bot]
parent 296e5ec0c3
commit 2cbd3b5020
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
) {
// Unless activity is recreated due to config change, navigate to onboarding
if (savedInstanceState == null) {
navHost.navController.navigate(NavGraphDirections.actionGlobalHomeJunoOnboarding())
navHost.navController.navigate(NavGraphDirections.actionGlobalJunoOnboarding())
}
} else {
lifecycleScope.launch(IO) {

2
app/src/main/java/org/mozilla/fenix/onboarding/JunoOnboardingFragment.kt
View File

@ -158,7 +158,7 @@ class JunoOnboardingFragment : Fragment() {
requireComponents.fenixOnboarding.finish()
findNavController().nav(
id = R.id.junoOnboardingFragment,
directions = JunoOnboardingFragmentDirections.actionOnboardingHome(),
directions = JunoOnboardingFragmentDirections.actionHome(),
)
telemetryRecorder.onOnboardingComplete(
sequenceId = sequenceId,

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

@ -34,17 +34,11 @@
app:popUpToInclusive="false" />
<action
android:id="@+id/action_global_home_juno_onboarding"
android:id="@+id/action_global_juno_onboarding"
app:destination="@id/junoOnboardingFragment"
app:popUpTo="@id/startupFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_onboarding_home"
app:destination="@id/homeFragment"
app:popUpTo="@id/junoOnboardingFragment"
app:popUpToInclusive="true" />
<action
android:id="@+id/action_global_home_onboarding_dialog"
app:destination="@id/homeOnboardingDialogFragment" />
@ -202,6 +196,11 @@
<fragment
android:id="@+id/junoOnboardingFragment"
android:name="org.mozilla.fenix.onboarding.JunoOnboardingFragment">
<action
android:id="@+id/action_home"
app:destination="@id/homeFragment"
app:popUpTo="@id/junoOnboardingFragment"
app:popUpToInclusive="true" />
</fragment>
<fragment