feat(android): use native webview instead of gioui framework

pkg/browser/gioui/browser.go

@@ -1,118 +0,0 @@
-package gioui
-
-import (
-	"context"
-	"sync/atomic"
-
-	"forge.cadoles.com/arcad/arcast/pkg/browser"
-	"gioui.org/app"
-	"gioui.org/f32"
-	"gioui.org/layout"
-	"github.com/gioui-plugins/gio-plugins/webviewer"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type Browser struct {
-	window *app.Window
-	tag    int
-
-	url     *atomic.Value
-	changed *atomic.Bool
-	status  *atomic.Value
-	title   *atomic.Value
-}
-
-func (b *Browser) Layout(gtx layout.Context) layout.Dimensions {
-	events := gtx.Events(&b.tag)
-	for _, evt := range events {
-		switch ev := evt.(type) {
-		case webviewer.TitleEvent:
-			b.title.Store(ev.Title)
-		case webviewer.NavigationEvent:
-			b.url.Store(ev.URL)
-		}
-	}
-
-	ctx := context.Background()
-	logger.Debug(ctx, "drawing")
-
-	webviewer.WebViewOp{Tag: &b.tag}.Push(gtx.Ops)
-
-	webviewer.OffsetOp{
-		Point: f32.Point{
-			X: 0,
-			Y: 0,
-		},
-	}.Add(gtx.Ops)
-
-	webviewer.RectOp{
-		Size: f32.Point{
-			X: float32(gtx.Constraints.Max.X),
-			Y: float32(gtx.Constraints.Max.Y),
-		},
-	}.Add(gtx.Ops)
-
-	if b.changed.CompareAndSwap(true, false) {
-		url := b.url.Load().(string)
-		logger.Debug(ctx, "url changed", logger.F("url", url))
-		webviewer.NavigateOp{URL: url}.Add(gtx.Ops)
-	}
-
-	return layout.Dimensions{Size: gtx.Constraints.Max}
-}
-
-// Load implements browser.Browser.
-func (b *Browser) Load(url string) error {
-	b.url.Store(url)
-	b.changed.Store(true)
-	b.status.Store(browser.StatusCasting)
-
-	b.window.Invalidate()
-
-	return nil
-}
-
-// Status implements browser.Browser.
-func (b *Browser) Status() (browser.Status, error) {
-	return b.status.Load().(browser.Status), nil
-}
-
-// Title implements browser.Browser.
-func (b *Browser) Title() (string, error) {
-	return b.title.Load().(string), nil
-}
-
-// URL implements browser.Browser.
-func (b *Browser) URL() (string, error) {
-	return b.url.Load().(string), nil
-}
-
-// Reset implements browser.Browser.
-func (b *Browser) Reset(url string) error {
-	b.url.Store(url)
-	b.changed.Store(true)
-	b.status.Store(browser.StatusIdle)
-
-	b.window.Invalidate()
-
-	return nil
-}
-
-func NewBrowser(window *app.Window) *Browser {
-	b := &Browser{
-		window:  window,
-		url:     &atomic.Value{},
-		changed: &atomic.Bool{},
-		status:  &atomic.Value{},
-		title:   &atomic.Value{},
-	}
-
-	b.url.Store("")
-	b.title.Store("")
-	b.changed.Store(false)
-	b.status.Store(browser.StatusIdle)
-
-	return b
-}
-
-var _ browser.Browser = &Browser{}

pkg/browser/proxy/browser.go

@@ -0,0 +1,110 @@
+package proxy
+
+import (
+	"sync"
+
+	"forge.cadoles.com/arcad/arcast/pkg/browser"
+	"github.com/pkg/errors"
+)
+
+var (
+	ErrNotInitialized = errors.New("not initialized")
+)
+
+type Browser struct {
+	loadURL  func(url string)
+	getURL   func() string
+	getTitle func() string
+
+	status browser.Status
+	mutex  sync.RWMutex
+}
+
+// Load implements browser.Browser.
+func (b *Browser) Load(url string) error {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	if b.loadURL == nil {
+		return errors.WithStack(ErrNotInitialized)
+	}
+
+	b.loadURL(url)
+	b.status = browser.StatusCasting
+
+	return nil
+}
+
+// Reset implements browser.Browser.
+func (b *Browser) Reset(url string) error {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	if b.loadURL == nil {
+		return errors.WithStack(ErrNotInitialized)
+	}
+
+	b.loadURL(url)
+	b.status = browser.StatusIdle
+
+	return nil
+}
+
+// Status implements browser.Browser.
+func (b *Browser) Status() (browser.Status, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	return b.status, nil
+}
+
+// Title implements browser.Browser.
+func (b *Browser) Title() (string, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	if b.getTitle == nil {
+		return "", errors.WithStack(ErrNotInitialized)
+	}
+
+	return b.getTitle(), nil
+}
+
+// URL implements browser.Browser.
+func (b *Browser) URL() (string, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	if b.getURL == nil {
+		return "", errors.WithStack(ErrNotInitialized)
+	}
+
+	return b.getURL(), nil
+}
+
+func (b *Browser) SetLoadURL(fn func(url string)) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.loadURL = fn
+}
+
+func (b *Browser) SetGetTitle(fn func() string) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.getTitle = fn
+}
+
+func (b *Browser) SetGetURL(fn func() string) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.getURL = fn
+}
+
+func NewBrowser() *Browser {
+	return &Browser{}
+}
+
+var _ browser.Browser = &Browser{}