Skip to content

PM-38363: Add a loading ViewState to the PlanScreen #7080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
david-livefront wants to merge 1 commit into
base: main
Choose a base branch
from
Open

PM-38363: Add a loading ViewState to the PlanScreen #7080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions app/src/main/kotlin/com/x8bit/bitwarden/ui/platform/feature/premium/plan/PlanScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ import com.bitwarden.ui.platform.components.appbar.BitwardenTopAppBar
import com.bitwarden.ui.platform.components.badge.BitwardenStatusBadge
import com.bitwarden.ui.platform.components.button.BitwardenFilledButton
import com.bitwarden.ui.platform.components.button.BitwardenOutlinedButton
import com.bitwarden.ui.platform.components.button.model.BitwardenButtonData
import com.bitwarden.ui.platform.components.card.BitwardenInfoCalloutCard
import com.bitwarden.ui.platform.components.content.BitwardenContentBlock
import com.bitwarden.ui.platform.components.content.BitwardenErrorContent
import com.bitwarden.ui.platform.components.content.BitwardenLoadingContent
import com.bitwarden.ui.platform.components.content.model.ContentBlockData
import com.bitwarden.ui.platform.components.dialog.BitwardenLoadingDialog
import com.bitwarden.ui.platform.components.dialog.BitwardenTwoButtonDialog
Expand All @@ -70,6 +73,8 @@ import com.bitwarden.ui.platform.theme.BitwardenTheme
import com.bitwarden.ui.util.asText
import com.x8bit.bitwarden.data.billing.repository.model.PremiumSubscriptionStatus
import com.x8bit.bitwarden.ui.platform.composition.LocalAuthTabLaunchers
import com.x8bit.bitwarden.ui.platform.feature.premium.plan.PlanState.ViewState.Error.Type.PRICING_UNAVAILABLE
import com.x8bit.bitwarden.ui.platform.feature.premium.plan.PlanState.ViewState.Error.Type.SUBSCRIPTION
import com.x8bit.bitwarden.ui.platform.feature.premium.plan.handlers.PlanHandlers
import com.x8bit.bitwarden.ui.platform.feature.premium.plan.util.badgeColors
import com.x8bit.bitwarden.ui.platform.feature.premium.plan.util.labelRes
Expand Down Expand Up @@ -144,23 +149,47 @@ fun PlanScreen(
},
) {
when (val viewState = state.viewState) {
is PlanState.ViewState.Free.Cloud -> {
is PlanState.ViewState.Content.Free.Cloud -> {
FreeCloudContent(
viewState = viewState,
handlers = handlers,
)
}

is PlanState.ViewState.Free.SelfHosted -> {
is PlanState.ViewState.Content.Free.SelfHosted -> {
FreeSelfHostedContent()
}

is PlanState.ViewState.Premium -> {
is PlanState.ViewState.Content.Premium -> {
PremiumContent(
viewState = viewState,
handlers = handlers,
)
}

is PlanState.ViewState.Error -> {
BitwardenErrorContent(
illustrationData = IconData.Local(iconRes = BitwardenDrawable.ill_file_error),
message = viewState.message(),
buttonData = BitwardenButtonData(
label = BitwardenString.try_again.asText(),
onClick = {
when (viewState.type) {
PRICING_UNAVAILABLE -> handlers.onRetryPricingClick()
SUBSCRIPTION -> handlers.onRetrySubscriptionClick()
}
},
),
modifier = Modifier.fillMaxSize(),
)
}

is PlanState.ViewState.Loading -> {
BitwardenLoadingContent(
text = viewState.message(),
modifier = Modifier.fillMaxSize(),
)
}
}
}
}
Expand All @@ -184,18 +213,6 @@ private fun PlanDialogs(
)
}

is PlanState.DialogState.GetPricingError -> {
BitwardenTwoButtonDialog(
title = dialogState.title(),
message = dialogState.message(),
confirmButtonText = stringResource(BitwardenString.try_again),
dismissButtonText = stringResource(BitwardenString.close),
onConfirmClick = handlers.onRetryPricingClick,
onDismissClick = handlers.onClosePricingErrorClick,
onDismissRequest = handlers.onClosePricingErrorClick,
)
}

is PlanState.DialogState.WaitingForPayment -> {
BitwardenTwoButtonDialog(
title = stringResource(id = BitwardenString.payment_not_received_yet),
Expand Down Expand Up @@ -250,18 +267,6 @@ private fun PlanDialogs(
)
}

is PlanState.DialogState.SubscriptionError -> {
BitwardenTwoButtonDialog(
title = dialogState.title(),
message = dialogState.message(),
confirmButtonText = stringResource(id = BitwardenString.try_again),
dismissButtonText = stringResource(id = BitwardenString.close),
onConfirmClick = handlers.onRetrySubscriptionClick,
onDismissClick = handlers.onBackClick,
onDismissRequest = handlers.onBackClick,
)
}

PlanState.DialogState.LoadingPortal -> {
BitwardenLoadingDialog(
text = stringResource(id = BitwardenString.loading_portal),
Expand All @@ -278,7 +283,7 @@ private fun PlanDialogs(

@Composable
private fun FreeCloudContent(
viewState: PlanState.ViewState.Free.Cloud,
viewState: PlanState.ViewState.Content.Free.Cloud,
handlers: PlanHandlers,
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -504,7 +509,7 @@ private fun PriceRow(

@Composable
private fun PremiumContent(
viewState: PlanState.ViewState.Premium,
viewState: PlanState.ViewState.Content.Premium,
handlers: PlanHandlers,
modifier: Modifier = Modifier,
) {
Expand Down Expand Up @@ -571,7 +576,7 @@ private fun PremiumContent(

@Composable
private fun SubscriptionCard(
viewState: PlanState.ViewState.Premium,
viewState: PlanState.ViewState.Content.Premium,
modifier: Modifier = Modifier,
) {
Column(
Expand Down Expand Up @@ -607,7 +612,7 @@ private fun SubscriptionCard(

@Composable
private fun SubscriptionLineItems(
viewState: PlanState.ViewState.Premium,
viewState: PlanState.ViewState.Content.Premium,
) {
val rowModifier = Modifier
.fillMaxWidth()
Expand Down Expand Up @@ -827,7 +832,7 @@ private fun PlanScreenFreeCloudAccount_preview() {
BitwardenTheme {
BitwardenScaffold {
FreeCloudContent(
viewState = PlanState.ViewState.Free.Cloud(
viewState = PlanState.ViewState.Content.Free.Cloud(
rate = "$1.67",
checkoutUrl = null,
isAwaitingPremiumStatus = false,
Expand Down Expand Up @@ -875,7 +880,7 @@ private fun PlanScreenPremiumAccount_preview() {
BitwardenTheme {
BitwardenScaffold {
PremiumContent(
viewState = PlanState.ViewState.Premium(
viewState = PlanState.ViewState.Content.Premium(
status = PremiumSubscriptionStatus.ACTIVE,
billingAmountText = BitwardenString.billing_rate_per_year.asText("$19.80"),
storageCostText = "$24.00",
Expand Down Expand Up @@ -917,7 +922,7 @@ private fun PlanScreenPremiumAccountZeroState_preview() {
BitwardenTheme {
BitwardenScaffold {
PremiumContent(
viewState = PlanState.ViewState.Premium(
viewState = PlanState.ViewState.Content.Premium(
status = PremiumSubscriptionStatus.ACTIVE,
billingAmountText = BitwardenString.billing_rate_per_year.asText("$19.80"),
storageCostText = null,
Expand Down
Loading
Loading