diff --git a/app/src/main/java/eu/darken/capod/common/settings/SettingsBaseItem.kt b/app/src/main/java/eu/darken/capod/common/settings/SettingsBaseItem.kt index a1ef72be..9b9fa091 100644 --- a/app/src/main/java/eu/darken/capod/common/settings/SettingsBaseItem.kt +++ b/app/src/main/java/eu/darken/capod/common/settings/SettingsBaseItem.kt @@ -38,7 +38,7 @@ fun SettingsBaseItem( iconSize: Dp = 24.dp, subtitle: String? = null, enabled: Boolean = true, - proLocked: Boolean = false, + requiresUpgrade: Boolean = false, onLongClick: (() -> Unit)? = null, trailingContent: @Composable (() -> Unit)? = null, ) { @@ -97,9 +97,9 @@ fun SettingsBaseItem( fontWeight = FontWeight.Normal, color = MaterialTheme.colorScheme.onSurface.copy(alpha = contentAlpha) ) - if (proLocked) { + if (requiresUpgrade) { Spacer(modifier = Modifier.width(6.dp)) - ProBadge() + UpgradeBadge() } } if (subtitle != null) { diff --git a/app/src/main/java/eu/darken/capod/common/settings/SettingsListPreferenceItem.kt b/app/src/main/java/eu/darken/capod/common/settings/SettingsListPreferenceItem.kt index 6aad1e42..93cd3b87 100644 --- a/app/src/main/java/eu/darken/capod/common/settings/SettingsListPreferenceItem.kt +++ b/app/src/main/java/eu/darken/capod/common/settings/SettingsListPreferenceItem.kt @@ -38,7 +38,7 @@ fun SettingsListPreferenceItem( modifier: Modifier = Modifier, subtitle: String? = null, enabled: Boolean = true, - proLocked: Boolean = false, + requiresUpgrade: Boolean = false, ) { var showDialog by remember { mutableStateOf(false) } @@ -49,7 +49,7 @@ fun SettingsListPreferenceItem( onClick = { if (enabled) showDialog = true }, modifier = modifier, enabled = enabled, - proLocked = proLocked, + requiresUpgrade = requiresUpgrade, ) if (showDialog) { diff --git a/app/src/main/java/eu/darken/capod/common/settings/SettingsPreferenceItem.kt b/app/src/main/java/eu/darken/capod/common/settings/SettingsPreferenceItem.kt index a91e75fc..7d42784a 100644 --- a/app/src/main/java/eu/darken/capod/common/settings/SettingsPreferenceItem.kt +++ b/app/src/main/java/eu/darken/capod/common/settings/SettingsPreferenceItem.kt @@ -17,7 +17,7 @@ fun SettingsPreferenceItem( subtitle: String? = null, value: String? = null, enabled: Boolean = true, - proLocked: Boolean = false, + requiresUpgrade: Boolean = false, ) { val contentAlpha = if (enabled) 1f else 0.5f @@ -28,7 +28,7 @@ fun SettingsPreferenceItem( modifier = modifier, subtitle = subtitle, enabled = enabled, - proLocked = proLocked, + requiresUpgrade = requiresUpgrade, trailingContent = if (value != null) { { Text( diff --git a/app/src/main/java/eu/darken/capod/common/settings/SettingsSwitchItem.kt b/app/src/main/java/eu/darken/capod/common/settings/SettingsSwitchItem.kt index 79cd2b33..e474af16 100644 --- a/app/src/main/java/eu/darken/capod/common/settings/SettingsSwitchItem.kt +++ b/app/src/main/java/eu/darken/capod/common/settings/SettingsSwitchItem.kt @@ -20,7 +20,7 @@ fun SettingsSwitchItem( onCheckedChange: (Boolean) -> Unit, modifier: Modifier = Modifier, enabled: Boolean = true, - proLocked: Boolean = false, + requiresUpgrade: Boolean = false, ) { SettingsBaseItem( icon = icon, @@ -29,7 +29,7 @@ fun SettingsSwitchItem( modifier = modifier, subtitle = subtitle, enabled = enabled, - proLocked = proLocked, + requiresUpgrade = requiresUpgrade, trailingContent = { Switch( checked = checked, diff --git a/app/src/main/java/eu/darken/capod/common/settings/ProBadge.kt b/app/src/main/java/eu/darken/capod/common/settings/UpgradeBadge.kt similarity index 78% rename from app/src/main/java/eu/darken/capod/common/settings/ProBadge.kt rename to app/src/main/java/eu/darken/capod/common/settings/UpgradeBadge.kt index b3f83fc5..b6541da4 100644 --- a/app/src/main/java/eu/darken/capod/common/settings/ProBadge.kt +++ b/app/src/main/java/eu/darken/capod/common/settings/UpgradeBadge.kt @@ -14,10 +14,10 @@ import eu.darken.capod.common.compose.Preview2 import eu.darken.capod.common.compose.PreviewWrapper @Composable -fun ProBadge(modifier: Modifier = Modifier) { +fun UpgradeBadge(modifier: Modifier = Modifier) { Icon( imageVector = Icons.TwoTone.Stars, - contentDescription = stringResource(R.string.overview_anc_mode_requires_upgrade), + contentDescription = stringResource(R.string.common_upgrade_required_label), tint = MaterialTheme.colorScheme.primary, modifier = modifier.size(16.dp), ) @@ -25,6 +25,6 @@ fun ProBadge(modifier: Modifier = Modifier) { @Preview2 @Composable -private fun ProBadgePreview() = PreviewWrapper { - ProBadge() +private fun UpgradeBadgePreview() = PreviewWrapper { + UpgradeBadge() } diff --git a/app/src/main/java/eu/darken/capod/main/ui/devicesettings/DeviceSettingsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/devicesettings/DeviceSettingsScreen.kt index 2a2be592..278f51db 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/devicesettings/DeviceSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/devicesettings/DeviceSettingsScreen.kt @@ -288,7 +288,7 @@ fun DeviceSettingsScreen( title = stringResource(R.string.device_settings_listening_mode_cycle_label), subtitle = stringResource(R.string.device_settings_listening_mode_cycle_description), onClick = onUpgrade, - proLocked = true, + requiresUpgrade = true, ) } } @@ -480,7 +480,7 @@ fun DeviceSettingsScreen( subtitle = stringResource(R.string.stem_actions_nav_description), onClick = onStemActionsClick, enabled = enabled, - proLocked = !isPro, + requiresUpgrade = !isPro, ) } } @@ -516,7 +516,7 @@ fun DeviceSettingsScreen( checked = sleepDet.enabled, onCheckedChange = onSleepDetectionChange, enabled = enabled, - proLocked = !isPro, + requiresUpgrade = !isPro, ) } } diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt index 12086cad..8d0dc0c0 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsScreen.kt @@ -165,7 +165,7 @@ fun GeneralSettingsScreen( title = stringResource(R.string.ui_theme_mode_label), subtitle = stringResource(state.themeState.mode.labelRes), onClick = onUpgrade, - proLocked = true, + requiresUpgrade = true, ) } } @@ -185,7 +185,7 @@ fun GeneralSettingsScreen( title = stringResource(R.string.ui_theme_style_label), subtitle = stringResource(state.themeState.style.labelRes), onClick = onUpgrade, - proLocked = true, + requiresUpgrade = true, ) } } @@ -202,7 +202,7 @@ fun GeneralSettingsScreen( if (!state.isPro) onUpgrade() else showColorDialog = true }, enabled = !isMaterialYouActive, - proLocked = !state.isPro && !isMaterialYouActive, + requiresUpgrade = !state.isPro && !isMaterialYouActive, ) } item { diff --git a/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt b/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt index 541b02b8..e8303752 100644 --- a/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt +++ b/app/src/main/java/eu/darken/capod/reaction/ui/ReactionSettingsScreen.kt @@ -127,7 +127,7 @@ fun ReactionSettingsScreen( subtitle = stringResource(R.string.settings_autoplay_description), checked = state.autoPlay, onCheckedChange = onAutoPlayChanged, - proLocked = !state.isPro, + requiresUpgrade = !state.isPro, ) } item { @@ -137,7 +137,7 @@ fun ReactionSettingsScreen( subtitle = stringResource(R.string.settings_autopause_description), checked = state.autoPause, onCheckedChange = onAutoPauseChanged, - proLocked = !state.isPro, + requiresUpgrade = !state.isPro, ) } item { @@ -159,7 +159,7 @@ fun ReactionSettingsScreen( subtitle = stringResource(R.string.settings_autoconnect_description), checked = state.autoConnect, onCheckedChange = onAutoConnectChanged, - proLocked = !state.isPro, + requiresUpgrade = !state.isPro, ) } item { @@ -181,7 +181,7 @@ fun ReactionSettingsScreen( subtitle = stringResource(R.string.settings_popup_caseopen_description), checked = state.showPopUpOnCaseOpen, onCheckedChange = onShowPopUpOnCaseOpenChanged, - proLocked = !state.isPro, + requiresUpgrade = !state.isPro, ) } item { @@ -191,7 +191,7 @@ fun ReactionSettingsScreen( subtitle = stringResource(R.string.settings_popup_connected_description), checked = state.showPopUpOnConnection, onCheckedChange = onShowPopUpOnConnectionChanged, - proLocked = !state.isPro, + requiresUpgrade = !state.isPro, ) } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c038f069..d9f0d2ca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ Thank you Upgrade Upgrade to unlock. + Requires upgrade Donate Check Close