1 files changed, 59 insertions, 29 deletions
diff --git a/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml b/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml
index f33313ff0d..1e59de2f0b 100644
--- a/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml
+++ b/mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml
@@ -119,6 +119,14 @@
         android:id="@+id/action_global_addonsManagementFragment"
         app:destination="@id/addons_management_graph" />
     <action
+        android:id="@+id/action_loginsListFragment"
+        app:destination="@id/savedLogins"
+        app:enterAnim="@anim/slide_in_right"
+        app:exitAnim="@anim/slide_out_left"
+        app:popEnterAnim="@anim/slide_in_left"
+        app:popExitAnim="@anim/slide_out_right" />
+
+    <action
         android:id="@+id/action_global_trackingProtectionFragment"
         app:destination="@id/trackingProtectionFragment" />
     <action
@@ -208,6 +216,13 @@
             android:name="scrollToCollection"
             android:defaultValue="false"
             app:argType="boolean" />
+        <action
+            android:id="@+id/action_homeFragment_to_loginsListFragment"
+            app:destination="@id/savedLogins"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
     </fragment>
 
     <dialog
@@ -304,7 +319,14 @@
             app:destination="@id/reviewQualityCheckFragment" />
         <action
             android:id="@+id/action_browserFragment_to_translationsDialogFragment"
-            app:destination="@id/translations_graph" />
+            app:destination="@id/translationsDialogFragment" />
+        <action
+            android:id="@+id/action_loginsListFragment"
+            app:destination="@id/savedLogins"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
     </fragment>
 
     <fragment
@@ -616,6 +638,13 @@
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right" />
         <action
+            android:id="@+id/action_settingsFragment_to_translationsSettingsFragment"
+            app:destination="@id/translations_settings_graph"
+            app:enterAnim="@anim/slide_in_right"
+            app:exitAnim="@anim/slide_out_left"
+            app:popEnterAnim="@anim/slide_in_left"
+            app:popExitAnim="@anim/slide_out_right" />
+        <action
             android:id="@+id/action_settingsFragment_to_addonsFragment"
             app:destination="@id/addons_management_graph"
             app:enterAnim="@anim/slide_in_right"
@@ -1422,33 +1451,24 @@
         </fragment>
     </navigation>
 
-    <navigation
-        android:id="@+id/translations_graph"
-        app:startDestination="@id/translationsDialogFragment">
+    <dialog
+        android:id="@+id/translationsDialogFragment"
+        android:name="org.mozilla.fenix.translations.TranslationsDialogFragment">
         <argument
-            android:name="sessionId"
-            app:argType="string"
-            app:nullable="true" />
-        <dialog
-            android:id="@+id/translationsDialogFragment"
-            android:name="org.mozilla.fenix.translations.TranslationsDialogFragment">
-            <argument
-                android:name="sessionId"
-                app:argType="string" />
-            <argument
-                android:name="translationsDialogAccessPoint"
-                android:defaultValue="Translations"
-                app:argType="org.mozilla.fenix.translations.TranslationsDialogAccessPoint" />
-            <action
-                android:id="@+id/action_translationsDialogFragment_to_translationSettingsFragment"
-                app:destination="@id/translationSettingsFragment" />
-        </dialog>
+            android:name="translationsDialogAccessPoint"
+            android:defaultValue="Translations"
+            app:argType="org.mozilla.fenix.translations.TranslationsDialogAccessPoint" />
+        <action
+            android:id="@+id/action_translationsDialogFragment_to_translationSettingsFragment"
+            app:destination="@id/translations_settings_graph" />
+    </dialog>
+
+    <navigation
+        android:id="@+id/translations_settings_graph"
+        app:startDestination="@id/translationSettingsFragment">
         <fragment
             android:id="@+id/translationSettingsFragment"
             android:name="org.mozilla.fenix.translations.TranslationSettingsFragment">
-            <argument
-                android:name="sessionId"
-                app:argType="string" />
             <action
                 android:id="@+id/action_translationSettingsFragment_to_translationsDialogFragment"
                 app:destination="@id/translationsDialogFragment"
@@ -1461,7 +1481,7 @@
                 android:id="@+id/action_translationSettingsFragment_to_automaticTranslationPreferenceFragment"
                 app:destination="@id/automaticTranslationPreferenceFragment" />
             <action
-                android:id="@+id/action_translationSettingsFragment_to_neverTranslateSitePreferenceFragment"
+                android:id="@+id/action_translationSettings_to_neverTranslateSitePreference"
                 app:destination="@id/neverTranslateSitePreferenceFragment" />
         </fragment>
         <fragment
@@ -1480,16 +1500,16 @@
         </fragment>
         <fragment
             android:id="@+id/neverTranslateSitePreferenceFragment"
-            android:name="org.mozilla.fenix.translations.preferences.nevertranslatesite.NeverTranslateSitePreferenceFragment">
+            android:name="org.mozilla.fenix.translations.preferences.nevertranslatesite.NeverTranslateSitesPreferenceFragment">
             <action
-                android:id="@+id/action_neverTranslateSitePreferenceFragment_to_neverTranslateSiteDialogPreferenceFragment"
+                android:id="@+id/action_neverTranslateSitePreference_to_neverTranslateSiteDialogPreference"
                 app:destination="@id/neverTranslateSiteDialogPreferenceFragment" />
         </fragment>
         <dialog
             android:id="@+id/neverTranslateSiteDialogPreferenceFragment"
             android:name="org.mozilla.fenix.translations.preferences.nevertranslatesite.NeverTranslateSiteDialogPreferenceFragment">
             <argument
-                android:name="websiteUrl"
+                android:name="neverTranslateSiteUrl"
                 app:argType="string" />
         </dialog>
         <fragment
@@ -1519,8 +1539,18 @@
     <navigation
         android:id="@+id/menu_graph"
         app:startDestination="@id/menuDialogFragment">
+        <argument
+            android:name="accesspoint"
+            app:argType="org.mozilla.fenix.components.menu.MenuAccessPoint" />
         <dialog
             android:id="@+id/menuDialogFragment"
-            android:name="org.mozilla.fenix.components.menu.MenuDialogFragment" />
+            android:name="org.mozilla.fenix.components.menu.MenuDialogFragment">
+            <argument
+                android:name="accesspoint"
+                app:argType="org.mozilla.fenix.components.menu.MenuAccessPoint" />
+            <action
+                android:id="@+id/action_menuDialogFragment_to_translationsDialogFragment"
+                app:destination="@id/translationsDialogFragment" />
+        </dialog>
     </navigation>
 </navigation>