Skip to content

Commit 4e489d2

Browse files
CreativeCodeCatCreativeCodeCat
committed
refactor(UI): Adjust spacing and padding in settings
This commit introduces several minor UI adjustments to the settings screen to improve visual consistency and reduce whitespace. - Reduces the vertical spacing between settings groups from `14.dp` to `12.dp` in `SettingsFragment`. - Decreases padding and spacing within the `SettingsItem` composable. - Adjusts the font size calculation for the "Enabled/Disabled" and option text in `SettingsToggle` and `SettingsRadioButton`, making it proportional to the primary font size.
1 parent 58b1b4e commit 4e489d2

File tree

2 files changed

+20
-24
lines changed

2 files changed

+20
-24
lines changed

‎app/src/main/java/com/github/droidworksstudio/mlauncher/ui/SettingsFragment.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ class SettingsFragment : BaseFragment() {
624624
}
625625
)
626626

627-
Spacer(modifier = Modifier.height(14.dp))
627+
Spacer(modifier = Modifier.height(12.dp))
628628

629629
// App List & Search
630630
SettingsTitle(
@@ -753,7 +753,7 @@ class SettingsFragment : BaseFragment() {
753753
)
754754
}
755755

756-
Spacer(modifier = Modifier.height(14.dp))
756+
Spacer(modifier = Modifier.height(12.dp))
757757

758758
// Home Management
759759
SettingsTitle(
@@ -876,7 +876,7 @@ class SettingsFragment : BaseFragment() {
876876
)
877877
}
878878

879-
Spacer(modifier = Modifier.height(14.dp))
879+
Spacer(modifier = Modifier.height(12.dp))
880880

881881
// Toggles
882882
SettingsTitle(
@@ -985,7 +985,7 @@ class SettingsFragment : BaseFragment() {
985985
}
986986
)
987987

988-
Spacer(modifier = Modifier.height(14.dp))
988+
Spacer(modifier = Modifier.height(12.dp))
989989

990990
// Info Tiles
991991
SettingsTitle(
@@ -1067,7 +1067,7 @@ class SettingsFragment : BaseFragment() {
10671067
}
10681068
)
10691069

1070-
Spacer(modifier = Modifier.height(14.dp))
1070+
Spacer(modifier = Modifier.height(12.dp))
10711071

10721072
// Weather
10731073
SettingsTitle(
@@ -1209,7 +1209,7 @@ class SettingsFragment : BaseFragment() {
12091209
}
12101210
)
12111211

1212-
Spacer(modifier = Modifier.height(14.dp))
1212+
Spacer(modifier = Modifier.height(12.dp))
12131213

12141214
// Visibility & Display
12151215
SettingsTitle(
@@ -1314,7 +1314,7 @@ class SettingsFragment : BaseFragment() {
13141314
)
13151315
}
13161316

1317-
Spacer(modifier = Modifier.height(14.dp))
1317+
Spacer(modifier = Modifier.height(12.dp))
13181318

13191319
// Alignment
13201320
SettingsTitle(
@@ -1457,7 +1457,7 @@ class SettingsFragment : BaseFragment() {
14571457
}
14581458
)
14591459

1460-
Spacer(modifier = Modifier.height(14.dp))
1460+
Spacer(modifier = Modifier.height(12.dp))
14611461

14621462
// Colors
14631463
SettingsTitle(
@@ -1620,7 +1620,7 @@ class SettingsFragment : BaseFragment() {
16201620
}
16211621
)
16221622

1623-
Spacer(modifier = Modifier.height(14.dp))
1623+
Spacer(modifier = Modifier.height(12.dp))
16241624

16251625
// Icon Packs
16261626
SettingsTitle(
@@ -1709,7 +1709,7 @@ class SettingsFragment : BaseFragment() {
17091709
}
17101710
)
17111711

1712-
Spacer(modifier = Modifier.height(14.dp))
1712+
Spacer(modifier = Modifier.height(12.dp))
17131713

17141714
// Text Size (moved to bottom for advanced users)
17151715
SettingsTitle(
@@ -2001,7 +2001,7 @@ class SettingsFragment : BaseFragment() {
20012001
}
20022002
)
20032003

2004-
Spacer(modifier = Modifier.height(14.dp))
2004+
Spacer(modifier = Modifier.height(12.dp))
20052005

20062006
// Swipe Actions
20072007
SettingsTitle(
@@ -2256,7 +2256,7 @@ class SettingsFragment : BaseFragment() {
22562256
}
22572257
)
22582258

2259-
Spacer(modifier = Modifier.height(14.dp))
2259+
Spacer(modifier = Modifier.height(12.dp))
22602260

22612261
// Thresholds
22622262
SettingsTitle(
@@ -2344,7 +2344,7 @@ class SettingsFragment : BaseFragment() {
23442344
}
23452345
)
23462346

2347-
Spacer(modifier = Modifier.height(14.dp))
2347+
Spacer(modifier = Modifier.height(12.dp))
23482348

23492349
// Notes Colors
23502350
SettingsTitle(
@@ -2447,7 +2447,7 @@ class SettingsFragment : BaseFragment() {
24472447
}
24482448
)
24492449

2450-
Spacer(modifier = Modifier.height(14.dp))
2450+
Spacer(modifier = Modifier.height(12.dp))
24512451

24522452
// Input Colors
24532453
SettingsTitle(
@@ -2757,7 +2757,7 @@ class SettingsFragment : BaseFragment() {
27572757
}
27582758
)
27592759

2760-
Spacer(modifier = Modifier.height(14.dp))
2760+
Spacer(modifier = Modifier.height(12.dp))
27612761

27622762
// Personalization
27632763
SettingsTitle(

‎app/src/main/java/com/github/droidworksstudio/mlauncher/ui/compose/SettingsComposable.kt‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ object SettingsComposable {
210210
}
211211
}
212212
}
213-
.padding(vertical = 16.dp, horizontal = 16.dp),
213+
.padding(vertical = 8.dp, horizontal = 12.dp),
214214
verticalAlignment = Alignment.CenterVertically
215215
) {
216216
Image(
@@ -219,7 +219,7 @@ object SettingsComposable {
219219
modifier = Modifier.size(iconSize)
220220
)
221221

222-
Spacer(modifier = Modifier.width(16.dp))
222+
Spacer(modifier = Modifier.width(12.dp))
223223

224224
Column {
225225
AndroidView(
@@ -237,7 +237,7 @@ object SettingsComposable {
237237
)
238238

239239
description?.let {
240-
Spacer(modifier = Modifier.height(4.dp))
240+
Spacer(modifier = Modifier.height(1.dp))
241241
AndroidView(
242242
factory = { context ->
243243
FontAppCompatTextView(context).apply {
@@ -476,13 +476,11 @@ object SettingsComposable {
476476
}
477477
)
478478

479-
Spacer(modifier = Modifier.height(2.dp)) // optional spacing
480-
481479
// “Enabled/Disabled” text
482480
AndroidView(
483481
factory = { ctx ->
484482
FontAppCompatTextView(ctx).apply {
485-
setTextSize(TypedValue.COMPLEX_UNIT_SP, resolvedFontSizeSp - 2)
483+
setTextSize(TypedValue.COMPLEX_UNIT_SP, (resolvedFontSizeSp / 1.3).toFloat())
486484
textAlignment = View.TEXT_ALIGNMENT_VIEW_START
487485
}
488486
},
@@ -527,12 +525,10 @@ object SettingsComposable {
527525
}
528526
)
529527

530-
Spacer(modifier = Modifier.height(2.dp)) // optional spacing between title and option
531-
532528
AndroidView(
533529
factory = { context ->
534530
FontAppCompatTextView(context).apply {
535-
setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSizeSp - 2)
531+
setTextSize(TypedValue.COMPLEX_UNIT_SP, (fontSizeSp / 1.3).toFloat())
536532
}
537533
},
538534
modifier = Modifier.wrapContentHeight(),

0 commit comments

Comments
 (0)