Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d09b190 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere
Browse files

Reconcile MaterialTheme.colorScheme and AndroidColorScheme (1/2) 

This CL reconcicles MaterialTheme.colorScheme with AndroidColorScheme,
so that the only colors left in AndroidColorScheme are the ones not
already available in MaterialTheme.colorScheme. See
b/370422346#comment2 for details.

This CL also adds a test that ensures that the Material colors match
the associated value coming from attributes (R.attr.materialColorFoo).

Bug: 370422346
Test: atest PlatformThemeTest
Flag: NONE color alignment
Change-Id: Ieef5db28a4b60e9de0d998597ad489c7d5468ebf
parent 69dae7aa

packages/CredentialManager/src/com/android/credentialmanager/common/ui/BottomSheet.kt

+2 −3
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import androidx.compose.runtime.rememberCoroutineScope 
import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import com.android.compose.rememberSystemUiController

import com.android.compose.theme.LocalAndroidColorScheme

import androidx.compose.ui.unit.dp

import com.android.credentialmanager.common.material.ModalBottomSheetLayout

import com.android.credentialmanager.common.material.ModalBottomSheetValue
@@ -57,7 +56,7 @@ fun ModalBottomSheet( 
        )

        androidx.compose.material3.ModalBottomSheet(

                onDismissRequest = onDismiss,

                containerColor = LocalAndroidColorScheme.current.surfaceBright,

                containerColor = MaterialTheme.colorScheme.surfaceBright,

                sheetState = state,

                content = {

                    Box(
@@ -91,7 +90,7 @@ fun ModalBottomSheet( 
            setBottomSheetSystemBarsColor(sysUiController)

        }

        ModalBottomSheetLayout(

                sheetBackgroundColor = LocalAndroidColorScheme.current.surfaceBright,

                sheetBackgroundColor = MaterialTheme.colorScheme.surfaceBright,

                modifier = Modifier.background(Color.Transparent),

                sheetState = state,

                sheetContent = { sheetContent() },

packages/CredentialManager/src/com/android/credentialmanager/common/ui/Cards.kt

+2 −2
Original line number Diff line number Diff line
@@ -29,12 +29,12 @@ import androidx.compose.foundation.lazy.LazyColumn 
import androidx.compose.foundation.lazy.LazyListScope

import androidx.compose.material3.Card

import androidx.compose.material3.CardDefaults

import androidx.compose.material3.MaterialTheme

import androidx.compose.runtime.Composable

import androidx.compose.ui.Alignment

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.unit.dp

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.credentialmanager.ui.theme.Shapes



/**
@@ -54,7 +54,7 @@ fun SheetContainerCard( 
        modifier = modifier.fillMaxWidth().wrapContentHeight(),

        border = null,

        colors = CardDefaults.cardColors(

            containerColor = LocalAndroidColorScheme.current.surfaceBright,

            containerColor = MaterialTheme.colorScheme.surfaceBright,

        ),

    ) {

        if (topAppBar != null) {

packages/CredentialManager/src/com/android/credentialmanager/common/ui/Entry.kt

+9 −9
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import androidx.compose.material.icons.Icons 
import androidx.compose.material.icons.outlined.Lock

import androidx.compose.material3.Icon

import androidx.compose.material3.IconButton

import androidx.compose.material3.MaterialTheme

import androidx.compose.material3.SuggestionChip

import androidx.compose.material3.SuggestionChipDefaults

import androidx.compose.runtime.Composable
@@ -52,7 +53,6 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation 
import androidx.compose.ui.unit.Dp

import androidx.compose.ui.unit.LayoutDirection

import androidx.compose.ui.unit.dp

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.credentialmanager.ui.theme.EntryShape

import com.android.credentialmanager.ui.theme.Shapes
@@ -172,7 +172,7 @@ fun Entry( 
                            // Decorative purpose only.

                            contentDescription = null,

                            modifier = Modifier.size(24.dp),

                            tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                            tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        )

                    }

                }
@@ -186,7 +186,7 @@ fun Entry( 
                        Icon(

                            modifier = iconSize,

                            bitmap = iconImageBitmap,

                            tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                            tint = MaterialTheme.colorScheme.onSurfaceVariant,

                            // Decorative purpose only.

                            contentDescription = null,

                        )
@@ -210,7 +210,7 @@ fun Entry( 
                    Icon(

                        modifier = iconSize,

                        imageVector = iconImageVector,

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        // Decorative purpose only.

                        contentDescription = null,

                    )
@@ -222,7 +222,7 @@ fun Entry( 
                    Icon(

                        modifier = iconSize,

                        painter = iconPainter,

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                        // Decorative purpose only.

                        contentDescription = null,

                    )
@@ -233,9 +233,9 @@ fun Entry( 
        },

        border = null,

        colors = SuggestionChipDefaults.suggestionChipColors(

            containerColor = LocalAndroidColorScheme.current.surfaceContainerHigh,

            labelColor = LocalAndroidColorScheme.current.onSurfaceVariant,

            iconContentColor = LocalAndroidColorScheme.current.onSurfaceVariant,

            containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,

            labelColor = MaterialTheme.colorScheme.onSurfaceVariant,

            iconContentColor = MaterialTheme.colorScheme.onSurfaceVariant,

        ),

    )

}
@@ -338,7 +338,7 @@ fun MoreOptionTopAppBar( 
                        imageVector = navigationIcon,

                        contentDescription = navigationIconContentDescription,

                        modifier = Modifier.size(24.dp).autoMirrored(),

                        tint = LocalAndroidColorScheme.current.onSurfaceVariant,

                        tint = MaterialTheme.colorScheme.onSurfaceVariant,

                )

            }

        }

packages/CredentialManager/src/com/android/credentialmanager/common/ui/SectionHeader.kt

+3 −3
Original line number Diff line number Diff line
@@ -21,23 +21,23 @@ import androidx.compose.foundation.layout.fillMaxWidth 
import androidx.compose.foundation.layout.padding

import androidx.compose.foundation.layout.wrapContentHeight

import androidx.compose.runtime.Composable

import androidx.compose.material3.MaterialTheme

import androidx.compose.ui.Modifier

import androidx.compose.ui.graphics.Color

import androidx.compose.ui.unit.dp

import com.android.compose.theme.LocalAndroidColorScheme



@Composable

fun CredentialListSectionHeader(text: String, isFirstSection: Boolean) {

    InternalSectionHeader(

        text = text,

        color = LocalAndroidColorScheme.current.onSurfaceVariant,

        color = MaterialTheme.colorScheme.onSurfaceVariant,

        applyTopPadding = !isFirstSection

    )

}



@Composable

fun MoreAboutPasskeySectionHeader(text: String) {

    InternalSectionHeader(text, LocalAndroidColorScheme.current.onSurface)

    InternalSectionHeader(text, MaterialTheme.colorScheme.onSurface)

}



@Composable

packages/CredentialManager/src/com/android/credentialmanager/common/ui/SystemUiControllerUtils.kt

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
package com.android.credentialmanager.common.ui



import androidx.compose.runtime.Composable

import androidx.compose.material3.MaterialTheme

import androidx.compose.ui.graphics.Color

import com.android.compose.SystemUiController

import com.android.compose.theme.LocalAndroidColorScheme

import com.android.credentialmanager.common.material.ModalBottomSheetDefaults



@Composable
@@ -34,7 +34,7 @@ fun setBottomSheetSystemBarsColor(sysUiController: SystemUiController) { 
        darkIcons = false

    )

    sysUiController.setNavigationBarColor(

        color = LocalAndroidColorScheme.current.surfaceBright,

        color = MaterialTheme.colorScheme.surfaceBright,

        darkIcons = false

    )

}
 
 No newline at end of file