(android) Hide unknown source warning if no message

Also fixed contact photo border, and move outgoing offer message to its own section in payment details.
ACINQ · Jul 8, 2024 · 9df1e36 · 9df1e36
1 parent 1b483dd
commit 9df1e36
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactCompactView.kt b/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactCompactView.kt
@@ -58,7 +58,7 @@ fun ContactCompactView(
 
     SplashClickableContent(onClick = { showSheet = true }) {
         Row(verticalAlignment = Alignment.CenterVertically) {
-            ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 28.dp, borderSize = 2.dp)
+            ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 28.dp)
             Spacer(modifier = Modifier.width(8.dp))
             Text(text = contact.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
         }

diff --git a/...x-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactPhotoView.kt b/...x-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactPhotoView.kt
@@ -18,14 +18,12 @@ package fr.acinq.phoenix.android.components.contact
 
 import android.Manifest
 import android.content.Intent
-import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.provider.Settings
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.result.launch
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -55,10 +53,7 @@ import com.google.accompanist.permissions.isGranted
 import com.google.accompanist.permissions.rememberPermissionState
 import com.google.accompanist.permissions.shouldShowRationale
 import fr.acinq.phoenix.android.R
-import fr.acinq.phoenix.android.utils.BitmapHelper
-import fr.acinq.phoenix.android.utils.createContactPictureUri
-import fr.acinq.phoenix.android.utils.mutedBgColor
-import java.io.ByteArrayOutputStream
+import fr.acinq.phoenix.android.utils.borderColor
 
 @OptIn(ExperimentalPermissionsApi::class)
 @Composable
@@ -67,11 +62,10 @@ fun ContactPhotoView(
     name: String?,
     onChange: ((String?) -> Unit)?,
     imageSize: Dp = 96.dp,
-    borderSize: Dp = 4.dp
 ) {
     val context = LocalContext.current
 
-    val tempPhotoUri by remember { mutableStateOf(photoUri?.let { Uri.parse(it) } ?: context.createContactPictureUri()) }
+    val tempPhotoUri by remember { mutableStateOf(photoUri?.let { Uri.parse(it) }) }
     var realUri by remember { mutableStateOf<Uri?>(null) }
     val bitmap: ImageBitmap? = remember(tempPhotoUri) {
         realUri?.let { uri ->
@@ -92,8 +86,7 @@ fun ContactPhotoView(
     )
     Surface(
         shape = CircleShape,
-        border = BorderStroke(width = borderSize, color = MaterialTheme.colors.surface),
-        elevation = 1.dp,
+        border = bitmap?.let { BorderStroke(width = 1.dp, color = borderColor) },
         modifier = if (onChange != null) {
             Modifier.clickable(
                 role = Role.Button,
@@ -116,11 +109,10 @@ fun ContactPhotoView(
             )
         } else Modifier
     ) {
-
         if (bitmap == null) {
             Image(
                 painter = painterResource(id = R.drawable.ic_contact_placeholder),
-                colorFilter = ColorFilter.tint(mutedBgColor),
+                colorFilter = ColorFilter.tint(borderColor),
                 contentDescription = name,
                 modifier = Modifier.size(imageSize)
             )

diff --git a/...x-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactsListView.kt b/...x-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactsListView.kt
@@ -141,7 +141,7 @@ private fun ContactRow(contact: ContactInfo, canEditContact: Boolean, onEditCont
         verticalAlignment = Alignment.CenterVertically,
     ) {
         Spacer(modifier = Modifier.width(12.dp))
-        ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 32.dp, borderSize = 0.dp)
+        ContactPhotoView(photoUri = contact.photoUri, name = contact.name, onChange = null, imageSize = 32.dp)
         Spacer(modifier = Modifier.width(8.dp))
         Text(
             text = contact.name,

diff --git a/...oid/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentDetailsSplashView.kt b/...oid/src/main/kotlin/fr/acinq/phoenix/android/payments/details/PaymentDetailsSplashView.kt
@@ -74,6 +74,7 @@ import fr.acinq.phoenix.data.lnurl.LnurlPay
 import fr.acinq.phoenix.utils.extensions.WalletPaymentState
 import fr.acinq.phoenix.utils.extensions.minDepthForFunding
 import fr.acinq.phoenix.utils.extensions.incomingOfferMetadata
+import fr.acinq.phoenix.utils.extensions.outgoingInvoiceRequest
 import fr.acinq.phoenix.utils.extensions.state
 import io.ktor.http.Url
 import kotlinx.coroutines.delay
@@ -124,11 +125,15 @@ fun PaymentDetailsSplashView(
         }
 
         payment.incomingOfferMetadata()?.let { meta ->
-            meta.payerNote?.let {
+            meta.payerNote?.takeIf { it.isNotBlank() }?.let {
                 OfferPayerNote(payerNote = it)
                 Spacer(modifier = Modifier.height(8.dp))
             }
-            OfferSentBy(payerPubkey = meta.payerKey)
+            OfferSentBy(payerPubkey = meta.payerKey, !meta.payerNote.isNullOrBlank())
+        }
+
+        payment.outgoingInvoiceRequest()?.payerNote?.takeIf { it.isNotBlank() }?.let {
+            OfferPayerNote(payerNote = it)
         }
 
         PaymentDescriptionView(data = data, onMetadataDescriptionUpdate = onMetadataDescriptionUpdate)
@@ -449,7 +454,7 @@ private fun OfferPayerNote(payerNote: String) {
 }
 
 @Composable
-private fun OfferSentBy(payerPubkey: PublicKey?) {
+private fun OfferSentBy(payerPubkey: PublicKey?, hasPayerNote: Boolean) {
     val contactsManager = business.contactsManager
     val contactState = remember { mutableStateOf<OfferContactState>(OfferContactState.Init) }
     LaunchedEffect(Unit) {
@@ -463,8 +468,10 @@ private fun OfferSentBy(payerPubkey: PublicKey?) {
             is OfferContactState.Init -> Text(text = stringResource(id = R.string.utils_loading_data))
             is OfferContactState.NotFound -> {
                 Text(text = stringResource(id = R.string.paymentdetails_offer_sender_unknown))
-                Spacer(modifier = Modifier.height(4.dp))
-                Text(text = stringResource(id = R.string.paymentdetails_offer_sender_unknown_details), style = MaterialTheme.typography.subtitle2)
+                if (hasPayerNote) {
+                    Spacer(modifier = Modifier.height(4.dp))
+                    Text(text = stringResource(id = R.string.paymentdetails_offer_sender_unknown_details), style = MaterialTheme.typography.subtitle2)
+                }
             }
             is OfferContactState.Found -> {
                 ContactCompactView(

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/extensions.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/extensions.kt
@@ -146,7 +146,7 @@ fun WalletPayment.smartDescription(context: Context): String? = when (this) {
     is LightningOutgoingPayment -> when (val details = this.details) {
         is LightningOutgoingPayment.Details.Normal -> details.paymentRequest.desc
         is LightningOutgoingPayment.Details.SwapOut -> context.getString(R.string.paymentdetails_desc_swapout, details.address)
-        is LightningOutgoingPayment.Details.Blinded -> details.paymentRequest.invoiceRequest.payerNote ?: details.paymentRequest.description
+        is LightningOutgoingPayment.Details.Blinded -> details.paymentRequest.description
     }
     is IncomingPayment -> when (val origin = this.origin) {
         is IncomingPayment.Origin.Invoice -> origin.paymentRequest.description

diff --git a/phoenix-android/src/main/res/values-b+es+419/strings.xml b/phoenix-android/src/main/res/values-b+es+419/strings.xml
@@ -268,7 +268,7 @@
     <string name="home__balance_loading">Cargando…</string>
     <string name="home__onchain_incoming">+%1$s</string>
 
-    <string name="home__faq_button">Preguntas frecuentes</string>
+    <string name="home__faq_button">FAQ</string>
     <string name="home__payments_none">Usa los botones Recibir y Enviar en la parte inferior de esta pantalla para empezar.</string>
     <string name="home__payments_more_button">Mostrar todos los pagos…</string>
     <string name="home__connection__electrum_late">Retraso de Electrum</string>

diff --git a/phoenix-android/src/main/res/values-vi/strings.xml b/phoenix-android/src/main/res/values-vi/strings.xml
@@ -274,7 +274,7 @@
     <string name="home__balance_loading">Đang tải…</string>
     <string name="home__onchain_incoming">+%1$s</string>
 
-    <string name="home__faq_button">Câu hỏi thường gặp</string>
+    <string name="home__faq_button">FAQ</string>
     <string name="home__payments_none">Sử dụng các nút Nhận và Gửi ở cuối màn hình này để bắt đầu!</string>
     <string name="home__payments_more_button">Hiển thị tất cả các khoản thanh toán…</string>
     <string name="home__connection__electrum_late">Electrum muộn</string>