Refactor all app code into app package.

Create flexible new app.New() which can help detect the correct scenario, such as CI tests.
Completed with a refactor of desktop to driver/efl, leaving behind the old desktop/NewApp() function

app.go

@@ -23,50 +23,3 @@ type App interface {
 	// cleanly, closing all open windows.
 	Quit()
 }
-
-type fyneApp struct {
-}
-
-func (app *fyneApp) NewWindow(title string) Window {
-	return GetDriver().CreateWindow(title)
-}
-
-func (app *fyneApp) Run() {
-	GetDriver().Run()
-}
-
-func (app *fyneApp) Quit() {
-	GetDriver().Quit()
-}
-
-func (app *fyneApp) applyTheme(Settings) {
-	for _, window := range GetDriver().AllWindows() {
-		content := window.Content()
-
-		switch themed := content.(type) {
-		case ThemedObject:
-			themed.ApplyTheme()
-			window.Canvas().Refresh(content)
-		}
-	}
-}
-
-// NewAppWithDriver initialises a new Fyne application using the specified driver
-// and returns a handle to that App.
-// As this package has no default driver one must be provided.
-// Helpers are available - see desktop.NewApp() and test.NewApp().
-func NewAppWithDriver(d Driver) App {
-	newApp := &fyneApp{}
-	setDriver(d)
-
-	listener := make(chan Settings)
-	GetSettings().AddChangeListener(listener)
-	go func() {
-		for {
-			settings := <-listener
-			newApp.applyTheme(settings)
-		}
-	}()
-
-	return newApp
-}

app/app.go

@@ -0,0 +1,54 @@
+package app
+
+import (
+	"github.com/fyne-io/fyne"
+)
+
+type fyneApp struct {
+	driver fyne.Driver
+}
+
+func (app *fyneApp) NewWindow(title string) fyne.Window {
+	return app.driver.CreateWindow(title)
+}
+
+func (app *fyneApp) Run() {
+	app.driver.Run()
+}
+
+func (app *fyneApp) Quit() {
+	app.driver.Quit()
+}
+
+func (app *fyneApp) applyTheme(fyne.Settings) {
+	for _, window := range app.driver.AllWindows() {
+		content := window.Content()
+
+		switch themed := content.(type) {
+		case fyne.ThemedObject:
+			themed.ApplyTheme()
+			window.Canvas().Refresh(content)
+		}
+	}
+}
+
+// NewAppWithDriver initialises a new Fyne application using the specified driver
+// and returns a handle to that App.
+// As this package has no default driver one must be provided.
+// Helpers are available - see desktop.NewApp() and test.NewApp().
+func NewAppWithDriver(d fyne.Driver) fyne.App {
+	newApp := &fyneApp{}
+	newApp.driver = d
+	fyne.SetDriver(d)
+
+	listener := make(chan fyne.Settings)
+	fyne.GetSettings().AddChangeListener(listener)
+	go func() {
+		for {
+			settings := <-listener
+			newApp.applyTheme(settings)
+		}
+	}()
+
+	return newApp
+}

app_bsd.go → app/app_bsd.go

@@ -2,7 +2,7 @@
 
 // +build openbsd freebsd netbsd
 
-package fyne
+package app
 
 import "os/exec"
 

app/app_ci.go

@@ -0,0 +1,13 @@
+// +build ci
+
+package app
+
+import (
+	"github.com/fyne-io/fyne"
+	"github.com/fyne-io/fyne/test"
+)
+
+// New returns a new app instance using the test (headless) driver.
+func New() fyne.App {
+	return NewAppWithDriver(test.NewTestDriver())
+}

app_darwin.go → app/app_darwin.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package fyne
+package app
 
 import "os/exec"
 

app/app_efl.go

@@ -0,0 +1,11 @@
+// +build !ci,!gl
+
+package app
+
+import "github.com/fyne-io/fyne"
+import "github.com/fyne-io/fyne/driver/efl"
+
+// New returns a new app instance using the EFL driver.
+func New() fyne.App {
+	return NewAppWithDriver(efl.NewEFLDriver())
+}

app_linux.go → app/app_linux.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package fyne
+package app
 
 import "os/exec"
 

app_other.go → app/app_other.go

@@ -1,6 +1,6 @@
 // +build ci !linux,!darwin,!windows,!freebsd,!openbsd,!netbsd
 
-package fyne
+package app
 
 import "log"
 

app_test.go → app/app_test.go

@@ -1,6 +1,9 @@
-package fyne
+package app
 
-import "testing"
+import (
+	"github.com/fyne-io/fyne"
+	"testing"
+)
 
 func TestDummyApp(t *testing.T) {
 	app := NewAppWithDriver(new(dummyDriver))
@@ -11,16 +14,16 @@ func TestDummyApp(t *testing.T) {
 type dummyDriver struct {
 }
 
-func (d *dummyDriver) CreateWindow(string) Window {
+func (d *dummyDriver) CreateWindow(string) fyne.Window {
 	return nil
 }
 
-func (d *dummyDriver) AllWindows() []Window {
+func (d *dummyDriver) AllWindows() []fyne.Window {
 	return nil
 }
 
-func (d *dummyDriver) RenderedTextSize(text string, size int, _ TextStyle) Size {
-	return NewSize(len(text)*size, size)
+func (d *dummyDriver) RenderedTextSize(text string, size int, _ fyne.TextStyle) fyne.Size {
+	return fyne.NewSize(len(text)*size, size)
 }
 
 func (d *dummyDriver) Run() {

app_windows.go → app/app_windows.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package fyne
+package app
 
 import "os/exec"
 

cmd/fyne_demo/main.go

@@ -5,6 +5,7 @@ import "errors"
 import "fmt"
 
 import "github.com/fyne-io/fyne"
+import "github.com/fyne-io/fyne/app"
 import "github.com/fyne-io/fyne/layout"
 import "github.com/fyne-io/fyne/theme"
 import "github.com/fyne-io/fyne/dialog"
@@ -31,18 +32,12 @@ func formApp(app fyne.App) {
 	w.Show()
 }
 
-func appButton(app fyne.App, label string, onClick func(fyne.App)) *widget.Button {
-	return widget.NewButton(label, func() {
-		onClick(app)
-	})
-}
-
 func confirmCallback(response bool) {
 	fmt.Println("Responded with", response)
 }
 
 func main() {
-	app := NewApp()
+	app := app.New()
 
 	w := app.NewWindow("Fyne Demo")
 	entry := widget.NewEntry()

desktop/app.go

@@ -1,13 +1,18 @@
 // +build !ci
 
-// Package desktop provides a full implementation of the Fyne APIs for desktop
-// applications. This supports Windows, Mac OS X and Linux using the EFL (Evas)
-// render pipeline.
+// Package desktop is a legacy package which provided a an EFL based driver.
+// This supports Windows, Mac OS X and Linux using the EFL (Evas) render pipeline.
+// The replacement app package should be used by calling app.New() to create a new desktop application.
 package desktop
 
+import "log"
+
 import "github.com/fyne-io/fyne"
+import "github.com/fyne-io/fyne/app"
+import "github.com/fyne-io/fyne/driver/efl"
 
 // NewApp returns a new app instance using the desktop (EFL) driver.
 func NewApp() fyne.App {
-	return fyne.NewAppWithDriver(NewEFLDriver())
+	log.Println("desktop.NewApp() is deprecated - please use app.New()")
+	return app.NewAppWithDriver(efl.NewEFLDriver())
 }

driver.go

@@ -24,8 +24,8 @@ func GetDriver() Driver {
 	return driver
 }
 
-// setDriver sets the application driver.
+// SetDriver sets the application driver.
 // This bridges internal modularity - do not call this method directly.
-func setDriver(d Driver) {
+func SetDriver(d Driver) {
 	driver = d
 }

desktop/canvas.go → driver/efl/canvas.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 // #cgo pkg-config: eina evas ecore-evas
 // #include <Eina.h>

desktop/cfuncs.go → driver/efl/cfuncs.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 /*
 #cgo pkg-config: ecore-evas ecore-input

desktop/driver.go → driver/efl/driver.go

@@ -1,6 +1,8 @@
 // +build !ci
 
-package desktop
+// Package efl provides a full Fyne render implementation using an EFL installation.
+// This supports Windows, Mac OS X and Linux using the EFL (Evas) render pipeline.
+package efl
 
 // #cgo pkg-config: ecore
 // #include <Ecore.h>

desktop/efl_bsd.go → driver/efl/efl_bsd.go

@@ -2,7 +2,7 @@
 
 // +build freebsd openbsd netbsd
 
-package desktop
+package efl
 
 // #cgo pkg-config: ecore-evas
 // #include <Ecore_Evas.h>

desktop/efl_darwin.go → driver/efl/efl_darwin.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 func oSEngineName() string {
 	return "opengl_cocoa"

desktop/efl_linux.go → driver/efl/efl_linux.go

@@ -2,7 +2,7 @@
 
 // +build !wayland
 
-package desktop
+package efl
 
 // #cgo pkg-config: ecore-evas
 // #include <Ecore_Evas.h>

desktop/efl_other.go → driver/efl/efl_other.go

@@ -2,7 +2,7 @@
 
 // +build !linux,!darwin,!windows,!freebsd,!openbsd,!netbsd
 
-package desktop
+package efl
 
 func oSEngineName() string {
 	return oSEngineOther

desktop/efl_wayland_linux.go → driver/efl/efl_wayland_linux.go

@@ -2,7 +2,7 @@
 
 // +build wayland
 
-package desktop
+package efl
 
 // #cgo pkg-config: ecore-evas ecore-wl2
 // #include <Ecore_Evas.h>

desktop/efl_windows.go → driver/efl/efl_windows.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 func oSEngineName() string {
 	return "software_gdi"

desktop/loop.go → driver/efl/loop.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 // #cgo pkg-config: eina evas ecore-evas ecore-input
 // #cgo CFLAGS: -DEFL_BETA_API_SUPPORT=master-compatibility-hack

desktop/text.go → driver/efl/text.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 // #cgo pkg-config: ecore evas
 // #include <Ecore.h>

desktop/window.go → driver/efl/window.go

@@ -1,6 +1,6 @@
 // +build !ci
 
-package desktop
+package efl
 
 // #cgo pkg-config: ecore ecore-evas ecore-input evas
 // #include <Ecore.h>