Merge branch 'feat/new-receive-sheet' into feat/send-sheet-redesign

Author: jvsena42

app/src/main/java/to/bitkit/ui/components/QrCodeImage.kt

@@ -35,6 +35,7 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -143,7 +144,7 @@ fun QrCodeImage(
             }
 
             if (bitmap == null) {
-                CaptionB("Generating QR ...", color = Colors.Black)
+                CaptionB(stringResource(R.string.wallet__receive_qr_generating), color = Colors.Black)
             }
         }
     }

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveQrScreen.kt

@@ -281,7 +281,7 @@ private fun ReceiveQrView(
         QrCodeImage(
             content = uri,
             logoPainter = qrLogoPainter,
-            tipMessage = androidx.compose.ui.res.stringResource(R.string.wallet__receive_copied),
+            tipMessage = stringResource(R.string.wallet__receive_copied),
             onBitmapGenerated = { bitmap -> qrBitmap = bitmap },
             testTag = "QRCode",
             modifier = Modifier.weight(1f, fill = false)
@@ -293,7 +293,7 @@ private fun ReceiveQrView(
             verticalAlignment = Alignment.Top,
         ) {
             PrimaryButton(
-                text = androidx.compose.ui.res.stringResource(R.string.common__edit),
+                text = stringResource(R.string.common__edit),
                 size = ButtonSize.Small,
                 onClick = onClickEditInvoice,
                 fullWidth = false,
@@ -313,11 +313,11 @@ private fun ReceiveQrView(
                 modifier = Modifier.testTag("SpecifyInvoiceButton")
             )
             Tooltip(
-                text = androidx.compose.ui.res.stringResource(R.string.wallet__receive_copied),
+                text = stringResource(R.string.wallet__receive_copied),
                 tooltipState = qrButtonTooltipState
             ) {
                 PrimaryButton(
-                    text = androidx.compose.ui.res.stringResource(R.string.common__copy),
+                    text = stringResource(R.string.common__copy),
                     size = ButtonSize.Small,
                     onClick = {
                         context.setClipboardText(uri)
@@ -341,7 +341,7 @@ private fun ReceiveQrView(
                 )
             }
             PrimaryButton(
-                text = androidx.compose.ui.res.stringResource(R.string.common__share),
+                text = stringResource(R.string.common__share),
                 size = ButtonSize.Small,
                 onClick = {
                     qrBitmap?.let { bitmap ->
@@ -377,10 +377,10 @@ fun CjitOnBoardingView(modifier: Modifier = Modifier) {
             .padding(32.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Display("Receive on <accent>spending balance</accent>".withAccent(accentColor = Colors.Purple))
+        Display(stringResource(R.string.wallet__receive_onboarding_title).withAccent(accentColor = Colors.Purple))
         VerticalSpacer(8.dp)
         BodyM(
-            "Enjoy instant and cheap\ntransactions with friends, family,\nand merchants.",
+            stringResource(R.string.wallet__receive_onboarding_description),
             color = Colors.White64,
             modifier = Modifier.fillMaxWidth()
         )
@@ -441,15 +441,15 @@ private fun ReceiveDetailsView(
                     // Show both onchain AND lightning if available
                     if (onchainAddress.isNotEmpty()) {
                         CopyAddressCard(
-                            title = androidx.compose.ui.res.stringResource(R.string.wallet__receive_bitcoin_invoice),
+                            title = stringResource(R.string.wallet__receive_bitcoin_invoice),
                             address = onchainAddress,
                             type = CopyAddressType.ONCHAIN,
                             testTag = "ReceiveOnchainAddress",
                         )
                     }
                     if (cjitInvoice != null || bolt11.isNotEmpty()) {
                         CopyAddressCard(
-                            title = androidx.compose.ui.res.stringResource(R.string.wallet__receive_lightning_invoice),
+                            title = stringResource(R.string.wallet__receive_lightning_invoice),
                             address = cjitInvoice ?: bolt11,
                             type = CopyAddressType.LIGHTNING,
                             testTag = "ReceiveLightningAddress",
@@ -460,7 +460,7 @@ private fun ReceiveDetailsView(
                 ReceiveTab.SPENDING -> {
                     if (cjitInvoice != null || bolt11.isNotEmpty()) {
                         CopyAddressCard(
-                            title = androidx.compose.ui.res.stringResource(R.string.wallet__receive_lightning_invoice),
+                            title = stringResource(R.string.wallet__receive_lightning_invoice),
                             address = cjitInvoice ?: bolt11,
                             type = CopyAddressType.LIGHTNING,
                             testTag = "ReceiveLightningAddress",

app/src/main/java/to/bitkit/ui/screens/wallets/receive/ReceiveSheet.kt

@@ -11,11 +11,13 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.rememberNavController
 import kotlinx.serialization.Serializable
+import to.bitkit.R
 import to.bitkit.models.Toast
 import to.bitkit.repositories.LightningState
 import to.bitkit.ui.screens.wallets.send.AddTagScreen
@@ -45,6 +47,9 @@ fun ReceiveSheet(
     val cjitEntryDetails = remember { mutableStateOf<CjitEntryDetails?>(null) }
     val lightningState: LightningState by wallet.lightningState.collectAsStateWithLifecycle()
 
+    val geoBlockedTitle = stringResource(R.string.wallet__receive_geo_blocked_title)
+    val geoBlockedDescription = stringResource(R.string.wallet__receive_geo_blocked_description)
+
     LaunchedEffect(Unit) {
         wallet.resetPreActivityMetadataTagsForCurrentInvoice()
         wallet.refreshReceiveState()
@@ -84,8 +89,8 @@ fun ReceiveSheet(
                             toast(
                                 Toast(
                                     type = Toast.ToastType.ERROR,
-                                    title = "Instant Payments Unavailable",
-                                    description = "Bitkit does not provide Lightning services in your country, but you can still connect to other nodes.",
+                                    title = geoBlockedTitle,
+                                    description = geoBlockedDescription,
                                     autoHide = true,
                                 )
                             )

app/src/main/res/values/strings.xml

@@ -983,6 +983,11 @@
     <string name="wallet__receive_cjit_error_msg">Failed to send funds to your spending account.</string>
     <string name="wallet__receive_will">You will receive</string>
     <string name="wallet__receive_ldk_init">Spending Balance Initializing...</string>
+    <string name="wallet__receive_onboarding_title">Receive on &lt;accent&gt;spending balance&lt;/accent&gt;</string>
+    <string name="wallet__receive_onboarding_description">Enjoy instant and cheap\ntransactions with friends, family,\nand merchants.</string>
+    <string name="wallet__receive_qr_generating">Generating QR ...</string>
+    <string name="wallet__receive_geo_blocked_title">Instant Payments Unavailable</string>
+    <string name="wallet__receive_geo_blocked_description">Bitkit does not provide Lightning services in your country, but you can still connect to other nodes.</string>
     <string name="wallet__minimum">MINIMUM</string>
     <string name="wallet__activity">Activity</string>
     <string name="wallet__activity_show_all">Show All Activity</string>