Improve user-friendliness of default config

[rbdr/mobius] / hotline / ui.go

diff --git a/hotline/ui.go b/hotline/ui.go
index 3d0fa68a941c138b3d0b9f91ec0e4434e1ac22af..b9e45dd9bafaa662f9284ce2fe06c792e5b7dfd0 100644 (file)
--- a/hotline/ui.go
+++ b/hotline/ui.go
@@ -2,10 +2,9 @@ package hotline
 
 import (
        "fmt"
 
 import (
        "fmt"

-       "github.com/davecgh/go-spew/spew"

        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"
        "github.com/gdamore/tcell/v2"
        "github.com/rivo/tview"

-       "gopkg.in/yaml.v2"
+       "gopkg.in/yaml.v3"

        "io"
        "io/ioutil"
        "os"
        "io"
        "io/ioutil"
        "os"


@@ -19,7 +18,6 @@ type UI struct {
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView
        App         *tview.Application
        Pages       *tview.Pages
        userList    *tview.TextView

-       agreeModal  *tview.Modal

        trackerList *tview.List
        HLClient    *Client
 }
        trackerList *tview.List
        HLClient    *Client
 }


@@ -75,7 +73,6 @@ func NewUI(c *Client) *UI {
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),
                chatInput:   chatInput,
                userList:    userList,
                trackerList: tview.NewList(),

-               agreeModal:  tview.NewModal(),

                HLClient:    c,
        }
 }
                HLClient:    c,
        }
 }


@@ -110,7 +107,7 @@ func (ui *UI) showBookmarks() *tview.List {
 func (ui *UI) getTrackerList() *tview.List {
        listing, err := GetListing(ui.HLClient.pref.Tracker)
        if err != nil {
 func (ui *UI) getTrackerList() *tview.List {
        listing, err := GetListing(ui.HLClient.pref.Tracker)
        if err != nil {

-               spew.Dump(err)
+               // TODO

        }
 
        list := tview.NewList()
        }
 
        list := tview.NewList()


@@ -233,7 +230,7 @@ func (ui *UI) renderJoinServerForm(name, server, login, password, backPage strin
        joinServerForm.
                //      AddInputField("Name", server, 0, func(textToCheck string, lastChar rune) bool {
                //      return false
        joinServerForm.
                //      AddInputField("Name", server, 0, func(textToCheck string, lastChar rune) bool {
                //      return false

-               //}, nil).
+               // }, nil).

                AddInputField("Server", server, 0, nil, nil).
                AddInputField("Login", login, 0, nil, nil).
                AddPasswordField("Password", password, 0, '*', nil).
                AddInputField("Server", server, 0, nil, nil).
                AddInputField("Login", login, 0, nil, nil).
                AddPasswordField("Password", password, 0, '*', nil).


@@ -372,7 +369,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).
 
                        newsPostForm := tview.NewForm().
                                SetButtonsAlign(tview.AlignRight).

-                               //AddButton("Cancel", nil). // TODO: implement cancel button behavior
+                               // AddButton("Cancel", nil). // TODO: implement cancel button behavior

                                AddButton("Send", nil)
                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {
                                AddButton("Send", nil)
                        newsPostForm.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey {
                                switch event.Key() {


@@ -440,7 +437,7 @@ func (ui *UI) renderServerUI() *tview.Flex {
                                        SetDirection(tview.FlexRow).
                                        AddItem(nil, 0, 1, false).
                                        AddItem(newsFlex, 15, 1, true).
                                        SetDirection(tview.FlexRow).
                                        AddItem(nil, 0, 1, false).
                                        AddItem(newsFlex, 15, 1, true).

-                                       //AddItem(newsPostForm, 3, 0, false).
+                                       // AddItem(newsPostForm, 3, 0, false).

                                        AddItem(nil, 0, 1, false), 40, 1, false).
                                AddItem(nil, 0, 1, false)
 
                                        AddItem(nil, 0, 1, false), 40, 1, false).
                                AddItem(nil, 0, 1, false)