fyne-ioGH-4595: expose viewlayout publicly

maruu · Feb 1, 2024 · 0ea6caa · 0ea6caa
1 parent 85644c2
commit 0ea6caa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 25 deletions.
diff --git a/dialog/file.go b/dialog/file.go
@@ -17,11 +17,11 @@ import (
 	"fyne.io/fyne/v2/widget"
 )
 
-type viewLayout int
+type ViewLayout int
 
 const (
-	gridView viewLayout = iota
-	listView
+	GridView ViewLayout = iota
+	ListView
 )
 
 const viewLayoutKey = "fyne:fileDialogViewLayout"
@@ -56,7 +56,7 @@ type fileDialog struct {
 	favoritesList    *widget.List
 	showHidden       bool
 
-	view viewLayout
+	view ViewLayout
 
 	data     []fyne.URI
 	dataLock sync.RWMutex
@@ -138,9 +138,9 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 		title = label + " Folder"
 	}
 
-	view := viewLayout(fyne.CurrentApp().Preferences().Int(viewLayoutKey))
-	if view != listView {
-		view = gridView
+	view := ViewLayout(fyne.CurrentApp().Preferences().Int(viewLayoutKey))
+	if view != ListView {
+		view = GridView
 	}
 
 	f.setView(view)
@@ -169,19 +169,19 @@ func (f *fileDialog) makeUI() fyne.CanvasObject {
 	})
 
 	var toggleViewButtonIcon fyne.Resource
-	if f.view == gridView {
+	if f.view == GridView {
 		toggleViewButtonIcon = theme.ListIcon()
 	} else {
 		toggleViewButtonIcon = theme.GridIcon()
 	}
 
 	var toggleViewButton *widget.Button
 	toggleViewButton = widget.NewButtonWithIcon("", toggleViewButtonIcon, func() {
-		if f.view == gridView {
-			f.setView(listView)
+		if f.view == GridView {
+			f.setView(ListView)
 			toggleViewButton.SetIcon(theme.GridIcon())
 		} else {
-			f.setView(gridView)
+			f.setView(GridView)
 			toggleViewButton.SetIcon(theme.ListIcon())
 		}
 	})
@@ -516,7 +516,7 @@ func (f *fileDialog) setSelected(file fyne.URI, id int) {
 	}
 }
 
-func (f *fileDialog) setView(view viewLayout) {
+func (f *fileDialog) setView(view ViewLayout) {
 	f.view = view
 	fyne.CurrentApp().Preferences().SetInt(viewLayoutKey, int(view))
 
@@ -542,7 +542,7 @@ func (f *fileDialog) setView(view viewLayout) {
 			f.setSelected(file, id)
 		}
 	}
-	if f.view == gridView {
+	if f.view == GridView {
 		grid := widget.NewGridWrap(count, template, update)
 		grid.OnSelected = choose
 		f.files = grid

diff --git a/dialog/file_test.go b/dialog/file_test.go
@@ -528,22 +528,22 @@ func TestViewPreferences(t *testing.T) {
 	toggleViewButton := ui.Objects[1].(*fyne.Container).Objects[0].(*fyne.Container).Objects[1].(*widget.Button)
 
 	// viewLayout preference should be 'grid'
-	view := viewLayout(prefs.Int(viewLayoutKey))
-	assert.Equal(t, gridView, view)
+	view := ViewLayout(prefs.Int(viewLayoutKey))
+	assert.Equal(t, GridView, view)
 
 	// toggle view
 	test.Tap(toggleViewButton)
 
 	// viewLayout preference should be 'list'
-	view = viewLayout(prefs.Int(viewLayoutKey))
-	assert.Equal(t, listView, view)
+	view = ViewLayout(prefs.Int(viewLayoutKey))
+	assert.Equal(t, ListView, view)
 
 	// toggle view
 	test.Tap(toggleViewButton)
 
 	// viewLayout preference should be 'grid' again
-	view = viewLayout(prefs.Int(viewLayoutKey))
-	assert.Equal(t, gridView, view)
+	view = ViewLayout(prefs.Int(viewLayoutKey))
+	assert.Equal(t, GridView, view)
 }
 
 func TestFileFavorites(t *testing.T) {

diff --git a/dialog/fileitem.go b/dialog/fileitem.go
@@ -43,7 +43,7 @@ func (i *fileDialogItem) setLocation(l fyne.URI, dir, up bool) {
 	i.location = l
 	i.name = l.Name()
 
-	if i.picker.view == gridView {
+	if i.picker.view == GridView {
 		ext := filepath.Ext(i.name[1:])
 		i.name = i.name[:len(i.name)-len(ext)]
 	}
@@ -63,7 +63,7 @@ func (f *fileDialog) newFileItem(location fyne.URI, dir, up bool) *fileDialogIte
 		dir:      dir,
 	}
 
-	if f.view == gridView {
+	if f.view == GridView {
 		ext := filepath.Ext(item.name[1:])
 		item.name = item.name[:len(item.name)-len(ext)]
 	}
@@ -86,7 +86,7 @@ type fileItemRenderer struct {
 }
 
 func (s *fileItemRenderer) Layout(size fyne.Size) {
-	if s.item.picker.view == gridView {
+	if s.item.picker.view == GridView {
 		s.icon.Resize(fyne.NewSize(fileIconSize, fileIconSize))
 		s.icon.Move(fyne.NewPos((size.Width-fileIconSize)/2, 0))
 
@@ -105,7 +105,7 @@ func (s *fileItemRenderer) Layout(size fyne.Size) {
 }
 
 func (s *fileItemRenderer) MinSize() fyne.Size {
-	if s.item.picker.view == gridView {
+	if s.item.picker.view == GridView {
 		return fyne.NewSize(fileIconCellWidth, fileIconSize+s.fileTextSize)
 	}
 

diff --git a/dialog/fileitem_test.go b/dialog/fileitem_test.go
@@ -28,7 +28,7 @@ func TestFileItem_Name(t *testing.T) {
 	assert.Equal(t, "noext", item.name)
 
 	// Test that the extension remains for the list view.
-	f.view = listView
+	f.view = ListView
 
 	item = f.newFileItem(storage.NewFileURI("/path/to/filename.txt"), false, false)
 	assert.Equal(t, "filename.txt", item.name)
@@ -57,7 +57,7 @@ func TestFileItem_FolderName(t *testing.T) {
 	assert.Equal(t, ".maybeHidden", item.name)
 
 	// Test that the extension remains for the list view.
-	f.view = listView
+	f.view = ListView
 	item = f.newFileItem(storage.NewFileURI("/path/to/myapp.app/"), true, false)
 	assert.Equal(t, "myapp.app", item.name)
 }