Skip to content

Commit f7b3ee3

Browse files
lazarinibrunolazarinibruno
committed
style: run ktfmtFormat
1 parent 2097c83 commit f7b3ee3

File tree

3 files changed

+89
-90
lines changed

3 files changed

+89
-90
lines changed

‎app/src/main/java/com/android/periodpals/ui/theme/Color.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ val surfaceContainerLight = Color(0xFFEDEDF4)
4747
val surfaceContainerHighLight = Color(0xFFE7E8EE)
4848
val surfaceContainerHighestLight = Color(0xFFE2E2E9)
4949

50-
5150
/* Dark theme, still in development and thus not in use */
5251
val primaryDark = Color(0xFFAAC7FF)
5352
val onPrimaryDark = Color(0xFF0A305F)
@@ -84,4 +83,3 @@ val surfaceContainerLowDark = Color(0xFF191C20)
8483
val surfaceContainerDark = Color(0xFF1D2024)
8584
val surfaceContainerHighDark = Color(0xFF282A2F)
8685
val surfaceContainerHighestDark = Color(0xFF33353A)
87-

‎app/src/main/java/com/android/periodpals/ui/theme/Theme.kt

Lines changed: 89 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -32,81 +32,83 @@ private val LightColorScheme =
3232
)
3333

3434
/* Color themes still in development */
35-
private val lightSchemeInDev = lightColorScheme(
36-
primary = primaryLight,
37-
onPrimary = onPrimaryLight,
38-
primaryContainer = primaryContainerLight,
39-
onPrimaryContainer = onPrimaryContainerLight,
40-
secondary = secondaryLight,
41-
onSecondary = onSecondaryLight,
42-
secondaryContainer = secondaryContainerLight,
43-
onSecondaryContainer = onSecondaryContainerLight,
44-
tertiary = tertiaryLight,
45-
onTertiary = onTertiaryLight,
46-
tertiaryContainer = tertiaryContainerLight,
47-
onTertiaryContainer = onTertiaryContainerLight,
48-
error = errorLight,
49-
onError = onErrorLight,
50-
errorContainer = errorContainerLight,
51-
onErrorContainer = onErrorContainerLight,
52-
background = backgroundLight,
53-
onBackground = onBackgroundLight,
54-
surface = surfaceLight,
55-
onSurface = onSurfaceLight,
56-
surfaceVariant = surfaceVariantLight,
57-
onSurfaceVariant = onSurfaceVariantLight,
58-
outline = outlineLight,
59-
outlineVariant = outlineVariantLight,
60-
scrim = scrimLight,
61-
inverseSurface = inverseSurfaceLight,
62-
inverseOnSurface = inverseOnSurfaceLight,
63-
inversePrimary = inversePrimaryLight,
64-
surfaceDim = surfaceDimLight,
65-
surfaceBright = surfaceBrightLight,
66-
surfaceContainerLowest = surfaceContainerLowestLight,
67-
surfaceContainerLow = surfaceContainerLowLight,
68-
surfaceContainer = surfaceContainerLight,
69-
surfaceContainerHigh = surfaceContainerHighLight,
70-
surfaceContainerHighest = surfaceContainerHighestLight,
71-
)
35+
private val lightSchemeInDev =
36+
lightColorScheme(
37+
primary = primaryLight,
38+
onPrimary = onPrimaryLight,
39+
primaryContainer = primaryContainerLight,
40+
onPrimaryContainer = onPrimaryContainerLight,
41+
secondary = secondaryLight,
42+
onSecondary = onSecondaryLight,
43+
secondaryContainer = secondaryContainerLight,
44+
onSecondaryContainer = onSecondaryContainerLight,
45+
tertiary = tertiaryLight,
46+
onTertiary = onTertiaryLight,
47+
tertiaryContainer = tertiaryContainerLight,
48+
onTertiaryContainer = onTertiaryContainerLight,
49+
error = errorLight,
50+
onError = onErrorLight,
51+
errorContainer = errorContainerLight,
52+
onErrorContainer = onErrorContainerLight,
53+
background = backgroundLight,
54+
onBackground = onBackgroundLight,
55+
surface = surfaceLight,
56+
onSurface = onSurfaceLight,
57+
surfaceVariant = surfaceVariantLight,
58+
onSurfaceVariant = onSurfaceVariantLight,
59+
outline = outlineLight,
60+
outlineVariant = outlineVariantLight,
61+
scrim = scrimLight,
62+
inverseSurface = inverseSurfaceLight,
63+
inverseOnSurface = inverseOnSurfaceLight,
64+
inversePrimary = inversePrimaryLight,
65+
surfaceDim = surfaceDimLight,
66+
surfaceBright = surfaceBrightLight,
67+
surfaceContainerLowest = surfaceContainerLowestLight,
68+
surfaceContainerLow = surfaceContainerLowLight,
69+
surfaceContainer = surfaceContainerLight,
70+
surfaceContainerHigh = surfaceContainerHighLight,
71+
surfaceContainerHighest = surfaceContainerHighestLight,
72+
)
7273

73-
private val darkSchemeInDev = darkColorScheme(
74-
primary = primaryDark,
75-
onPrimary = onPrimaryDark,
76-
primaryContainer = primaryContainerDark,
77-
onPrimaryContainer = onPrimaryContainerDark,
78-
secondary = secondaryDark,
79-
onSecondary = onSecondaryDark,
80-
secondaryContainer = secondaryContainerDark,
81-
onSecondaryContainer = onSecondaryContainerDark,
82-
tertiary = tertiaryDark,
83-
onTertiary = onTertiaryDark,
84-
tertiaryContainer = tertiaryContainerDark,
85-
onTertiaryContainer = onTertiaryContainerDark,
86-
error = errorDark,
87-
onError = onErrorDark,
88-
errorContainer = errorContainerDark,
89-
onErrorContainer = onErrorContainerDark,
90-
background = backgroundDark,
91-
onBackground = onBackgroundDark,
92-
surface = surfaceDark,
93-
onSurface = onSurfaceDark,
94-
surfaceVariant = surfaceVariantDark,
95-
onSurfaceVariant = onSurfaceVariantDark,
96-
outline = outlineDark,
97-
outlineVariant = outlineVariantDark,
98-
scrim = scrimDark,
99-
inverseSurface = inverseSurfaceDark,
100-
inverseOnSurface = inverseOnSurfaceDark,
101-
inversePrimary = inversePrimaryDark,
102-
surfaceDim = surfaceDimDark,
103-
surfaceBright = surfaceBrightDark,
104-
surfaceContainerLowest = surfaceContainerLowestDark,
105-
surfaceContainerLow = surfaceContainerLowDark,
106-
surfaceContainer = surfaceContainerDark,
107-
surfaceContainerHigh = surfaceContainerHighDark,
108-
surfaceContainerHighest = surfaceContainerHighestDark,
109-
)
74+
private val darkSchemeInDev =
75+
darkColorScheme(
76+
primary = primaryDark,
77+
onPrimary = onPrimaryDark,
78+
primaryContainer = primaryContainerDark,
79+
onPrimaryContainer = onPrimaryContainerDark,
80+
secondary = secondaryDark,
81+
onSecondary = onSecondaryDark,
82+
secondaryContainer = secondaryContainerDark,
83+
onSecondaryContainer = onSecondaryContainerDark,
84+
tertiary = tertiaryDark,
85+
onTertiary = onTertiaryDark,
86+
tertiaryContainer = tertiaryContainerDark,
87+
onTertiaryContainer = onTertiaryContainerDark,
88+
error = errorDark,
89+
onError = onErrorDark,
90+
errorContainer = errorContainerDark,
91+
onErrorContainer = onErrorContainerDark,
92+
background = backgroundDark,
93+
onBackground = onBackgroundDark,
94+
surface = surfaceDark,
95+
onSurface = onSurfaceDark,
96+
surfaceVariant = surfaceVariantDark,
97+
onSurfaceVariant = onSurfaceVariantDark,
98+
outline = outlineDark,
99+
outlineVariant = outlineVariantDark,
100+
scrim = scrimDark,
101+
inverseSurface = inverseSurfaceDark,
102+
inverseOnSurface = inverseOnSurfaceDark,
103+
inversePrimary = inversePrimaryDark,
104+
surfaceDim = surfaceDimDark,
105+
surfaceBright = surfaceBrightDark,
106+
surfaceContainerLowest = surfaceContainerLowestDark,
107+
surfaceContainerLow = surfaceContainerLowDark,
108+
surfaceContainer = surfaceContainerDark,
109+
surfaceContainerHigh = surfaceContainerHighDark,
110+
surfaceContainerHighest = surfaceContainerHighestDark,
111+
)
110112

111113
@Composable
112114
fun PeriodPalsAppTheme(
@@ -116,23 +118,23 @@ fun PeriodPalsAppTheme(
116118
content: @Composable () -> Unit
117119
) {
118120
val colorScheme =
119-
when {
120-
darkTheme -> DarkColorScheme
121-
else -> LightColorScheme
122-
}
123-
124-
// Dynamic color scheme (disabled for the moment)
125-
/*
126-
val colorScheme =
127121
when {
128-
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
129-
val context = LocalContext.current
130-
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
131-
}
132122
darkTheme -> DarkColorScheme
133123
else -> LightColorScheme
134124
}
135-
*/
125+
126+
// Dynamic color scheme (disabled for the moment)
127+
/*
128+
val colorScheme =
129+
when {
130+
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
131+
val context = LocalContext.current
132+
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
133+
}
134+
darkTheme -> DarkColorScheme
135+
else -> LightColorScheme
136+
}
137+
*/
136138

137139
// Match the system bar to the primary color of the app when the app isn't in edit mode (that is,
138140
// actually running in a device/emulator)

‎app/src/main/java/com/android/periodpals/ui/theme/Type.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,3 @@ val Typography = Typography()
3535
*/
3636
)
3737
*/
38-

0 commit comments

Comments
 (0)