Skip to content

Commit 158990a

Browse files
saadndmWyvest
andauthored
fix(ui): remove duplicate accordion option padding (#1089)
Co-authored-by: Julian Chang <wyvest@polyfrost.org>
1 parent 092d202 commit 158990a

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

  • modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/screens

modules/internal/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/screens/ConfigScreen.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ private fun AccordionRow(node: SettingNode.Accordion, compact: Boolean = false)
434434
},
435435
shape = shape
436436
)
437-
.padding(vertical = 12.dp)
437+
.padding(bottom = 12.dp)
438438
) {
439439
AccordionOptionsGrid(node.body, compact = compact)
440440
}
@@ -612,9 +612,10 @@ private fun displayAlpha(display: Property.Display): Float {
612612
@Composable
613613
private fun SettingContent(prop: Property<*>, nested: Boolean = false, compact: Boolean = false, enabled: Boolean = true) {
614614
val theme = LocalTheme.current
615+
val verticalPadding = if (nested) 0.dp else 12.dp
615616

616617
if (prop.getMetadata<Any?>("visualizer") == Visualizer.InfoVisualizer::class.java) {
617-
Row(modifier = Modifier.fillMaxWidth().blockInteraction(!enabled).padding(horizontal = 16.dp, vertical = 12.dp)) {
618+
Row(modifier = Modifier.fillMaxWidth().blockInteraction(!enabled).padding(horizontal = 16.dp, vertical = verticalPadding)) {
618619
Option(prop)
619620
}
620621
return
@@ -677,7 +678,7 @@ private fun SettingContent(prop: Property<*>, nested: Boolean = false, compact:
677678
modifier = Modifier
678679
.fillMaxWidth()
679680
.blockInteraction(!enabled)
680-
.padding(horizontal = 16.dp, vertical = 12.dp),
681+
.padding(start = 16.dp, end = 16.dp, top = verticalPadding, bottom = if (nested) 8.dp else verticalPadding),
681682
verticalArrangement = Arrangement.spacedBy(10.dp),
682683
) {
683684
SettingLabel(prop, nested = nested)
@@ -704,7 +705,7 @@ private fun SettingContent(prop: Property<*>, nested: Boolean = false, compact:
704705
modifier = Modifier
705706
.fillMaxWidth()
706707
.blockInteraction(!enabled)
707-
.padding(horizontal = 16.dp, vertical = 12.dp),
708+
.padding(horizontal = 16.dp, vertical = verticalPadding),
708709
verticalAlignment = Alignment.CenterVertically,
709710
horizontalArrangement = Arrangement.spacedBy(16.dp),
710711
) {

0 commit comments

Comments
 (0)