Skip to content

Commit 42846b8

Browse files
ginuerzhginuerzh
committed
add noto fonts
1 parent 64838e2 commit 42846b8

33 files changed

+514
-130
lines changed

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ windows-arm64:
3737

3838
# go install gioui.org/cmd/gogio@latest
3939
android:
40-
gogio -x -work -target android -minsdk 22 -version $(VERSION).7 -name GOST+ -signkey build/sign.keystore -signpass android -appid gost.plus -o $(BINDIR)/$(NAME)-$(VERSION).aab .
40+
gogio -x -work -target android -minsdk 22 -version $(VERSION).8 -name GOST+ -signkey build/sign.keystore -signpass android -appid gost.plus -o $(BINDIR)/$(NAME)-$(VERSION).aab .
41+
gogio -x -work -target android -minsdk 22 -version $(VERSION).8 -name GOST+ -signkey build/sign.keystore -signpass android -appid gost.plus -o $(BINDIR)/$(NAME)-$(VERSION).apk .
4142

4243
gz_releases=$(addsuffix .gz, $(PLATFORM_LIST))
4344
zip_releases=$(addsuffix .zip, $(WINDOWS_ARCH_LIST))

‎go.mod‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
module github.com/go-gost/gost.plus
22

3-
go 1.22.0
3+
go 1.22
4+
5+
toolchain go1.22.2
46

57
require (
68
gioui.org v0.6.0
@@ -26,7 +28,7 @@ require (
2628
github.com/go-redis/redis/v8 v8.11.5 // indirect
2729
github.com/go-text/typesetting v0.1.1 // indirect
2830
github.com/gobwas/glob v0.2.3 // indirect
29-
github.com/golang/protobuf v1.5.3 // indirect
31+
github.com/golang/protobuf v1.5.4 // indirect
3032
github.com/gorilla/websocket v1.5.1 // indirect
3133
github.com/hashicorp/hcl v1.0.0 // indirect
3234
github.com/magiconair/properties v1.8.7 // indirect
@@ -36,7 +38,7 @@ require (
3638
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
3739
github.com/pires/go-proxyproto v0.7.0 // indirect
3840
github.com/prometheus/client_golang v1.17.0 // indirect
39-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
41+
github.com/prometheus/client_model v0.5.0 // indirect
4042
github.com/prometheus/common v0.44.0 // indirect
4143
github.com/prometheus/procfs v0.11.1 // indirect
4244
github.com/rs/xid v1.3.0 // indirect
@@ -52,14 +54,14 @@ require (
5254
github.com/xtaci/smux v1.5.24 // indirect
5355
github.com/yl2chen/cidranger v1.0.2 // indirect
5456
go.uber.org/multierr v1.11.0 // indirect
55-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
57+
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
5658
golang.org/x/image v0.14.0 // indirect
57-
golang.org/x/net v0.19.0 // indirect
58-
golang.org/x/sys v0.18.0 // indirect
59+
golang.org/x/net v0.24.0 // indirect
60+
golang.org/x/sys v0.19.0 // indirect
5961
golang.org/x/text v0.14.0 // indirect
60-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
61-
google.golang.org/grpc v1.59.0 // indirect
62-
google.golang.org/protobuf v1.31.0 // indirect
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
63+
google.golang.org/grpc v1.63.2 // indirect
64+
google.golang.org/protobuf v1.33.0 // indirect
6365
gopkg.in/ini.v1 v1.67.0 // indirect
6466
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
6567
)

‎go.sum‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,10 @@ github.com/go-text/typesetting-utils v0.0.0-20231211103740-d9332ae51f04/go.mod h
4444
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
4545
github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
4646
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
47-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
48-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
49-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
50-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
51-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
52-
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
47+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
48+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
49+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
50+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
5351
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5452
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5553
github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
@@ -83,8 +81,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
8381
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8482
github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
8583
github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
86-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM=
87-
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU=
84+
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
85+
github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
8886
github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
8987
github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
9088
github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI=
@@ -126,29 +124,26 @@ github.com/yl2chen/cidranger v1.0.2 h1:lbOWZVCG1tCRX4u24kuM1Tb4nHqWkDxwLdoS+Seva
126124
github.com/yl2chen/cidranger v1.0.2/go.mod h1:9U1yz7WPYDwf0vpNWFaeRh0bjwz5RVgRy/9UEQfHl0g=
127125
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
128126
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
129-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 h1:LfspQV/FYTatPTr/3HzIcmiUFH7PGP+OQ6mgDYo3yuQ=
130-
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
127+
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
128+
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
131129
golang.org/x/exp/shiny v0.0.0-20240103183307-be819d1f06fc h1:OG+uKOKt/BW+ydf/M7gym7ONo8U+dyIlLazys3du298=
132130
golang.org/x/exp/shiny v0.0.0-20240103183307-be819d1f06fc/go.mod h1:3F+MieQB7dRYLTmnncoFbb1crS5lfQoTfDgQy6K4N0o=
133131
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
134132
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
135-
golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
136-
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
133+
golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
134+
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
137135
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
138136
golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
139-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
140-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
137+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
138+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
141139
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
142140
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
143-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
144-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f h1:ultW7fxlIvee4HYrtnaRPon9HpEgFk5zYpmfMgtKB5I=
145-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f/go.mod h1:L9KNLi232K1/xB6f7AlSX692koaRnKaWSR0stBki0Yc=
146-
google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
147-
google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
148-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
149-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
150-
google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
151-
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
141+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
143+
google.golang.org/grpc v1.63.2 h1:MUeiw1B2maTVZthpU5xvASfTh3LDbxHd6IJ6QQVU+xM=
144+
google.golang.org/grpc v1.63.2/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA=
145+
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
146+
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
152147
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
153148
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
154149
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

‎main.go‎

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ package main
22

33
import (
44
"context"
5+
"fmt"
6+
"log/slog"
57
_ "net"
68
"os"
79
"time"
@@ -16,35 +18,30 @@ import (
1618
"github.com/go-gost/gost.plus/tunnel"
1719
"github.com/go-gost/gost.plus/tunnel/entrypoint"
1820
"github.com/go-gost/gost.plus/ui"
21+
"github.com/go-gost/gost.plus/ui/page"
22+
"github.com/go-gost/gost.plus/ui/theme"
23+
"github.com/go-gost/gost.plus/ui/widget"
1924
_ "github.com/go-gost/gost.plus/winres"
2025
)
2126

2227
func main() {
2328
Init()
2429

2530
go func() {
26-
var w app.Window
27-
w.Option(app.Title("GOST+"))
28-
w.Option(app.MinSize(800, 600))
29-
err := run(&w)
30-
if err != nil {
31+
if err := run(); err != nil {
3132
logger.Default().Fatal(err)
3233
}
3334
os.Exit(0)
3435
}()
3536
app.Main()
3637
}
3738

38-
func run(w *app.Window) error {
39-
go func() {
40-
for e := range runner.Event() {
41-
if e.TaskID == runner.TaskUpdateStats {
42-
w.Invalidate()
43-
}
44-
}
45-
}()
46-
39+
func run() error {
4740
ui := ui.NewUI()
41+
42+
go handleEvent(ui)
43+
44+
w := ui.Window()
4845
var ops op.Ops
4946
for {
5047
switch e := w.Event().(type) {
@@ -60,6 +57,34 @@ func run(w *app.Window) error {
6057
}
6158
}
6259

60+
func handleEvent(ui *ui.UI) {
61+
for {
62+
select {
63+
case e := <-ui.Router().Event():
64+
switch e.ID {
65+
case page.EventThemeChanged:
66+
slog.Debug("theme changed", "event", e.ID)
67+
ui.Window().Option(app.StatusColor(theme.Current().Material.Bg))
68+
}
69+
70+
case e := <-runner.Event():
71+
switch e.TaskID {
72+
case runner.TaskUpdateStats:
73+
ui.Window().Invalidate()
74+
75+
default:
76+
if e.Err != nil {
77+
slog.Error(fmt.Sprintf("task: %s", e.Err), "task", e.TaskID)
78+
ui.Router().Notify(widget.Message{
79+
Type: widget.Error,
80+
Content: e.Err.Error(),
81+
})
82+
}
83+
}
84+
}
85+
}
86+
}
87+
6388
func Init() {
6489
config.Init()
6590
tunnel.LoadConfig()

‎ui/fonts/NotoSans-Bold.ttf‎

569 KB
Binary file not shown.

‎ui/fonts/NotoSans-Regular.ttf‎

569 KB
Binary file not shown.

‎ui/fonts/NotoSans-SemiBold.ttf‎

570 KB
Binary file not shown.

‎ui/fonts/NotoSansMono-Regular.ttf‎

396 KB
Binary file not shown.

‎ui/fonts/NotoSansSC-Bold.ttf‎

10.1 MB
Binary file not shown.

‎ui/fonts/NotoSansSC-Regular.ttf‎

10.1 MB
Binary file not shown.

0 commit comments

Comments
 (0)