refactor: remove some of the clear screen commands

This commit is contained in:
Slug-Boi
2024-11-16 23:20:25 +01:00
parent 597d4f5572
commit a3336ed6c0
3 changed files with 9 additions and 13 deletions
+1 -1
View File
@@ -6,8 +6,8 @@ import (
"github.com/Slug-Boi/cocommit/src/cmd/tui" "github.com/Slug-Boi/cocommit/src/cmd/tui"
"github.com/Slug-Boi/cocommit/src/cmd/utils" "github.com/Slug-Boi/cocommit/src/cmd/utils"
"github.com/inancgumus/screen" "github.com/inancgumus/screen"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )
+4 -6
View File
@@ -14,7 +14,6 @@ import (
"github.com/charmbracelet/bubbles/textarea" "github.com/charmbracelet/bubbles/textarea"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/inancgumus/screen"
) )
type KeyMap struct { type KeyMap struct {
@@ -43,8 +42,7 @@ func Entry_CM() string {
log.Fatal(err) log.Fatal(err)
} }
if m.(model_cm).textarea.Value() == "" { if m.(model_cm).textarea.Value() == "" {
screen.Clear()
screen.MoveTopLeft()
fmt.Println("No commit message provided. Exiting...") fmt.Println("No commit message provided. Exiting...")
os.Exit(0) os.Exit(0)
} }
@@ -62,9 +60,9 @@ type model_cm struct {
func initialModel_cm() model_cm { func initialModel_cm() model_cm {
ti := textarea.New() ti := textarea.New()
ti.FocusedStyle = textarea.Style{ ti.FocusedStyle = textarea.Style{
Base: lipgloss.NewStyle().Foreground(lipgloss.Color("170")), Base: lipgloss.NewStyle().Foreground(lipgloss.Color("170")),
LineNumber: lipgloss.NewStyle().Foreground(lipgloss.Color("90")), LineNumber: lipgloss.NewStyle().Foreground(lipgloss.Color("90")),
} }
ti.SetWidth(80) ti.SetWidth(80)
ti.SetHeight(8) ti.SetHeight(8)
+4 -6
View File
@@ -2,17 +2,17 @@ package tui
import ( import (
"fmt" "fmt"
"github.com/Slug-Boi/cocommit/src/cmd/utils"
"io" "io"
"os" "os"
"sort" "sort"
"strings" "strings"
"github.com/Slug-Boi/cocommit/src/cmd/utils"
"github.com/charmbracelet/bubbles/key" "github.com/charmbracelet/bubbles/key"
"github.com/charmbracelet/bubbles/list" "github.com/charmbracelet/bubbles/list"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/inancgumus/screen"
) )
const listHeight = 14 const listHeight = 14
@@ -201,14 +201,12 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, tea.ClearScreen return m, tea.ClearScreen
case key.Matches(msg, m.keys.tempAdd): case key.Matches(msg, m.keys.tempAdd):
screen.Clear()
screen.MoveTopLeft()
sub_model = tempAuthorModel(&m) sub_model = tempAuthorModel(&m)
return m, tea.ClearScreen return m, tea.ClearScreen
case key.Matches(msg, m.keys.createAuthor): case key.Matches(msg, m.keys.createAuthor):
screen.Clear()
screen.MoveTopLeft()
sub_model = createAuthorModel(&m) sub_model = createAuthorModel(&m)
return m, tea.ClearScreen return m, tea.ClearScreen
case key.Matches(msg, m.keys.deleteAuthor): case key.Matches(msg, m.keys.deleteAuthor):