Merge branch 'release/v2.2.x' into develop

CHANGELOG.md

@@ -3,6 +3,7 @@
 This file lists the main changes with each version of the Fyne toolkit.
 More detailed release notes can be found on the [releases page](https://github.com/fyne-io/fyne/releases). 
 
+<<<<<<< HEAD
 ## 2.3.0 - Ongoing
 
 ### Added
@@ -20,13 +21,17 @@ More detailed release notes can be found on the [releases page](https://github.c
 * Fyne bundle does not support appending when parameter is a directory
 
 
-## 2.2.4 - Ongoing
+## 2.2.4 - 9 November 2022
 
 ### Fixes
 
 * Iphone incorrect click coordinates in zoomed screen view (#3122)
 * CachedFontFace seems to be causing crash (#3134)
 * Fix possible compile error if "fyne build" is used without icon metadata
+* Detect and use recent Android NDK toolchain
+* Handle fyne package -release and fyne release properly for Android and iOS
+* Fix issue with mobile simulation when systray used
+* Fix incorrect size and position for radio focus indicator (#3137)
 
 
 ## 2.2.3 - 8 July 2022

app/app_xdg.go

@@ -98,13 +98,17 @@ func (a *fyneApp) cachedIconPath() string {
 // SetSystemTrayMenu creates a system tray item and attaches the specified menu.
 // By default this will use the application icon.
 func (a *fyneApp) SetSystemTrayMenu(menu *fyne.Menu) {
-	a.Driver().(systrayDriver).SetSystemTrayMenu(menu)
+	if desk, ok := a.Driver().(systrayDriver); ok { // don't use this on mobile tag
+		desk.SetSystemTrayMenu(menu)
+	}
 }
 
 // SetSystemTrayIcon sets a custom image for the system tray icon.
 // You should have previously called `SetSystemTrayMenu` to initialise the menu icon.
 func (a *fyneApp) SetSystemTrayIcon(icon fyne.Resource) {
-	a.Driver().(systrayDriver).SetSystemTrayIcon(icon)
+	if desk, ok := a.Driver().(systrayDriver); ok { // don't use this on mobile tag
+		desk.SetSystemTrayIcon(icon)
+	}
 }
 
 func rootConfigDir() string {

cmd/fyne/internal/commands/package.go

@@ -15,12 +15,13 @@ import (
 	"strconv"
 	"strings"
 
-	"fyne.io/fyne/v2"
 	_ "github.com/fyne-io/image/ico" // import image encodings
 	"github.com/urfave/cli/v2"
 	"golang.org/x/mod/modfile"
 	"golang.org/x/mod/module"
 
+	"fyne.io/fyne/v2"
+
 	"fyne.io/fyne/v2/cmd/fyne/internal/metadata"
 )