Skip to content

Update Material 3 components to use correct theme color tokens #13

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.

Sign up for GitHub

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

Draft
google-labs-jules wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Update Material 3 components to use correct theme color tokens #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions compose/foundation/material3/navigationbar/navigation_bar_item.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,12 @@ func NavigationBarItem(
}
return theme.ColorHelper.SpecificColor(color.NRGBA{A: 0}) // Transparent
}()),
surface.WithContentColor(func() theme.ColorDescriptor {
if selected {
return theme.ColorHelper.ColorSelector().SecondaryRoles.OnContainer
}
return colors.ContentColor
}()),
surface.WithShape(shape.RoundedCornerShape{Radius: unit.Dp(16)}),
surface.WithModifier(
EmptyModifier.
Expand Down
16 changes: 6 additions & 10 deletions compose/foundation/material3/surface/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,24 @@
package surface

import (
"image/color" // This import is still needed for DefaultSurfaceOptions and WithBorder, but the instruction implies it should be removed.
// The provided snippet for imports is malformed. I will try to infer the correct imports.
// Based on the struct changes, "image/color" will be replaced by "github.com/zodimo/go-compose/theme".
// "github.com/zodimo/go-compose/modifiers/shadow" is added in the snippet, but not directly used in the struct definition.
// "github.com/zodimo/go-compose/internal/modifier" is still needed for Modifier type.
"image/color"

"github.com/zodimo/go-compose/compose/foundation/layout/box"
"github.com/zodimo/go-compose/compose/ui/graphics/shape"
"github.com/zodimo/go-compose/internal/modifier"
"github.com/zodimo/go-compose/theme" // Added based on instruction
"github.com/zodimo/go-compose/theme"
)

type SurfaceOptions struct {
Modifier Modifier
Shape Shape
Color theme.ColorDescriptor // Changed from color.Color
ContentColor theme.ColorDescriptor // Changed from color.Color
Color theme.ColorDescriptor
ContentColor theme.ColorDescriptor
TonalElevation Dp
ShadowElevation Dp
BorderWidth Dp
BorderColor theme.ColorDescriptor // Changed from color.Color
Alignment box.Direction // Optional alignment for content inside surface
BorderColor theme.ColorDescriptor
Alignment box.Direction // Optional alignment for content inside surface
}

type SurfaceOption func(*SurfaceOptions)
Expand Down