Skip to content

Refactor appbar to use updated Composer API #10

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

Refactor appbar to use updated Composer API #10

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
62 changes: 27 additions & 35 deletions compose/foundation/material3/appbar/top_app_bar.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,14 @@ func SingleRowTopAppBar(

// Title
box.Box(
func(c Composer) Composer {
if title != nil {
return surface.Surface(
title,
surface.WithContentColor(colors.TitleContentColor),
surface.WithColor(color.NRGBA{}), // Transparent
)(c)
}
return c
},
c.When(
title != nil,
surface.Surface(
title,
surface.WithContentColor(colors.TitleContentColor),
surface.WithColor(color.NRGBA{}), // Transparent
),
),
box.WithModifier(weight.Weight(1)), // Occupy remaining space
box.WithAlignment(layout.W), // Align text to start
box.WithModifier(padding.Horizontal(16, 16)), // Horizontal(16, 16)
Expand Down Expand Up @@ -155,14 +153,12 @@ func CenterAlignedTopAppBar(
),
// Layer 2: Centered Title
box.Box(
c.Sequence(
c.When(
title != nil,
surface.Surface(
title,
surface.WithContentColor(opts.Colors.TitleContentColor),
surface.WithColor(color.NRGBA{}),
),
c.When(
title != nil,
surface.Surface(
title,
surface.WithContentColor(opts.Colors.TitleContentColor),
surface.WithColor(color.NRGBA{}),
),
),
box.WithAlignment(layout.Center),
Expand Down Expand Up @@ -208,24 +204,20 @@ func TwoRowsTopAppBar(
),
// Bottom Row: Title
box.Box(
c.Sequence(
c.When(
title != nil,
surface.Surface(
func(c Composer) Composer {
// Default style for Headline?
// For now, just render title.
// Ideally we should apply Material3 typography h5 or h6.
// But we don't have typography passed in easily yet.
// Rely on user passing Text with style.
c.When(
title != nil,
surface.Surface(
// Default style for Headline?
// For now, just render title.
// Ideally we should apply Material3 typography h5 or h6.
// But we don't have typography passed in easily yet.
// Rely on user passing Text with style.

// Using ProvideTextStyle? Not yet implemented in foundation?
// Just render.
return title(c)
},
surface.WithContentColor(colors.TitleContentColor),
surface.WithColor(color.NRGBA{}),
),
// Using ProvideTextStyle? Not yet implemented in foundation?
// Just render.
title,
surface.WithContentColor(colors.TitleContentColor),
surface.WithColor(color.NRGBA{}),
),
),
box.WithModifier(size.FillMaxWidth()),
Expand Down