Merge pull request #127 from soramitsu/rc/1.0.1

Rc/1.0.1

Author: valentunn

app/build.gradle

@@ -55,6 +55,12 @@ android {
             sourceCompatibility 1.8
             targetCompatibility 1.8
         }
+
+        bundle {
+            language {
+                enableSplit = false
+            }
+        }
     }
 }
 

app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt

@@ -1,8 +1,12 @@
 package jp.co.soramitsu.app.root.navigation
 
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
 import androidx.navigation.NavController
+import androidx.navigation.NavOptions
 import jp.co.soramitsu.app.R
 import jp.co.soramitsu.app.root.presentation.RootRouter
+import jp.co.soramitsu.common.navigation.DelayedNavigation
 import jp.co.soramitsu.common.utils.postToUiThread
 import jp.co.soramitsu.feature_account_api.domain.model.Node
 import jp.co.soramitsu.feature_account_impl.presentation.AccountRouter
@@ -19,6 +23,7 @@ import jp.co.soramitsu.feature_account_impl.presentation.mnemonic.confirm.Confir
 import jp.co.soramitsu.feature_account_impl.presentation.node.details.NodeDetailsFragment
 import jp.co.soramitsu.feature_account_impl.presentation.pincode.PinCodeAction
 import jp.co.soramitsu.feature_account_impl.presentation.pincode.PincodeFragment
+import jp.co.soramitsu.feature_account_impl.presentation.pincode.ToolbarConfiguration
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
 import jp.co.soramitsu.feature_onboarding_impl.presentation.create.CreateAccountFragment
 import jp.co.soramitsu.feature_onboarding_impl.presentation.welcome.WelcomeFragment
@@ -31,35 +36,36 @@ import jp.co.soramitsu.feature_wallet_impl.presentation.send.amount.ChooseAmount
 import jp.co.soramitsu.feature_wallet_impl.presentation.send.confirm.ConfirmTransferFragment
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.TransactionDetailFragment
 import jp.co.soramitsu.splash.SplashRouter
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+class NavComponentDelayedNavigation(val globalActionId: Int, val extras: Bundle? = null) : DelayedNavigation
 
 class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, RootRouter {
 
     private var navController: NavController? = null
+    private var activity: AppCompatActivity? = null
 
-    fun attachNavController(navController: NavController) {
+    fun attach(navController: NavController, activity: AppCompatActivity) {
         this.navController = navController
+        this.activity = activity
     }
 
-    override fun openAddFirstAccount() {
-        navController?.navigate(R.id.action_splash_to_onboarding, WelcomeFragment.getBundle(false))
+    fun detach() {
+        navController = null
+        activity = null
     }
 
-    override fun openCreatePin() {
-        val action = PinCodeAction.Create(R.id.action_open_main)
-        val bundle = PincodeFragment.getPinCodeBundle(action)
-        navController?.navigate(R.id.action_splash_to_pin, bundle)
+    override fun openAddFirstAccount() {
+        navController?.navigate(R.id.action_splash_to_onboarding, WelcomeFragment.getBundle(false))
     }
 
-    override fun openCheckPin() {
-        val action = PinCodeAction.Check(R.id.action_open_main)
+    override fun openInitialCheckPincode() {
+        val action = PinCodeAction.Check(NavComponentDelayedNavigation(R.id.action_open_main), ToolbarConfiguration())
         val bundle = PincodeFragment.getPinCodeBundle(action)
         navController?.navigate(R.id.action_splash_to_pin, bundle)
     }
 
-    override fun openMainScreen() {
-        navController?.navigate(R.id.action_splash_to_main)
-    }
-
     override fun openCreateAccount(selectedNetworkType: Node.NetworkType?) {
         navController?.navigate(R.id.action_welcomeFragment_to_createAccountFragment, CreateAccountFragment.getBundle(selectedNetworkType))
     }
@@ -72,14 +78,25 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_open_main)
     }
 
-    override fun openDestination(destination: Int) {
-        navController?.navigate(destination)
+    override fun openAfterPinCode(delayedNavigation: DelayedNavigation) {
+        require(delayedNavigation is NavComponentDelayedNavigation)
+
+        val navOptions = NavOptions.Builder()
+            .setPopUpTo(R.id.pincodeFragment, true)
+            .setEnterAnim(R.anim.fragment_open_enter)
+            .setExitAnim(R.anim.fragment_open_exit)
+            .setPopEnterAnim(R.anim.fragment_close_enter)
+            .setPopExitAnim(R.anim.fragment_close_exit)
+            .build()
+
+        navController?.navigate(delayedNavigation.globalActionId, delayedNavigation.extras, navOptions)
     }
 
     override fun openCreatePincode() {
-        val action = PinCodeAction.Create(R.id.action_open_main)
-        val bundle = PincodeFragment.getPinCodeBundle(action)
+        val bundle = buildCreatePinBundle()
+
         when (navController?.currentDestination?.id) {
+            R.id.splashFragment -> navController?.navigate(R.id.action_splash_to_pin, bundle)
             R.id.importAccountFragment -> navController?.navigate(R.id.action_importAccountFragment_to_pincodeFragment, bundle)
             R.id.confirmMnemonicFragment -> navController?.navigate(R.id.action_confirmMnemonicFragment_to_pincodeFragment, bundle)
         }
@@ -128,7 +145,11 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
     }
 
     override fun back() {
-        navController?.navigateUp()
+        val popped = navController!!.popBackStack()
+
+        if (!popped) {
+            activity!!.finish()
+        }
     }
 
     override fun openChooseRecipient() {
@@ -222,16 +243,16 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_nodes_to_onboarding, WelcomeFragment.getBundleWithNetworkType(true, networkType))
     }
 
-    override fun openExportMnemonic(accountAddress: String) {
+    override fun openExportMnemonic(accountAddress: String): DelayedNavigation {
         val extras = ExportMnemonicFragment.getBundle(accountAddress)
 
-        navController?.navigate(R.id.action_accountDetailsFragment_to_exportMnemonicFragment, extras)
+        return NavComponentDelayedNavigation(R.id.action_export_mnemonic, extras)
     }
 
-    override fun openExportSeed(accountAddress: String) {
+    override fun openExportSeed(accountAddress: String): DelayedNavigation {
         val extras = ExportSeedFragment.getBundle(accountAddress)
 
-        navController?.navigate(R.id.action_accountDetailsFragment_to_exportSeedFragment, extras)
+        return NavComponentDelayedNavigation(R.id.action_export_seed, extras)
     }
 
     override fun openConfirmMnemonicOnExport(mnemonic: List<String>) {
@@ -240,10 +261,10 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         navController?.navigate(R.id.action_exportMnemonicFragment_to_confirmExportMnemonicFragment, extras)
     }
 
-    override fun openExportJsonPassword(accountAddress: String) {
+    override fun openExportJsonPassword(accountAddress: String): DelayedNavigation {
         val extras = ExportJsonPasswordFragment.getBundle(accountAddress)
 
-        navController?.navigate(R.id.action_accountDetailsFragment_to_exportJsonPasswordFragment, extras)
+        return NavComponentDelayedNavigation(R.id.action_export_json, extras)
     }
 
     override fun openExportJsonConfirm(payload: ExportJsonConfirmPayload) {
@@ -261,4 +282,26 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
         val bundle = PincodeFragment.getPinCodeBundle(action)
         navController?.navigate(R.id.action_mainFragment_to_pinCodeFragment, bundle)
     }
-}
+
+    override fun withPinCodeCheckRequired(
+        delayedNavigation: DelayedNavigation,
+        createMode: Boolean,
+        pinCodeTitleRes: Int?
+    ) {
+        val action = if (createMode) {
+            PinCodeAction.Create(delayedNavigation)
+        } else {
+            PinCodeAction.Check(delayedNavigation, ToolbarConfiguration(pinCodeTitleRes, true))
+        }
+
+        val extras = PincodeFragment.getPinCodeBundle(action)
+
+        navController?.navigate(R.id.open_pincode_check, extras)
+    }
+
+    private fun buildCreatePinBundle(): Bundle {
+        val delayedNavigation = NavComponentDelayedNavigation(R.id.action_open_main)
+        val action = PinCodeAction.Create(delayedNavigation)
+        return PincodeFragment.getPinCodeBundle(action)
+    }
+}

app/src/main/java/jp/co/soramitsu/app/root/presentation/RootActivity.kt

@@ -41,8 +41,7 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        navController.setGraph(R.navigation.root_nav_graph)
-        navigator.attachNavController(navController)
+        navigator.attach(navController, this)
 
         rootNetworkBar.setOnApplyWindowInsetsListener { view, insets ->
             view.updatePadding(top = insets.systemWindowInsetTop)
@@ -53,6 +52,12 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
 //        processJsonOpenIntent()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        navigator.detach()
+    }
+
     override fun layoutResource(): Int {
         return R.layout.activity_root
     }
@@ -100,6 +105,10 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
 //        }
 //    }
 
-    private val navController: NavController
-        get() = NavHostFragment.findNavController(navHost)
+    private val navController: NavController by lazy {
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.navHost) as NavHostFragment
+
+        navHostFragment.navController
+    }
 }

app/src/main/java/jp/co/soramitsu/app/root/presentation/main/MainFragment.kt

@@ -37,12 +37,6 @@ class MainFragment : BaseFragment<MainViewModel>() {
         backCallback.isEnabled = false
     }
 
-    override fun onViewStateRestored(savedInstanceState: Bundle?) {
-        super.onViewStateRestored(savedInstanceState)
-
-        navController!!.restoreState(savedInstanceState)
-    }
-
     override fun initViews() {
         val nestedNavHostFragment =
             childFragmentManager.findFragmentById(R.id.bottomNavHost) as NavHostFragment

app/src/main/res/layout/activity_root.xml

@@ -6,11 +6,12 @@
     android:layout_height="match_parent"
     android:background="@drawable/drawable_background_image">
 
-    <fragment
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/navHost"
         android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        app:navGraph="@navigation/root_nav_graph"
         app:defaultNavHost="true" />
 
     <TextView

app/src/main/res/navigation/main_nav_graph.xml

@@ -41,18 +41,31 @@
         android:id="@+id/action_return_to_wallet"
         app:destination="@id/mainFragment"
         app:enterAnim="@anim/fragment_close_enter"
-        app:popUpTo="@id/main_nav_graph"
-        app:launchSingleTop="true"
         app:exitAnim="@anim/fragment_close_exit"
+        app:launchSingleTop="true"
         app:popEnterAnim="@anim/fragment_open_enter"
-        app:popExitAnim="@anim/fragment_open_exit" />
+        app:popExitAnim="@anim/fragment_open_exit"
+        app:popUpTo="@id/main_nav_graph" />
 
-    <action android:id="@+id/finish_export_flow"
-        app:popUpTo="@+id/accountDetailsFragment"
+    <action
+        android:id="@+id/finish_export_flow"
         app:enterAnim="@anim/fragment_close_enter"
         app:exitAnim="@anim/fragment_close_exit"
         app:popEnterAnim="@anim/fragment_open_enter"
-        app:popExitAnim="@anim/fragment_open_exit" />
+        app:popExitAnim="@anim/fragment_open_exit"
+        app:popUpTo="@+id/accountDetailsFragment" />
+
+    <action
+        android:id="@+id/action_export_mnemonic"
+        app:destination="@id/exportMnemonicFragment" />
+
+    <action
+        android:id="@+id/action_export_seed"
+        app:destination="@id/exportSeedFragment" />
+
+    <action
+        android:id="@+id/action_export_json"
+        app:destination="@id/exportJsonPasswordFragment" />
 
     <fragment
         android:id="@+id/mainFragment"
@@ -190,32 +203,7 @@
         android:id="@+id/accountDetailsFragment"
         android:name="jp.co.soramitsu.feature_account_impl.presentation.account.details.AccountDetailsFragment"
         android:label="AccountDetailsFragment"
-        tools:layout="@layout/fragment_account_details">
-
-        <action
-            android:id="@+id/action_accountDetailsFragment_to_exportMnemonicFragment"
-            app:destination="@id/exportMnemonicFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_accountDetailsFragment_to_exportSeedFragment"
-            app:destination="@id/exportSeedFragment"
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit" />
-
-        <action
-            app:enterAnim="@anim/fragment_open_enter"
-            app:exitAnim="@anim/fragment_open_exit"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            android:id="@+id/action_accountDetailsFragment_to_exportJsonPasswordFragment"
-            app:destination="@id/exportJsonPasswordFragment" />
-    </fragment>
+        tools:layout="@layout/fragment_account_details" />
 
     <fragment
         android:id="@+id/editAccountsFragment"
@@ -333,26 +321,26 @@
         tools:layout="@layout/fragment_export_seed" />
 
     <fragment
-        tools:layout="@layout/fragment_export_json_password"
         android:id="@+id/exportJsonPasswordFragment"
         android:name="jp.co.soramitsu.feature_account_impl.presentation.exporting.json.password.ExportJsonPasswordFragment"
-        android:label="ExportJsonPasswordFragment" >
+        android:label="ExportJsonPasswordFragment"
+        tools:layout="@layout/fragment_export_json_password">
 
         <action
+            android:id="@+id/action_exportJsonPasswordFragment_to_exportJsonConfirmFragment"
+            app:destination="@id/exportJsonConfirmFragment"
             app:enterAnim="@anim/fragment_open_enter"
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"
-            app:popExitAnim="@anim/fragment_close_exit"
-            android:id="@+id/action_exportJsonPasswordFragment_to_exportJsonConfirmFragment"
-            app:destination="@id/exportJsonConfirmFragment" />
+            app:popExitAnim="@anim/fragment_close_exit" />
 
     </fragment>
 
     <fragment
-        tools:layout="@layout/fragment_export_json_confirm"
         android:id="@+id/exportJsonConfirmFragment"
         android:name="jp.co.soramitsu.feature_account_impl.presentation.exporting.json.confirm.ExportJsonConfirmFragment"
-        android:label="ExportJsonConfirmFragment" />
+        android:label="ExportJsonConfirmFragment"
+        tools:layout="@layout/fragment_export_json_confirm" />
 
     <fragment
         android:id="@+id/pincodeFragment"

app/src/main/res/navigation/onboarding_nav_graph.xml

@@ -60,7 +60,7 @@
             app:destination="@id/pincodeFragment"
             app:enterAnim="@anim/fragment_open_enter"
             app:exitAnim="@anim/fragment_open_exit"
-            app:popUpTo="@id/root_nav_graph"
+            app:popUpTo="@id/welcomeFragment"
             app:popUpToInclusive="true"
             app:popEnterAnim="@anim/fragment_close_enter"
             app:popExitAnim="@anim/fragment_close_exit">
@@ -97,7 +97,7 @@
             android:id="@+id/action_confirmMnemonicFragment_to_pincodeFragment"
             app:destination="@id/pincodeFragment"
             app:enterAnim="@anim/fragment_open_enter"
-            app:popUpTo="@id/root_nav_graph"
+            app:popUpTo="@id/welcomeFragment"
             app:popUpToInclusive="true"
             app:exitAnim="@anim/fragment_open_exit"
             app:popEnterAnim="@anim/fragment_close_enter"