Merge pull request #295 from soramitsu/rc/1.8

Rc/1.8

Author: valentunn

app/build.gradle

@@ -50,21 +50,21 @@ android {
         }
     }
 
-    android {
-        compileOptions {
-            sourceCompatibility 1.8
-            targetCompatibility 1.8
+    bundle {
+        language {
+            enableSplit = false
         }
+    }
 
-        bundle {
-            language {
-                enableSplit = false
-            }
-        }
+    compileOptions {
+        sourceCompatibility 1.8
+        targetCompatibility 1.8
     }
 
     kotlinOptions {
         freeCompilerArgs = ["-Xallow-result-return-type"]
+
+        jvmTarget = '1.8'
     }
 }
 
@@ -94,6 +94,9 @@ dependencies {
     implementation project(':feature-staking-api')
     implementation project(':feature-staking-impl')
 
+    implementation project(':feature-crowdloan-api')
+    implementation project(':feature-crowdloan-impl')
+
     implementation kotlinDep
 
     implementation androidDep
@@ -126,6 +129,8 @@ dependencies {
     testImplementation project(':test-shared')
 
     implementation insetterDep
+
+    implementation liveDataKtxDep
 }
 
 task printVersion {

app/src/main/java/jp/co/soramitsu/app/di/app/NavigationModule.kt

@@ -5,6 +5,7 @@ import dagger.Provides
 import jp.co.soramitsu.app.root.navigation.Navigator
 import jp.co.soramitsu.common.di.scope.ApplicationScope
 import jp.co.soramitsu.feature_account_impl.presentation.AccountRouter
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.CrowdloanRouter
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
 import jp.co.soramitsu.feature_staking_impl.presentation.StakingRouter
 import jp.co.soramitsu.feature_wallet_impl.presentation.WalletRouter
@@ -36,4 +37,8 @@ class NavigationModule {
     @ApplicationScope
     @Provides
     fun provideStakingRouter(navigator: Navigator): StakingRouter = navigator
+
+    @ApplicationScope
+    @Provides
+    fun provideCrowdloanRouter(navigator: Navigator): CrowdloanRouter = navigator
 }

app/src/main/java/jp/co/soramitsu/app/di/deps/ComponentHolderModule.kt

@@ -14,6 +14,8 @@ import jp.co.soramitsu.core_db.di.DbApi
 import jp.co.soramitsu.core_db.di.DbHolder
 import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
 import jp.co.soramitsu.feature_account_impl.di.AccountFeatureHolder
+import jp.co.soramitsu.feature_crowdloan_api.di.CrowdloanFeatureApi
+import jp.co.soramitsu.feature_crowdloan_impl.di.CrowdloanFeatureHolder
 import jp.co.soramitsu.feature_onboarding_api.di.OnboardingFeatureApi
 import jp.co.soramitsu.feature_onboarding_impl.di.OnboardingFeatureHolder
 import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
@@ -78,5 +80,11 @@ interface ComponentHolderModule {
     @Binds
     @ClassKey(RuntimeApi::class)
     @IntoMap
-    fun provideARuntimeFeature(runtimeHolder: RuntimeHolder): FeatureApiHolder
+    fun provideRuntimeFeature(runtimeHolder: RuntimeHolder): FeatureApiHolder
+
+    @ApplicationScope
+    @Binds
+    @ClassKey(CrowdloanFeatureApi::class)
+    @IntoMap
+    fun provideCrowdloanFeature(holder: CrowdloanFeatureHolder): FeatureApiHolder
 }

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

@@ -10,6 +10,7 @@ import jp.co.soramitsu.common.di.CommonApi
 import jp.co.soramitsu.common.di.scope.FeatureScope
 import jp.co.soramitsu.core_db.di.DbApi
 import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
+import jp.co.soramitsu.feature_crowdloan_api.di.CrowdloanFeatureApi
 import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
 import jp.co.soramitsu.feature_wallet_api.di.WalletFeatureApi
 import jp.co.soramitsu.runtime.di.RuntimeApi
@@ -44,6 +45,7 @@ interface RootComponent {
             AccountFeatureApi::class,
             WalletFeatureApi::class,
             StakingFeatureApi::class,
+            CrowdloanFeatureApi::class,
             DbApi::class,
             CommonApi::class,
             RuntimeApi::class

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

@@ -4,15 +4,23 @@ import jp.co.soramitsu.common.data.network.AppLinksProvider
 import jp.co.soramitsu.common.data.network.rpc.ConnectionManager
 import jp.co.soramitsu.common.mixin.api.NetworkStateMixin
 import jp.co.soramitsu.common.resources.ResourceManager
+import jp.co.soramitsu.common.utils.SuspendableProperty
+import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.fearless_utils.wsrpc.SocketService
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.updaters.CrowdloanUpdaters
+import jp.co.soramitsu.feature_crowdloan_api.data.repository.CrowdloanRepository
 import jp.co.soramitsu.feature_staking_api.di.StakingUpdaters
+import jp.co.soramitsu.feature_staking_api.domain.api.StakingRepository
 import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_api.domain.model.BuyTokenRegistry
 import jp.co.soramitsu.runtime.RuntimeUpdater
 
 interface RootDependencies {
+
+    fun crowdloanRepository(): CrowdloanRepository
+
     fun networkStateMixin(): NetworkStateMixin
 
     fun connectionManager(): ConnectionManager
@@ -31,6 +39,12 @@ interface RootDependencies {
 
     fun stakingUpdaters(): StakingUpdaters
 
+    fun crowdloanUpdaters(): CrowdloanUpdaters
+
+    fun runtimeProperty(): SuspendableProperty<RuntimeSnapshot>
+
+    fun stakingRepository(): StakingRepository
+
     fun runtimeUpdater(): RuntimeUpdater
 
     fun socketService(): SocketService

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

@@ -6,6 +6,7 @@ import jp.co.soramitsu.common.di.FeatureContainer
 import jp.co.soramitsu.common.di.scope.ApplicationScope
 import jp.co.soramitsu.core_db.di.DbApi
 import jp.co.soramitsu.feature_account_api.di.AccountFeatureApi
+import jp.co.soramitsu.feature_crowdloan_api.di.CrowdloanFeatureApi
 import jp.co.soramitsu.feature_staking_api.di.StakingFeatureApi
 import jp.co.soramitsu.feature_wallet_api.di.WalletFeatureApi
 import jp.co.soramitsu.runtime.di.RuntimeApi
@@ -24,6 +25,7 @@ class RootFeatureHolder @Inject constructor(
             .accountFeatureApi(getFeature(AccountFeatureApi::class.java))
             .walletFeatureApi(getFeature(WalletFeatureApi::class.java))
             .stakingFeatureApi(getFeature(StakingFeatureApi::class.java))
+            .crowdloanFeatureApi(getFeature(CrowdloanFeatureApi::class.java))
             .runtimeApi(getFeature(RuntimeApi::class.java))
             .build()
         return DaggerRootComponent.factory()

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

@@ -5,9 +5,14 @@ import dagger.Provides
 import jp.co.soramitsu.app.root.domain.RootInteractor
 import jp.co.soramitsu.app.root.domain.UpdateSystem
 import jp.co.soramitsu.common.di.scope.FeatureScope
+import jp.co.soramitsu.common.utils.SuspendableProperty
+import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.fearless_utils.wsrpc.SocketService
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_crowdloan_api.data.network.blockhain.updaters.CrowdloanUpdaters
+import jp.co.soramitsu.feature_crowdloan_api.data.repository.CrowdloanRepository
 import jp.co.soramitsu.feature_staking_api.di.StakingUpdaters
+import jp.co.soramitsu.feature_staking_api.domain.api.StakingRepository
 import jp.co.soramitsu.feature_wallet_api.di.WalletUpdaters
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.runtime.RuntimeUpdater
@@ -20,14 +25,18 @@ class RootFeatureModule {
     fun provideUpdateSystem(
         walletUpdaters: WalletUpdaters,
         stakingUpdaters: StakingUpdaters,
+        crowdloanUpdaters: CrowdloanUpdaters,
         runtimeUpdater: RuntimeUpdater,
+        runtimeProperty: SuspendableProperty<RuntimeSnapshot>,
         socketService: SocketService
     ): UpdateSystem {
         return UpdateSystem(
             runtimeUpdater,
+            runtimeProperty,
             updaters = listOf(
                 *walletUpdaters.updaters,
                 *stakingUpdaters.updaters,
+                *crowdloanUpdaters.updaters,
                 runtimeUpdater
             ),
             socketService
@@ -38,9 +47,17 @@ class RootFeatureModule {
     @FeatureScope
     fun provideRootInteractor(
         accountRepository: AccountRepository,
+        stakingRepository: StakingRepository,
+        crowdloanRepository: CrowdloanRepository,
         updateSystem: UpdateSystem,
         walletRepository: WalletRepository
     ): RootInteractor {
-        return RootInteractor(accountRepository, updateSystem, walletRepository)
+        return RootInteractor(
+            accountRepository,
+            updateSystem,
+            stakingRepository,
+            crowdloanRepository,
+            walletRepository
+        )
     }
 }

app/src/main/java/jp/co/soramitsu/app/root/domain/RootInteractor.kt

@@ -2,13 +2,17 @@ package jp.co.soramitsu.app.root.domain
 
 import jp.co.soramitsu.core.updater.Updater
 import jp.co.soramitsu.feature_account_api.domain.interfaces.AccountRepository
+import jp.co.soramitsu.feature_crowdloan_api.data.repository.CrowdloanRepository
+import jp.co.soramitsu.feature_staking_api.domain.api.StakingRepository
 import jp.co.soramitsu.feature_wallet_api.domain.interfaces.WalletRepository
 import jp.co.soramitsu.feature_wallet_impl.data.buyToken.ExternalProvider
 import kotlinx.coroutines.flow.Flow
 
 class RootInteractor(
     private val accountRepository: AccountRepository,
     private val updateSystem: UpdateSystem,
+    private val stakingRepository: StakingRepository,
+    private val crowdloanRepository: CrowdloanRepository,
     private val walletRepository: WalletRepository,
 ) {
 
@@ -20,6 +24,10 @@ class RootInteractor(
 
     fun isBuyProviderRedirectLink(link: String) = ExternalProvider.REDIRECT_URL_BASE in link
 
+    fun stakingAvailableFlow() = stakingRepository.stakingAvailableFlow()
+
+    fun crowdloanAvailableFlow() = crowdloanRepository.crowdloanAvailableFlow()
+
     suspend fun updatePhishingAddresses() {
         runCatching {
             walletRepository.updatePhishingAddresses()

app/src/main/java/jp/co/soramitsu/app/root/domain/UpdateSystem.kt

@@ -1,12 +1,16 @@
 package jp.co.soramitsu.app.root.domain
 
 import jp.co.soramitsu.common.data.network.StorageSubscriptionBuilder
+import jp.co.soramitsu.common.utils.SuspendableProperty
+import jp.co.soramitsu.common.utils.hasModule
 import jp.co.soramitsu.core.updater.Updater
+import jp.co.soramitsu.fearless_utils.runtime.RuntimeSnapshot
 import jp.co.soramitsu.fearless_utils.wsrpc.SocketService
 import jp.co.soramitsu.fearless_utils.wsrpc.request.runtime.storage.subscribeUsing
 import jp.co.soramitsu.runtime.RuntimeUpdater
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.merge
@@ -15,6 +19,7 @@ import kotlinx.coroutines.withContext
 
 class UpdateSystem(
     private val runtimeUpdater: RuntimeUpdater,
+    private val runtimeProperty: SuspendableProperty<RuntimeSnapshot>,
     private val updaters: List<Updater>,
     private val socketService: SocketService
 ) {
@@ -24,13 +29,21 @@ class UpdateSystem(
 
         val scopeFlows = updaters.groupBy(Updater::scope).map { (scope, scopeUpdaters) ->
             scope.invalidationFlow().flatMapLatest {
+                val runtimeMetadata = runtimeProperty.get().metadata
+
                 val subscriptionBuilder = StorageSubscriptionBuilder.create()
 
-                val updatersFlow = scopeUpdaters.map { it.listenForUpdates(subscriptionBuilder).flowOn(Dispatchers.IO) }
+                val updatersFlow = scopeUpdaters
+                    .filter { it.requiredModules.all(runtimeMetadata::hasModule) }
+                    .map { it.listenForUpdates(subscriptionBuilder).flowOn(Dispatchers.IO) }
 
-                val cancellable = socketService.subscribeUsing(subscriptionBuilder.proxy.build())
+                if (updatersFlow.isNotEmpty()) {
+                    val cancellable = socketService.subscribeUsing(subscriptionBuilder.proxy.build())
 
-                updatersFlow.merge().onCompletion { cancellable.cancel() }
+                    updatersFlow.merge().onCompletion { cancellable.cancel() }
+                } else {
+                    emptyFlow()
+                }
             }
         }
 

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

@@ -27,6 +27,11 @@ import jp.co.soramitsu.feature_account_impl.presentation.node.details.NodeDetail
 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_crowdloan_impl.presentation.CrowdloanRouter
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.confirm.ConfirmContributeFragment
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.confirm.parcel.ConfirmContributePayload
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.select.CrowdloanContributeFragment
+import jp.co.soramitsu.feature_crowdloan_impl.presentation.contribute.select.parcel.ContributePayload
 import jp.co.soramitsu.feature_onboarding_impl.OnboardingRouter
 import jp.co.soramitsu.feature_onboarding_impl.presentation.welcome.WelcomeFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.StakingRouter
@@ -41,6 +46,8 @@ import jp.co.soramitsu.feature_staking_impl.presentation.staking.controller.conf
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.main.model.StakingStoryModel
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rebond.confirm.ConfirmRebondFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.rebond.confirm.ConfirmRebondPayload
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.rewardDestination.confirm.ConfirmRewardDestinationFragment
+import jp.co.soramitsu.feature_staking_impl.presentation.staking.rewardDestination.confirm.parcel.ConfirmRewardDestinationPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.confirm.ConfirmUnbondFragment
 import jp.co.soramitsu.feature_staking_impl.presentation.staking.unbond.confirm.ConfirmUnbondPayload
 import jp.co.soramitsu.feature_staking_impl.presentation.story.StoryFragment
@@ -66,7 +73,8 @@ class Navigator :
     AccountRouter,
     WalletRouter,
     RootRouter,
-    StakingRouter {
+    StakingRouter,
+    CrowdloanRouter {
 
     private var navController: NavController? = null
     private var activity: AppCompatActivity? = null
@@ -213,6 +221,14 @@ class Navigator :
         navController?.navigate(R.id.action_open_confirm_rebond, ConfirmRebondFragment.getBundle(payload))
     }
 
+    override fun openContribute(payload: ContributePayload) {
+        navController?.navigate(R.id.action_mainFragment_to_crowdloanContributeFragment, CrowdloanContributeFragment.getBundle(payload))
+    }
+
+    override fun openConfirmContribute(payload: ConfirmContributePayload) {
+        navController?.navigate(R.id.action_crowdloanContributeFragment_to_confirmContributeFragment, ConfirmContributeFragment.getBundle(payload))
+    }
+
     override fun back() {
         val popped = navController!!.popBackStack()
 
@@ -233,6 +249,17 @@ class Navigator :
         navController?.navigate(R.id.action_confirmStakingFragment_back_to_currentValidatorsFragment)
     }
 
+    override fun openChangeRewardDestination() {
+        navController?.navigate(R.id.action_mainFragment_to_selectRewardDestinationFragment)
+    }
+
+    override fun openConfirmRewardDestination(payload: ConfirmRewardDestinationPayload) {
+        navController?.navigate(
+            R.id.action_selectRewardDestinationFragment_to_confirmRewardDestinationFragment,
+            ConfirmRewardDestinationFragment.getBundle(payload)
+        )
+    }
+
     override fun openControllerAccount() {
         navController?.navigate(R.id.action_stakingBalanceFragment_to_setControllerAccountFragment)
     }
@@ -406,7 +433,7 @@ class Navigator :
     override fun withPinCodeCheckRequired(
         delayedNavigation: DelayedNavigation,
         createMode: Boolean,
-        pinCodeTitleRes: Int?
+        pinCodeTitleRes: Int?,
     ) {
         val action = if (createMode) {
             PinCodeAction.Create(delayedNavigation)

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

@@ -83,6 +83,13 @@ class MainFragment : BaseFragment<MainViewModel>() {
     }
 
     override fun subscribe(viewModel: MainViewModel) {
+        viewModel.stakingAvailableLiveData.observe {
+            bottomNavigationView.menu.findItem(R.id.stakingFragment).isVisible = it
+        }
+
+        viewModel.crowdloanAvailableLiveData.observe {
+            bottomNavigationView.menu.findItem(R.id.crowdloanFragment).isVisible = it
+        }
     }
 
     private fun isAtHomeTab(destination: NavDestination) =