ALTAPPS-1303: Shared, Android mobile content trial

androidHyperskillApp/src/main/java/org/hyperskill/app/android/paywall/ui/PaywallContent.kt

@@ -1,6 +1,5 @@
 package org.hyperskill.app.android.paywall.ui
 
-import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -31,17 +30,14 @@ import androidx.compose.ui.unit.sp
 import org.hyperskill.app.R
 import org.hyperskill.app.android.core.extensions.compose.plus
 import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillButton
-import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillButtonDefaults
 import org.hyperskill.app.android.core.view.ui.widget.compose.HyperskillTheme
 
 @Composable
 fun PaywallContent(
     buyButtonText: String,
     priceText: String?,
-    isContinueWithLimitsButtonVisible: Boolean,
     onTermsOfServiceClick: () -> Unit,
     onBuySubscriptionClick: () -> Unit,
-    onContinueWithLimitsClick: () -> Unit,
     modifier: Modifier = Modifier,
     padding: PaddingValues = PaddingValues()
 ) {
@@ -58,8 +54,7 @@ fun PaywallContent(
             Image(
                 painter = painterResource(id = org.hyperskill.app.android.R.drawable.img_paywall),
                 contentDescription = null,
-                modifier = Modifier
-                    .align(Alignment.CenterHorizontally)
+                modifier = Modifier.align(Alignment.CenterHorizontally)
             )
             Spacer(modifier = Modifier.height(24.dp))
             Text(
@@ -81,10 +76,6 @@ fun PaywallContent(
             ) {
                 Text(text = buyButtonText)
             }
-            Spacer(modifier = Modifier.height(8.dp))
-            if (isContinueWithLimitsButtonVisible) {
-                ContinueButton(onClick = onContinueWithLimitsClick)
-            }
             Spacer(modifier = Modifier.height(20.dp))
             TermsOfService(
                 modifier = Modifier
@@ -116,24 +107,6 @@ private fun SubscriptionPrice(
     }
 }
 
-@Composable
-private fun ContinueButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier
-) {
-    HyperskillButton(
-        onClick = onClick,
-        colors = HyperskillButtonDefaults.buttonColors(colorResource(id = R.color.layer_1)),
-        border = BorderStroke(1.dp, colorResource(id = R.color.button_tertiary)),
-        modifier = modifier.fillMaxWidth()
-    ) {
-        Text(
-            text = stringResource(id = R.string.paywall_mobile_only_continue_btn),
-            color = colorResource(id = R.color.button_tertiary)
-        )
-    }
-}
-
 @Composable
 private fun TermsOfService(
     modifier: Modifier = Modifier
@@ -153,11 +126,9 @@ fun PaywallContentPreview() {
     HyperskillTheme {
         PaywallContent(
             buyButtonText = PaywallPreviewDefaults.BUY_BUTTON_TEXT,
-            isContinueWithLimitsButtonVisible = true,
             priceText = PaywallPreviewDefaults.PRICE_TEXT,
             onTermsOfServiceClick = {},
-            onBuySubscriptionClick = {},
-            onContinueWithLimitsClick = {}
+            onBuySubscriptionClick = {}
         )
     }
 }

androidHyperskillApp/src/main/java/org/hyperskill/app/android/paywall/ui/PaywallScreen.kt

@@ -1,26 +1,37 @@
 package org.hyperskill.app.android.paywall.ui
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.consumeWindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.safeDrawing
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.layout.windowInsetsPadding
+import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.composed
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import org.hyperskill.app.R
 import org.hyperskill.app.android.core.extensions.findActivity
@@ -52,93 +63,142 @@ fun PaywallScreen(
                 viewModel.onBuySubscriptionClick(activity)
             }
         },
-        onContinueWithLimitsClick = viewModel::onContinueWithLimitsClick,
+        onCloseClick = viewModel::onCloseClick,
         onRetryLoadingClick = viewModel::onRetryLoadingClicked,
         onTermsOfServiceClick = viewModel::onTermsOfServiceClick
     )
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 fun PaywallScreen(
     viewState: ViewState,
     onBackClick: () -> Unit,
     onBuySubscriptionClick: () -> Unit,
-    onContinueWithLimitsClick: () -> Unit,
+    onCloseClick: () -> Unit,
     onRetryLoadingClick: () -> Unit,
     onTermsOfServiceClick: () -> Unit
+) {
+    PaywallScaffold(
+        isToolbarVisible = viewState.isToolbarVisible,
+        onBackClick = onBackClick,
+        onCloseClick = onCloseClick
+    ) { padding ->
+        val insets = WindowInsets.safeDrawing
+        when (val contentState = viewState.contentState) {
+            ViewStateContent.Idle -> {
+                // no op
+            }
+            ViewStateContent.Loading -> {
+                HyperskillProgressBar(
+                    modifier = Modifier
+                        .align(Alignment.Center)
+                )
+            }
+            ViewStateContent.Error ->
+                ScreenDataLoadingError(
+                    errorMessage = stringResource(id = R.string.paywall_placeholder_error_description),
+                    modifier = Modifier
+                        .background(PaywallDefaults.BackgroundColor)
+                        .windowInsetsPadding(insets)
+                ) {
+                    onRetryLoadingClick()
+                }
+            is ViewStateContent.Content ->
+                PaywallContent(
+                    buyButtonText = contentState.buyButtonText,
+                    priceText = contentState.priceText,
+                    onBuySubscriptionClick = onBuySubscriptionClick,
+                    onTermsOfServiceClick = onTermsOfServiceClick,
+                    padding = padding
+                )
+            ViewStateContent.SubscriptionSyncLoading ->
+                SubscriptionSyncLoading(
+                    modifier = Modifier.windowInsetsPadding(insets)
+                )
+        }
+    }
+}
+
+@Composable
+private fun PaywallScaffold(
+    isToolbarVisible: Boolean,
+    onBackClick: () -> Unit,
+    onCloseClick: () -> Unit,
+    modifier: Modifier = Modifier,
+    content: @Composable BoxScope.(PaddingValues) -> Unit
 ) {
     Scaffold(
         topBar = {
-            if (viewState.isToolbarVisible) {
+            if (isToolbarVisible) {
                 HyperskillTopAppBar(
                     title = stringResource(id = R.string.paywall_screen_title),
                     onNavigationIconClick = onBackClick,
                     backgroundColor = PaywallDefaults.BackgroundColor,
                 )
             }
-        }
+        },
+        modifier = modifier
     ) { padding ->
-        Box(
+        Column(
             modifier = Modifier
                 .fillMaxSize()
                 .background(PaywallDefaults.BackgroundColor)
-                .consumeStatusBarInsets(viewState.isToolbarVisible)
         ) {
-            val insets = WindowInsets.safeDrawing
-            when (val contentState = viewState.contentState) {
-                ViewStateContent.Idle -> {
-                    // no op
-                }
-                ViewStateContent.Loading -> {
-                    HyperskillProgressBar(
-                        modifier = Modifier.align(Alignment.Center)
-                    )
-                }
-                ViewStateContent.Error ->
-                    ScreenDataLoadingError(
-                        errorMessage = stringResource(id = R.string.paywall_placeholder_error_description),
-                        modifier = Modifier
-                            .background(PaywallDefaults.BackgroundColor)
-                            .windowInsetsPadding(insets)
-                    ) {
-                        onRetryLoadingClick()
-                    }
-                is ViewStateContent.Content ->
-                    PaywallContent(
-                        buyButtonText = contentState.buyButtonText,
-                        isContinueWithLimitsButtonVisible = contentState.isContinueWithLimitsButtonVisible,
-                        priceText = contentState.priceText,
-                        onBuySubscriptionClick = onBuySubscriptionClick,
-                        onContinueWithLimitsClick = onContinueWithLimitsClick,
-                        onTermsOfServiceClick = onTermsOfServiceClick,
-                        padding = padding
-                    )
-                ViewStateContent.SubscriptionSyncLoading ->
-                    SubscriptionSyncLoading(
-                        modifier = Modifier.windowInsetsPadding(insets)
-                    )
+            if (!isToolbarVisible) {
+                CloseButton(
+                    onClick = onCloseClick,
+                    modifier = Modifier
+                        .align(Alignment.End)
+                        .padding(12.dp)
+                        .windowInsetsPadding(WindowInsets.statusBars)
+                )
             }
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .fillMaxWidth()
+                    .consumeStatusBarInsets(isToolbarVisible),
+                content = {
+                    content(padding)
+                }
+            )
         }
     }
 }
 
+@Composable
+private fun CloseButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit
+) {
+    Box(
+        modifier = modifier
+            .requiredSize(32.dp)
+            .clip(CircleShape)
+            .clickable(onClick = onClick)
+    ) {
+        Image(
+            painter = painterResource(id = org.hyperskill.app.android.R.drawable.ic_close_topic_completed),
+            contentDescription = null,
+            modifier = Modifier.align(Alignment.Center)
+        )
+    }
+}
+
 private class PaywallPreviewProvider : PreviewParameterProvider<ViewState> {
     override val values: Sequence<ViewState>
         get() = sequenceOf(
             ViewState(
                 isToolbarVisible = true,
                 contentState = ViewStateContent.Content(
                     buyButtonText = PaywallPreviewDefaults.BUY_BUTTON_TEXT,
-                    isContinueWithLimitsButtonVisible = false,
                     priceText = "$11.99 / month"
                 )
             ),
             ViewState(
                 isToolbarVisible = false,
                 contentState = ViewStateContent.Content(
                     buyButtonText = PaywallPreviewDefaults.BUY_BUTTON_TEXT,
-                    isContinueWithLimitsButtonVisible = true,
                     priceText = PaywallPreviewDefaults.PRICE_TEXT
                 )
             ),
@@ -176,7 +236,7 @@ fun PaywallScreenPreview(
             viewState = viewState,
             onBackClick = {},
             onBuySubscriptionClick = {},
-            onContinueWithLimitsClick = {},
+            onCloseClick = {},
             onRetryLoadingClick = {},
             onTermsOfServiceClick = {}
         )

androidHyperskillApp/src/main/java/org/hyperskill/app/android/paywall/ui/SubscriptionDetails.kt

@@ -30,6 +30,7 @@ fun SubscriptionDetails(
         SubscriptionOption(text = stringResource(id = SharedR.string.mobile_only_subscription_feature_1))
         SubscriptionOption(text = stringResource(id = SharedR.string.mobile_only_subscription_feature_2))
         SubscriptionOption(text = stringResource(id = SharedR.string.mobile_only_subscription_feature_3))
+        SubscriptionOption(text = stringResource(id = SharedR.string.mobile_only_subscription_feature_4))
     }
 }
 

androidHyperskillApp/src/main/java/org/hyperskill/app/android/stage_implementation/fragment/StageStepWrapperFragment.kt

@@ -17,6 +17,7 @@ import org.hyperskill.app.android.core.view.ui.fragment.setChildFragment
 import org.hyperskill.app.android.core.view.ui.navigation.requireRouter
 import org.hyperskill.app.android.databinding.FragmentStageStepWrapperBinding
 import org.hyperskill.app.android.main.view.ui.navigation.MainScreenRouter
+import org.hyperskill.app.android.paywall.navigation.PaywallScreen
 import org.hyperskill.app.android.share_streak.fragment.ShareStreakDialogFragment
 import org.hyperskill.app.android.stage_implementation.delegate.StageStepMenuDelegate
 import org.hyperskill.app.android.step.view.delegate.StepDelegate
@@ -32,6 +33,7 @@ import org.hyperskill.app.step.domain.model.StepRoute
 import org.hyperskill.app.step.presentation.StepFeature
 import org.hyperskill.app.step.presentation.StepViewModel
 import org.hyperskill.app.step_completion.presentation.StepCompletionFeature
+import org.hyperskill.app.topic_completed_modal.presentation.TopicCompletedModalFeature
 import ru.nobird.android.view.base.ui.delegate.ViewStateDelegate
 import ru.nobird.android.view.base.ui.extension.argument
 import ru.nobird.android.view.redux.ui.extension.reduxViewModel
@@ -207,12 +209,15 @@ class StageStepWrapperFragment :
         stepViewModel.onRefuseStreakSharingClick(streak)
     }
 
-    override fun navigateToStudyPlan() {
-        onNewMessage(StepCompletionFeature.Message.TopicCompletedModalGoToStudyPlanClicked)
-    }
-
-    override fun navigateToNextTopic() {
-        onNewMessage(StepCompletionFeature.Message.TopicCompletedModalContinueNextTopicClicked)
+    override fun navigateTo(destination: TopicCompletedModalFeature.Action.ViewAction.NavigateTo) {
+        when (destination) {
+            TopicCompletedModalFeature.Action.ViewAction.NavigateTo.NextTopic ->
+                onNewMessage(StepCompletionFeature.Message.TopicCompletedModalContinueNextTopicClicked)
+            TopicCompletedModalFeature.Action.ViewAction.NavigateTo.StudyPlan ->
+                onNewMessage(StepCompletionFeature.Message.TopicCompletedModalGoToStudyPlanClicked)
+            is TopicCompletedModalFeature.Action.ViewAction.NavigateTo.Paywall ->
+                requireRouter().navigateTo(PaywallScreen(destination.paywallTransitionSource))
+        }
     }
 
     override fun fullScrollDown() {