From b790b27000476f08f22e61cd4915af08901f563b Mon Sep 17 00:00:00 2001
From: Chris Cummer <chriscummer@me.com>
Date: Sun, 28 Jul 2019 06:24:04 -0700
Subject: [PATCH] Move the FocusTracker from /wtf to /app

---
 {wtf => app}/focus_tracker.go | 17 +++++++++--------
 app/wtf_app.go                |  4 ++--
 main.go                       |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)
 rename {wtf => app}/focus_tracker.go (90%)

diff --git a/wtf/focus_tracker.go b/app/focus_tracker.go
similarity index 90%
rename from wtf/focus_tracker.go
rename to app/focus_tracker.go
index c2987f2a..0d6ef821 100644
--- a/wtf/focus_tracker.go
+++ b/app/focus_tracker.go
@@ -1,10 +1,11 @@
-package wtf
+package app
 
 import (
 	"sort"
 
 	"github.com/olebedev/config"
 	"github.com/rivo/tview"
+	"github.com/wtfutil/wtf/wtf"
 )
 
 type FocusState int
@@ -21,12 +22,12 @@ type FocusTracker struct {
 	App       *tview.Application
 	Idx       int
 	IsFocused bool
-	Widgets   []Wtfable
+	Widgets   []wtf.Wtfable
 
 	config *config.Config
 }
 
-func NewFocusTracker(app *tview.Application, widgets []Wtfable, config *config.Config) FocusTracker {
+func NewFocusTracker(app *tview.Application, widgets []wtf.Wtfable, config *config.Config) FocusTracker {
 	focusTracker := FocusTracker{
 		App:       app,
 		Idx:       -1,
@@ -157,7 +158,7 @@ func (tracker *FocusTracker) blur(idx int) {
 	view := widget.TextView()
 	view.Blur()
 
-	view.SetBorderColor(ColorFor(widget.BorderColor()))
+	view.SetBorderColor(wtf.ColorFor(widget.BorderColor()))
 
 	tracker.IsFocused = false
 }
@@ -177,12 +178,12 @@ func (tracker *FocusTracker) focus(idx int) {
 	}
 
 	view := widget.TextView()
-	view.SetBorderColor(ColorFor(tracker.config.UString("wtf.colors.border.focused", "gray")))
+	view.SetBorderColor(wtf.ColorFor(tracker.config.UString("wtf.colors.border.focused", "gray")))
 	tracker.App.SetFocus(view)
 }
 
-func (tracker *FocusTracker) focusables() []Wtfable {
-	focusable := []Wtfable{}
+func (tracker *FocusTracker) focusables() []wtf.Wtfable {
+	focusable := []wtf.Wtfable{}
 
 	for _, widget := range tracker.Widgets {
 		if widget.Focusable() {
@@ -207,7 +208,7 @@ func (tracker *FocusTracker) focusables() []Wtfable {
 	return focusable
 }
 
-func (tracker *FocusTracker) focusableAt(idx int) Wtfable {
+func (tracker *FocusTracker) focusableAt(idx int) wtf.Wtfable {
 	if idx < 0 || idx >= len(tracker.focusables()) {
 		return nil
 	}
diff --git a/app/wtf_app.go b/app/wtf_app.go
index efa25343..dca52b19 100644
--- a/app/wtf_app.go
+++ b/app/wtf_app.go
@@ -21,7 +21,7 @@ type WtfApp struct {
 	config         *config.Config
 	configFilePath string
 	display        *Display
-	focusTracker   wtf.FocusTracker
+	focusTracker   FocusTracker
 	isCustomConfig bool
 	pages          *tview.Pages
 	widgets        []wtf.Wtfable
@@ -39,7 +39,7 @@ func NewWtfApp(app *tview.Application, config *config.Config, configFilePath str
 
 	wtfApp.widgets = maker.MakeWidgets(wtfApp.app, wtfApp.pages, wtfApp.config)
 	wtfApp.display = NewDisplay(wtfApp.widgets, wtfApp.config)
-	wtfApp.focusTracker = wtf.NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config)
+	wtfApp.focusTracker = NewFocusTracker(wtfApp.app, wtfApp.widgets, wtfApp.config)
 
 	wtfApp.pages.AddPage("grid", wtfApp.display.Grid, true, true)
 	wtfApp.app.SetRoot(wtfApp.pages, true)
diff --git a/main.go b/main.go
index fd1cdb02..381820e2 100644
--- a/main.go
+++ b/main.go
@@ -69,7 +69,7 @@ func main() {
 	wtfApp := app.NewWtfApp(tviewApp, config, flags.Config, flags.HasCustomConfig())
 	wtfApp.Start()
 
-	if err := wtfApp.App().Run(); err != nil {
+	if err := tviewApp.Run(); err != nil {
 		fmt.Printf("\n%s %v\n", aurora.Red("ERROR"), err)
 		os.Exit(1)
 	}