Fix navigation to import owner flow (#1244)

safe-global · Feb 3, 2021 · da8f441 · da8f441
1 parent ccb67ad
commit da8f441
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/app/src/main/java/io/gnosis/safe/ui/assets/coins/CoinsAdapter.kt b/app/src/main/java/io/gnosis/safe/ui/assets/coins/CoinsAdapter.kt
@@ -5,6 +5,7 @@ import android.view.ViewGroup
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
 import androidx.viewbinding.ViewBinding
+import io.gnosis.safe.R
 import io.gnosis.safe.databinding.ItemBannerImportKeyBinding
 import io.gnosis.safe.databinding.ItemCoinBalanceBinding
 import io.gnosis.safe.databinding.ItemCoinTotalBinding
@@ -124,7 +125,7 @@ class BannerViewHolder(private val viewBinding: ItemBannerImportKeyBinding) : Ba
             }
             bannerAction.setOnClickListener {
                 bannerListener.get()?.onBannerActionTriggered()
-                Navigation.findNavController(it).navigate(AssetsFragmentDirections.actionAssetsFragmentToOwnerInfoFragment())
+                Navigation.findNavController(it).navigate(R.id.action_to_import_owner)
             }
         }
     }

diff --git a/app/src/main/java/io/gnosis/safe/ui/safe/add/AddSafeOwnerFragment.kt b/app/src/main/java/io/gnosis/safe/ui/safe/add/AddSafeOwnerFragment.kt
@@ -64,7 +64,7 @@ class AddSafeOwnerFragment : BaseViewBindingFragment<FragmentAddSafeOwnerBinding
             importButton.setOnClickListener {
                 tracker.logOnboardingOwnerImport()
                 finishAddSafeFlow()
-                findNavController().navigate(AssetsFragmentDirections.actionAssetsFragmentToOwnerInfoFragment())
+                findNavController().navigate(R.id.action_to_import_owner)
             }
             skip.setOnClickListener {
                 tracker.logOnboardingOwnerSkipped()

diff --git a/app/src/main/java/io/gnosis/safe/ui/safe/empty/NoSafeFragment.kt b/app/src/main/java/io/gnosis/safe/ui/safe/empty/NoSafeFragment.kt
@@ -29,7 +29,7 @@ class NoSafeFragment : BaseViewBindingFragment<FragmentNoSafesBinding>() {
         super.onViewCreated(view, savedInstanceState)
 
         binding.loadSafeButton.setOnClickListener {
-            requireParentFragment().findNavController().navigate(R.id.action_to_add_safe_nav)
+            requireParentFragment().findNavController().navigate(R.id.action_to_add_safe)
         }
     }
 

diff --git a/app/src/main/java/io/gnosis/safe/ui/safe/selection/SafeSelectionViewModel.kt b/app/src/main/java/io/gnosis/safe/ui/safe/selection/SafeSelectionViewModel.kt
@@ -60,7 +60,7 @@ class SafeSelectionViewModel @Inject constructor(
             updateState {
                 SafeSelectionState.AddSafeState(
                     ViewAction.NavigateTo(
-                        SafeSelectionDialogDirections.actionSafeSelectionDialogToAddSafeNav()
+                        SafeSelectionDialogDirections.actionSafeSelectionDialogToAddSafe()
                     )
                 )
             }

diff --git a/app/src/main/res/layout/fragment_transactions.xml b/app/src/main/res/layout/fragment_transactions.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -23,4 +23,4 @@
 
     </LinearLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/navigation/main_nav.xml b/app/src/main/res/navigation/main_nav.xml
@@ -7,18 +7,22 @@
     app:startDestination="@id/assetsFragment">
 
     <action
-        android:id="@+id/action_to_add_safe_nav"
+        android:id="@+id/action_to_add_safe"
         app:destination="@id/addSafeFragment"
         app:launchSingleTop="true" />
 
+    <action
+        android:id="@+id/action_to_import_owner"
+        app:destination="@id/ownerInfoFragment" />
+
     <dialog
         android:id="@+id/safeSelectionDialog"
         android:name="io.gnosis.safe.ui.safe.selection.SafeSelectionDialog"
         android:label="SafeSelectionDialog"
         tools:layout="@layout/dialog_safe_selection">
 
         <action
-            android:id="@+id/action_safeSelectionDialog_to_add_safe_nav"
+            android:id="@+id/action_safeSelectionDialog_to_add_safe"
             app:destination="@id/addSafeFragment"
             app:launchSingleTop="true"
             app:popUpTo="@id/addSafeFragment"
@@ -42,10 +46,6 @@
             android:id="@+id/action_assetsFragment_to_collectiblesDetailsFragment"
             app:destination="@id/collectiblesDetailsFragment" />
 
-        <action
-            android:id="@+id/action_assetsFragment_to_ownerInfoFragment"
-            app:destination="@id/ownerInfoFragment" />
-
     </fragment>
 
     <fragment