vaultwarden/keyguard-app-Bitwarden-Vaultwarden
1
0
Fork 0
mirror of https://github.com/AChep/keyguard-app.git synced 2025-02-02 15:26:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

improvement: Add a note explaining how premium subscription works

Browse Source
This commit is contained in:
Artem Chepurnoy 2024-06-12 23:58:24 +03:00
parent 3f3c7ecf92
commit e1f90ad96d
No known key found for this signature in database
GPG Key ID: FAC37D0CF674043E
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/src/commonMain/composeResources/values/strings.xml
View File

@ -1071,6 +1071,7 @@
<string name="pref_item_premium_membership_title">About Keyguard membership</string> <string name="pref_item_premium_membership_title">About Keyguard membership</string>
<string name="pref_item_premium_membership_text">The Premium unlocks extra features and funds a development of the app. Thank you for supporting us! ❤️</string> <string name="pref_item_premium_membership_text">The Premium unlocks extra features and funds a development of the app. Thank you for supporting us! ❤️</string>
<string name="pref_item_premium_membership_section_subscriptions_title">Subscriptions</string> <string name="pref_item_premium_membership_section_subscriptions_title">Subscriptions</string>
<string name="pref_item_premium_membership_section_subscriptions_note">Your subscription will renew 24 hours before it expires and your Google Play account will be automatically charged at that time. You can turn auto-renewal on or off, and you can cancel your subscription at any time on Google Play. If you've never subscribed, you may be eligible for a free trial. You won't be charged if you cancel before the end of your free trial.</string>
<string name="pref_item_premium_membership_section_products_title">Products</string> <string name="pref_item_premium_membership_section_products_title">Products</string>
<string name="pref_item_premium_membership_failed_to_load_subscriptions">Failed to load a list of subscriptions</string> <string name="pref_item_premium_membership_failed_to_load_subscriptions">Failed to load a list of subscriptions</string>
<string name="pref_item_premium_membership_failed_to_load_products">Failed to load a list of products</string> <string name="pref_item_premium_membership_failed_to_load_products">Failed to load a list of products</string>

11
common/src/commonMain/kotlin/com/artemchep/keyguard/feature/home/settings/component/SettingSubscriptions.kt
View File

@ -47,10 +47,12 @@ import com.artemchep.keyguard.ui.ExpandedIfNotEmpty
import com.artemchep.keyguard.ui.FlatItemLayout import com.artemchep.keyguard.ui.FlatItemLayout
import com.artemchep.keyguard.ui.FlatItemTextContent import com.artemchep.keyguard.ui.FlatItemTextContent
import com.artemchep.keyguard.ui.FlatSimpleNote import com.artemchep.keyguard.ui.FlatSimpleNote
import com.artemchep.keyguard.ui.MediumEmphasisAlpha
import com.artemchep.keyguard.ui.SimpleNote import com.artemchep.keyguard.ui.SimpleNote
import com.artemchep.keyguard.ui.icons.ChevronIcon import com.artemchep.keyguard.ui.icons.ChevronIcon
import com.artemchep.keyguard.ui.shimmer.shimmer import com.artemchep.keyguard.ui.shimmer.shimmer
import com.artemchep.keyguard.ui.theme.Dimens import com.artemchep.keyguard.ui.theme.Dimens
import com.artemchep.keyguard.ui.theme.combineAlpha
import org.jetbrains.compose.resources.stringResource import org.jetbrains.compose.resources.stringResource
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
@ -166,6 +168,15 @@ private fun SettingSubscriptions(
} }
}, },
) )
Text(
stringResource(Res.string.pref_item_premium_membership_section_subscriptions_note),
modifier = Modifier
.padding(top = 16.dp)
.padding(horizontal = Dimens.horizontalPadding),
style = MaterialTheme.typography.bodyMedium,
color = LocalContentColor.current
.combineAlpha(MediumEmphasisAlpha),
)
Section(text = stringResource(Res.string.pref_item_premium_membership_section_products_title)) Section(text = stringResource(Res.string.pref_item_premium_membership_section_products_title))
loadableProducts.fold( loadableProducts.fold(
ifLoading = { ifLoading = {