feat(billing): add font for billing screen, add animation

This commit is contained in:
Nishant Mishra
2025-10-27 12:13:53 +05:30
parent 16b4a9f125
commit 86bb382f4b
5 changed files with 16 additions and 5 deletions

View File

@@ -23,6 +23,8 @@ import androidx.compose.animation.Crossfade
import androidx.compose.animation.SharedTransitionLayout import androidx.compose.animation.SharedTransitionLayout
import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.animation.togetherWith import androidx.compose.animation.togetherWith
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.calculateEndPadding import androidx.compose.foundation.layout.calculateEndPadding
@@ -246,5 +248,12 @@ fun AppScreen(
) )
} }
} }
if (showPaywall) TomatoPlusPaywallDialog(isPlus = isPlus) { showPaywall = false }
AnimatedVisibility(
showPaywall,
enter = slideInVertically { it },
exit = slideOutVertically { it }
) {
TomatoPlusPaywallDialog(isPlus = isPlus) { showPaywall = false }
}
} }

View File

@@ -233,7 +233,7 @@ private fun SettingsScreen(
) { ) {
item { Spacer(Modifier.height(12.dp)) } item { Spacer(Modifier.height(12.dp)) }
if (!isPlus) item { item {
Row( Row(
verticalAlignment = Alignment.CenterVertically, verticalAlignment = Alignment.CenterVertically,
modifier = Modifier modifier = Modifier
@@ -251,7 +251,8 @@ private fun SettingsScreen(
) )
Spacer(Modifier.width(8.dp)) Spacer(Modifier.width(8.dp))
Text( Text(
"Get Tomato+", if (!isPlus) stringResource(R.string.get_plus)
else stringResource(R.string.app_name_plus),
style = typography.titleLarge, style = typography.titleLarge,
fontFamily = robotoFlexTopBar, fontFamily = robotoFlexTopBar,
color = colorScheme.onPrimary color = colorScheme.onPrimary

View File

@@ -81,4 +81,6 @@
<string name="sound">Sound</string> <string name="sound">Sound</string>
<string name="dnd">Do Not Disturb</string> <string name="dnd">Do Not Disturb</string>
<string name="dnd_desc">Turn on DND when running a Focus timer</string> <string name="dnd_desc">Turn on DND when running a Focus timer</string>
<string name="app_name_plus">Tomato+</string>
<string name="get_plus">Get Tomato+</string>
</resources> </resources>

View File

@@ -37,8 +37,7 @@ fun TomatoPlusPaywallDialog(
onDismiss: () -> Unit onDismiss: () -> Unit
) { ) {
val paywallOptions = remember { val paywallOptions = remember {
PaywallOptions.Builder(dismissRequest = onDismiss) PaywallOptions.Builder(dismissRequest = onDismiss).build()
.build()
} }
Scaffold { innerPadding -> Scaffold { innerPadding ->

View File