archive
/
tailscale-android
mirror of https://github.com/tailscale/tailscale-android
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmd/tailscale: bump gio version

Browse Source 
Signed-off-by: Elias Naur <mail@eliasnaur.com>
pull/2/head
Elias Naur 4 years ago
parent 059cf8f4be
commit 08c2192240
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

26
cmd/tailscale/ui.go
Unescape Escape View File

@ -384,8 +384,8 @@ func (ui *UI) layoutMenu(gtx layout.Context, sysIns system.Insets, expiry time.T
ui.menu.show = false
}
layout.Inset{
Top: unit.Add(gtx, sysIns.Top, unit.Dp(2)),
Right: unit.Add(gtx, sysIns.Right, unit.Dp(2)),
Top: unit.Add(gtx.Metric, sysIns.Top, unit.Dp(2)),
Right: unit.Add(gtx.Metric, sysIns.Right, unit.Dp(2)),
}.Layout(gtx, func(gtx C) D {
return layout.NE.Layout(gtx, func(gtx C) D {
return Background{Color: argb(0x33000000), CornerRadius: unit.Dp(2)}.Layout(gtx, func(gtx C) D {
@ -477,7 +477,7 @@ func (ui *UI) layoutMessage(gtx layout.Context, sysIns system.Insets) layout.Dim
}
op.InvalidateOp{At: now.Add(rem)}.Add(gtx.Ops)
return layout.S.Layout(gtx, func(gtx C) D {
return layout.Inset{Bottom: unit.Add(gtx, sysIns.Bottom, unit.Dp(8))}.Layout(gtx, func(gtx C) D {
return layout.Inset{Bottom: unit.Add(gtx.Metric, sysIns.Bottom, unit.Dp(8))}.Layout(gtx, func(gtx C) D {
return Background{Color: rgb(0x323232), CornerRadius: unit.Dp(5)}.Layout(gtx, func(gtx C) D {
return layout.UniformInset(unit.Dp(12)).Layout(gtx, func(gtx C) D {
l := material.Body2(ui.theme, s)
@ -506,8 +506,8 @@ func (ui *UI) layoutPeer(gtx layout.Context, sysIns system.Insets, p *UIPeer, cl
return material.Clickable(gtx, clk, func(gtx C) D {
return layout.Inset{
Top: unit.Dp(8),
Right: unit.Max(gtx, sysIns.Right, unit.Dp(16)),
Left: unit.Max(gtx, sysIns.Left, unit.Dp(16)),
Right: unit.Max(gtx.Metric, sysIns.Right, unit.Dp(16)),
Left: unit.Max(gtx.Metric, sysIns.Left, unit.Dp(16)),
Bottom: unit.Dp(8),
}.Layout(gtx, func(gtx C) D {
gtx.Constraints.Min.X = gtx.Constraints.Max.X
@ -540,8 +540,8 @@ func (ui *UI) layoutSection(gtx layout.Context, sysIns system.Insets, title stri
return Background{Color: rgb(0xe1e0e9)}.Layout(gtx, func(gtx C) D {
return layout.Inset{
Top: unit.Dp(16),
Right: unit.Max(gtx, sysIns.Right, unit.Dp(16)),
Left: unit.Max(gtx, sysIns.Left, unit.Dp(16)),
Right: unit.Max(gtx.Metric, sysIns.Right, unit.Dp(16)),
Left: unit.Max(gtx.Metric, sysIns.Left, unit.Dp(16)),
Bottom: unit.Dp(16),
}.Layout(gtx, func(gtx C) D {
l := material.Body1(ui.theme, title)
@ -560,8 +560,8 @@ func (ui *UI) layoutTop(gtx layout.Context, sysIns system.Insets, state *Network
return Background{Color: rgb(headerColor)}.Layout(gtx, func(gtx C) D {
return layout.Inset{
Top: sysIns.Top,
Right: unit.Max(gtx, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx, sysIns.Left, unit.Dp(16)),
Right: unit.Max(gtx.Metric, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx.Metric, sysIns.Left, unit.Dp(16)),
}.Layout(gtx, func(gtx C) D {
return layout.Flex{Alignment: layout.Middle}.Layout(gtx,
layout.Rigid(func(gtx C) D {
@ -629,8 +629,8 @@ func (ui *UI) layoutLocal(gtx layout.Context, sysIns system.Insets, host, addr s
}
return Background{Color: rgb(headerColor)}.Layout(gtx, func(gtx C) D {
return layout.Inset{
Right: unit.Max(gtx, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx, sysIns.Left, unit.Dp(8)),
Right: unit.Max(gtx.Metric, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx.Metric, sysIns.Left, unit.Dp(8)),
Bottom: unit.Dp(8),
}.Layout(gtx, func(gtx C) D {
return Background{Color: rgb(infoColor), CornerRadius: unit.Dp(8)}.Layout(gtx, func(gtx C) D {
@ -662,8 +662,8 @@ func (ui *UI) layoutSearchbar(gtx layout.Context, sysIns system.Insets) layout.D
return Background{Color: rgb(0xf0eff6)}.Layout(gtx, func(gtx C) D {
return layout.Inset{
Top: unit.Dp(8),
Right: unit.Max(gtx, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx, sysIns.Left, unit.Dp(8)),
Right: unit.Max(gtx.Metric, sysIns.Right, unit.Dp(8)),
Left: unit.Max(gtx.Metric, sysIns.Left, unit.Dp(8)),
Bottom: unit.Dp(8),
}.Layout(gtx, func(gtx C) D {
return Background{Color: rgb(0xe3e2ea), CornerRadius: unit.Dp(8)}.Layout(gtx, func(gtx C) D {

2
go.mod
Unescape Escape View File

@ -3,7 +3,7 @@ module tailscale.com/tailscale-android
go 1.14
require (
gioui.org v0.0.0-20200615160648-c2f99fb0e99c
gioui.org v0.0.0-20200617094714-596e32161041
gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039
github.com/tailscale/wireguard-go v0.0.0-20200515231107-62868271d710
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3

4
go.sum
Unescape Escape View File

@ -1,8 +1,8 @@
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-20200530124200-1377bea3cdc5/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
gioui.org v0.0.0-20200615160648-c2f99fb0e99c h1:5nU1iD464+yYrV946xsTC0jFMcDmY3XAe9dwyizP3PU=
gioui.org v0.0.0-20200615160648-c2f99fb0e99c/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
gioui.org v0.0.0-20200617094714-596e32161041 h1:mogSEMG8m1oAoF9kc7s0ABUkqZK6wq6rswSUCTbqhVs=
gioui.org v0.0.0-20200617094714-596e32161041/go.mod h1:AHI9rFr6AEEHCb8EPVtb/p5M+NMJRKH58IOp8O3Je04=
gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039 h1:mO1CTk+PwcDQGMXpN1JJiFflYBvwqSQ6+3Gvp64IKHo=
gioui.org/cmd v0.0.0-20200530141830-d2c67cdf8039/go.mod h1:B1g+HOceSj7g3S4Yao3skwInTpcK978KANys5YuapMc=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

Write Preview
Loading…
Cancel
Save