-
Notifications
You must be signed in to change notification settings - Fork 394
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Refactor Receive Address module navigation
- Loading branch information
1 parent
9ad86c3
commit 11b2c08
Showing
32 changed files
with
679 additions
and
670 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
14 changes: 14 additions & 0 deletions
14
...main/java/io/horizontalsystems/bankwallet/modules/depositcex/CexDepositSharedViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package io.horizontalsystems.bankwallet.modules.depositcex | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import io.horizontalsystems.bankwallet.core.providers.CexAsset | ||
| import io.horizontalsystems.bankwallet.core.providers.CexDepositNetwork | ||
| import io.horizontalsystems.bankwallet.modules.receive.ui.UsedAddressesParams | ||
|
|
||
| class CexDepositSharedViewModel : ViewModel() { | ||
|
|
||
| var network: CexDepositNetwork? = null | ||
| var cexAsset: CexAsset? = null | ||
| var usedAddressesParams: UsedAddressesParams? = null | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 0 additions & 28 deletions
28
.../java/io/horizontalsystems/bankwallet/modules/depositcex/DepositCexChooseAssetFragment.kt
This file was deleted.
Oops, something went wrong.
146 changes: 107 additions & 39 deletions
146
app/src/main/java/io/horizontalsystems/bankwallet/modules/depositcex/DepositCexFragment.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,75 +1,143 @@ | ||
| package io.horizontalsystems.bankwallet.modules.depositcex | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Parcelable | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.platform.LocalView | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.lifecycle.viewmodel.compose.viewModel | ||
| import androidx.navigation.NavController | ||
| import androidx.navigation.compose.NavHost | ||
| import androidx.navigation.compose.rememberNavController | ||
| import androidx.navigation.navigation | ||
| import io.horizontalsystems.bankwallet.R | ||
| import io.horizontalsystems.bankwallet.core.BaseComposeFragment | ||
| import io.horizontalsystems.bankwallet.core.composablePage | ||
| import io.horizontalsystems.bankwallet.core.getInput | ||
| import io.horizontalsystems.bankwallet.core.providers.CexAsset | ||
| import io.horizontalsystems.bankwallet.core.providers.CexDepositNetwork | ||
| import io.horizontalsystems.bankwallet.core.slideFromRight | ||
| import io.horizontalsystems.bankwallet.modules.receive.address.ReceiveAddressScreen | ||
| import io.horizontalsystems.core.helpers.HudHelper | ||
| import kotlinx.parcelize.Parcelize | ||
| import io.horizontalsystems.bankwallet.modules.depositcex.ReceiveRoutes.ASSET_SELECT_SCREEN | ||
| import io.horizontalsystems.bankwallet.modules.depositcex.ReceiveRoutes.DEPOSIT_SCREEN | ||
| import io.horizontalsystems.bankwallet.modules.depositcex.ReceiveRoutes.NETWORK_SELECT_SCREEN | ||
| import io.horizontalsystems.bankwallet.modules.depositcex.ReceiveRoutes.USED_ADDRESS_SCREEN | ||
| import io.horizontalsystems.bankwallet.modules.receive.CloseWithMessage | ||
| import io.horizontalsystems.bankwallet.modules.receive.navigateBack | ||
| import io.horizontalsystems.bankwallet.modules.receive.sharedViewModel | ||
| import io.horizontalsystems.bankwallet.modules.receive.ui.ReceiveAddressScreen | ||
| import io.horizontalsystems.bankwallet.modules.receive.ui.UsedAddressScreen | ||
| import io.horizontalsystems.bankwallet.modules.receive.ui.UsedAddressesParams | ||
|
|
||
| class DepositCexFragment : BaseComposeFragment() { | ||
|
|
||
| @Parcelize | ||
| data class Input(val cexAsset: CexAsset, val network: CexDepositNetwork? = null) : Parcelable | ||
|
|
||
| @Composable | ||
| override fun GetContent(navController: NavController) { | ||
| val input = navController.getInput<Input>() | ||
| val cexAsset = input?.cexAsset | ||
| val network = input?.network | ||
| val input = navController.getInput<CexAsset>() | ||
| CexDepositScreen(input, navController) | ||
| } | ||
| } | ||
|
|
||
| if (cexAsset != null) { | ||
| val networks = cexAsset.depositNetworks | ||
| if (networks.isEmpty() || network != null || networks.size == 1) { | ||
| val viewContent = LocalContext.current | ||
| object ReceiveRoutes { | ||
| const val DEPOSIT_SCREEN = "deposit_screen" | ||
| const val ASSET_SELECT_SCREEN = "asset_select_screen" | ||
| const val NETWORK_SELECT_SCREEN = "network_select_screen" | ||
| const val USED_ADDRESS_SCREEN = "used_address_screen" | ||
| } | ||
|
|
||
| val viewModel = | ||
| viewModel<DepositAddressViewModel>(factory = DepositAddressViewModel.Factory(cexAsset, network)) | ||
| @Composable | ||
| fun CexDepositScreen( | ||
| asset: CexAsset?, | ||
| fragmentNavController: NavController | ||
| ) { | ||
| val startDestination = if (asset == null) { | ||
| ASSET_SELECT_SCREEN | ||
| } else if (asset.depositNetworks.isEmpty() || asset.depositNetworks.size == 1) { | ||
| DEPOSIT_SCREEN | ||
| } else { | ||
| NETWORK_SELECT_SCREEN | ||
| } | ||
|
|
||
| val navController = rememberNavController() | ||
|
|
||
| NavHost( | ||
| navController = navController, | ||
| startDestination = "deposit_address" | ||
| ) { | ||
| navigation( | ||
| startDestination = startDestination, | ||
| route = "deposit_address" | ||
| ) { | ||
| composablePage(DEPOSIT_SCREEN) { entry -> | ||
| val viewModel = entry.sharedViewModel<CexDepositSharedViewModel>(navController) | ||
| val cexAsset = asset ?: viewModel.cexAsset | ||
| if (cexAsset == null) { | ||
| CloseWithMessage(fragmentNavController) | ||
| return@composablePage | ||
| } | ||
|
|
||
| val addressViewModel = | ||
| viewModel<DepositAddressViewModel>(factory = DepositAddressViewModel.Factory(cexAsset, viewModel.network)) | ||
| val context = LocalContext.current | ||
|
|
||
| ReceiveAddressScreen( | ||
| title = stringResource(R.string.CexDeposit_Title, cexAsset.id), | ||
| coinName = cexAsset.name, | ||
| uiState = viewModel.uiState, | ||
| onErrorClick = { viewModel.onErrorClick() }, | ||
| setAmount = { amount -> viewModel.setAmount(amount) }, | ||
| navController = navController, | ||
| uiState = addressViewModel.uiState, | ||
| onErrorClick = { addressViewModel.onErrorClick() }, | ||
| setAmount = { amount -> addressViewModel.setAmount(amount) }, | ||
| onShareClick = { address -> | ||
| viewContent.startActivity(Intent().apply { | ||
| context.startActivity(Intent().apply { | ||
| action = Intent.ACTION_SEND | ||
| putExtra(Intent.EXTRA_TEXT, address) | ||
| type = "text/plain" | ||
| }) | ||
| }, | ||
| showUsedAddresses = { usedAddresses -> | ||
| viewModel.usedAddressesParams = UsedAddressesParams(cexAsset.name, usedAddresses) | ||
| navController.navigate(USED_ADDRESS_SCREEN) | ||
| }, | ||
| onBackPress = navigateBack(fragmentNavController, navController), | ||
| closeModule = { fragmentNavController.popBackStack() }, | ||
| ) | ||
| } else { | ||
| val navigatedFromMain = navController.previousBackStackEntry?.destination?.id == R.id.mainFragment | ||
| val navigateBack: () -> Unit = { navController.popBackStack() } | ||
| } | ||
| composablePage(USED_ADDRESS_SCREEN) { entry -> | ||
| val viewModel = entry.sharedViewModel<CexDepositSharedViewModel>(navController) | ||
| val usedAddressesParams = viewModel.usedAddressesParams | ||
| if (usedAddressesParams == null) { | ||
| CloseWithMessage(fragmentNavController) | ||
| return@composablePage | ||
| } | ||
| UsedAddressScreen(usedAddressesParams) { navController.popBackStack() } | ||
| } | ||
| composablePage(ASSET_SELECT_SCREEN) { entry -> | ||
| val viewModel = entry.sharedViewModel<CexDepositSharedViewModel>(navController) | ||
| SelectCoinScreen( | ||
| onClose = navigateBack(fragmentNavController, navController), | ||
| itemIsSuspended = { !it.depositEnabled }, | ||
| onSelectAsset = { cexAsset -> | ||
| viewModel.cexAsset = cexAsset | ||
| if (cexAsset.depositNetworks.isEmpty() || cexAsset.depositNetworks.size == 1) { | ||
| viewModel.network = cexAsset.depositNetworks.firstOrNull() | ||
| navController.navigate(DEPOSIT_SCREEN) | ||
| } else { | ||
| navController.navigate(NETWORK_SELECT_SCREEN) | ||
| } | ||
| }, | ||
| withBalance = false | ||
| ) | ||
| } | ||
| composablePage(NETWORK_SELECT_SCREEN) { entry -> | ||
| val viewModel = entry.sharedViewModel<CexDepositSharedViewModel>(navController) | ||
| val cexAsset = asset ?: viewModel.cexAsset | ||
| if (cexAsset == null) { | ||
| CloseWithMessage(fragmentNavController) | ||
| return@composablePage | ||
| } | ||
| SelectNetworkScreen( | ||
| networks = networks, | ||
| onNavigateBack = if (navigatedFromMain) null else navigateBack, | ||
| onClose = { navController.popBackStack(R.id.mainFragment, false) }, | ||
| networks = cexAsset.depositNetworks, | ||
| onNavigateBack = navigateBack(fragmentNavController, navController), | ||
| onSelectNetwork = { | ||
| navController.slideFromRight(R.id.depositCexFragment, Input(cexAsset, it)) | ||
| viewModel.network = it | ||
| navController.navigate(DEPOSIT_SCREEN) | ||
| } | ||
| ) | ||
| } | ||
|
|
||
| } else { | ||
| val view = LocalView.current | ||
| HudHelper.showErrorMessage(view, stringResource(id = R.string.Error_ParameterNotSet)) | ||
| navController.popBackStack() | ||
| } | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.