Merge pull request #121 from soramitsu/rc/1.0.0

Rc/1.0.0

Author: ArtemNurtdinov

app/src/main/AndroidManifest.xml

@@ -51,6 +51,11 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <receiver
+            android:name="jp.co.soramitsu.feature_account_impl.presentation.exporting.json.confirm.ShareCompletedReceiver"
+            android:enabled="true"
+            android:exported="false" />
+
     </application>
 
 </manifest>

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

@@ -2,14 +2,23 @@ package jp.co.soramitsu.app.root.navigation
 
 import androidx.navigation.NavController
 import jp.co.soramitsu.app.R
-import jp.co.soramitsu.feature_account_api.domain.model.CryptoType
+import jp.co.soramitsu.app.root.presentation.RootRouter
+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
 import jp.co.soramitsu.feature_account_impl.presentation.account.details.AccountDetailsFragment
+import jp.co.soramitsu.feature_account_impl.presentation.exporting.json.confirm.ExportJsonConfirmFragment
+import jp.co.soramitsu.feature_account_impl.presentation.exporting.json.confirm.ExportJsonConfirmPayload
+import jp.co.soramitsu.feature_account_impl.presentation.exporting.json.password.ExportJsonPasswordFragment
+import jp.co.soramitsu.feature_account_impl.presentation.exporting.mnemonic.ExportMnemonicFragment
+import jp.co.soramitsu.feature_account_impl.presentation.exporting.seed.ExportSeedFragment
 import jp.co.soramitsu.feature_account_impl.presentation.importing.ImportAccountFragment
 import jp.co.soramitsu.feature_account_impl.presentation.mnemonic.backup.BackupMnemonicFragment
 import jp.co.soramitsu.feature_account_impl.presentation.mnemonic.confirm.ConfirmMnemonicFragment
+import jp.co.soramitsu.feature_account_impl.presentation.mnemonic.confirm.ConfirmMnemonicPayload
 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_onboarding_impl.OnboardingRouter
 import jp.co.soramitsu.feature_onboarding_impl.presentation.create.CreateAccountFragment
 import jp.co.soramitsu.feature_onboarding_impl.presentation.welcome.WelcomeFragment
@@ -23,7 +32,7 @@ import jp.co.soramitsu.feature_wallet_impl.presentation.send.confirm.ConfirmTran
 import jp.co.soramitsu.feature_wallet_impl.presentation.transaction.detail.TransactionDetailFragment
 import jp.co.soramitsu.splash.SplashRouter
 
-class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
+class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, RootRouter {
 
     private var navController: NavController? = null
 
@@ -35,8 +44,16 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
         navController?.navigate(R.id.action_splash_to_onboarding, WelcomeFragment.getBundle(false))
     }
 
-    override fun openPin() {
-        navController?.navigate(R.id.action_splash_to_pin)
+    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 openCheckPin() {
+        val action = PinCodeAction.Check(R.id.action_open_main)
+        val bundle = PincodeFragment.getPinCodeBundle(action)
+        navController?.navigate(R.id.action_splash_to_pin, bundle)
     }
 
     override fun openMainScreen() {
@@ -55,27 +72,22 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
         navController?.navigate(R.id.action_open_main)
     }
 
+    override fun openDestination(destination: Int) {
+        navController?.navigate(destination)
+    }
+
     override fun openCreatePincode() {
+        val action = PinCodeAction.Create(R.id.action_open_main)
+        val bundle = PincodeFragment.getPinCodeBundle(action)
         when (navController?.currentDestination?.id) {
-            R.id.importAccountFragment -> navController?.navigate(R.id.action_importAccountFragment_to_pincodeFragment)
-            R.id.confirmMnemonicFragment -> navController?.navigate(R.id.action_confirmMnemonicFragment_to_pincodeFragment)
+            R.id.importAccountFragment -> navController?.navigate(R.id.action_importAccountFragment_to_pincodeFragment, bundle)
+            R.id.confirmMnemonicFragment -> navController?.navigate(R.id.action_confirmMnemonicFragment_to_pincodeFragment, bundle)
         }
     }
 
-    override fun openConfirmMnemonicScreen(
-        accountName: String,
-        mnemonic: List<String>,
-        cryptoType: CryptoType,
-        node: Node,
-        derivationPath: String
-    ) {
-        val bundle = ConfirmMnemonicFragment.getBundle(
-            accountName,
-            mnemonic,
-            cryptoType,
-            node,
-            derivationPath
-        )
+    override fun openConfirmMnemonicOnCreate(confirmMnemonicPayload: ConfirmMnemonicPayload) {
+        val bundle = ConfirmMnemonicFragment.getBundle(confirmMnemonicPayload)
+
         navController?.navigate(
             R.id.action_backupMnemonicFragment_to_confirmMnemonicFragment,
             bundle
@@ -171,6 +183,13 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
         navController?.navigate(R.id.action_open_receive)
     }
 
+    override fun returnToMain() {
+        // to achieve smooth animation
+        postToUiThread {
+            navController?.navigate(R.id.action_return_to_wallet)
+        }
+    }
+
     override fun openAccountDetails(address: String) {
         val extras = AccountDetailsFragment.getBundle(address)
 
@@ -185,8 +204,8 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
         navController?.navigate(R.id.action_editAccountsFragment_to_mainFragment)
     }
 
-    override fun openNodeDetails(nodeId: Int) {
-        navController?.navigate(R.id.action_nodesFragment_to_nodeDetailsFragment, NodeDetailsFragment.getBundle(nodeId))
+    override fun openNodeDetails(nodeId: Int, isSelected: Boolean) {
+        navController?.navigate(R.id.action_nodesFragment_to_nodeDetailsFragment, NodeDetailsFragment.getBundle(nodeId, isSelected))
     }
 
     override fun openAssetDetails(token: Asset.Token) {
@@ -202,4 +221,44 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter {
     override fun createAccountForNetworkType(networkType: Node.NetworkType) {
         navController?.navigate(R.id.action_nodes_to_onboarding, WelcomeFragment.getBundleWithNetworkType(true, networkType))
     }
+
+    override fun openExportMnemonic(accountAddress: String) {
+        val extras = ExportMnemonicFragment.getBundle(accountAddress)
+
+        navController?.navigate(R.id.action_accountDetailsFragment_to_exportMnemonicFragment, extras)
+    }
+
+    override fun openExportSeed(accountAddress: String) {
+        val extras = ExportSeedFragment.getBundle(accountAddress)
+
+        navController?.navigate(R.id.action_accountDetailsFragment_to_exportSeedFragment, extras)
+    }
+
+    override fun openConfirmMnemonicOnExport(mnemonic: List<String>) {
+        val extras = ConfirmMnemonicFragment.getBundle(ConfirmMnemonicPayload(mnemonic, null))
+
+        navController?.navigate(R.id.action_exportMnemonicFragment_to_confirmExportMnemonicFragment, extras)
+    }
+
+    override fun openExportJsonPassword(accountAddress: String) {
+        val extras = ExportJsonPasswordFragment.getBundle(accountAddress)
+
+        navController?.navigate(R.id.action_accountDetailsFragment_to_exportJsonPasswordFragment, extras)
+    }
+
+    override fun openExportJsonConfirm(payload: ExportJsonConfirmPayload) {
+        val extras = ExportJsonConfirmFragment.getBundle(payload)
+
+        navController?.navigate(R.id.action_exportJsonPasswordFragment_to_exportJsonConfirmFragment, extras)
+    }
+
+    override fun finishExportFlow() {
+        navController?.navigate(R.id.finish_export_flow)
+    }
+
+    override fun openChangePinCode() {
+        val action = PinCodeAction.Change
+        val bundle = PincodeFragment.getPinCodeBundle(action)
+        navController?.navigate(R.id.action_mainFragment_to_pinCodeFragment, bundle)
+    }
 }

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

@@ -1,9 +1,6 @@
 package jp.co.soramitsu.app.root.presentation
 
-import android.content.Context
-import android.content.Intent
 import android.os.Bundle
-import android.view.View
 import androidx.lifecycle.Observer
 import androidx.navigation.NavController
 import androidx.navigation.fragment.NavHostFragment
@@ -13,28 +10,16 @@ import jp.co.soramitsu.app.root.di.RootComponent
 import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.common.base.BaseActivity
 import jp.co.soramitsu.common.di.FeatureUtils
+import jp.co.soramitsu.common.utils.setVisible
 import jp.co.soramitsu.common.utils.updatePadding
 import jp.co.soramitsu.splash.presentation.SplashBackgroundHolder
-import jp.co.soramitsu.splash.presentation.SplashFragment
 import kotlinx.android.synthetic.main.activity_root.mainView
 import kotlinx.android.synthetic.main.activity_root.navHost
 import kotlinx.android.synthetic.main.activity_root.rootNetworkBar
 import javax.inject.Inject
 
 class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
 
-    companion object {
-        private const val ACTION_CHANGE_LANGUAGE = "jp.co.soramitsu.app.root.presentation.ACTION_CHANGE_LANGUAGE"
-
-        fun restartAfterLanguageChange(context: Context) {
-            val intent = Intent(context, RootActivity::class.java).apply {
-                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
-                action = ACTION_CHANGE_LANGUAGE
-            }
-            context.startActivity(intent)
-        }
-    }
-
     @Inject
     lateinit var navigator: Navigator
 
@@ -45,11 +30,18 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
             .inject(this)
     }
 
+    override fun onRestoreInstanceState(savedInstanceState: Bundle) {
+        super.onRestoreInstanceState(savedInstanceState)
+
+        removeSplashBackground()
+
+        viewModel.restoredAfterConfigChange()
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        val languageChanged = ACTION_CHANGE_LANGUAGE == intent.action
-        navController.setGraph(R.navigation.root_nav_graph, SplashFragment.getBundle(languageChanged))
+        navController.setGraph(R.navigation.root_nav_graph)
         navigator.attachNavController(navController)
 
         rootNetworkBar.setOnApplyWindowInsetsListener { view, insets ->
@@ -68,11 +60,21 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
     override fun initViews() {
     }
 
+    override fun onStop() {
+        super.onStop()
+
+        viewModel.noticeInBackground()
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        viewModel.noticeInForeground()
+    }
+
     override fun subscribe(viewModel: RootViewModel) {
         viewModel.showConnectingBarLiveData.observe(this, Observer { show ->
-            val visibility = if (show) View.VISIBLE else View.GONE
-
-            rootNetworkBar.visibility = visibility
+            rootNetworkBar.setVisible(show)
         })
     }
 
@@ -83,7 +85,9 @@ class RootActivity : BaseActivity<RootViewModel>(), SplashBackgroundHolder {
     override fun changeLanguage() {
         viewModel.noticeLanguageLanguage()
 
-        restartAfterLanguageChange(this)
+        recreate()
+
+//        restartAfterLanguageChange(this)
     }
 
 //    private fun processJsonOpenIntent() {

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

@@ -0,0 +1,5 @@
+package jp.co.soramitsu.app.root.presentation
+
+interface RootRouter {
+    fun returnToMain()
+}

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

@@ -6,12 +6,14 @@ import io.reactivex.schedulers.Schedulers
 import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.common.base.BaseViewModel
 import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
+import jp.co.soramitsu.common.data.network.rpc.LifecycleCondition
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 import jp.co.soramitsu.common.mixin.api.NetworkStateUi
 import jp.co.soramitsu.common.utils.plusAssign
 
 class RootViewModel(
     private val interactor: RootInteractor,
+    private val rootRouter: RootRouter,
     private val connectionManager: ConnectionManager,
     private val networkStateMixin: NetworkStateMixin
 ) : BaseViewModel(), NetworkStateUi by networkStateMixin {
@@ -26,10 +28,10 @@ class RootViewModel(
     }
 
     private fun observeAllowedToConnect() {
-        disposables += connectionManager.observeAllowedToConnect()
+        disposables += connectionManager.observeLifecycleCondition()
             .distinctUntilChanged()
-            .subscribe { allowed ->
-                if (allowed) {
+            .subscribe { lifecycleCondition ->
+                if (lifecycleCondition == LifecycleCondition.ALLOWED) {
                     bindConnectionToNode()
                 } else {
                     unbindConnection()
@@ -65,12 +67,30 @@ class RootViewModel(
     override fun onCleared() {
         super.onCleared()
 
+        connectionManager.setLifecycleCondition(LifecycleCondition.FORBIDDEN)
+    }
+
+    fun noticeInBackground() {
         if (!willBeClearedForLanguageChange) {
-            connectionManager.setAllowedToConnect(false)
+            connectionManager.setLifecycleCondition(LifecycleCondition.STOPPED)
+        }
+    }
+
+    fun noticeInForeground() {
+        if (connectionManager.getLifecycleCondition() == LifecycleCondition.STOPPED) {
+            connectionManager.setLifecycleCondition(LifecycleCondition.ALLOWED)
         }
     }
 
     fun noticeLanguageLanguage() {
         willBeClearedForLanguageChange = true
     }
+
+    fun restoredAfterConfigChange() {
+        if (willBeClearedForLanguageChange) {
+            rootRouter.returnToMain()
+
+            willBeClearedForLanguageChange = false
+        }
+    }
 }

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

@@ -7,6 +7,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.multibindings.IntoMap
 import jp.co.soramitsu.app.root.domain.RootInteractor
+import jp.co.soramitsu.app.root.navigation.Navigator
+import jp.co.soramitsu.app.root.presentation.RootRouter
 import jp.co.soramitsu.app.root.presentation.RootViewModel
 import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 import jp.co.soramitsu.common.di.viewmodel.ViewModelKey
@@ -20,16 +22,21 @@ import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 )
 class RootActivityModule {
 
+    @Provides
+    fun provideRootRouter(navigator: Navigator): RootRouter = navigator
+
     @Provides
     @IntoMap
     @ViewModelKey(RootViewModel::class)
     fun provideViewModel(
         interactor: RootInteractor,
+        rootRouter: RootRouter,
         connectionManager: ConnectionManager,
         networkStateMixin: NetworkStateMixin
     ): ViewModel {
         return RootViewModel(
             interactor,
+            rootRouter,
             connectionManager,
             networkStateMixin
         )

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

@@ -37,6 +37,12 @@ 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
@@ -59,7 +65,7 @@ class MainFragment : BaseFragment<MainViewModel>() {
     override fun inject() {
         FeatureUtils.getFeature<RootComponent>(this, RootApi::class.java)
             .mainFragmentComponentFactory()
-            .create(this)
+            .create(requireActivity())
             .inject(this)
     }