Skip to content

Commit 43d85d3

Browse files
committed
Adjust color transparency in dark mode
1 parent 842f1ef commit 43d85d3

2 files changed

Lines changed: 18 additions & 5 deletions

File tree

ui/src/commonMain/kotlin/net/cacheux/nvp/ui/DoseList.kt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import androidx.compose.foundation.lazy.items
1515
import androidx.compose.material3.HorizontalDivider
1616
import androidx.compose.material3.MaterialTheme
1717
import androidx.compose.material3.Text
18+
import androidx.compose.material3.darkColorScheme
1819
import androidx.compose.runtime.Composable
1920
import androidx.compose.ui.Alignment
2021
import androidx.compose.ui.Modifier
@@ -112,7 +113,9 @@ fun DoseListItem(
112113
Box(
113114
modifier = Modifier
114115
.background(
115-
color = dose.doses.first().color.hexToColor().copy(alpha = 0.5f)
116+
color = dose.doses.first().color.hexToColor().copy(
117+
alpha = if (isInDarkMode()) 0.3f else 0.5f
118+
)
116119
)
117120
.fillMaxWidth()
118121
.clickable { onClick(dose) }
@@ -125,11 +128,13 @@ fun DoseListItem(
125128
Text(
126129
fontSize = 14.sp,
127130
fontStyle = FontStyle.Italic,
131+
color = MaterialTheme.colorScheme.onSurface,
128132
text = format.format(Date(dose.getTime()))
129133
)
130134
Text(
131135
fontSize = 18.sp,
132136
fontWeight = FontWeight.SemiBold,
137+
color = MaterialTheme.colorScheme.onSurface,
133138
text = dose.displayedTotal()
134139
)
135140

@@ -156,10 +161,12 @@ fun DoseListPreview() {
156161
testDoseGroup(testDateTime(12, 1, 15, date = 2), 14),
157162
testDoseGroup(testDateTime(12, 1, 14, date = 3), 14),
158163
)
159-
DoseList(
160-
items,
161-
currentDoseGroup = current
162-
)
164+
MaterialTheme(colorScheme = darkColorScheme()) {
165+
DoseList(
166+
items,
167+
currentDoseGroup = current
168+
)
169+
}
163170
}
164171

165172
@Preview

ui/src/commonMain/kotlin/net/cacheux/nvp/ui/utils.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package net.cacheux.nvp.ui
22

3+
import androidx.compose.material3.MaterialTheme
4+
import androidx.compose.material3.darkColorScheme
35
import androidx.compose.runtime.Composable
46
import androidx.compose.runtime.collectAsState
57
import net.cacheux.nvplib.utils.StateFlowWrapper
@@ -19,3 +21,7 @@ fun <T> stateWrapper(initValue: T, setter: (T) -> Unit = {}) = StateWrapper(
1921
value = initValue,
2022
setter = setter
2123
)
24+
25+
@Composable
26+
fun isInDarkMode() =
27+
MaterialTheme.colorScheme.background == darkColorScheme().background

0 commit comments

Comments
 (0)