Skip to content

Commit ea9ab79

Browse files
committed
refactor: test out new colors
1 parent 7d22b57 commit ea9ab79

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui/components/ReviewCard.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ fun ReviewCard(
3939
) {
4040
Column(
4141
modifier = Modifier
42-
.background(color = MaterialTheme.colorScheme.secondaryContainer)
4342
.padding(16.dp)
4443
) {
4544
Text(

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui/theme/Color.kt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,18 @@ package com.google.firebase.example.dataconnect.ui.theme
22

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

5-
val Purple80 = Color(0xFFD0BCFF)
6-
val PurpleGrey80 = Color(0xFFCCC2DC)
7-
val Pink80 = Color(0xFFEFB8C8)
5+
val Blue80 = Color(0xFF77A6EE)
6+
val BlueGrey80 = Color(0xFF27282A)
7+
val Pink80 = Color(0xFFB8C8EF)
88

99
val Purple40 = Color(0xFF6650a4)
1010
val PurpleGrey40 = Color(0xFF625b71)
11-
val Pink40 = Color(0xFF7D5260)
11+
val Pink40 = Color(0xFF7D5260)
12+
13+
val Red = Color(0xFFB73612)
14+
val Yellow = Color(0xFFF4E9D7)
15+
val Gray = Color(0xFFF0F0F0)
16+
val White = Color(0xFFF4F4F5)
17+
18+
val Ink1 = Color(0xFF131314)
19+
val Ink2 = Color(0xFF222222)

dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui/theme/Theme.kt

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.google.firebase.example.dataconnect.ui.theme
22

3-
import android.app.Activity
43
import android.os.Build
54
import androidx.compose.foundation.isSystemInDarkTheme
65
import androidx.compose.material3.MaterialTheme
@@ -12,9 +11,12 @@ import androidx.compose.runtime.Composable
1211
import androidx.compose.ui.platform.LocalContext
1312

1413
private val DarkColorScheme = darkColorScheme(
15-
primary = Purple80,
16-
secondary = PurpleGrey80,
17-
tertiary = Pink80
14+
primary = Blue80,
15+
onPrimary = Ink1,
16+
secondary = BlueGrey80,
17+
tertiary = Pink80,
18+
background = Ink1,
19+
surfaceVariant = Ink2
1820
)
1921

2022
private val LightColorScheme = lightColorScheme(
@@ -37,7 +39,7 @@ private val LightColorScheme = lightColorScheme(
3739
fun FirebaseDataConnectTheme(
3840
darkTheme: Boolean = isSystemInDarkTheme(),
3941
// Dynamic color is available on Android 12+
40-
dynamicColor: Boolean = true,
42+
dynamicColor: Boolean = false,
4143
content: @Composable () -> Unit
4244
) {
4345
val colorScheme = when {

0 commit comments

Comments
 (0)