changed to use pages for resultAndInputView

core is working -> now we need the more advanced grpc calls

cmd/gosdn-tview/main.go

@@ -15,10 +15,8 @@ func main() {
 
 	app := app.NewApp()
 	mainView := views.NewMainView(app, conn)
-	addPNDView := views.NewAddPNDView(app)
 
 	app.SetRoot(mainView)
-	app.AddPage("PND", addPNDView)
 
 	app.Run()
 	defer app.Stop()

cmd/gosdn-tview/views/addPNDView.go

@@ -13,6 +13,10 @@ func NewAddPNDView(app *app.App) *AddPNDView {
 	pndv := &AddPNDView{
 		addPNDView: tview.NewForm(),
 	}
+	pndv.addPNDView.
+		SetBorder(true).
+		SetTitle("Add new PND")
+
 	pndv.addPNDView.
 		AddInputField("Name", "", 20, nil, nil).
 		AddInputField("description", "", 20, nil, nil).

cmd/gosdn-tview/views/commandsListView.go

@@ -30,7 +30,8 @@ func (cv *CommandListView) GetCommands(app *app.App, rv *ResultAndInputView,
 	conn *grpc.ClientConn) {
 	//TODO: create own command in grpc -> commands
 	cv.commandsList.AddItem("AddPND", "closes the application", '!', func() {
-		app.SwitchPage("PND")
+		rv.ChangeContentView("addPND")
+		app.SetFocus(rv.GetContent())
 	})
 
 	for i, command := range commands.CommandList {
@@ -39,6 +40,7 @@ func (cv *CommandListView) GetCommands(app *app.App, rv *ResultAndInputView,
 			AddItem(command.Name, command.Description, rune('a'+i), func() {
 				r := f(conn)
 				rv.SetContent(r)
+				rv.ChangeContentView("result")
 			})
 	}
 

cmd/gosdn-tview/views/mainView.go

@@ -20,7 +20,7 @@ func NewMainView(app *app.App, conn *grpc.ClientConn) *MainView {
 		pages:              tview.NewPages(),
 		mainGrid:           tview.NewGrid(),
 		commandsListView:   NewCommandListView(),
-		resultAndInputView: NewResultAndInputView(),
+		resultAndInputView: NewResultAndInputView(app),
 		headerView:         NewHeaderView(),
 		footerView:         NewFooterView(app, conn),
 	}

cmd/gosdn-tview/views/resultAndInputView.go

 package views
 
 import (
+	"code.fbi.h-da.de/cocsn/gosdn/cmd/gosdn-tview/app"
 	"github.com/rivo/tview"
 )
 
 type ResultAndInputView struct {
-	resultAndInputView *tview.TextView
+	pages        *tview.Pages
+	resultView   *tview.TextView
+	pndInputView *AddPNDView
 }
 
-func NewResultAndInputView() *ResultAndInputView {
+func NewResultAndInputView(app *app.App) *ResultAndInputView {
 	rv := &ResultAndInputView{
-		resultAndInputView: tview.NewTextView(),
+		pages:        tview.NewPages(),
+		pndInputView: NewAddPNDView(app),
+		resultView:   tview.NewTextView(),
 	}
-	rv.resultAndInputView.
+	rv.resultView.
 		SetDynamicColors(true).
 		SetRegions(true).
 		SetScrollable(true).
 		SetTitle("Result").
 		SetBorder(true)
 
+	rv.pages.
+		AddPage("result", rv.resultView, true, true).
+		AddPage("addPND", rv.pndInputView.GetContent(), true, false)
+
 	return rv
 }
 
 func (rv *ResultAndInputView) GetContent() tview.Primitive {
-	return rv.resultAndInputView
+	return rv.pages
+}
+
+func (rv *ResultAndInputView) ChangeContentView(s string) {
+	rv.pages.SwitchToPage(s)
 }
 
 func (rv *ResultAndInputView) SetContent(s string) {
-	rv.resultAndInputView.Clear()
-	rv.resultAndInputView.SetText(s)
+	rv.resultView.Clear()
+	rv.resultView.SetText(s)
 }