-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Specify surfaceTint in TV ColorScheme (remove TODO) #1605
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
XDdevv
wants to merge
2
commits into
android:main
Choose a base branch
from
XDdevv:surface-tint-impl
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -81,6 +81,7 @@ val colorSchemeForDarkMode = darkColorScheme( | |||||||||||||||||||||
primaryContainer = primaryContainerDark, | ||||||||||||||||||||||
onPrimaryContainer = onPrimaryContainerDark, | ||||||||||||||||||||||
secondary = secondaryDark, | ||||||||||||||||||||||
surfaceTint = primaryDark, | ||||||||||||||||||||||
onSecondary = onSecondaryDark, | ||||||||||||||||||||||
secondaryContainer = secondaryContainerDark, | ||||||||||||||||||||||
onSecondaryContainer = onSecondaryContainerDark, | ||||||||||||||||||||||
|
@@ -106,7 +107,6 @@ val colorSchemeForDarkMode = darkColorScheme( | |||||||||||||||||||||
onErrorContainer = onErrorContainerDark, | ||||||||||||||||||||||
) | ||||||||||||||||||||||
|
||||||||||||||||||||||
// Todo: specify surfaceTint | ||||||||||||||||||||||
val colorSchemeForLightMode = lightColorScheme( | ||||||||||||||||||||||
primary = primaryLight, | ||||||||||||||||||||||
onPrimary = onPrimaryLight, | ||||||||||||||||||||||
|
@@ -125,6 +125,7 @@ val colorSchemeForLightMode = lightColorScheme( | |||||||||||||||||||||
background = backgroundLight, | ||||||||||||||||||||||
onBackground = onBackgroundLight, | ||||||||||||||||||||||
surface = surfaceLight, | ||||||||||||||||||||||
surfaceTint = primaryLight, | ||||||||||||||||||||||
onSurface = onSurfaceLight, | ||||||||||||||||||||||
surfaceVariant = surfaceVariantLight, | ||||||||||||||||||||||
onSurfaceVariant = onSurfaceVariantLight, | ||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To maintain consistency with the function signature of
Suggested change
|
||||||||||||||||||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For consistency with the
darkColorScheme
function signature and to improve readability,surfaceTint
should be grouped with the othersurface*
properties. Please remove it from here and addsurfaceTint = primaryDark,
afteronSurfaceVariant = onSurfaceVariantDark
(around line 99).