Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions app/src/main/java/to/bitkit/ui/components/NumberPadActionButton.kt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package to.bitkit.ui.components

import androidx.annotation.DrawableRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
Expand All @@ -12,7 +12,6 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.OutlinedButton
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
Expand Down Expand Up @@ -76,32 +75,30 @@ fun NumberPadActionButton(
}
}
} else {
OutlinedButton(
onClick = onClick,
shape = buttonShape,
colors = AppButtonDefaults.secondaryColors,
contentPadding = contentPadding,
border = BorderStroke(width = 1.dp, color = color),
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
modifier = modifier
.requiredHeight(height)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(8.dp),
) {
if (icon != null) {
Icon(
painter = painterResource(icon),
contentDescription = text,
tint = color,
modifier = Modifier.size(16.dp)
)
}
Caption13Up(
text = text,
.border(
width = 1.dp,
color = color,
shape = buttonShape
)
.padding(contentPadding)
) {
if (icon != null) {
Icon(
painter = painterResource(icon),
contentDescription = text,
tint = color,
modifier = Modifier.size(16.dp)
)
}
Caption13Up(
text = text,
color = color,
)
}
}
}
Expand Down
Loading