zec
/
secant-android-wallet
mirror of https://github.com/zcash/secant-android-wallet.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adopt SDK 1.17.0-beta01 changes

This commit is contained in:
Carter Jernigan 2023-05-22 11:47:58 -04:00 committed by Carter Jernigan
parent 8ca30f19c4
commit de00a6eb51
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@ -153,7 +153,7 @@ ZCASH_ANDROID_WALLET_PLUGINS_VERSION=1.0.0
ZCASH_BIP39_VERSION=1.0.4 ZCASH_BIP39_VERSION=1.0.4
# TODO [#279]: Revert to stable SDK before app release # TODO [#279]: Revert to stable SDK before app release
# TODO [#279]: https://github.com/zcash/secant-android-wallet/issues/279 # TODO [#279]: https://github.com/zcash/secant-android-wallet/issues/279
ZCASH_SDK_VERSION=1.17.0-beta01-SNAPSHOT ZCASH_SDK_VERSION=1.17.0-beta01
ZXING_VERSION=3.5.1 ZXING_VERSION=3.5.1

1
ui-lib/src/main/java/co/electriccoin/zcash/ui/fixture/WalletSnapshotFixture.kt
View File

@ -25,6 +25,7 @@ object WalletSnapshotFixture {
null, null,
null, null,
null, null,
null
), ),
orchardBalance: WalletBalance = ORCHARD_BALANCE, orchardBalance: WalletBalance = ORCHARD_BALANCE,
saplingBalance: WalletBalance = SAPLING_BALANCE, saplingBalance: WalletBalance = SAPLING_BALANCE,

3
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/model/WalletDisplayValues.kt
View File

@ -51,8 +51,7 @@ data class WalletDisplayValues(
} }
statusText = context.getString(R.string.home_status_syncing_format, progressPercent) statusText = context.getString(R.string.home_status_syncing_format, progressPercent)
} }
Synchronizer.Status.SYNCED, Synchronizer.Status.SYNCED -> {
Synchronizer.Status.ENHANCING -> {
statusText = if (updateAvailable) { statusText = if (updateAvailable) {
context.getString(R.string.home_status_update) context.getString(R.string.home_status_update)
} else { } else {

9
ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/home/view/HomeView.kt
View File

@ -314,7 +314,7 @@ private fun HomeMainContent(
) { ) {
Status(walletSnapshot, isUpdateAvailable, isFiatConversionEnabled, isCircularProgressBarEnabled) Status(walletSnapshot, isUpdateAvailable, isFiatConversionEnabled, isCircularProgressBarEnabled)
if (isSyncing(walletSnapshot.status)) { if (walletSnapshot.status == Synchronizer.Status.SYNCING) {
Spacer(modifier = Modifier.height(ZcashTheme.dimens.spacingLarge)) Spacer(modifier = Modifier.height(ZcashTheme.dimens.spacingLarge))
Body(text = stringResource(id = R.string.home_information)) Body(text = stringResource(id = R.string.home_information))
} }
@ -340,17 +340,12 @@ private fun HomeMainContent(
History(transactionHistory) History(transactionHistory)
if (isKeepScreenOnDuringSync == true && isSyncing(walletSnapshot.status)) { if (isKeepScreenOnDuringSync == true && walletSnapshot.status == Synchronizer.Status.SYNCING) {
DisableScreenTimeout() DisableScreenTimeout()
} }
} }
} }
private fun isSyncing(status: Synchronizer.Status): Boolean {
return status == Synchronizer.Status.SYNCING ||
status == Synchronizer.Status.ENHANCING
}
@Composable @Composable
@Suppress("LongMethod", "MagicNumber") @Suppress("LongMethod", "MagicNumber")
private fun Status( private fun Status(