Skip to content

Pro: show hero copy in every Pro status, not just never-subscribed and the sheet #2163

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
mpretty-cyro wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Pro: show hero copy in every Pro status, not just never-subscribed and the sheet #2163

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
31 changes: 18 additions & 13 deletions ...src/main/java/org/thoughtcrime/securesms/preferences/prosettings/ProSettingsHomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,21 +208,26 @@ fun ProSettingsHome(
}
}
) {
// Header for non-pro users or expired users in sheet mode
if(subscriptionType is ProStatus.NeverSubscribed || expiredInSheet) {
if(data.proDataState.refreshState !is State.Success){
Spacer(Modifier.height(LocalDimensions.current.contentSpacing))
}
val headerText = when(subscriptionType) {
is ProStatus.NeverSubscribed -> R.string.proFullestPotential
is ProStatus.Expired -> R.string.proAccessRenewStart
is ProStatus.Active -> R.string.proThanksForSupporting
}

Text(
text = if(expiredInSheet) Phrase.from(context.getText(R.string.proAccessRenewStart))
.format().toString()
else Phrase.from(context.getText(R.string.proFullestPotential))
.format().toString(),
style = LocalType.current.base,
textAlign = TextAlign.Center,
)
if(data.proDataState.refreshState !is State.Success){
Spacer(Modifier.height(LocalDimensions.current.contentSpacing))
}

Text(
text = Phrase.from(context.getText(headerText))
.format().toString(),
style = LocalType.current.base,
textAlign = TextAlign.Center,
)

// The Continue CTA belongs only where upgrading is what the screen is for — the expired
// main screen offers renewal through ProManage below instead.
if(subscriptionType is ProStatus.NeverSubscribed || expiredInSheet) {
Spacer(Modifier.height(LocalDimensions.current.spacing))

Box {
Expand Down
Loading