diff --git a/CHANGELOG.md b/CHANGELOG.md index d1794945..96c86541 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2 ## [Unreleased] +### Added +- Flexa feature has been turned on +- Disclaimer added to integrations screen + ## [1.2.2 (789)] - 2024-11-18 ### Added diff --git a/docs/whatsNew/WHATS_NEW_EN.md b/docs/whatsNew/WHATS_NEW_EN.md index 62e48850..29f10852 100644 --- a/docs/whatsNew/WHATS_NEW_EN.md +++ b/docs/whatsNew/WHATS_NEW_EN.md @@ -9,6 +9,10 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +### Added +- Flexa feature has been turned on +- Disclaimer added to integrations screen + ## [1.2.2 (789)] - 2024-11-18 ### Added diff --git a/docs/whatsNew/WHATS_NEW_ES.md b/docs/whatsNew/WHATS_NEW_ES.md index f07fff97..662c4643 100644 --- a/docs/whatsNew/WHATS_NEW_ES.md +++ b/docs/whatsNew/WHATS_NEW_ES.md @@ -9,6 +9,10 @@ directly impact users rather than highlighting other key architectural updates.* ## [Unreleased] +### Added +- Flexa feature has been turned on +- Disclaimer added to integrations screen + ## [1.2.2 (789)] - 2024-11-18 ### Agregado diff --git a/gradle.properties b/gradle.properties index 1c0c70f0..053a4d39 100644 --- a/gradle.properties +++ b/gradle.properties @@ -217,7 +217,7 @@ ZXING_VERSION=3.5.3 ZIP_321_VERSION = 0.0.6 ZCASH_BIP39_VERSION=1.0.8 -FLEXA_VERSION=1.0.5 +FLEXA_VERSION=1.0.6 # WARNING: Ensure a non-snapshot version is used before releasing to production ZCASH_SDK_VERSION=2.2.6 diff --git a/maven/com/flexa/core/1.0.5/core-1.0.5.aar b/maven/com/flexa/core/1.0.5/core-1.0.5.aar deleted file mode 100644 index 5ffeeb91..00000000 Binary files a/maven/com/flexa/core/1.0.5/core-1.0.5.aar and /dev/null differ diff --git a/maven/com/flexa/core/1.0.6/core-1.0.6.aar b/maven/com/flexa/core/1.0.6/core-1.0.6.aar new file mode 100644 index 00000000..fb024c59 Binary files /dev/null and b/maven/com/flexa/core/1.0.6/core-1.0.6.aar differ diff --git a/maven/com/flexa/core/1.0.5/core-1.0.5.pom b/maven/com/flexa/core/1.0.6/core-1.0.6.pom similarity index 99% rename from maven/com/flexa/core/1.0.5/core-1.0.5.pom rename to maven/com/flexa/core/1.0.6/core-1.0.6.pom index b233e8e4..6938242d 100644 --- a/maven/com/flexa/core/1.0.5/core-1.0.5.pom +++ b/maven/com/flexa/core/1.0.6/core-1.0.6.pom @@ -3,7 +3,7 @@ 4.0.0 com.flexa core - 1.0.5 + 1.0.6 aar diff --git a/maven/com/flexa/core/maven-metadata-local.xml b/maven/com/flexa/core/maven-metadata-local.xml index 83c6ba6b..f30e6428 100644 --- a/maven/com/flexa/core/maven-metadata-local.xml +++ b/maven/com/flexa/core/maven-metadata-local.xml @@ -3,11 +3,11 @@ com.flexa core - 1.0.5 - 1.0.5 + 1.0.6 + 1.0.6 - 1.0.5 + 1.0.6 - 20241030092850 + 20241115103837 diff --git a/maven/com/flexa/spend/1.0.5/spend-1.0.5.aar b/maven/com/flexa/spend/1.0.5/spend-1.0.5.aar deleted file mode 100644 index 04f325a0..00000000 Binary files a/maven/com/flexa/spend/1.0.5/spend-1.0.5.aar and /dev/null differ diff --git a/maven/com/flexa/spend/1.0.6/spend-1.0.6.aar b/maven/com/flexa/spend/1.0.6/spend-1.0.6.aar new file mode 100644 index 00000000..025296dd Binary files /dev/null and b/maven/com/flexa/spend/1.0.6/spend-1.0.6.aar differ diff --git a/maven/com/flexa/spend/1.0.5/spend-1.0.5.pom b/maven/com/flexa/spend/1.0.6/spend-1.0.6.pom similarity index 97% rename from maven/com/flexa/spend/1.0.5/spend-1.0.5.pom rename to maven/com/flexa/spend/1.0.6/spend-1.0.6.pom index 163e30e3..38a3da00 100644 --- a/maven/com/flexa/spend/1.0.5/spend-1.0.5.pom +++ b/maven/com/flexa/spend/1.0.6/spend-1.0.6.pom @@ -3,13 +3,13 @@ 4.0.0 com.flexa spend - 1.0.5 + 1.0.6 aar com.flexa core - 1.0.5 + 1.0.6 androidx.core @@ -99,7 +99,7 @@ com.flexa core - 1.0.5 + 1.0.6 diff --git a/maven/com/flexa/spend/maven-metadata-local.xml b/maven/com/flexa/spend/maven-metadata-local.xml index bc45ceb0..161f0c02 100644 --- a/maven/com/flexa/spend/maven-metadata-local.xml +++ b/maven/com/flexa/spend/maven-metadata-local.xml @@ -3,11 +3,11 @@ com.flexa spend - 1.0.5 - 1.0.5 + 1.0.6 + 1.0.6 - 1.0.5 + 1.0.6 - 20241030092854 + 20241115103856 diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiCard.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiCard.kt new file mode 100644 index 00000000..2206c712 --- /dev/null +++ b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiCard.kt @@ -0,0 +1,32 @@ +package co.electriccoin.zcash.ui.design.component + +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.ColumnScope +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import co.electriccoin.zcash.ui.design.theme.colors.ZashiColors + +@Composable +fun ZashiCard( + modifier: Modifier = Modifier, + content: @Composable ColumnScope.() -> Unit, +) { + Card( + modifier = modifier, + colors = + CardDefaults.cardColors( + containerColor = ZashiColors.Surfaces.bgSecondary, + contentColor = ZashiColors.Text.textTertiary + ), + ) { + Column( + Modifier.padding(24.dp) + ) { + content() + } + } +} diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/configuration/ConfigurationEntries.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/configuration/ConfigurationEntries.kt index 607547fc..a1fe9d52 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/configuration/ConfigurationEntries.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/configuration/ConfigurationEntries.kt @@ -11,5 +11,5 @@ object ConfigurationEntries { */ val IS_RESCAN_ENABLED = BooleanConfigurationEntry(ConfigKey("is_rescan_enabled"), true) - val IS_FLEXA_AVAILABLE = BooleanConfigurationEntry(ConfigKey("is_flexa_available"), false) + val IS_FLEXA_AVAILABLE = BooleanConfigurationEntry(ConfigKey("is_flexa_available"), true) } diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/model/IntegrationsState.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/model/IntegrationsState.kt index c5c31deb..ed216d38 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/model/IntegrationsState.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/model/IntegrationsState.kt @@ -5,7 +5,6 @@ import co.electriccoin.zcash.ui.design.util.StringResource import kotlinx.collections.immutable.ImmutableList data class IntegrationsState( - val version: StringResource, val disabledInfo: StringResource?, val onBack: () -> Unit, val items: ImmutableList, diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/view/IntegrationsView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/view/IntegrationsView.kt index 9dba9495..81b0b2dc 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/view/IntegrationsView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/view/IntegrationsView.kt @@ -20,21 +20,23 @@ import androidx.compose.ui.graphics.ColorFilter import androidx.compose.ui.platform.testTag import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import co.electriccoin.zcash.ui.R import co.electriccoin.zcash.ui.common.model.TopAppBarSubTitleState import co.electriccoin.zcash.ui.design.component.BlankBgScaffold +import co.electriccoin.zcash.ui.design.component.ZashiCard import co.electriccoin.zcash.ui.design.component.ZashiHorizontalDivider import co.electriccoin.zcash.ui.design.component.ZashiSettingsListItem import co.electriccoin.zcash.ui.design.component.ZashiSettingsListItemState import co.electriccoin.zcash.ui.design.component.ZashiSmallTopAppBar import co.electriccoin.zcash.ui.design.component.ZashiTopAppBarBackNavigation -import co.electriccoin.zcash.ui.design.component.ZashiVersion import co.electriccoin.zcash.ui.design.newcomponent.PreviewScreens import co.electriccoin.zcash.ui.design.theme.ZcashTheme import co.electriccoin.zcash.ui.design.theme.colors.ZashiColors import co.electriccoin.zcash.ui.design.theme.dimensions.ZashiDimensions +import co.electriccoin.zcash.ui.design.theme.typography.ZashiTypography import co.electriccoin.zcash.ui.design.util.StringResource import co.electriccoin.zcash.ui.design.util.getValue import co.electriccoin.zcash.ui.design.util.stringRes @@ -78,7 +80,23 @@ fun Integrations( Spacer(modifier = Modifier.height(ZashiDimensions.Spacing.spacingXl)) Spacer(modifier = Modifier.weight(1f)) - ZashiVersion(modifier = Modifier.align(CenterHorizontally), version = state.version) + ZashiCard( + modifier = Modifier.padding(horizontal = 20.dp).fillMaxWidth(), + ) { + Image( + modifier = Modifier.align(CenterHorizontally), + painter = painterResource(R.drawable.ic_integrations_info), + contentDescription = "", + colorFilter = ColorFilter.tint(ZashiColors.Text.textSecondary) + ) + Spacer(Modifier.height(16.dp)) + Text( + modifier = Modifier.fillMaxWidth(), + text = stringResource(id = R.string.integrations_info), + textAlign = TextAlign.Center, + style = ZashiTypography.textMd + ) + } } } } @@ -134,7 +152,6 @@ private fun IntegrationSettings() = Integrations( state = IntegrationsState( - version = stringRes("Version 1.2"), onBack = {}, disabledInfo = stringRes("Disabled info"), items = diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt index a610bf37..d0384069 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/integrations/viewmodel/IntegrationsViewModel.kt @@ -75,7 +75,6 @@ class IntegrationsViewModel( val state = combine(observeIsFlexaAvailableUseCase(), isEnabled) { isFlexaAvailable, isEnabled -> IntegrationsState( - version = stringRes(R.string.integrations_version, versionInfo.versionName), disabledInfo = stringRes(R.string.integrations_disabled_info).takeIf { isEnabled.not() }, onBack = ::onBack, items = diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt index ca14aa52..fa60c668 100644 --- a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt +++ b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/seed/view/SeedView.kt @@ -243,7 +243,7 @@ private fun SeedSecret( ) { Image( painter = painterResource(id = R.drawable.ic_zashi_tooltip), - contentDescription = "", + contentDescription = null, colorFilter = ColorFilter.tint(ZashiColors.Inputs.Default.icon) ) } @@ -306,7 +306,7 @@ private fun SecretContent(state: SeedSecretState) { ) { Image( painter = painterResource(R.drawable.ic_reveal), - contentDescription = "", + contentDescription = null, colorFilter = ColorFilter.tint(ZashiColors.Text.textPrimary) ) diff --git a/ui-lib/src/main/res/ui/integrations/drawable/ic_integrations_info.xml b/ui-lib/src/main/res/ui/integrations/drawable/ic_integrations_info.xml new file mode 100644 index 00000000..b9abfdbe --- /dev/null +++ b/ui-lib/src/main/res/ui/integrations/drawable/ic_integrations_info.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/ui-lib/src/main/res/ui/integrations/values-es/strings.xml b/ui-lib/src/main/res/ui/integrations/values-es/strings.xml index 0452560e..e38bb884 100644 --- a/ui-lib/src/main/res/ui/integrations/values-es/strings.xml +++ b/ui-lib/src/main/res/ui/integrations/values-es/strings.xml @@ -3,7 +3,7 @@ Integraciones Compra %1$s con Coinbase Una forma sencilla de comprar %1$s y recibirlo directamente en tu billetera Zashi. - Versión %1$s + Zashi integrations provide access to third party services. Features and information shared with them are outside of our control and subject to their privacy policies. Durante el proceso de restauración, no es posible utilizar integraciones de pago. Paga con Flexa Paga con clips de pago de Flexa y explora una nueva forma de gastar Zcash. diff --git a/ui-lib/src/main/res/ui/integrations/values/strings.xml b/ui-lib/src/main/res/ui/integrations/values/strings.xml index f0bc0d51..d087b4e9 100644 --- a/ui-lib/src/main/res/ui/integrations/values/strings.xml +++ b/ui-lib/src/main/res/ui/integrations/values/strings.xml @@ -3,7 +3,7 @@ Integrations Buy %1$s with Coinbase A hassle-free way to buy %1$s and get it directly into your Zashi wallet. - Version %1$s + Zashi integrations provide access to third party services. Features and information shared with them are outside of our control and subject to their privacy policies. During the Restore process, it is not possible to use payment integrations. Pay with Flexa Pay with Flexa payment clips and explore a new way of spending Zcash.