(android) Fix refund view scanner

ACINQ · May 21, 2024 · 25bbd61 · 25bbd61
1 parent 78ae137
commit 25bbd61
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 138 deletions.
diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/AmountInput.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/AmountInput.kt
@@ -240,7 +240,7 @@ fun AmountInput(
                 colors = outlinedTextFieldColors(),
                 interactionSource = interactionSource,
                 shape = RoundedCornerShape(8.dp),
-                modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp, top = if (staticLabel != null) 14.dp else 0.dp)
+                modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp, top = if (staticLabel != null) 12.dp else 0.dp)
             )
         }
 

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/FeerateSlider.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/FeerateSlider.kt
@@ -37,10 +37,11 @@ fun FeerateSlider(
     feerate: Satoshi,
     onFeerateChange: (Satoshi) -> Unit,
     mempoolFeerate: MempoolFeerate?,
-    enabled: Boolean
+    enabled: Boolean,
+    modifier: Modifier = Modifier,
 ) {
     var showUnknownMempoolStateDialog by remember { mutableStateOf(false) }
-    Column {
+    Column(modifier = modifier) {
         // the actual value of the feerate, in sat/vbyte
         Text(text = stringResource(id = R.string.cpfp_feerate_value, feerate.sat), style = MaterialTheme.typography.body2)
 
@@ -73,13 +74,13 @@ fun FeerateSlider(
             CompositionLocalProvider(LocalTextStyle provides MaterialTheme.typography.body1.copy(fontSize = 14.sp)) {
                 when {
                     feerate >= mempoolFeerate.fastest.feerate -> {
-                        Text(text = stringResource(id = R.string.mempool_fastest), maxLines = 1)
+                        Text(text = stringResource(id = R.string.mempool_fastest), maxLines = 1, modifier = Modifier.padding(vertical = 1.dp))
                     }
                     feerate >= mempoolFeerate.halfHour.feerate -> {
-                        Text(text = stringResource(id = R.string.mempool_halfhour), maxLines = 1)
+                        Text(text = stringResource(id = R.string.mempool_halfhour), maxLines = 1, modifier = Modifier.padding(vertical = 1.dp))
                     }
                     feerate >= mempoolFeerate.hour.feerate -> {
-                        Text(text = stringResource(id = R.string.mempool_hour), maxLines = 1)
+                        Text(text = stringResource(id = R.string.mempool_hour), maxLines = 1, modifier = Modifier.padding(vertical = 1.dp))
                     }
                     else -> {
                         TextWithIcon(text = stringResource(id = R.string.mempool_slow), icon = R.drawable.ic_alert_triangle, iconTint = MaterialTheme.colors.onSurface, space = 4.dp, maxLines = 1)

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Inputs.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/components/Inputs.kt
@@ -96,7 +96,7 @@ fun TextInput(
             colors = if (errorMessage.isNullOrBlank()) outlinedTextFieldColors() else errorOutlinedTextFieldColors(),
             shape = RoundedCornerShape(8.dp),
             interactionSource = interactionSource,
-            modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp, top = if (staticLabel != null) 14.dp else 0.dp)
+            modifier = Modifier.fillMaxWidth().padding(bottom = 8.dp, top = if (staticLabel != null) 12.dp else 0.dp)
         )
 
         staticLabel?.let {

diff --git a/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/MutualCloseView.kt b/phoenix-android/src/main/kotlin/fr/acinq/phoenix/android/settings/MutualCloseView.kt
@@ -65,11 +65,7 @@ fun MutualCloseView(
     MVIView(CF::closeChannelsConfiguration) { model, postIntent ->
         if (showScannerView) {
             var scanView by remember { mutableStateOf<DecoratedBarcodeView?>(null) }
-            Box(
-                Modifier
-                    .fillMaxWidth()
-                    .fillMaxHeight()
-            ) {
+            Box(Modifier.fillMaxSize()) {
                 ScannerView(
                     onScanViewBinding = { scanView = it },
                     onScannedText = {