Merge pull request #1757 from novasamatech/rc/9.2.0

Rc/9.2.0
novasamatech · Jan 17, 2025 · e4d1e28 · e4d1e28
2 parents 0051bd9 + 5d5f2a5
commit e4d1e28
Show file tree

Hide file tree

Showing 299 changed files with 8,564 additions and 2,561 deletions.
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/AccountNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/AccountNavigationModule.kt
@@ -2,16 +2,16 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.Navigator
-import io.novafoundation.nova.app.root.navigation.account.PolkadotVaultVariantSignCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.account.SelectAddressCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.account.SelectMultipleWalletsCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.account.SelectWalletCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.cloudBackup.ChangeBackupPasswordCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.cloudBackup.RestoreBackupPasswordCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.cloudBackup.SyncWalletsBackupPasswordCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.pincode.PinCodeTwoFactorVerificationCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.Navigator
+import io.novafoundation.nova.app.root.navigation.navigators.account.PolkadotVaultVariantSignCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.account.SelectAddressCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.account.SelectMultipleWalletsCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.account.SelectWalletCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.cloudBackup.ChangeBackupPasswordCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.cloudBackup.RestoreBackupPasswordCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.cloudBackup.SyncWalletsBackupPasswordCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.pincode.PinCodeTwoFactorVerificationCommunicatorImpl
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.common.sequrity.verification.PinCodeTwoFactorVerificationCommunicator
 import io.novafoundation.nova.feature_account_api.presenatation.mixin.selectAddress.SelectAddressCommunicator
@@ -30,34 +30,34 @@ class AccountNavigationModule {
     @Provides
     @ApplicationScope
     fun providePinCodeTwoFactorVerificationCommunicator(
-        navigationHolder: NavigationHolder
-    ): PinCodeTwoFactorVerificationCommunicator = PinCodeTwoFactorVerificationCommunicatorImpl(navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): PinCodeTwoFactorVerificationCommunicator = PinCodeTwoFactorVerificationCommunicatorImpl(navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideSelectWalletCommunicator(
-        navigationHolder: NavigationHolder
-    ): SelectWalletCommunicator = SelectWalletCommunicatorImpl(navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): SelectWalletCommunicator = SelectWalletCommunicatorImpl(navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideParitySignerCommunicator(
-        navigationHolder: NavigationHolder
-    ): PolkadotVaultVariantSignCommunicator = PolkadotVaultVariantSignCommunicatorImpl(navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): PolkadotVaultVariantSignCommunicator = PolkadotVaultVariantSignCommunicatorImpl(navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideSelectAddressCommunicator(
         router: AssetsRouter,
-        navigationHolder: NavigationHolder
-    ): SelectAddressCommunicator = SelectAddressCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): SelectAddressCommunicator = SelectAddressCommunicatorImpl(router, navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideSelectMultipleWalletsCommunicator(
         router: AssetsRouter,
-        navigationHolder: NavigationHolder
-    ): SelectMultipleWalletsCommunicator = SelectMultipleWalletsCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): SelectMultipleWalletsCommunicator = SelectMultipleWalletsCommunicatorImpl(router, navigationHoldersRegistry)
 
     @ApplicationScope
     @Provides
@@ -67,20 +67,20 @@ class AccountNavigationModule {
     @ApplicationScope
     fun providePushGovernanceSettingsCommunicator(
         router: AccountRouter,
-        navigationHolder: NavigationHolder
-    ): SyncWalletsBackupPasswordCommunicator = SyncWalletsBackupPasswordCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): SyncWalletsBackupPasswordCommunicator = SyncWalletsBackupPasswordCommunicatorImpl(router, navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideChangeBackupPasswordCommunicator(
         router: AccountRouter,
-        navigationHolder: NavigationHolder
-    ): ChangeBackupPasswordCommunicator = ChangeBackupPasswordCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): ChangeBackupPasswordCommunicator = ChangeBackupPasswordCommunicatorImpl(router, navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideRestoreBackupPasswordCommunicator(
         router: AccountRouter,
-        navigationHolder: NavigationHolder
-    ): RestoreBackupPasswordCommunicator = RestoreBackupPasswordCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): RestoreBackupPasswordCommunicator = RestoreBackupPasswordCommunicatorImpl(router, navigationHoldersRegistry)
 }
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/BuyNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/BuyNavigationModule.kt
@@ -2,8 +2,8 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.buy.BuyNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.buy.BuyNavigator
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.feature_buy_impl.presentation.BuyRouter
 
@@ -12,5 +12,6 @@ class BuyNavigationModule {
 
     @ApplicationScope
     @Provides
-    fun provideRouter(navigationHolder: NavigationHolder): BuyRouter = BuyNavigator(navigationHolder)
+    fun provideRouter(navigationHoldersRegistry: NavigationHoldersRegistry): BuyRouter =
+        BuyNavigator(navigationHoldersRegistry)
 }
diff --git a/...src/main/java/io/novafoundation/nova/app/di/app/navigation/CloudBackupNavigationModule.kt b/...src/main/java/io/novafoundation/nova/app/di/app/navigation/CloudBackupNavigationModule.kt
@@ -2,8 +2,8 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.cloudBackup.CloudBackupNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.cloudBackup.CloudBackupNavigator
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.feature_cloud_backup_impl.presentation.CloudBackupRouter
 
@@ -12,5 +12,6 @@ class CloudBackupNavigationModule {
 
     @ApplicationScope
     @Provides
-    fun provideRouter(navigationHolder: NavigationHolder): CloudBackupRouter = CloudBackupNavigator(navigationHolder)
+    fun provideRouter(navigationHoldersRegistry: NavigationHoldersRegistry): CloudBackupRouter =
+        CloudBackupNavigator(navigationHoldersRegistry)
 }
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/CurrencyNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/CurrencyNavigationModule.kt
@@ -2,8 +2,8 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.wallet.CurrencyNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.wallet.CurrencyNavigator
 import io.novafoundation.nova.app.root.presentation.RootRouter
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.feature_currency_api.presentation.CurrencyRouter
@@ -15,6 +15,6 @@ class CurrencyNavigationModule {
     @Provides
     fun provideRouter(
         rootRouter: RootRouter,
-        navigationHolder: NavigationHolder
-    ): CurrencyRouter = CurrencyNavigator(rootRouter, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry,
+    ): CurrencyRouter = CurrencyNavigator(rootRouter, navigationHoldersRegistry)
 }
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/DAppNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/DAppNavigationModule.kt
@@ -2,23 +2,25 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.dApp.DAppNavigator
-import io.novafoundation.nova.app.root.navigation.dApp.DAppSearchCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.dApp.DAppNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.dApp.DAppSearchCommunicatorImpl
 import io.novafoundation.nova.common.di.scope.ApplicationScope
-import io.novafoundation.nova.feature_dapp_impl.DAppRouter
+import io.novafoundation.nova.feature_dapp_impl.presentation.DAppRouter
 import io.novafoundation.nova.feature_dapp_impl.presentation.search.DAppSearchCommunicator
 
 @Module
 class DAppNavigationModule {
 
     @ApplicationScope
     @Provides
-    fun provideRouter(navigationHolder: NavigationHolder): DAppRouter = DAppNavigator(navigationHolder)
+    fun provideRouter(
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): DAppRouter = DAppNavigator(navigationHoldersRegistry)
 
     @ApplicationScope
     @Provides
-    fun provideSearchDappCommunicator(navigationHolder: NavigationHolder): DAppSearchCommunicator {
-        return DAppSearchCommunicatorImpl(navigationHolder)
+    fun provideSearchDappCommunicator(navigationHoldersRegistry: NavigationHoldersRegistry): DAppSearchCommunicator {
+        return DAppSearchCommunicatorImpl(navigationHoldersRegistry)
     }
 }
diff --git a/...src/main/java/io/novafoundation/nova/app/di/app/navigation/DeepLinkingNavigationModule.kt b/...src/main/java/io/novafoundation/nova/app/di/app/navigation/DeepLinkingNavigationModule.kt
@@ -2,28 +2,28 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.deepLinking.DeepLinkingNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.deepLinking.DeepLinkingNavigator
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.feature_account_impl.presentation.AccountRouter
 import io.novafoundation.nova.feature_assets.presentation.AssetsRouter
-import io.novafoundation.nova.feature_dapp_impl.DAppRouter
+import io.novafoundation.nova.feature_dapp_impl.presentation.DAppRouter
 import io.novafoundation.nova.feature_deep_linking.presentation.handling.DeepLinkingRouter
-import io.novafoundation.nova.feature_governance_impl.presentation.GovernanceRouter
 
 @Module
 class DeepLinkingNavigationModule {
 
     @ApplicationScope
     @Provides
     fun provideRouter(
+        navigationHoldersRegistry: NavigationHoldersRegistry,
         accountRouter: AccountRouter,
         assetsRouter: AssetsRouter,
-        dAppRouter: DAppRouter,
-        governanceRouter: GovernanceRouter
+        dAppRouter: DAppRouter
     ): DeepLinkingRouter = DeepLinkingNavigator(
+        navigationHoldersRegistry = navigationHoldersRegistry,
         accountRouter = accountRouter,
         assetsRouter = assetsRouter,
-        dAppRouter = dAppRouter,
-        governanceRouter = governanceRouter
+        dAppRouter = dAppRouter
     )
 }
diff --git a/...rc/main/java/io/novafoundation/nova/app/di/app/navigation/ExternalSignNavigationModule.kt b/...rc/main/java/io/novafoundation/nova/app/di/app/navigation/ExternalSignNavigationModule.kt
@@ -2,9 +2,9 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.externalSign.ExternalSignCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.externalSign.ExternalSignNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.externalSign.ExternalSignCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.externalSign.ExternalSignNavigator
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.common.utils.sequrity.AutomaticInteractionGate
 import io.novafoundation.nova.feature_external_sign_api.model.ExternalSignCommunicator
@@ -15,14 +15,15 @@ class ExternalSignNavigationModule {
 
     @ApplicationScope
     @Provides
-    fun provideRouter(navigationHolder: NavigationHolder): ExternalSignRouter = ExternalSignNavigator(navigationHolder)
+    fun provideRouter(navigationHoldersRegistry: NavigationHoldersRegistry): ExternalSignRouter =
+        ExternalSignNavigator(navigationHoldersRegistry)
 
     @ApplicationScope
     @Provides
     fun provideSignExtrinsicCommunicator(
-        navigationHolder: NavigationHolder,
+        navigationHoldersRegistry: NavigationHoldersRegistry,
         automaticInteractionGate: AutomaticInteractionGate,
     ): ExternalSignCommunicator {
-        return ExternalSignCommunicatorImpl(navigationHolder, automaticInteractionGate)
+        return ExternalSignCommunicatorImpl(navigationHoldersRegistry, automaticInteractionGate)
     }
 }
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/GovernanceNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/GovernanceNavigationModule.kt
@@ -2,12 +2,13 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.Navigator
-import io.novafoundation.nova.app.root.navigation.governance.GovernanceNavigator
-import io.novafoundation.nova.app.root.navigation.governance.SelectTracksCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.governance.TinderGovVoteCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.Navigator
+import io.novafoundation.nova.app.root.navigation.navigators.governance.GovernanceNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.governance.SelectTracksCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.governance.TinderGovVoteCommunicatorImpl
 import io.novafoundation.nova.common.di.scope.ApplicationScope
+import io.novafoundation.nova.common.resources.ContextManager
 import io.novafoundation.nova.feature_account_api.presenatation.account.wallet.list.SelectTracksCommunicator
 import io.novafoundation.nova.feature_governance_impl.presentation.GovernanceRouter
 import io.novafoundation.nova.feature_governance_impl.presentation.referenda.vote.setup.tindergov.TinderGovVoteCommunicator
@@ -18,21 +19,22 @@ class GovernanceNavigationModule {
     @ApplicationScope
     @Provides
     fun provideRouter(
-        navigationHolder: NavigationHolder,
+        navigationHoldersRegistry: NavigationHoldersRegistry,
         commonNavigator: Navigator,
-    ): GovernanceRouter = GovernanceNavigator(navigationHolder, commonNavigator)
+        contextManager: ContextManager
+    ): GovernanceRouter = GovernanceNavigator(navigationHoldersRegistry, commonNavigator, contextManager)
 
     @Provides
     @ApplicationScope
     fun provideSelectTracksCommunicator(
         router: GovernanceRouter,
-        navigationHolder: NavigationHolder
-    ): SelectTracksCommunicator = SelectTracksCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): SelectTracksCommunicator = SelectTracksCommunicatorImpl(router, navigationHoldersRegistry)
 
     @Provides
     @ApplicationScope
     fun provideTinderGovVoteCommunicator(
         router: GovernanceRouter,
-        navigationHolder: NavigationHolder
-    ): TinderGovVoteCommunicator = TinderGovVoteCommunicatorImpl(router, navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): TinderGovVoteCommunicator = TinderGovVoteCommunicatorImpl(router, navigationHoldersRegistry)
 }
diff --git a/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/LedgerNavigationModule.kt b/app/src/main/java/io/novafoundation/nova/app/di/app/navigation/LedgerNavigationModule.kt
@@ -2,10 +2,10 @@ package io.novafoundation.nova.app.di.app.navigation
 
 import dagger.Module
 import dagger.Provides
-import io.novafoundation.nova.app.root.navigation.NavigationHolder
-import io.novafoundation.nova.app.root.navigation.ledger.LedgerNavigator
-import io.novafoundation.nova.app.root.navigation.ledger.LedgerSignCommunicatorImpl
-import io.novafoundation.nova.app.root.navigation.ledger.SelectLedgerAddressCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.NavigationHoldersRegistry
+import io.novafoundation.nova.app.root.navigation.navigators.ledger.LedgerNavigator
+import io.novafoundation.nova.app.root.navigation.navigators.ledger.LedgerSignCommunicatorImpl
+import io.novafoundation.nova.app.root.navigation.navigators.ledger.SelectLedgerAddressCommunicatorImpl
 import io.novafoundation.nova.common.di.scope.ApplicationScope
 import io.novafoundation.nova.feature_account_api.presenatation.sign.LedgerSignCommunicator
 import io.novafoundation.nova.feature_account_impl.presentation.AccountRouter
@@ -17,17 +17,18 @@ class LedgerNavigationModule {
 
     @ApplicationScope
     @Provides
-    fun provideSelectLedgerAddressCommunicator(navigationHolder: NavigationHolder): SelectLedgerAddressInterScreenCommunicator {
-        return SelectLedgerAddressCommunicatorImpl(navigationHolder)
+    fun provideSelectLedgerAddressCommunicator(navigationHoldersRegistry: NavigationHoldersRegistry): SelectLedgerAddressInterScreenCommunicator {
+        return SelectLedgerAddressCommunicatorImpl(navigationHoldersRegistry)
     }
 
     @Provides
     @ApplicationScope
     fun provideLedgerSignerCommunicator(
-        navigationHolder: NavigationHolder
-    ): LedgerSignCommunicator = LedgerSignCommunicatorImpl(navigationHolder)
+        navigationHoldersRegistry: NavigationHoldersRegistry
+    ): LedgerSignCommunicator = LedgerSignCommunicatorImpl(navigationHoldersRegistry)
 
     @ApplicationScope
     @Provides
-    fun provideRouter(router: AccountRouter, navigationHolder: NavigationHolder): LedgerRouter = LedgerNavigator(router, navigationHolder)
+    fun provideRouter(router: AccountRouter, navigationHoldersRegistry: NavigationHoldersRegistry): LedgerRouter =
+        LedgerNavigator(router, navigationHoldersRegistry)
 }