Skip to content

Commit ce04756

Browse files
PururunPururun
committed
Resolve some feedback
1 parent 3999d25 commit ce04756

File tree

3 files changed

+54
-54
lines changed

3 files changed

+54
-54
lines changed

‎android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/ServerIpOverridesScreen.kt

+1-2
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ private fun ImportOverridesByBottomSheet(
231231
}
232232
}
233233
}
234-
Color.Red
235234
val backgroundColor: Color = MaterialTheme.colorScheme.surfaceContainer
236235
val onBackgroundColor: Color = MaterialTheme.colorScheme.onSurface
237236

@@ -267,7 +266,7 @@ private fun ImportOverridesByBottomSheet(
267266
modifier = Modifier.testTag(SERVER_IP_OVERRIDES_IMPORT_BY_TEXT_TEST_TAG)
268267
)
269268
if (overridesActive) {
270-
HorizontalDivider(color = MaterialTheme.colorScheme.onSurface)
269+
HorizontalDivider(color = onBackgroundColor)
271270
Row(
272271
verticalAlignment = Alignment.CenterVertically,
273272
) {

‎android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorTokens.kt ‎android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorDarkTokens.kt

-52
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,6 @@ package net.mullvad.mullvadvpn.lib.theme.color
22

33
import androidx.compose.ui.graphics.Color
44

5-
// This is experimental and currently not used
6-
internal object ColorLightTokens {
7-
val Background = PaletteTokens.DarkBlue100
8-
val Error = PaletteTokens.Red600
9-
val ErrorContainer = PaletteTokens.Red100
10-
val InverseOnSurface = PaletteTokens.DarkBlue100
11-
val InversePrimary = PaletteTokens.Blue200
12-
val InverseSurface = PaletteTokens.DarkBlue800
13-
val OnBackground = PaletteTokens.DarkBlue900
14-
val OnError = PaletteTokens.Red900
15-
val OnErrorContainer = PaletteTokens.Red900
16-
val OnPrimary = PaletteTokens.Blue900
17-
val OnPrimaryContainer = PaletteTokens.Blue900
18-
val OnPrimaryFixed = PaletteTokens.Blue900
19-
val OnPrimaryFixedVariant = PaletteTokens.Blue700
20-
val OnSecondary = PaletteTokens.Green900
21-
val OnSecondaryContainer = PaletteTokens.Green900
22-
val OnSecondaryFixed = PaletteTokens.Green900
23-
val OnSecondaryFixedVariant = PaletteTokens.Green700
24-
val OnSurface = PaletteTokens.DarkBlue900
25-
val OnSurfaceVariant = PaletteTokens.DarkBlue700
26-
val OnTertiary = PaletteTokens.Yellow900
27-
val OnTertiaryContainer = PaletteTokens.Yellow900
28-
val OnTertiaryFixed = PaletteTokens.Yellow900
29-
val OnTertiaryFixedVariant = PaletteTokens.Yellow700
30-
val Outline = PaletteTokens.DarkBlue500
31-
val OutlineVariant = PaletteTokens.DarkBlue200
32-
val Primary = PaletteTokens.Blue600
33-
val PrimaryContainer = PaletteTokens.Blue100
34-
val PrimaryFixed = PaletteTokens.Blue100
35-
val PrimaryFixedDim = PaletteTokens.Blue200
36-
val Scrim = PaletteTokens.DarkBlue900
37-
val Secondary = PaletteTokens.Green600
38-
val SecondaryContainer = PaletteTokens.Green100
39-
val SecondaryFixed = PaletteTokens.Green100
40-
val SecondaryFixedDim = PaletteTokens.Green200
41-
val Surface = PaletteTokens.DarkBlue100
42-
val SurfaceBright = PaletteTokens.DarkBlue100
43-
val SurfaceContainer = PaletteTokens.DarkBlue900
44-
val SurfaceContainerHighest = OpacityTokens.WhiteOnBlue20
45-
val SurfaceContainerHigh = OpacityTokens.WhiteOnBlue40
46-
val SurfaceContainerLow = OpacityTokens.WhiteOnBlue50
47-
val SurfaceContainerLowest = OpacityTokens.WhiteOnBlue60
48-
val SurfaceDim = PaletteTokens.DarkBlue200
49-
val SurfaceTint = Primary
50-
val SurfaceVariant = PaletteTokens.DarkBlue100
51-
val Tertiary = PaletteTokens.Yellow600
52-
val TertiaryContainer = PaletteTokens.Yellow100
53-
val TertiaryFixed = PaletteTokens.Yellow100
54-
val TertiaryFixedDim = PaletteTokens.Yellow200
55-
}
56-
575
internal object ColorDarkTokens {
586
val Background = PaletteTokens.DarkBlue500 // Used by login screen and text fields
597
val Error = PaletteTokens.Red500 // General error color

‎android/lib/theme/src/main/kotlin/net/mullvad/mullvadvpn/lib/theme/color/ColorLightTokens.kt

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package net.mullvad.mullvadvpn.lib.theme.color
2+
3+
// This is experimental and currently not used
4+
internal object ColorLightTokens {
5+
val Background = PaletteTokens.DarkBlue100
6+
val Error = PaletteTokens.Red600
7+
val ErrorContainer = PaletteTokens.Red100
8+
val InverseOnSurface = PaletteTokens.DarkBlue100
9+
val InversePrimary = PaletteTokens.Blue200
10+
val InverseSurface = PaletteTokens.DarkBlue800
11+
val OnBackground = PaletteTokens.DarkBlue900
12+
val OnError = PaletteTokens.Red900
13+
val OnErrorContainer = PaletteTokens.Red900
14+
val OnPrimary = PaletteTokens.Blue900
15+
val OnPrimaryContainer = PaletteTokens.Blue900
16+
val OnPrimaryFixed = PaletteTokens.Blue900
17+
val OnPrimaryFixedVariant = PaletteTokens.Blue700
18+
val OnSecondary = PaletteTokens.Green900
19+
val OnSecondaryContainer = PaletteTokens.Green900
20+
val OnSecondaryFixed = PaletteTokens.Green900
21+
val OnSecondaryFixedVariant = PaletteTokens.Green700
22+
val OnSurface = PaletteTokens.DarkBlue900
23+
val OnSurfaceVariant = PaletteTokens.DarkBlue700
24+
val OnTertiary = PaletteTokens.Yellow900
25+
val OnTertiaryContainer = PaletteTokens.Yellow900
26+
val OnTertiaryFixed = PaletteTokens.Yellow900
27+
val OnTertiaryFixedVariant = PaletteTokens.Yellow700
28+
val Outline = PaletteTokens.DarkBlue500
29+
val OutlineVariant = PaletteTokens.DarkBlue200
30+
val Primary = PaletteTokens.Blue600
31+
val PrimaryContainer = PaletteTokens.Blue100
32+
val PrimaryFixed = PaletteTokens.Blue100
33+
val PrimaryFixedDim = PaletteTokens.Blue200
34+
val Scrim = PaletteTokens.DarkBlue900
35+
val Secondary = PaletteTokens.Green600
36+
val SecondaryContainer = PaletteTokens.Green100
37+
val SecondaryFixed = PaletteTokens.Green100
38+
val SecondaryFixedDim = PaletteTokens.Green200
39+
val Surface = PaletteTokens.DarkBlue100
40+
val SurfaceBright = PaletteTokens.DarkBlue100
41+
val SurfaceContainer = PaletteTokens.DarkBlue900
42+
val SurfaceContainerHighest = OpacityTokens.WhiteOnBlue20
43+
val SurfaceContainerHigh = OpacityTokens.WhiteOnBlue40
44+
val SurfaceContainerLow = OpacityTokens.WhiteOnBlue50
45+
val SurfaceContainerLowest = OpacityTokens.WhiteOnBlue60
46+
val SurfaceDim = PaletteTokens.DarkBlue200
47+
val SurfaceTint = Primary
48+
val SurfaceVariant = PaletteTokens.DarkBlue100
49+
val Tertiary = PaletteTokens.Yellow600
50+
val TertiaryContainer = PaletteTokens.Yellow100
51+
val TertiaryFixed = PaletteTokens.Yellow100
52+
val TertiaryFixedDim = PaletteTokens.Yellow200
53+
}

0 commit comments

Comments
 (0)