[TASK] First Beta Release

Author: Sharrnah

CustomWidget/TappableSelect.go

@@ -0,0 +1,87 @@
+package CustomWidget
+
+import (
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/theme"
+	"fyne.io/fyne/v2/widget"
+	"sync"
+)
+
+const defaultPlaceHolder string = "(Select one)"
+
+type TappableSelect struct {
+	widget.Select
+	popUp                *widget.PopUpMenu
+	UpdateBeforeOpenFunc func()
+	LastTappedPointEvent *fyne.PointEvent
+
+	impl         fyne.Widget
+	propertyLock sync.RWMutex
+}
+
+var _ fyne.Widget = (*TappableSelect)(nil)
+var _ fyne.Tappable = (*TappableSelect)(nil)
+
+// NewSelect creates a new select widget with the set list of options and changes handler
+func NewSelect(options []string, changed func(string)) *TappableSelect {
+	s := &TappableSelect{}
+	s.OnChanged = changed
+	s.Options = options
+	s.PlaceHolder = defaultPlaceHolder
+
+	s.ExtendBaseWidget(s)
+	return s
+}
+func (s *TappableSelect) super() fyne.Widget {
+	return s
+}
+
+func (s *TappableSelect) updateSelected(text string) {
+	s.Selected = text
+
+	if s.OnChanged != nil {
+		s.OnChanged(s.Selected)
+	}
+
+	s.Refresh()
+}
+
+func (s *TappableSelect) popUpPos() fyne.Position {
+	buttonPos := fyne.CurrentApp().Driver().AbsolutePositionForObject(s.super())
+	return buttonPos.Add(fyne.NewPos(0, s.Size().Height-theme.InputBorderSize()))
+}
+func (s *TappableSelect) showPopUp() {
+	items := make([]*fyne.MenuItem, len(s.Options))
+	for i := range s.Options {
+		text := s.Options[i] // capture
+		items[i] = fyne.NewMenuItem(text, func() {
+			s.updateSelected(text)
+			s.popUp = nil
+		})
+	}
+
+	c := fyne.CurrentApp().Driver().CanvasForObject(s.super())
+	s.popUp = widget.NewPopUpMenu(fyne.NewMenu("", items...), c)
+	//s.popUp.alignment = s.Alignment
+	s.popUp.ShowAtPosition(s.popUpPos())
+	s.popUp.Resize(fyne.NewSize(s.Size().Width, s.popUp.MinSize().Height))
+}
+
+func (s *TappableSelect) GetPopup() *widget.PopUpMenu {
+	return s.popUp
+}
+
+func (s *TappableSelect) ShopPopup() {
+	if s.Disabled() {
+		return
+	}
+
+	s.Refresh()
+
+	s.showPopUp()
+}
+
+func (s *TappableSelect) Tapped(ev *fyne.PointEvent) {
+	s.LastTappedPointEvent = ev
+	s.UpdateBeforeOpenFunc()
+}

CustomWidget/TextValueSelect.go

@@ -0,0 +1,121 @@
+package CustomWidget
+
+import (
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/widget"
+)
+
+type TextValueSelect struct {
+	widget.Select
+	Name      string
+	Options   []TextValueOption
+	OnChanged func(TextValueOption) `json:"-"`
+}
+
+type TextValueOption struct {
+	// Text sets the text of the select.
+	Text string
+	// Value sets the value of the select.
+	Value string
+}
+
+func (s *TextValueOption) String() string {
+	return s.Value
+}
+
+// NewTextValueSelect Creates a new TextValue Select widget
+// Set defaultIndex to -1 if no default should be selected
+func NewTextValueSelect(name string, options []TextValueOption, changed func(TextValueOption), defaultIndex int) *TextValueSelect {
+	s := &TextValueSelect{}
+	s.Name = name
+	s.OnChanged = changed
+	s.Select.OnChanged = func(text string) {
+		s.updateSelected(text)
+	}
+	s.Options = options
+	s.PlaceHolder = defaultPlaceHolder
+
+	if defaultIndex > -1 && defaultIndex <= len(s.Options) {
+		s.Selected = s.Options[defaultIndex].Text
+	}
+
+	s.ExtendBaseWidget(s)
+	return s
+}
+
+// ClearSelected clears the current option of the select widget.  After
+// clearing the current option, the Select widget's PlaceHolder will
+// be displayed.
+func (s *TextValueSelect) ClearSelected() {
+	s.updateSelected("")
+}
+
+func (s *TextValueSelect) GetName() string {
+	return s.Name
+}
+
+// SelectedIndex returns the index value of the currently selected item in Options list.
+// It will return -1 if there is no selection.
+func (s *TextValueSelect) SelectedIndex() int {
+	for i, option := range s.Options {
+		if s.Selected == option.Text {
+			return i
+		}
+	}
+	return -1 // not selected/found
+}
+
+func (s *TextValueSelect) GetSelected() *TextValueOption {
+	selectedIndex := s.SelectedIndex()
+	if selectedIndex == -1 {
+		return nil
+	}
+	return &s.Options[s.SelectedIndex()]
+}
+
+// SetSelected sets the current option of the select widget
+func (s *TextValueSelect) SetSelected(value string) {
+	for _, option := range s.Options {
+		if value == option.Value {
+			s.updateSelected(option.Text)
+		}
+	}
+}
+
+// SetSelectedIndex will set the Selected option from the value in Options list at index position.
+func (s *TextValueSelect) SetSelectedIndex(index int) {
+	if index < 0 || index >= len(s.Options) {
+		return
+	}
+
+	s.updateSelected(s.Options[index].Text)
+}
+
+func (s *TextValueSelect) updateSelected(text string) {
+	var lastSelected TextValueOption
+	for i := 0; i < len(s.Options); i++ {
+		if s.Options[i].Text == text {
+			s.Selected = s.Options[i].Text
+			lastSelected = s.Options[i]
+		}
+	}
+
+	if s.OnChanged != nil {
+		s.OnChanged(lastSelected)
+	}
+
+	s.Refresh()
+}
+
+// Tapped is called when a pointer tapped event is captured and triggers any tap handler
+func (s *TextValueSelect) Tapped(tapEvent *fyne.PointEvent) {
+	// copy options over to base widget
+	var items []string
+	for i := range s.Options {
+		items = append(items, s.Options[i].Text)
+	}
+	s.Select.Options = items
+
+	s.Select.Tapped(tapEvent)
+
+}

FyneApp.toml

@@ -1,8 +1,8 @@
-Website = "https://github.com/Sharrnah/whispering"
-
-[Details]
-Icon = "app-icon.png"
-Name = "Whispering Tiger"
-ID = "tiger.whispering"
-Version = "1.0.0"
-Build = 1
+Website = "https://github.com/Sharrnah/whispering"
+
+[Details]
+  Icon = "app-icon.png"
+  Name = "Whispering Tiger"
+  ID = "tiger.whispering"
+  Version = "1.0.0"
+  Build = 7

Pages/Advanced.go

@@ -11,7 +11,7 @@ import (
 )
 
 func CreateAdvancedWindow() fyne.CanvasObject {
-	Settings.Form = Settings.BuildSettingsForm(nil).(*widget.Form)
+	Settings.Form = Settings.BuildSettingsForm(nil, Settings.Config.SettingsFilename).(*widget.Form)
 
 	settingsTabContent := container.NewVScroll(Settings.Form)
 
@@ -24,16 +24,19 @@ func CreateAdvancedWindow() fyne.CanvasObject {
 
 	// Log logText updater thread
 	go func(writer io.Writer, reader io.Reader) {
-		buffer := make([]byte, 1024)
-		for {
-			n, err := reader.Read(buffer) // Read from the pipe
-			if err != nil {
-				panic(err)
+		if reader != nil {
+			buffer := make([]byte, 1024)
+			for {
+				n, err := reader.Read(buffer) // Read from the pipe
+				if err != nil {
+					//panic(err)
+					logText.AppendText(err.Error())
+				}
+				logText.AppendText(string(buffer[0:n]))
+				logTabContent.ScrollToBottom()
 			}
-			logText.AppendText(string(buffer[0:n]))
-			logTabContent.ScrollToBottom()
 		}
-	}(RuntimeBackend.WriterBackend, RuntimeBackend.ReaderBackend)
+	}(RuntimeBackend.BackendsList[0].WriterBackend, RuntimeBackend.BackendsList[0].ReaderBackend)
 
 	tabs := container.NewAppTabs(
 		container.NewTabItem("Log", logTabContent),
@@ -43,7 +46,7 @@ func CreateAdvancedWindow() fyne.CanvasObject {
 
 	tabs.OnSelected = func(tab *container.TabItem) {
 		if tab.Text == "Settings" {
-			Settings.BuildSettingsForm(nil)
+			Settings.BuildSettingsForm(nil, Settings.Config.SettingsFilename)
 			tab.Content.(*container.Scroll).Content = Settings.Form
 		}
 	}