Browse Source

Add viewport

BubbleTea
Gregory Rudolph 3 years ago
parent
commit
78e8bc3684
Signed by: rudi
GPG Key ID: EF64F3CBD1A1EBDD
  1. 108
      main.go
  2. 19
      types.go

108
main.go

@ -6,10 +6,11 @@ import (
"io/ioutil" "io/ioutil"
"log" "log"
"os" "os"
"strings"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/bubbles/spinner" "github.com/charmbracelet/bubbles/spinner"
"github.com/charmbracelet/bubbles/viewport"
tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
"github.com/muesli/reflow/indent" "github.com/muesli/reflow/indent"
@ -19,11 +20,39 @@ import (
) )
var ( var (
helpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("241")).Render helpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("241")).Render
k = keybase.NewKeybase() titleStyle = func() lipgloss.Style {
mainModel *model b := lipgloss.RoundedBorder()
b.Right = "├"
return lipgloss.NewStyle().BorderStyle(b).Padding(0, 1)
}()
infoStyle = func() lipgloss.Style {
b := lipgloss.RoundedBorder()
b.Left = "┤"
return titleStyle.Copy().BorderStyle(b)
}()
k = keybase.NewKeybase()
mainModel *model
useHighPerformanceRenderer = false
) )
func (m model) headerView() string {
title := titleStyle.Render("convo-name")
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(title)))
return lipgloss.JoinHorizontal(lipgloss.Center, title, line)
}
func (m model) footerView() string {
info := infoStyle.Render(fmt.Sprintf("%3.f%%", m.viewport.ScrollPercent()*100))
line := strings.Repeat("─", max(0, m.viewport.Width-lipgloss.Width(info)))
return lipgloss.JoinHorizontal(lipgloss.Center, line, info)
}
func max(a, b int) int {
if a > b {
return a
}
return b
}
func main() { func main() {
var ( var (
daemonMode bool daemonMode bool
@ -78,37 +107,86 @@ func (m model) Init() tea.Cmd {
} }
func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) { func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
var (
cmd tea.Cmd
cmds []tea.Cmd
)
switch msg := msg.(type) { switch msg := msg.(type) {
case tea.KeyMsg: case tea.KeyMsg:
if msg.String() == "ctrl+c" { if msg.String() == "ctrl+c" {
m.quitting= true m.quitting = true
return m, tea.Quit return m, tea.Quit
} else { } else {
return m, nil return m, nil
} }
case spinner.TickMsg: case spinner.TickMsg:
var cmd tea.Cmd
m.spinner, cmd = m.spinner.Update(msg) m.spinner, cmd = m.spinner.Update(msg)
return m, cmd return m, cmd
case chat1.MsgSummary: case chat1.MsgSummary:
log.Println("chat1.MsgSummary passed to m.Update()") log.Println("chat1.MsgSummary passed to m.Update()")
var cmd tea.Cmd
return m, cmd return m, cmd
case tea.WindowSizeMsg:
headerHeight := lipgloss.Height(m.headerView())
footerHeight := lipgloss.Height(m.footerView())
verticalMarginHeight := headerHeight + footerHeight
if !m.ready {
// Since this program is using the full size of the viewport we
// need to wait until we've received the window dimensions before
// we can initialize the viewport. The initial dimensions come in
// quickly, though asynchronously, which is why we wait for them
// here.
m.viewport = viewport.New(msg.Width, msg.Height-verticalMarginHeight)
m.viewport.YPosition = headerHeight
m.viewport.HighPerformanceRendering = useHighPerformanceRenderer
m.viewport.SetContent(m.PopulateChat())
m.ready = true
// This is only necessary for high performance rendering, which in
// most cases you won't need.
// Render the viewport one line below the header.
m.viewport.YPosition = headerHeight + 1
} else {
m.viewport.Width = msg.Width
m.viewport.Height = msg.Height - verticalMarginHeight
}
if useHighPerformanceRenderer {
// Render (or re-render) the whole viewport. Necessary both to
// initialize the viewport and when the window is resized.
// This is needed for high-performance rendering only.
cmds = append(cmds, viewport.Sync(m.viewport))
}
// Handle keyboard and mouse events in the viewport
m.viewport, cmd = m.viewport.Update(msg)
cmds = append(cmds, cmd)
return m, tea.Batch(cmds...)
default: default:
return m, nil return m, nil
} }
} }
func (m model) View() string { func (m model) PopulateChat() string {
s := "\n" if m.currentConversation.Name == "" {
return ""
for _, res := range mainModel.chat { } else {
log.Println(res) ret := ""
if res.Content.TypeName == "text" { for _, chatmsg := range m.chat {
s += fmt.Sprintf("%+v: %+v\n", res.Sender.Username, res.Content.Text.Body) var content string
if chatmsg.Content.TypeName == "text" {
content = chatmsg.Content.Text.Body
} else {
content = "Unrendered."
}
ret += fmt.Sprintf("%+v: %+v", chatmsg.Sender.Username, content)
} }
return ret
} }
}
func (m model) View() string {
s := "\n"
s += m.viewport.View()
s += helpStyle("\nCtrl+C to exit\n") s += helpStyle("\nCtrl+C to exit\n")
if m.quitting { if m.quitting {

19
types.go

@ -2,14 +2,17 @@ package main
import "samhofi.us/x/keybase/v2/types/chat1" import "samhofi.us/x/keybase/v2/types/chat1"
import "github.com/charmbracelet/bubbles/spinner" import "github.com/charmbracelet/bubbles/spinner"
import "github.com/charmbracelet/bubbles/viewport"
type model struct { type model struct {
chat []chat1.MsgSummary chat []chat1.MsgSummary
conversations []Channels conversations []Channels
feed []chat1.MsgSummary feed []chat1.MsgSummary
currentConversation chat1.ChatChannel currentConversation chat1.ChatChannel
spinner spinner.Model viewport viewport.Model
quitting bool spinner spinner.Model
ready bool
quitting bool
} }
// Command outlines a command // Command outlines a command
@ -22,9 +25,9 @@ type Command struct {
// TypeCommand outlines a command that reacts on message type // TypeCommand outlines a command that reacts on message type
type TypeCommand struct { type TypeCommand struct {
Cmd []string // Message types that trigger this command Cmd []string // Message types that trigger this command
Name string // The name of this command Name string // The name of this command
Description string // A short description of the command Description string // A short description of the command
Exec func(chat1.MsgSummary) // A function that takes a raw chat message as input Exec func(chat1.MsgSummary) // A function that takes a raw chat message as input
} }

Loading…
Cancel
Save