(android) Relax rule for showing tipping button

Tipping should be available when the invoice specifies an amount, even
if overpayment is disabled. Overpayment applies to manual editing of
the amount input.

Author: dpad85

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/buttons/FilledButton.kt

@@ -106,6 +106,7 @@ fun TransparentFilledButton(
     space: Dp = 12.dp,
     shape: Shape = RoundedCornerShape(12.dp),
     padding: PaddingValues = PaddingValues(12.dp),
+    horizontalArrangement: Arrangement.Horizontal = Arrangement.Center,
     onClick: () -> Unit,
 ) {
     FilledButton(
@@ -115,6 +116,7 @@ fun TransparentFilledButton(
         iconTint = iconTint,
         modifier = modifier, text = text, icon = icon, maxLines = maxLines, enabled = enabled,
         enabledEffect = enabledEffect, space = space, padding = padding, onClick = onClick,
+        horizontalArrangement = horizontalArrangement,
     )
 }
 

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/AmountHeroInput.kt

@@ -76,6 +76,7 @@ import fr.acinq.phoenix.android.LocalBusiness
 import fr.acinq.phoenix.android.LocalExchangeRatesMap
 import fr.acinq.phoenix.android.LocalFiatCurrencies
 import fr.acinq.phoenix.android.R
+import fr.acinq.phoenix.android.components.HSeparator
 import fr.acinq.phoenix.android.components.buttons.BorderButton
 import fr.acinq.phoenix.android.components.buttons.Button
 import fr.acinq.phoenix.android.utils.borderColor
@@ -107,9 +108,9 @@ fun AmountHeroInput(
     inputModifier: Modifier = Modifier,
     dropdownModifier: Modifier = Modifier,
     inputTextSize: TextUnit = 16.sp,
-    enabled: Boolean = true,
-    canTip: Boolean = false,
-    canSendLNBalance: Boolean = false,
+    canEditAmount: Boolean,
+    canTip: Boolean,
+    canSendLNBalance: Boolean,
 ) {
     val context = LocalContext.current
     val focusManager = LocalFocusManager.current
@@ -192,7 +193,6 @@ fun AmountHeroInput(
                     is AmountConversionResult.Error.AmountNegative -> context.getString(R.string.send_error_amount_negative)
                 }
             }
-
             null -> {
                 inputValueInMsat = null
                 inputValueConvertedToAlt = ""
@@ -227,7 +227,7 @@ fun AmountHeroInput(
             ),
             keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus(); keyboardController?.hide() }),
             singleLine = true,
-            enabled = enabled,
+            enabled = canEditAmount,
             cursorBrush = SolidColor(MaterialTheme.colors.primary.copy(alpha = 0.7f))
         )
     }
@@ -256,15 +256,17 @@ fun AmountHeroInput(
             canAddMoreUnits = true,
             onDismiss = { },
             modifier = dropdownModifier,
-            enabled = enabled,
+            enabled = true,
             otherItems = if (canSendLNBalance) {
                 {
                     val peerManager = LocalBusiness.current?.peerManager
                     val scope = rememberCoroutineScope()
                     Spacer(Modifier.height(8.dp))
+                    HSeparator()
+                    Spacer(Modifier.height(8.dp))
                     Box(modifier = Modifier.padding(horizontal = 8.dp)) {
                         BorderButton(
-                            text = "Use all balance",
+                            text = stringResource(R.string.send_balance_use_all),
                             icon = R.drawable.ic_arrow_to_end,
                             onClick = {
                                 scope.launch {

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/inputs/UnitDropdown.kt

@@ -130,7 +130,7 @@ fun UnitDropdown(
                 Box(modifier = Modifier.padding(horizontal = 8.dp)) {
                     BorderButton(
                         text = stringResource(R.string.unitdropdown_more),
-                        icon = R.drawable.ic_plus_circle,
+                        icon = R.drawable.ic_settings,
                         onClick = { showAddCurrencyDialog = true ; expanded = false },
                         modifier = Modifier.fillMaxSize(),
                         borderColor = borderColor,

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/bolt11/SendToBolt11.kt

@@ -95,14 +95,14 @@ fun SendToBolt11View(
         topContent = {
             AmountHeroInput(
                 initialAmount = requestedAmount,
-                enabled = requestedAmount == null || isOverpaymentEnabled,
+                canEditAmount = requestedAmount == null || isOverpaymentEnabled,
                 onAmountChange = {
                     amount = it?.amount
                 },
                 validationErrorMessage = amountErrorMessage,
                 inputTextSize = 42.sp,
-                canTip = requestedAmount != null && isOverpaymentEnabled,
                 canSendLNBalance = requestedAmount == null,
+                canTip = requestedAmount != null,
             )
         }
     ) {

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/lnurl/LnurlPayView.kt

@@ -110,7 +110,9 @@ fun LnurlPayView(
                 },
                 validationErrorMessage = amountErrorMessage,
                 inputTextSize = 42.sp,
-                enabled = payIntent.minSendable != payIntent.maxSendable
+                canEditAmount = payIntent.minSendable != payIntent.maxSendable,
+                canTip = false,
+                canSendLNBalance = false,
             )
         }
     ) {

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/lnurl/LnurlWithdrawView.kt

@@ -91,7 +91,9 @@ fun LnurlWithdrawView(
                 },
                 validationErrorMessage = amountErrorMessage,
                 inputTextSize = 42.sp,
-                enabled = !isAmountDisabled,
+                canEditAmount = !isAmountDisabled,
+                canTip = false,
+                canSendLNBalance = false,
             )
         }
     ) {

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/offer/SendOfferView.kt

@@ -106,14 +106,14 @@ fun SendToOfferView(
         topContent = {
             AmountHeroInput(
                 initialAmount = requestedAmount,
-                enabled = vm.state !is OfferState.FetchingInvoice,
+                canEditAmount = vm.state !is OfferState.FetchingInvoice,
                 onAmountChange = { newAmount ->
                     if (newAmount?.amount != amount) vm.state = OfferState.Init
                     amount = newAmount?.amount
                 },
                 validationErrorMessage = amountErrorMessage,
                 inputTextSize = 42.sp,
-                canTip = requestedAmount != null && isOverpaymentEnabled,
+                canTip = requestedAmount != null,
                 canSendLNBalance = requestedAmount == null,
             )
         }

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/payments/send/spliceout/SpliceOutView.kt

@@ -125,7 +125,10 @@ fun SendSpliceOutView(
                     amount = newAmount
                 },
                 validationErrorMessage = amountErrorMessage,
-                inputTextSize = 42.sp
+                inputTextSize = 42.sp,
+                canEditAmount = true,
+                canTip = false,
+                canSendLNBalance = false,
             )
         }
     ) {

phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/utils/images/QRCodeAnalyser.kt

@@ -77,7 +77,7 @@ class ZxingQrCodeAnalyzer(
         } catch (e: ChecksumException) {
             log.debug("QR code detected but checksum failed: ", e)
         } catch (e: FormatException) {
-            log.warn("QR code detected but content does not match expectations: ", e)
+            log.debug("QR code detected but content does not match expectations: ", e)
         } catch (e: Exception) {
             log.debug("error when decoding: ", e)
         }

phoenix-android/src/main/res/values/strings.xml

@@ -154,6 +154,7 @@
     <!-- send -->
 
     <string name="send_balance_prefix">Balance</string>
+    <string name="send_balance_use_all">Use all balance</string>
     <string name="send_error_amount_too_large">Amount is too large.</string>
     <string name="send_error_amount_negative">Amount cannot be negative.</string>
     <string name="send_error_amount_invalid">This is not a valid amount.</string>