De-duplicate list lookup code and test

Moved code round a little so settings were in a sensible place

internal/ui/desk.go

@@ -217,16 +217,6 @@ func (l *deskLayout) WindowManager() fynedesk.WindowManager {
 	return l.wm
 }
 
-func isModuleEnabled(name string, settings fynedesk.DeskSettings) bool {
-	for _, mod := range settings.ModuleNames() {
-		if mod == name {
-			return true
-		}
-	}
-
-	return false
-}
-
 func (l *deskLayout) Modules() []fynedesk.Module {
 	var mods []fynedesk.Module
 	for _, meta := range fynedesk.AvailableModules() {

internal/ui/desk_test.go

@@ -58,60 +58,6 @@ func (*testDesk) Modules() []fynedesk.Module {
 	return nil
 }
 
-type testSettings struct {
-	background             string
-	iconTheme              string
-	launcherIcons          []string
-	launcherIconSize       int
-	launcherZoomScale      float64
-	launcherDisableZoom    bool
-	launcherDisableTaskbar bool
-
-	moduleNames []string
-}
-
-func (ts *testSettings) IconTheme() string {
-	return ts.iconTheme
-}
-
-func (ts *testSettings) Background() string {
-	return ts.background
-}
-
-func (ts *testSettings) LauncherIcons() []string {
-	return ts.launcherIcons
-}
-
-func (ts *testSettings) LauncherIconSize() int {
-	if ts.launcherIconSize == 0 {
-		return 32
-	}
-	return ts.launcherIconSize
-}
-
-func (ts *testSettings) LauncherDisableTaskbar() bool {
-	return ts.launcherDisableTaskbar
-}
-
-func (ts *testSettings) LauncherDisableZoom() bool {
-	return ts.launcherDisableZoom
-}
-
-func (ts *testSettings) LauncherZoomScale() float64 {
-	if ts.launcherZoomScale == 0 {
-		return 1.0
-	}
-	return ts.launcherZoomScale
-}
-
-func (ts *testSettings) ModuleNames() []string {
-	return ts.moduleNames
-}
-
-func (*testSettings) AddChangeListener(listener chan fynedesk.DeskSettings) {
-	return
-}
-
 type testScreensProvider struct {
 	screens []*fynedesk.Screen
 	primary *fynedesk.Screen

internal/ui/settings.go

@@ -77,6 +77,16 @@ func (d *deskSettings) apply() {
 	}
 }
 
+func isModuleEnabled(name string, settings fynedesk.DeskSettings) bool {
+	for _, mod := range settings.ModuleNames() {
+		if mod == name {
+			return true
+		}
+	}
+
+	return false
+}
+
 func (d *deskSettings) setBackground(name string) {
 	d.background = name
 	fyne.CurrentApp().Preferences().SetString("background", d.background)

internal/ui/settings_test.go

@@ -0,0 +1,72 @@
+package ui
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"fyne.io/fynedesk"
+)
+
+func TestDeskSettings_IsModuleEnabled(t *testing.T) {
+	s := &testSettings{moduleNames: []string{"Yes", "maybe"}}
+
+	assert.True(t, isModuleEnabled("Yes", s))
+	assert.True(t, isModuleEnabled("maybe", s))
+	assert.False(t, isModuleEnabled("Maybe", s))
+	assert.False(t, isModuleEnabled("No", s))
+}
+
+type testSettings struct {
+	background             string
+	iconTheme              string
+	launcherIcons          []string
+	launcherIconSize       int
+	launcherZoomScale      float64
+	launcherDisableZoom    bool
+	launcherDisableTaskbar bool
+
+	moduleNames []string
+}
+
+func (ts *testSettings) IconTheme() string {
+	return ts.iconTheme
+}
+
+func (ts *testSettings) Background() string {
+	return ts.background
+}
+
+func (ts *testSettings) LauncherIcons() []string {
+	return ts.launcherIcons
+}
+
+func (ts *testSettings) LauncherIconSize() int {
+	if ts.launcherIconSize == 0 {
+		return 32
+	}
+	return ts.launcherIconSize
+}
+
+func (ts *testSettings) LauncherDisableTaskbar() bool {
+	return ts.launcherDisableTaskbar
+}
+
+func (ts *testSettings) LauncherDisableZoom() bool {
+	return ts.launcherDisableZoom
+}
+
+func (ts *testSettings) LauncherZoomScale() float64 {
+	if ts.launcherZoomScale == 0 {
+		return 1.0
+	}
+	return ts.launcherZoomScale
+}
+
+func (ts *testSettings) ModuleNames() []string {
+	return ts.moduleNames
+}
+
+func (*testSettings) AddChangeListener(listener chan fynedesk.DeskSettings) {
+	return
+}

internal/ui/settings_ui.go

@@ -205,22 +205,12 @@ func (d *settingsUI) loadBarScreen() fyne.CanvasObject {
 		header, applyButton, widget.NewVBox(bar, details))
 }
 
-func listContains(list []string, item string) bool {
-	for _, listItem := range list {
-		if listItem == item {
-			return true
-		}
-	}
-
-	return false
-}
-
 func (d *settingsUI) loadModuleScreen() fyne.CanvasObject {
 	var modules []fyne.CanvasObject
 
 	for _, mod := range fynedesk.AvailableModules() {
 		name := mod.Name
-		enabled := listContains(d.settings.moduleNames, name)
+		enabled := isModuleEnabled(name, d.settings)
 
 		check := widget.NewCheck(name, func(bool) {})
 		check.SetChecked(enabled)