From acc3f704e478d4edfc80bfaab8c0aa63897f7ca6 Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Sat, 5 Dec 2020 22:03:28 -0500 Subject: [PATCH] example/{kitchen,tabs,gophers}: update to use material.Palette Update gioui.org/cmd while here. Signed-off-by: Chris Waldon --- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- example/go.mod | 2 +- example/go.sum | 4 ++-- example/gophers/ui.go | 3 +-- example/kitchen/kitchen.go | 2 +- example/tabs/tabs.go | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index 180ced78..013d18ee 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module gioui.org/cmd go 1.13 require ( - gioui.org v0.0.0-20201206215711-ede632b2650d + gioui.org v0.0.0-20201206220230-a87a520ae825 github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 github.com/chromedp/chromedp v0.5.2 golang.org/x/image v0.0.0-20200618115811-c13761719519 diff --git a/cmd/go.sum b/cmd/go.sum index 2b19d27e..3e36137d 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -1,6 +1,6 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20201206215711-ede632b2650d h1:RfXAagAM5vy/FPZMi1BlgUAZvsDp46R4+7f+2D+sHfk= -gioui.org v0.0.0-20201206215711-ede632b2650d/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= +gioui.org v0.0.0-20201206220230-a87a520ae825 h1:8eQeFlQ0IL5sOX74YcwEBk3OtGNTRCqIU3Rz0z0U6vE= +gioui.org v0.0.0-20201206220230-a87a520ae825/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4 h1:QD3KxSJ59L2lxG6MXBjNHxiQO2RmxTQ3XcK+wO44WOg= github.com/chromedp/cdproto v0.0.0-20191114225735-6626966fbae4/go.mod h1:PfAWWKJqjlGFYJEidUM6aVIWPr0EpobeyVWEEmplX7g= diff --git a/example/go.mod b/example/go.mod index a32d4ce3..b5037f1d 100644 --- a/example/go.mod +++ b/example/go.mod @@ -3,7 +3,7 @@ module gioui.org/example go 1.13 require ( - gioui.org v0.0.0-20201206215711-ede632b2650d + gioui.org v0.0.0-20201206220230-a87a520ae825 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72 github.com/google/go-github/v24 v24.0.1 diff --git a/example/go.sum b/example/go.sum index d15968d7..f786eb54 100644 --- a/example/go.sum +++ b/example/go.sum @@ -1,7 +1,7 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -gioui.org v0.0.0-20201206215711-ede632b2650d h1:RfXAagAM5vy/FPZMi1BlgUAZvsDp46R4+7f+2D+sHfk= -gioui.org v0.0.0-20201206215711-ede632b2650d/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= +gioui.org v0.0.0-20201206220230-a87a520ae825 h1:8eQeFlQ0IL5sOX74YcwEBk3OtGNTRCqIU3Rz0z0U6vE= +gioui.org v0.0.0-20201206220230-a87a520ae825/go.mod h1:Y+uS7hHMvku1Q+ooaoq6fYD5B2LGoT8JtFgvmYmRzTw= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluNRiMjZHalQZrVrvTbPh+qw= github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= diff --git a/example/gophers/ui.go b/example/gophers/ui.go index f10c1f15..b3009125 100644 --- a/example/gophers/ui.go +++ b/example/gophers/ui.go @@ -72,8 +72,7 @@ type ( func init() { theme = material.NewTheme(gofont.Collection()) - theme.Color.Text = rgb(0x333333) - theme.Color.Hint = rgb(0xbbbbbb) + theme.Palette.Fg = rgb(0x333333) } func newUI(fetchCommits func(string)) *UI { diff --git a/example/kitchen/kitchen.go b/example/kitchen/kitchen.go index 4a7e5735..f9e42b97 100644 --- a/example/kitchen/kitchen.go +++ b/example/kitchen/kitchen.go @@ -224,7 +224,7 @@ func (b iconAndTextButton) Layout(gtx layout.Context) layout.Dimensions { layLabel := layout.Rigid(func(gtx C) D { return layout.Inset{Left: textIconSpacer}.Layout(gtx, func(gtx C) D { l := material.Body1(b.theme, b.word) - l.Color = b.theme.Color.InvText + l.Color = b.theme.Palette.ContrastFg return l.Layout(gtx) }) }) diff --git a/example/tabs/tabs.go b/example/tabs/tabs.go index 42ded98c..48398ab3 100644 --- a/example/tabs/tabs.go +++ b/example/tabs/tabs.go @@ -108,7 +108,7 @@ func drawTabs(gtx layout.Context, th *material.Theme) layout.Dimensions { } tabHeight := gtx.Px(unit.Dp(4)) tabRect := image.Rect(0, 0, tabWidth, tabHeight) - paint.FillShape(gtx.Ops, th.Color.Primary, clip.Rect(tabRect).Op()) + paint.FillShape(gtx.Ops, th.Palette.ContrastBg, clip.Rect(tabRect).Op()) return layout.Dimensions{ Size: image.Point{X: tabWidth, Y: tabHeight}, }