File tree Expand file tree Collapse file tree 3 files changed +19
-10
lines changed
dataconnect/app/src/main/java/com/google/firebase/example/dataconnect/ui Expand file tree Collapse file tree 3 files changed +19
-10
lines changed Original file line number Diff line number Diff 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 (
Original file line number Diff line number Diff line change @@ -2,10 +2,18 @@ package com.google.firebase.example.dataconnect.ui.theme
22
33import 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
99val Purple40 = Color (0xFF6650a4 )
1010val 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 )
Original file line number Diff line number Diff line change 11package com.google.firebase.example.dataconnect.ui.theme
22
3- import android.app.Activity
43import android.os.Build
54import androidx.compose.foundation.isSystemInDarkTheme
65import androidx.compose.material3.MaterialTheme
@@ -12,9 +11,12 @@ import androidx.compose.runtime.Composable
1211import androidx.compose.ui.platform.LocalContext
1312
1413private 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
2022private val LightColorScheme = lightColorScheme(
@@ -37,7 +39,7 @@ private val LightColorScheme = lightColorScheme(
3739fun 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 {
You can’t perform that action at this time.
0 commit comments