(android) Fix clickable splash label padding

ACINQ · Jun 26, 2024 · fce0f39 · fce0f39
1 parent f39e32a
commit fce0f39
Show file tree

Hide file tree

Showing 14 changed files with 131 additions and 167 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/SplashLayout.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/SplashLayout.kt
@@ -21,6 +21,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ButtonDefaults
 import androidx.compose.material.MaterialTheme
@@ -35,6 +36,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
@@ -120,11 +122,10 @@ fun SplashLabelRow(
     iconTint: Color = MaterialTheme.typography.subtitle1.color,
     helpMessage: String? = null,
     helpLink: Pair<String, String>? = null,
+    space: Dp = 8.dp,
     content: @Composable ColumnScope.() -> Unit,
 ) {
-    Row(
-        modifier = Modifier.padding(vertical = 3.dp)
-    ) {
+    Row {
         Row(
             modifier = Modifier.weight(1f).alignByBaseline(),
             horizontalArrangement = Arrangement.End
@@ -151,7 +152,7 @@ fun SplashLabelRow(
                 )
             }
         }
-        Spacer(Modifier.width(8.dp))
+        Spacer(Modifier.width(space))
         Column(
             modifier = Modifier
                 .weight(1.6f)
@@ -160,4 +161,22 @@ fun SplashLabelRow(
             content()
         }
     }
-}
+}
+
+@Composable
+fun SplashClickableContent(
+    onClick: () -> Unit,
+    content: @Composable () -> Unit,
+) {
+    Clickable(
+        onClick = onClick,
+        modifier = Modifier
+            .fillMaxWidth()
+            .offset(x = (-8).dp),
+        shape = RoundedCornerShape(12.dp)
+    ) {
+        Column(modifier = Modifier.padding(8.dp)) {
+            content()
+        }
+    }
+}
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
@@ -37,6 +37,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import fr.acinq.lightning.wire.OfferTypes
 import fr.acinq.phoenix.android.components.Clickable
+import fr.acinq.phoenix.android.components.SplashClickableContent
 import fr.acinq.phoenix.data.ContactInfo
 
 
@@ -55,17 +56,11 @@ fun ContactCompactView(
 ) {
     var showSheet by remember { mutableStateOf(false) }
 
-    Clickable(
-        onClick = { showSheet = true },
-        modifier = Modifier.offset(x = (-8).dp),
-        shape = RoundedCornerShape(12.dp)
-    ) {
-        Column(modifier = Modifier.padding(8.dp)) {
-            Row(verticalAlignment = Alignment.CenterVertically) {
-                ContactPhotoView(image = contact.photo?.toByteArray(), name = contact.name, onChange = null, imageSize = 28.dp, borderSize = 2.dp)
-                Spacer(modifier = Modifier.width(8.dp))
-                Text(text = contact.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
-            }
+    SplashClickableContent(onClick = { showSheet = true }) {
+        Row(verticalAlignment = Alignment.CenterVertically) {
+            ContactPhotoView(image = contact.photo?.toByteArray(), name = contact.name, onChange = null, imageSize = 28.dp, borderSize = 2.dp)
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(text = contact.name, maxLines = 1, overflow = TextOverflow.Ellipsis)
         }
     }
 

diff --git a/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactOrOfferView.kt b/...android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/ContactOrOfferView.kt
@@ -16,38 +16,29 @@
 
 package fr.acinq.phoenix.android.components.contact
 
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.ColumnScope
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.offset
-import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import fr.acinq.lightning.wire.OfferTypes
 import fr.acinq.phoenix.android.R
-import fr.acinq.phoenix.android.Screen
 import fr.acinq.phoenix.android.business
-import fr.acinq.phoenix.android.components.Button
-import fr.acinq.phoenix.android.components.Clickable
-import fr.acinq.phoenix.android.components.HSeparator
-import fr.acinq.phoenix.android.components.SplashLabelRow
-import fr.acinq.phoenix.android.navController
+import fr.acinq.phoenix.android.components.PhoenixIcon
+import fr.acinq.phoenix.android.components.SplashClickableContent
+import fr.acinq.phoenix.android.utils.mutedTextColor
 import fr.acinq.phoenix.data.ContactInfo
-import kotlinx.coroutines.launch
 
 private sealed class OfferContactState {
     data object Init: OfferContactState()
@@ -76,9 +67,7 @@ fun ContactOrOfferView(offer: OfferTypes.Offer) {
             ContactCompactView(
                 contact = state.contact,
                 currentOffer = offer,
-                onContactChange = {
-                    contactState.value = if (it == null) OfferContactState.NotFound else OfferContactState.Found(it)
-                },
+                onContactChange = { contactState.value = if (it == null) OfferContactState.NotFound else OfferContactState.Found(it) },
             )
         }
         is OfferContactState.NotFound -> {
@@ -88,3 +77,30 @@ fun ContactOrOfferView(offer: OfferTypes.Offer) {
         }
     }
 }
+
+@Composable
+private fun DetachedOfferView(
+    offer: OfferTypes.Offer,
+    onContactSaved: (ContactInfo) -> Unit,
+) {
+    var showSaveContactDialog by remember { mutableStateOf(false) }
+
+    val encoded = remember(offer) { offer.encode() }
+    SplashClickableContent(onClick = { showSaveContactDialog = true }) {
+        Text(text = encoded, maxLines = 2, overflow = TextOverflow.Ellipsis)
+        Spacer(modifier = Modifier.height(8.dp))
+        Row {
+            PhoenixIcon(resourceId = R.drawable.ic_user, tint = mutedTextColor)
+            Spacer(modifier = Modifier.width(6.dp))
+            Text(text = stringResource(id = R.string.contact_add_contact_button), style = MaterialTheme.typography.subtitle2)
+        }
+    }
+
+    if (showSaveContactDialog) {
+        SaveNewContactDialog(
+            initialOffer = offer,
+            onDismiss = { showSaveContactDialog = false },
+            onSaved = { onContactSaved(it) },
+        )
+    }
+}
diff --git a/...-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/DetachedOfferView.kt b/...-android/src/main/kotlin/fr/acinq/phoenix/android/components/contact/DetachedOfferView.kt
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/LnurlPayView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/LnurlPayView.kt
@@ -105,6 +105,7 @@ fun LnurlPayView(
         SplashLabelRow(label = stringResource(R.string.lnurl_pay_domain)) {
             Text(text = model.paymentIntent.callback.host, maxLines = 1, overflow = TextOverflow.Ellipsis)
         }
+        Spacer(modifier = Modifier.height(8.dp))
         SplashLabelRow(label = stringResource(R.string.lnurl_pay_meta_description)) {
             Text(
                 text = model.paymentIntent.metadata.longDesc ?: model.paymentIntent.metadata.plainText,
@@ -128,19 +129,11 @@ fun LnurlPayView(
                     },
                 )
             }
-            comment?.let {
-                SplashLabelRow(label = "", icon = R.drawable.ic_message_circle, iconTint = MaterialTheme.colors.primary) {
-                    Clickable(onClick = { showCommentDialog = true }) {
-                        Text(text = it)
-                    }
-                }
-            } ?: run {
-                SplashLabelRow(label = "", icon = R.drawable.ic_message_circle, iconTint = MaterialTheme.colors.primary) {
-                    Button(
-                        text = stringResource(id = R.string.lnurl_pay_comment_add_button),
-                        onClick = { showCommentDialog = true },
-                        padding = PaddingValues(horizontal = 0.dp, vertical = 8.dp),
-                        shape = RoundedCornerShape(16.dp),
+            SplashLabelRow(label = stringResource(id = R.string.paymentdetails_lnurlpay_action_message_label)) {
+                SplashClickableContent(onClick = { showCommentDialog = true }) {
+                    Text(
+                        text = comment ?: stringResource(id = R.string.lnurl_pay_comment_add_button),
+                        style = if (comment == null) MaterialTheme.typography.caption else MaterialTheme.typography.body1
                     )
                 }
             }

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/ScanDataView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/ScanDataView.kt
@@ -227,18 +227,18 @@ fun ReadDataView(
                     text = "My contacts...",
                     onClick = { showContactsList = true },
                 )
-                Button(
-                    modifier = Modifier.fillMaxWidth(),
-                    icon = R.drawable.ic_input,
-                    text = stringResource(id = R.string.scan_manual_input_button),
-                    onClick = { showManualInputDialog = true },
-                )
                 Button(
                     modifier = Modifier.fillMaxWidth(),
                     icon = R.drawable.ic_clipboard,
                     text = stringResource(id = R.string.scan_paste_button),
                     onClick = { readClipboard(context)?.let { onScannedText(it) } },
                 )
+                Button(
+                    modifier = Modifier.fillMaxWidth(),
+                    icon = R.drawable.ic_input,
+                    text = stringResource(id = R.string.scan_manual_input_button),
+                    onClick = { showManualInputDialog = true },
+                )
             }
         }
 

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/SendLightningView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/SendLightningView.kt
@@ -133,16 +133,19 @@ fun SendBolt11PaymentView(
                 Text(text = it)
             }
         }
+        Spacer(modifier = Modifier.height(16.dp))
         SplashLabelRow(label = stringResource(R.string.send_destination_label), icon = R.drawable.ic_zap) {
             SelectionContainer {
                 Text(text = invoice.nodeId.toHex(), maxLines = 2, overflow = TextOverflow.Ellipsis)
             }
         }
         if (invoice.isAmountlessTrampoline()) {
+            Spacer(modifier = Modifier.height(16.dp))
             SplashLabelRow(label = "", helpMessage = stringResource(id = R.string.send_trampoline_amountless_warning_details)) {
                 Text(text = stringResource(id = R.string.send_trampoline_amountless_warning_label))
             }
         }
+        Spacer(modifier = Modifier.height(16.dp))
         SplashLabelRow(label = stringResource(id = R.string.send_trampoline_fee_label)) {
             val amt = amount
             if (amt == null) {