Apply new design to buy subscription module

horizontalsystems · Dec 26, 2024 · 73f98e1 · 73f98e1
1 parent 5538bbb
commit 73f98e1
Show file tree

Hide file tree

Showing 23 changed files with 1,009 additions and 1,015 deletions.
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/Extensions.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/Extensions.kt
@@ -191,10 +191,12 @@ fun NavGraphBuilder.composablePage(
 
 fun NavGraphBuilder.composablePopup(
     route: String,
+    arguments: List<NamedNavArgument> = emptyList(),
     content: @Composable AnimatedVisibilityScope.(NavBackStackEntry) -> Unit
 ) {
     composable(
         route,
+        arguments = arguments,
         enterTransition = {
             slideIntoContainer(
                 AnimatedContentTransitionScope.SlideDirection.Up,

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/core/NavController.kt b/app/src/main/java/io/horizontalsystems/bankwallet/core/NavController.kt
@@ -61,7 +61,7 @@ fun NavController.paidAction(paidAction: IPaidAction, block: () -> Unit) {
     if (UserSubscriptionManager.isActionAllowed(paidAction)) {
         block.invoke()
     } else {
-        slideFromRightForResult<BuySubscriptionFragment.Result>(
+        slideFromBottomForResult<BuySubscriptionFragment.Result>(
             R.id.buySubscriptionFragment,
             BuySubscriptionFragment.Input(paidAction)
         ) {

diff --git a/...in/java/io/horizontalsystems/bankwallet/modules/market/favorites/MarketSignalsFragment.kt b/...in/java/io/horizontalsystems/bankwallet/modules/market/favorites/MarketSignalsFragment.kt
@@ -37,7 +37,7 @@ import io.horizontalsystems.bankwallet.ui.compose.components.VSpacer
 import io.horizontalsystems.bankwallet.ui.compose.components.sectionItemBorder
 import io.horizontalsystems.bankwallet.ui.compose.components.subhead2_leah
 import io.horizontalsystems.marketkit.models.Analytics.TechnicalAdvice.Advice
-import io.horizontalsystems.subscriptions.core.EnableWatchlistSignals
+import io.horizontalsystems.subscriptions.core.TradeSignals
 import kotlinx.parcelize.Parcelize
 
 class MarketSignalsFragment : BaseComposeFragment() {
@@ -130,7 +130,7 @@ fun MarketSignalsScreen(navController: NavController) {
                         .padding(start = 16.dp, end = 16.dp),
                     title = stringResource(R.string.Market_Signal_TurnOn),
                     onClick = {
-                        navController.paidAction(EnableWatchlistSignals) {
+                        navController.paidAction(TradeSignals) {
                             navController.setNavigationResultX(MarketSignalsFragment.Result(true))
                             navController.popBackStack()
                         }

diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/premium/PremiumFragment.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/premium/PremiumFragment.kt
diff --git a/app/src/main/java/io/horizontalsystems/bankwallet/modules/premium/PremiumUiElements.kg.kt b/app/src/main/java/io/horizontalsystems/bankwallet/modules/premium/PremiumUiElements.kg.kt