refactor: replace Spacer with custom spacers

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

@@ -4,7 +4,6 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
@@ -179,7 +178,7 @@ private fun PinPad(
                         .testTag("AttemptsRemaining")
                 )
             }
-            Spacer(modifier = Modifier.height(16.dp))
+            VerticalSpacer(16.dp)
         }
 
         if (allowBiometrics) {
@@ -199,7 +198,7 @@ private fun PinPad(
                     )
                 },
             )
-            Spacer(modifier = Modifier.height(16.dp))
+            VerticalSpacer(16.dp)
         }
 
         PinDots(

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

@@ -4,7 +4,6 @@ import androidx.compose.animation.AnimatedContent
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -162,7 +161,7 @@ fun BalanceHeader(
             )
 
             if (showEyeIcon) {
-                Spacer(modifier = Modifier.weight(1f))
+                FillWidth()
                 AnimatedContent(
                     targetState = hideBalance,
                     transitionSpec = { BalanceAnimations.eyeIconTransition },

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

@@ -2,9 +2,7 @@ package to.bitkit.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
@@ -61,7 +59,7 @@ fun BiometricsView(
             contentDescription = null,
             modifier = Modifier.size(64.dp),
         )
-        Spacer(modifier = Modifier.height(16.dp))
+        VerticalSpacer(16.dp)
         Subtitle(
             text = run {
                 val biometricsName = stringResource(R.string.security__bio)

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

@@ -4,9 +4,7 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.layout.padding
@@ -42,7 +40,7 @@ fun EmptyStateView(
             modifier = Modifier
                 .padding(bottom = 130.dp)
         ) {
-            Spacer(modifier = Modifier.height(6.dp))
+            VerticalSpacer(6.dp)
             Row(
                 verticalAlignment = Alignment.Bottom,
                 modifier = Modifier
@@ -61,7 +59,7 @@ fun EmptyStateView(
                         .heightIn(max = 144.dp)
                         .offset(x = (-10).dp)
                 )
-                Spacer(modifier = Modifier.weight(1f))
+                FillWidth()
             }
         }
         if (onClose != null) {

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

@@ -2,9 +2,7 @@ package to.bitkit.ui.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.Composable
@@ -28,9 +26,9 @@ fun RowScope.FeeInfo(
             text = label,
             color = Colors.White64,
         )
-        Spacer(modifier = Modifier.height(8.dp))
+        VerticalSpacer(8.dp)
         MoneySSB(sats = amount)
-        Spacer(modifier = Modifier.weight(1f))
+        FillHeight()
         HorizontalDivider(modifier = Modifier.padding(top = 16.dp))
     }
 }

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

@@ -3,9 +3,7 @@ package to.bitkit.ui.components
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.runtime.Composable
@@ -55,12 +53,12 @@ fun InfoScreenContent(
                 .padding(horizontal = 16.dp)
                 .testTag(testTag)
         ) {
-            Spacer(modifier = Modifier.height(16.dp))
+            VerticalSpacer(16.dp)
             Display(text = title)
-            Spacer(modifier = Modifier.height(8.dp))
+            VerticalSpacer(8.dp)
             BodyM(text = description, color = Colors.White64)
 
-            Spacer(modifier = Modifier.weight(1f))
+            FillHeight()
 
             Box(
                 contentAlignment = Alignment.Center,
@@ -77,13 +75,13 @@ fun InfoScreenContent(
                 )
             }
 
-            Spacer(modifier = Modifier.weight(1f))
+            FillHeight()
             PrimaryButton(
                 text = buttonText,
                 onClick = onButtonClick,
                 modifier = Modifier.testTag("$testTag-button")
             )
-            Spacer(modifier = Modifier.height(16.dp))
+            VerticalSpacer(16.dp)
         }
     }
 }

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

@@ -7,13 +7,11 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ArrowDownward
@@ -62,7 +60,7 @@ fun LightningChannel(
                 Caption13Up(text = stringResource(R.string.lightning__spending_label), color = Colors.White64)
                 Caption13Up(text = stringResource(R.string.lightning__receiving_label), color = Colors.White64)
             }
-            Spacer(modifier = Modifier.height(8.dp))
+            VerticalSpacer(8.dp)
         }
         Row(
             horizontalArrangement = Arrangement.SpaceBetween,
@@ -93,7 +91,7 @@ fun LightningChannel(
                 )
             }
         }
-        Spacer(modifier = Modifier.height(8.dp))
+        VerticalSpacer(8.dp)
         Row(
             verticalAlignment = CenterVertically,
             modifier = Modifier
@@ -114,7 +112,7 @@ fun LightningChannel(
                         .background(spendingAvailableColor, RoundedCornerShape(topStart = 8.dp, bottomStart = 8.dp))
                 )
             }
-            Spacer(modifier = Modifier.width(4.dp))
+            HorizontalSpacer(4.dp)
             Box(
                 modifier = Modifier
                     .weight(1f)

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

@@ -8,9 +8,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.width
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
@@ -92,7 +90,7 @@ private fun WordItem(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         BodyMSB(text = "$number.", color = Colors.White64)
-        Spacer(modifier = Modifier.width(8.dp))
+        HorizontalSpacer(8.dp)
         BodyMSB(text = word, color = Colors.White)
     }
 }

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

@@ -4,12 +4,10 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalTextStyle
 import androidx.compose.material3.MaterialTheme
@@ -145,7 +143,7 @@ private fun PreviewWithTrailingIcons() {
                         isActive = true,
                         onClick = {}
                     )
-                    Spacer(modifier = Modifier.width(12.dp))
+                    HorizontalSpacer(12.dp)
                     SearchInputIconButton(
                         iconRes = R.drawable.ic_calendar,
                         isActive = false,

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

@@ -15,44 +15,56 @@ import to.bitkit.ui.theme.Insets
 import to.bitkit.ui.theme.TopBarHeight
 
 @Composable
-fun VerticalSpacer(height: Dp) {
-    Spacer(modifier = Modifier.height(height))
+fun VerticalSpacer(
+    height: Dp,
+    modifier: Modifier = Modifier,
+) {
+    Spacer(modifier = modifier then Modifier.height(height))
 }
 
 @Composable
-fun ColumnScope.VerticalSpacer(minHeight: Dp, maxHeight: Dp) {
+fun ColumnScope.VerticalSpacer(
+    minHeight: Dp,
+    maxHeight: Dp,
+    modifier: Modifier = Modifier,
+) {
     Spacer(
-        modifier = Modifier
+        modifier = modifier then Modifier
             .weight(1f)
             .sizeIn(minHeight = minHeight, maxHeight = maxHeight)
     )
 }
 
 @Composable
-fun HorizontalSpacer(width: Dp) {
-    Spacer(modifier = Modifier.width(width))
+fun HorizontalSpacer(
+    width: Dp,
+    modifier: Modifier = Modifier,
+) {
+    Spacer(modifier = modifier then Modifier.width(width))
 }
 
 @Suppress("ComposeMultipleContentEmitters")
 @Composable
 fun ColumnScope.FillHeight(
+    modifier: Modifier = Modifier,
     @FloatRange weight: Float = 1f,
     fill: Boolean = true,
     min: Dp = 0.dp,
 ) {
-    if (min > 0.dp) Spacer(modifier = Modifier.height(min))
-    Spacer(modifier = Modifier.weight(weight, fill = fill))
+    if (min > 0.dp) Spacer(modifier = modifier then Modifier.height(min))
+    Spacer(modifier = modifier then Modifier.weight(weight, fill = fill))
 }
 
 @Suppress("ComposeMultipleContentEmitters")
 @Composable
 fun RowScope.FillWidth(
+    modifier: Modifier = Modifier,
     @FloatRange weight: Float = 1f,
     fill: Boolean = true,
     min: Dp = 0.dp,
 ) {
-    if (min > 0.dp) Spacer(modifier = Modifier.width(min))
-    Spacer(modifier = Modifier.weight(weight, fill = fill))
+    if (min > 0.dp) Spacer(modifier = modifier then Modifier.width(min))
+    Spacer(modifier = modifier then Modifier.weight(weight, fill = fill))
 }
 
 @Composable

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

@@ -1,9 +1,7 @@
 package to.bitkit.ui.components
 
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -23,15 +21,15 @@ fun SyncNodeView(modifier: Modifier) {
         modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Spacer(Modifier.height(32.dp))
+        VerticalSpacer(32.dp)
 
         BodyM(
             text = stringResource(R.string.lightning__wait_text_top),
             color = Colors.White64,
             modifier = Modifier.padding(horizontal = 16.dp)
         )
 
-        Spacer(modifier = Modifier.weight(1f))
+        FillHeight()
 
         TransferAnimationView(
             largeCircleRes = R.drawable.ln_sync_large,
@@ -40,11 +38,11 @@ fun SyncNodeView(modifier: Modifier) {
             rotateContent = false
         )
 
-        Spacer(modifier = Modifier.weight(1f))
+        FillHeight()
 
         BodySSB(text = stringResource(R.string.lightning__wait_text_bottom), color = Colors.White32)
 
-        Spacer(modifier = Modifier.height(32.dp))
+        VerticalSpacer(32.dp)
     }
 }
 

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

@@ -6,14 +6,12 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.BoxScope
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
@@ -92,7 +90,7 @@ fun BoxScope.TabBar(
                         contentDescription = stringResource(R.string.wallet__send),
                         modifier = Modifier.size(iconSize)
                     )
-                    Spacer(Modifier.width(iconToTextGap))
+                    HorizontalSpacer(iconToTextGap)
                     BodySSB(text = stringResource(R.string.wallet__send))
                 }
             }
@@ -113,7 +111,7 @@ fun BoxScope.TabBar(
                         contentDescription = stringResource(R.string.wallet__receive),
                         modifier = Modifier.size(iconSize)
                     )
-                    Spacer(Modifier.width(iconToTextGap))
+                    HorizontalSpacer(iconToTextGap)
                     BodySSB(text = stringResource(R.string.wallet__receive))
                 }
             }

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

@@ -6,7 +6,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
-import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
@@ -106,7 +105,7 @@ private fun RowScope.Content(
             text = title,
             color = Colors.White64,
         )
-        Spacer(modifier = Modifier.height(8.dp))
+        VerticalSpacer(8.dp)
 
         converted?.let { converted ->
             Row(