update tran boxes view, update tran sender, add tran logo

abdfnx · Feb 6, 2022 · 40dde85 · 40dde85
1 parent d211fc7
commit 40dde85
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 26 deletions.
diff --git a/.github/assets/logo.svg b/.github/assets/logo.svg
diff --git a/internal/tui/model.go b/internal/tui/model.go
@@ -39,6 +39,7 @@ type Bubble struct {
 	showDirectoriesOnly    bool
 	showFileTreePreview    bool
 	findMode               bool
+	sendMode			   bool
 	receiveMode			   bool
 	showBoxSpinner         bool
 	foundFilesPaths        []string

diff --git a/internal/tui/sender.go b/internal/tui/sender.go
@@ -5,14 +5,15 @@ import (
 	"sort"
 	"strings"
 
+	"github.com/abdfnx/tran/constants"
 	"github.com/abdfnx/tran/tools"
+	"github.com/charmbracelet/bubbles/progress"
+	"github.com/charmbracelet/bubbles/spinner"
+	tea "github.com/charmbracelet/bubbletea"
+	"github.com/charmbracelet/lipgloss"
 	"github.com/muesli/reflow/indent"
-	"github.com/abdfnx/tran/constants"
 	"github.com/muesli/reflow/wordwrap"
-	"github.com/charmbracelet/lipgloss"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/bubbles/spinner"
-	"github.com/charmbracelet/bubbles/progress"
+	"github.com/muesli/termenv"
 )
 
 // ui state flows from the top down
@@ -46,6 +47,8 @@ func NewSenderUI() *tea.Program {
 	m.resetSpinner()
 	var opts []tea.ProgramOption
 
+	termenv.AltScreen()
+
 	opts = append(opts, tea.WithAltScreen())
 
 	return tea.NewProgram(m, opts...)

diff --git a/internal/tui/update.go b/internal/tui/update.go
@@ -2,15 +2,12 @@ package tui
 
 import (
 	"os"
-	"fmt"
 	"errors"
 	"os/exec"
 	"path/filepath"
 
 	"github.com/muesli/termenv"
 	"github.com/abdfnx/tran/dfs"
-	"github.com/abdfnx/tran/tools"
-	"github.com/abdfnx/tran/models"
 	"github.com/abdfnx/tran/constants"
 	"github.com/charmbracelet/glamour"
 	"github.com/charmbracelet/lipgloss"
@@ -335,29 +332,15 @@ func (b *Bubble) handleKeys(msg tea.KeyMsg) tea.Cmd {
 			}
 
 		case key.Matches(msg, b.keyMap.Send):
-			selectedFile := b.treeFiles[b.treeCursor]
-
-			tools.RandomSeed()
-
-			err := ValidateTranxAddress()
-
-			if err != nil {
-				fmt.Println(err)
-			}
-
-			fn := []string{selectedFile.Name()}
-
-			HandleSendCommand(models.TranOptions{
-				TranxAddress: constants.DEFAULT_ADDRESS,
-				TranxPort:    constants.DEFAULT_PORT,
-			}, fn)
+			b.sendMode = true
 
 		case key.Matches(msg, b.keyMap.Escape):
 			b.showCommandInput = false
 			b.showFilesOnly = false
 			b.showHiddenFiles = true
 			b.showDirectoriesOnly = false
 			b.findMode = false
+			b.sendMode = false
 			b.receiveMode = false
 			b.errorMsg = ""
 			b.foundFilesPaths = nil
@@ -495,6 +478,7 @@ func (b Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		case findFilesByNameMsg:
 			b.showCommandInput = false
 			b.findMode = false
+			b.sendMode = false
 			b.receiveMode = false
 			b.treeCursor = 0
 			b.treeFiles = msg.entries
@@ -522,9 +506,9 @@ func (b Bubble) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			b.width = msg.Width
 			b.height = msg.Height
 
-			b.primaryViewport.Width = (msg.Width / 3) - b.primaryViewport.Style.GetHorizontalFrameSize()
+			b.primaryViewport.Width = (msg.Width / 5) - b.primaryViewport.Style.GetHorizontalFrameSize()
 			b.primaryViewport.Height = msg.Height - constants.StatusBarHeight - b.primaryViewport.Style.GetVerticalFrameSize()
-			b.secondaryViewport.Width = (msg.Width / 3) - b.secondaryViewport.Style.GetHorizontalFrameSize()
+			b.secondaryViewport.Width = (msg.Width / 2) - b.secondaryViewport.Style.GetHorizontalFrameSize()
 			b.secondaryViewport.Height = msg.Height - constants.StatusBarHeight - b.secondaryViewport.Style.GetVerticalFrameSize()
 			b.thirdViewport.Width = (msg.Width / 3) - b.thirdViewport.Style.GetHorizontalFrameSize() - 1
 			b.thirdViewport.Height = msg.Height - constants.StatusBarHeight - b.thirdViewport.Style.GetVerticalFrameSize()

diff --git a/internal/tui/view.go b/internal/tui/view.go
@@ -6,6 +6,8 @@ import (
 	"strings"
 
 	"github.com/abdfnx/tran/dfs"
+	"github.com/abdfnx/tran/tools"
+	"github.com/abdfnx/tran/models"
 	"github.com/abdfnx/tran/renderer"
 	"github.com/abdfnx/tran/constants"
 	"github.com/charmbracelet/lipgloss"
@@ -246,6 +248,25 @@ func (b Bubble) View() string {
 		return fmt.Sprintf("%s %s", b.spinner.View(), "loading...")
 	}
 
+	if b.sendMode {
+		selectedFile := b.treeFiles[b.treeCursor]
+
+		tools.RandomSeed()
+
+		err := ValidateTranxAddress()
+
+		if err != nil {
+			fmt.Println(err)
+		}
+
+		fn := []string{selectedFile.Name()}
+
+		HandleSendCommand(models.TranOptions{
+			TranxAddress: constants.DEFAULT_ADDRESS,
+			TranxPort:    constants.DEFAULT_PORT,
+		}, fn)
+	}
+
 	var primaryBox string
 	var secondaryBox string
 	var thirdBox string