Skip to content

Commit 6fc6169

Browse files
committed
Move tree widget into UI package
1 parent cc9d870 commit 6fc6169

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

FyneApp.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Website = "https://github.com/ErikKalkoken/janice"
44
Icon = "icon.png"
55
Name = "Janice"
66
ID = "io.github.erikkalkoken.janice"
7-
Version = "0.4.2"
8-
Build = 2
7+
Version = "0.5.0"
8+
Build = 1
99

1010
[Release]
1111
BuildName = "janice"

internal/widgets/treenode.go renamed to internal/ui/treenode.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package widgets
1+
package ui
22

33
import (
44
"fmt"
@@ -16,7 +16,7 @@ type TreeNode struct {
1616
value *widget.Label
1717
}
1818

19-
// NewTreeNode returns a new TreeNode instance.
19+
// NewTreeNode returns a new instance of the [TreeNode] widget.
2020
func NewTreeNode() *TreeNode {
2121
n := &TreeNode{
2222
key: widget.NewLabel(""),

internal/ui/ui.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"golang.org/x/text/message"
2222

2323
"github.com/ErikKalkoken/janice/internal/jsondocument"
24-
"github.com/ErikKalkoken/janice/internal/widgets"
2524
)
2625

2726
// preference keys
@@ -125,11 +124,11 @@ func (u *UI) makeTree() *widget.Tree {
125124
return u.document.IsBranch(id)
126125
},
127126
func(branch bool) fyne.CanvasObject {
128-
return widgets.NewTreeNode()
127+
return NewTreeNode()
129128
},
130129
func(uid widget.TreeNodeID, branch bool, co fyne.CanvasObject) {
131130
node := u.document.Value(uid)
132-
obj := co.(*widgets.TreeNode)
131+
obj := co.(*TreeNode)
133132
var text string
134133
switch v := node.Value; node.Type {
135134
case jsondocument.Array:

main.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ import (
1111
"github.com/ErikKalkoken/janice/internal/ui"
1212
)
1313

14+
const (
15+
appID = "io.github.erikkalkoken.janice"
16+
)
17+
1418
type logLevelFlag struct {
1519
value slog.Level
1620
}
@@ -42,7 +46,7 @@ func main() {
4246
flag.Parse()
4347
log.SetFlags(log.LstdFlags | log.Llongfile)
4448
slog.SetLogLoggerLevel(levelFlag.value)
45-
a := app.NewWithID("io.github.erikkalkoken.janice")
49+
a := app.NewWithID(appID)
4650
if *versionFlag {
4751
fmt.Printf("Current version is: %s", a.Metadata().Version)
4852
return

0 commit comments

Comments
 (0)