fix: [deps] updates Gio version (#105)

Author: inkeliz

README.md

@@ -1,11 +1,15 @@
 Gio-Plugins
 -------
 
-Compatible with Gio v0.8.0 (except "Auth", which [required a forked version](https://github.com/inkeliz/gio)).
+Compatible with Gio v0.9.1 (go get gioui.org@7bcb315ee174467d8e51c214ee434c41207cc718)
 
 > [!NOTE]
 > This package is not maintained by the Gio core team, and it is not part of the official Gio project. It is used
-> in a commercial application, and some efforts are made to keep it up-to-date with internal changes. 
+> in a commercial application, and some efforts are made to keep it up-to-date with internal changes.
+
+> [!IMPORTANT]
+> You may need to use a FORKED GOGIO to build your application with those plugins,
+> see [gogio-fork](https://github.com/inkeliz/gio-cmd).
 
 ------
 
@@ -34,28 +38,35 @@ First, you must download the `plugin` package:
 go get -u github.com/gioui-plugins/gio-plugins@latest
 ```
 
-Now, you need to modify your event-loop, you must include `gioplugins.Hijack(window)` in your event-loop, before handling
-events:
+You need to modify your event-loop, you must include `gioplugins.Hijack(window)` in your event-loop, before handling
+events and `gioplugins.ProxyEvents(app.Events)`, like this:
 
 ```diff
 window := &app.Window{} // Gio window
 
-for { 
+go func() {
+  for { 
 +   evt := gioplugins.Hijack(window) // Gio main event loop
-
-    switch evt := evt.(type) {
+  
+      switch evt := evt.(type) {
         // ...
-    }
-}
+      }
+  }
+}()
+
+go gioplugins.ProxyEvents(app.Events) // Proxy Gio events to gioplugins
+
+app.Main()
 ```
 
 Each plugin has its own README.md file, explaining how to use it. In general, you can simple
-use `nameOfPlugin.SomeOp{}.Add(gtx.Ops)`, similar of how you use `pointer.PassOp{}.Add(gtx.Ops)`, native 
+use `nameOfPlugin.SomeOp{}.Add(gtx.Ops)`, similar of how you use `pointer.PassOp{}.Add(gtx.Ops)`, native
 from Gio. Beginning with Gio 0.6, it also introduces `Command`, which is executed using `gtx.Execute`, you can
-also use Commands, if the plugin supports it, for instance `gioplugins.Execute(gtx, gioshare.TextCmd{Text: "Hello, World!"})`, 
+also use Commands, if the plugin supports it, for instance
+`gioplugins.Execute(gtx, gioshare.TextCmd{Text: "Hello, World!"})`,
 similar to what you are familiar with `gtx.Execute(clipboard.WriteCmd{Text: "Hello, World!"})`.
 
-Once `gioplugins.Event` is set, you can use the plugins as simple `op` operations or `cmd` commands. If you are unsure 
+Once `gioplugins.Event` is set, you can use the plugins as simple `op` operations or `cmd` commands. If you are unsure
 if the plugin is working, you can use the `pingpong` package, which will return on `PongEvent` to the given Tag:
 
 ```go
@@ -71,22 +82,32 @@ You can receive responses using the `Tag`, similar Gio-core operations:
 
 ```go
 for {
-	evt, ok := gioplugins.Event(pingpong.Filter{Tag: &something})
-	if !ok {
-		break
-    } 
-	
-    if evt, ok := evt.(pingpong.PongEvent); ok {
-        fmt.Println(evt.Pong)
-    } 
+  evt, ok := gioplugins.Event(gtx, pingpong.Filter{Tag: &something})
+  if !ok {
+    break
+  }
+  
+  if evt, ok := evt.(pingpong.PongEvent); ok {
+    fmt.Println(evt.Pong)
+  } 
 }
 ```
 
 Of course, `pingpong` has no use in real-world applications, but it can be used to test if the plugin is working.
 
+> [!IMPORTANT]
+> It uses `gioplugins.Event` and not `gtx.Event`!
+
 ## Plugins
 
-**We have few plugins available:**
+**Available from Gio (not in this repository):**
+
+| Name                                                       | Description                                                              |
+|------------------------------------------------------------|--------------------------------------------------------------------------|
+| **[Clipboard](https://pkg.go.dev/gioui.org/io/clipboard)** | Read/Write text from/to the native clipboard.                            |
+| **[Deeplink](https://pkg.go.dev/gioui.org/app)**           | Handle deeplinks (custom URL schemes) using the native platform support. |
+
+**Available plugins in this repository:**
 
 | Name                                                                              | Description                                                                      | OS                                                          |
 |-----------------------------------------------------------------------------------|----------------------------------------------------------------------------------|-------------------------------------------------------------|
@@ -96,11 +117,16 @@ Of course, `pingpong` has no use in real-world applications, but it can be used
 | **[Hyperlink](https://github.com/gioui-plugins/gio-plugins/tree/main/hyperlink)** | Open hyperlinks in the default browser.                                          | _Android, iOS, macOS, Windows, WebAssembly_                 |  
 | **[Explorer](https://github.com/gioui-plugins/gio-plugins/tree/main/explorer)**   | Opens the native file-dialog, to read/write files.                               | _Android, iOS, macOS, Windows, WebAssembly_                 |  
 | **[Safedata](https://github.com/gioui-plugins/gio-plugins/tree/main/safedata)**   | Read/Write files into the secure storage of the device.                          | _Android, iOS, macOS, Windows, WebAssembly_                 |
-| **[Auth](https://github.com/gioui-plugins/gio-plugins/tree/main/auth)**         | Authenticate the user using third party (Google and Apple).                      | _Android, iOS, macOS, Windows, WebAssembly_                 |
+| **[Auth](https://github.com/gioui-plugins/gio-plugins/tree/main/auth)**           | Authenticate the user using third party (Google and Apple).                      | _Android, iOS, macOS, Windows, WebAssembly_                 |
+| **ALTCHA (Coming Soon)**                                                          | Display captchas using ALTCHA, a reCaptcha alternative.                          | _Android, iOS, macOS, Windows, WebAssembly_                 |
+| **InAppPay (Coming Soon)**                                                        | Display in-app products to buy, using Google Play, Apple Store and Aptoide.      | _Android, iOS_                                              |
+| **Ads (Coming Soon)**                                                             | Display advertisements using AdMob.                                              | _Android, iOS_                                              |
 
-**We have few plugins planned:**
+* ALTCHA, Google Play, Apple Store and Aptoide are names trademarks of their respective owners.
+  Currently, those plugins are not endorsed by those companies.
 
-Some plugins are planned, but not yet implemented, follow the development at https://github.com/orgs/gioui-plugins/projects/1. Also, 
+More plugins are planned, but not yet implemented, follow the development
+at https://github.com/orgs/gioui-plugins/projects/1. Also,
 consider send some 👍 on issues which mentions features that you like.
 
 > [!TIP]
@@ -128,18 +154,18 @@ Most packages are compatible with the latest version of Gio, and only the latest
 that internal changes in the Gio API can break the compatibility with `plugin`. None of the packages has stable API,
 and breaking changes can happen at any time.
 
-Most plugins are compatible with Android 5+, iOS 13+, MacOS 12+, Windows 10+ and WebAssembly. Currently, we consider
-the Windows and Android as high-priority, and the WebAssembly as medium-priority, MacOS and iOS as low-priority.
+Most plugins are compatible with Android 5+, iOS 13+, MacOS 12+, Windows 10+ and WebAssembly.
+
 Furthermore, we don't have any plans to support Linux and FreeBSD due to the low market-share and the lack of API
 standards.
 
 | Priority | OS          | Arch         |
 |----------|-------------|--------------|
-| High     | Windows     | AMD64        |
 | High     | Android     | ARM64, ARMv7 |
-| Medium   | WebAssembly | WASMv1       |
+| High     | iOS         | ARM64        |
+| Medium   | Windows     | AMD64        |
+| Low      | WebAssembly | WASMv1       |
 | Low      | MacOS       | ARM64, AMD64 |
-| Low      | iOS         | ARM64        |
 | Ignored  | FreeBSD     | -            |
 | Ignored  | Linux       | -            |
 
@@ -157,34 +183,34 @@ integrity of native-APIs, so we can't guarantee that the native-APIs will have t
 Since we have limited resources and devices, we can't test all plugins on all platforms and devices. Currently, we have
 a few devices available and with limited range of OS versions. Plugins are usually tested on those devices:
 
-- **Android**: 
-  - Motorola Droid Maxx, 
-  - Motorola G 2Gen,
-  - Motorola E6, 
-  - Motorola E14,
-  - Motorola E15,
-  - Xiaomi A7, 
-  - Xiaomi Note 9,
-  - Xiaomi Redmi A3,
-  - Samsung Galaxy A20e,
-  - SPC Discovery,
-  - Blackberry Key One,
-  - (+ BrowserStack)
-- **iOS**: 
-  - iPhone SE 2Gen (2020), 
-  - iPad Air 5Gen,
-  - (+ BrowserStack),
-- **WASM**: 
-  - Chrome, 
-  - Firefox, 
-  - Safari, 
-  - (+ BrowserStack)
-- **Windows**: 
-  - Custom Device (RYZEN 3900X + RX 7900XT), 
-  - Custom VM (EPYC 7501P),
-- **MacOS**: 
-  - MacBook Air (M1, 2020)
-  - MacStudio (M2 Max, 2022)
+- **Android**:
+    - Motorola Droid Maxx,
+    - Motorola G 2Gen,
+    - Motorola E6,
+    - Motorola E14,
+    - Motorola E15,
+    - Xiaomi A7,
+    - Xiaomi Note 9,
+    - Xiaomi Redmi A3,
+    - Samsung Galaxy A20e,
+    - SPC Discovery,
+    - Blackberry Key One,
+    - (+ BrowserStack)
+- **iOS**:
+    - iPhone SE 2Gen (2020),
+    - iPad Air 5Gen,
+    - (+ BrowserStack),
+- **WASM**:
+    - Chrome,
+    - Firefox,
+    - Safari,
+    - (+ BrowserStack)
+- **Windows**:
+    - Custom Device (RYZEN 3900X + RX 7900XT),
+    - Custom VM (EPYC 7501P),
+- **MacOS**:
+    - MacBook Air (M1, 2020)
+    - MacStudio (M2 Max, 2022)
 
 Tests are performed manually, since most features interact with the native platform, and automated tests are not
 easy to implement. We are open to suggestions on how to improve the testing process.

auth/gioauth/plugin.go

@@ -3,7 +3,6 @@ package gioauth
 import (
 	"gioui.org/app"
 	"gioui.org/io/event"
-	"gioui.org/io/transfer"
 	"github.com/gioui-plugins/gio-plugins/auth"
 	"github.com/gioui-plugins/gio-plugins/auth/providers"
 	"github.com/gioui-plugins/gio-plugins/plugin"
@@ -59,24 +58,6 @@ func (p *authPlugin) Execute(cmd interface{}) {
 // Event implements plugin.Handler.
 func (p *authPlugin) Event(evt event.Event) {
 	switch evt := evt.(type) {
-	case app.FrameEvent:
-		for {
-			evt, ok := evt.Source.Event(transfer.URLFilter{Scheme: ""})
-			if !ok {
-				break
-			}
-
-			switch evt := evt.(type) {
-			case transfer.URLEvent:
-				if p.client != nil {
-					if err := p.client.ProcessCustomSchemeCallback(evt.URL.String()); err != nil {
-						p.plugin.SendEventUntagged(intName, ErrorEvent(auth.ErrorEvent{Error: err}))
-					}
-				} else {
-					p.startupURL = evt.URL.String()
-				}
-			}
-		}
 	case app.ViewEvent:
 		if p.client == nil {
 			p.config = NewConfigFromViewEvent(p.window, evt)
@@ -106,3 +87,23 @@ func (p *authPlugin) Event(evt event.Event) {
 		}
 	}
 }
+
+func (p *authPlugin) TypeGlobalEvent() []reflect.Type {
+	return wantGlobalEvents
+}
+
+func (p *authPlugin) GlobalEvent(evt event.Event) {
+	/*
+		switch evt := evt.(type) {
+
+			case app.URLEvent:
+				if p.client != nil {
+					if err := p.client.ProcessCustomSchemeCallback(evt.URL.String()); err != nil {
+						p.plugin.SendEventUntagged(intName, ErrorEvent(auth.ErrorEvent{Error: err}))
+					}
+				} else {
+					p.startupURL = evt.URL.String()
+				}
+		}
+	*/
+}

auth/gioauth/plugin_events.go

@@ -4,16 +4,16 @@ import (
 	"github.com/gioui-plugins/gio-plugins/auth"
 	"github.com/gioui-plugins/gio-plugins/plugin"
 	"reflect"
-
-	"gioui.org/app"
 )
 
 var (
 	wantEvents = []reflect.Type{
 		reflect.TypeOf(plugin.ViewEvent{}),
-		reflect.TypeOf(app.FrameEvent{}),
 		reflect.TypeOf(plugin.EndFrameEvent{}),
 	}
+	wantGlobalEvents = []reflect.Type{
+		// reflect.TypeOf(app.URLEvent{}),
+	}
 )
 
 // ErrorEvent is issued when an error occurs.

auth/gioauth/plugin_js.go

@@ -3,6 +3,5 @@ package gioauth
 import "syscall/js"
 
 func startURL() string {
-
 	return js.Global().Get("location").Get("href").String()
 }

go.mod

@@ -1,35 +1,24 @@
 module github.com/gioui-plugins/gio-plugins
 
-go 1.22
+go 1.24.0
+
+toolchain go1.24.3
 
 require (
-	gioui.org v0.6.1-0.20240607083507-1151eac07d84
+	gioui.org v0.9.1-0.20251215212054-7bcb315ee174
 	git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0
 	github.com/go-ole/go-ole v1.2.6
+	github.com/inkeliz/giosvg v0.0.0-20230915151051-c8ae55d003c6
 	github.com/inkeliz/go_inkwasm v0.1.23-0.20240519174017-989fbe5b10f6
-	golang.org/x/crypto v0.23.0
-	golang.org/x/sys v0.20.0
+	golang.org/x/crypto v0.46.0
+	golang.org/x/sys v0.39.0
 )
 
 require (
-	gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
 	gioui.org/shader v1.0.8 // indirect
-	github.com/chromedp/cdproto v0.0.0-20220131204822-e6abebe7b8cd // indirect
-	github.com/chromedp/chromedp v0.7.7 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
-	github.com/go-text/typesetting v0.1.1 // indirect
-	github.com/gobwas/httphead v0.1.0 // indirect
-	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.1.0 // indirect
-	github.com/inkeliz/giosvg v0.0.0-20230915151051-c8ae55d003c6 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 // indirect
-	golang.org/x/exp/shiny v0.0.0-20220921164117-439092de6870 // indirect
-	golang.org/x/image v0.5.0 // indirect
-	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/text v0.15.0 // indirect
-	golang.org/x/tools v0.21.0 // indirect
+	github.com/go-text/typesetting v0.3.0 // indirect
+	golang.org/x/exp/shiny v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
+	golang.org/x/image v0.26.0 // indirect
+	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/text v0.32.0 // indirect
 )