QR code image logic refactoring (#1732)

* QR code image logic refactor The QR code image logic of the `QrCode` and `Request` screens has been refactored to work upon the newer `ZashiQr` component * Refactor values into state * Changelog update
Electric-Coin-Company · Jan 21, 2025 · 603178f · 603178f
1 parent db983c6
commit 603178f
Show file tree

Hide file tree

Showing 13 changed files with 159 additions and 236 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this application adheres to [Semantic Versioning](https://semver.org/spec/v2
 
 ## [Unreleased]
 
+### Changed
+- The QR code image logic of the `QrCode`, `Request`, and `SignTransaction` screens has been refactored to work 
+  with the newer `ZashiQr` component 
+
 ### Fixed
 - The Disconnected popup trigger when the app is backgrounded has been fixed 
 

diff --git a/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt b/ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiQr.kt
@@ -2,48 +2,66 @@ package co.electriccoin.zcash.ui.design.component
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ImageBitmap
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalDensity
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import co.electriccoin.zcash.ui.design.theme.colors.ZashiColors
 import co.electriccoin.zcash.ui.design.theme.dimensions.ZashiDimensions
 import co.electriccoin.zcash.ui.design.util.AndroidQrCodeImageGenerator
 import co.electriccoin.zcash.ui.design.util.JvmQrCodeGenerator
 import co.electriccoin.zcash.ui.design.util.QrCodeColors
+import co.electriccoin.zcash.ui.design.util.StringResource
+import co.electriccoin.zcash.ui.design.util.getValue
 import co.electriccoin.zcash.ui.design.util.orDark
 
 @Composable
 fun ZashiQr(
-    qrData: String,
+    state: QrState,
     modifier: Modifier = Modifier,
     qrSize: Dp = ZashiQrDefaults.width,
-    colors: QrCodeColors = QrCodeDefaults.colors()
+    colors: QrCodeColors = QrCodeDefaults.colors(),
 ) {
     val qrSizePx = with(LocalDensity.current) { qrSize.roundToPx() }
-    val bitmap = getQrCode(qrData, qrSizePx, colors)
+    val bitmap = getQrCode(state.qrData, qrSizePx, colors)
 
     Surface(
         modifier = modifier,
         shape = RoundedCornerShape(ZashiDimensions.Radius.radius4xl),
         border = BorderStroke(width = 1.dp, color = ZashiColors.Surfaces.strokePrimary),
-        color = ZashiColors.Surfaces.bgPrimary
+        color = ZashiColors.Surfaces.bgPrimary,
     ) {
         Box(
             modifier = Modifier.padding(all = 12.dp)
         ) {
             Image(
                 bitmap = bitmap,
-                contentDescription = null,
+                contentDescription = state.contentDescription?.getValue(),
+                Modifier.clickable { state.onClick() }
             )
+            if (state.centerImageResId != null) {
+                Image(
+                    modifier =
+                        Modifier
+                            .size(64.dp)
+                            .align(Alignment.Center),
+                    imageVector = ImageVector.vectorResource(state.centerImageResId),
+                    contentDescription = null,
+                )
+            }
         }
     }
 }
@@ -75,3 +93,10 @@ object QrCodeDefaults {
         foreground = foreground
     )
 }
+
+data class QrState(
+    val qrData: String,
+    val contentDescription: StringResource? = null,
+    val onClick: () -> Unit = {},
+    val centerImageResId: Int? = null,
+)
diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt
@@ -541,20 +541,7 @@ fun NavHostController.popBackStackJustOnce(currentRouteToBePopped: String) {
 object NavigationArguments {
     const val SEND_SCAN_RECIPIENT_ADDRESS = "send_scan_recipient_address"
     const val SEND_SCAN_ZIP_321_URI = "send_scan_zip_321_uri"
-
-    const val SEND_CONFIRM_RECIPIENT_ADDRESS = "send_confirm_recipient_address"
-    const val SEND_CONFIRM_AMOUNT = "send_confirm_amount"
-    const val SEND_CONFIRM_MEMO = "send_confirm_memo"
-    const val SEND_CONFIRM_PROPOSAL = "send_confirm_proposal"
-    const val SEND_CONFIRM_INITIAL_STAGE = "send_confirm_initial_stage"
-
     const val MULTIPLE_SUBMISSION_CLEAR_FORM = "multiple_submission_clear_form"
-
-    const val PAYMENT_REQUEST_ADDRESS = "payment_request_address"
-    const val PAYMENT_REQUEST_AMOUNT = "payment_request_amount"
-    const val PAYMENT_REQUEST_MEMO = "payment_request_memo"
-    const val PAYMENT_REQUEST_PROPOSAL = "payment_request_proposal"
-    const val PAYMENT_REQUEST_URI = "payment_request_uri"
 }
 
 object NavigationTargets {

diff --git a/...rc/main/java/co/electriccoin/zcash/ui/screen/exchangerate/widget/StyledExchangeBalance.kt b/...rc/main/java/co/electriccoin/zcash/ui/screen/exchangerate/widget/StyledExchangeBalance.kt
@@ -5,7 +5,6 @@ package co.electriccoin.zcash.ui.screen.exchangerate.widget
 import androidx.compose.animation.animateContentSize
 import androidx.compose.animation.core.MutableTransitionState
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Column
@@ -93,7 +92,6 @@ fun StyledExchangeBalance(
 }
 
 @Suppress("LongParameterList", "LongMethod")
-@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun ExchangeAvailableRateLabelInternal(
     style: TextStyle,

diff --git a/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/model/QrCodeState.kt b/ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/qrcode/model/QrCodeState.kt
@@ -2,17 +2,30 @@ package co.electriccoin.zcash.ui.screen.qrcode.model
 
 import androidx.compose.ui.graphics.ImageBitmap
 import cash.z.ecc.android.sdk.model.WalletAddress
+import co.electriccoin.zcash.ui.design.component.QrState
+import co.electriccoin.zcash.ui.design.util.StringResource
 
-internal sealed class QrCodeState {
+sealed class QrCodeState {
     data object Loading : QrCodeState()
 
     data class Prepared(
         val qrCodeType: QrCodeType,
         val walletAddress: WalletAddress,
         val onAddressCopy: (String) -> Unit,
         val onQrCodeShare: (ImageBitmap) -> Unit,
+        val onQrCodeClick: () -> Unit,
         val onBack: () -> Unit,
-    ) : QrCodeState()
+    ) : QrCodeState() {
+        fun toQrState(
+            contentDescription: StringResource? = null,
+            centerImageResId: Int? = null
+        ) = QrState(
+            qrData = walletAddress.address,
+            onClick = onQrCodeClick,
+            contentDescription = contentDescription,
+            centerImageResId = centerImageResId
+        )
+    }
 }
 
 enum class QrCodeType {