orus-dev/osui-go
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated structure

Browse Source
This commit is contained in:
selimaj-dev
2024-10-12 17:49:55 +02:00
parent d4f6c4104d
commit 039bc27999
9 changed files with 201 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/button.go
+29 -64
View File
@@ -10,80 +10,55 @@ import (
"github.com/orus-dev/osui/isKey"
)
type ButtonParams struct {
Style ButtonStyle
Toggle bool
OnClick func(*ButtonComponent) bool
Width int
}
type ButtonStyle struct {
Background string `default:"" type:"bg"`
Foreground string `default:"" type:"fg"`
Outline string `default:"" type:"fg"`
ActiveBackground string `default:"" type:"bg"`
ActiveForeground string `default:"\x1b[34m" type:"fg"`
ActiveOutline string `default:"" type:"fg"`
ClickedBackground string `default:"" type:"bg"`
ClickedForeground string `default:"\x1b[32m" type:"fg"`
ClickedOutline string `default:"" type:"fg"`
}
type ButtonComponent struct {
Data osui.ComponentData
Style *ButtonStyle
Text string
Toggle bool
Clicked bool
on_click func(*ButtonComponent) bool
Data osui.ComponentData
Text string
clicked bool
}
func (b *ButtonComponent) Render() string {
osui.UseStyle(b.Style)
b.Data.Style.UseStyle()
if b.Clicked {
if b.clicked {
return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
colors.Reset+b.Style.ClickedOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.ClickedOutline,
colors.Reset+colors.Combine(b.Style.ClickedBackground, b.Style.ClickedForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.ClickedOutline,
colors.Reset+b.Data.Style.ClickedOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.ClickedOutline,
colors.Reset+colors.Combine(b.Data.Style.ClickedBackground, b.Data.Style.ClickedForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.ClickedOutline,
colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.ClickedOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.ClickedOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
)
}
if b.Data.IsActive {
return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
colors.Reset+b.Style.ActiveOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.ActiveOutline,
colors.Reset+colors.Combine(b.Style.ActiveBackground, b.Style.ActiveForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.ActiveOutline,
colors.Reset+b.Data.Style.ActiveOutline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.ActiveOutline,
colors.Reset+colors.Combine(b.Data.Style.ActiveBackground, b.Data.Style.ActiveForeground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.ActiveOutline,
colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.ActiveOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.ActiveOutline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
)
}
return fmt.Sprintf(" %s\n%s│%s│%s\n %s",
colors.Reset+b.Style.Outline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.Outline,
colors.Reset+colors.Combine(b.Style.Background, b.Style.Foreground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Style.Outline,
colors.Reset+b.Data.Style.Outline+strings.Repeat("_", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.Outline,
colors.Reset+colors.Combine(b.Data.Style.Background, b.Data.Style.Foreground)+centerText(b.Text, b.Data.Width-2)+colors.Reset+b.Data.Style.Outline,
colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Style.Outline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
colors.Reset+b.Data.Style.Outline+strings.Repeat("‾", b.Data.Width-2)+colors.Reset+b.Data.DefaultColor,
)
}
func (b *ButtonComponent) Update(key string) bool {
if isKey.Enter(key) {
if !b.on_click(b) {
if b.Toggle {
b.Clicked = !b.Clicked
return false
}
b.Clicked = true
b.Data.Screen.Render()
time.Sleep(time.Millisecond * 120)
b.Clicked = false
b.Data.OnClick()
if b.Data.Toggle {
b.clicked = !b.clicked
return false
}
b.clicked = true
b.Data.Screen.Render()
time.Sleep(time.Millisecond * 120)
b.clicked = false
}
return false
}
@@ -92,22 +67,12 @@ func (b *ButtonComponent) GetComponentData() *osui.ComponentData {
return &b.Data
}
func (b *ButtonComponent) Params(param ButtonParams) *ButtonComponent {
b.Style = osui.SetDefaults(&param.Style).(*ButtonStyle)
if param.OnClick != nil {
b.on_click = param.OnClick
}
b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
return b
}
func Button(text string) *ButtonComponent {
return &ButtonComponent{Text: text,
Style: osui.SetDefaults(&ButtonStyle{}).(*ButtonStyle),
func Button(param osui.Param, text string) *ButtonComponent {
return param.UseParam(&ButtonComponent{Text: text,
Data: osui.ComponentData{
Width: 20,
Height: 1,
},
on_click: func(bc *ButtonComponent) bool { return false },
}
clicked: false,
}).(*ButtonComponent)
}
ui/div.go
+4 -11
View File
@@ -32,7 +32,7 @@ func (d *DivComponent) GetComponentData() *osui.ComponentData {
}
func (d *DivComponent) Render() string {
osui.UseStyle(d.Style)
d.Data.Style.UseStyle()
frame := osui.NewFrame(d.Data.Width-2, d.Data.Height-2)
for i, c := range d.Components {
data := c.GetComponentData()
@@ -88,21 +88,14 @@ func (d *DivComponent) Update(key string) bool {
return false
}
func (b *DivComponent) Params(param DivParams) *DivComponent {
b.Style = osui.SetDefaults(&param.Style).(*DivStyle)
b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
return b
}
func (d *DivComponent) updateActive(newIndex int) {
if newIndex >= 0 && newIndex < len(d.Components) && len(d.Components) > 0 {
d.ActiveComponent = newIndex
}
}
func Div(components ...osui.Component) *DivComponent {
return &DivComponent{
func Div(param osui.Param, components ...osui.Component) *DivComponent {
return param.UseParam(&DivComponent{
Components: components,
Style: osui.SetDefaults(&DivStyle{}).(*DivStyle),
}
}).(*DivComponent)
}
ui/inputBox.go
+12 -27
View File
@@ -15,16 +15,8 @@ type InputBoxParams struct {
Height int
}
type InputBoxStyle struct {
Background string `default:"" type:"bg"`
Foreground string `default:"" type:"fg"`
Outline string `default:"" type:"fg"`
Cursor string `default:"" type:"fg"`
}
type InputBoxComponent struct {
Data osui.ComponentData
Style *InputBoxStyle
max_size uint
cursor uint
InputData string
@@ -35,26 +27,26 @@ func (s *InputBoxComponent) GetComponentData() *osui.ComponentData {
}
func (s InputBoxComponent) Render() string {
osui.UseStyle(s.Style)
s.Data.Style.UseStyle()
if s.max_size > uint(len(s.InputData)) {
return fmt.Sprintf(
" %s\n%s│%s%s│%s\n %s",
colors.Reset+s.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
colors.Reset+s.Style.Outline,
colors.Combine(s.Style.Foreground, s.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Style.Cursor+"█"+colors.Combine(s.Style.Foreground, s.Style.Background), ""),
strings.Repeat(" ", int(s.max_size)-len(s.InputData)-osui.LogicValueInt(s.Data.IsActive, 1, 0))+colors.Reset+s.Style.Outline,
colors.Reset+s.Data.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
colors.Reset+s.Data.Style.Outline,
colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Data.Style.Cursor+"█"+colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background), ""),
strings.Repeat(" ", int(s.max_size)-len(s.InputData)-osui.LogicValueInt(s.Data.IsActive, 1, 0))+colors.Reset+s.Data.Style.Outline,
colors.Reset+s.Data.DefaultColor,
s.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
s.Data.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
)
}
return fmt.Sprintf(
" %s\n%s│%s%s\n %s",
colors.Reset+s.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
colors.Reset+s.Style.Outline,
colors.Combine(s.Style.Foreground, s.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Style.Cursor+"█"+colors.Reset, s.Style.Outline+"|"+colors.Reset),
colors.Reset+s.Data.Style.Outline+strings.Repeat("_", int(s.max_size))+colors.Reset,
colors.Reset+s.Data.Style.Outline,
colors.Combine(s.Data.Style.Foreground, s.Data.Style.Background)+s.InputData+osui.LogicValue(s.Data.IsActive, s.Data.Style.Cursor+"█"+colors.Reset, s.Data.Style.Outline+"|"+colors.Reset),
colors.Reset+s.Data.DefaultColor,
colors.Reset+s.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
colors.Reset+s.Data.Style.Outline+strings.Repeat("‾", int(s.max_size))+colors.Reset+s.Data.DefaultColor,
)
}
@@ -83,13 +75,6 @@ func (s *InputBoxComponent) Update(key string) bool {
return false
}
func (b *InputBoxComponent) Params(p interface{}) *InputBoxComponent {
param := p.(InputBoxParams)
b.Style = osui.SetDefaults(&param.Style).(*InputBoxStyle)
b.Data.Width = osui.LogicValueInt(param.Width == 0, 20, param.Width)
return b
}
func InputBox(max_size uint) *InputBoxComponent {
return &InputBoxComponent{max_size: max_size, Style: osui.SetDefaults(&InputBoxStyle{}).(*InputBoxStyle)}
func InputBox(param osui.Param, max_size uint) *InputBoxComponent {
return param.UseParam(&InputBoxComponent{max_size: max_size}).(*InputBoxComponent)
}
ui/menu.go
+18 -38
View File
@@ -8,26 +8,10 @@ import (
"github.com/orus-dev/osui/isKey"
)
type MenuParams struct {
Style MenuStyle
OnSelected func(*MenuComponent, bool)
}
type MenuStyle struct {
Fg string `default:"" type:"fg"`
Bg string `default:"" type:"bg"`
SelectedFg string `default:"\x1b[34m" type:"fg"`
SelectedBg string `default:"" type:"bg"`
Cursor string `default:"> " type:"fg"`
CursorInactive string `default:" " type:"fg"`
}
type MenuComponent struct {
Data osui.ComponentData
Style *MenuStyle
Items []string
SelectedItem int
OnSelected func(*MenuComponent, bool)
}
func (m *MenuComponent) GetComponentData() *osui.ComponentData {
@@ -35,21 +19,21 @@ func (m *MenuComponent) GetComponentData() *osui.ComponentData {
}
func (m *MenuComponent) Render() string {
osui.UseStyle(m.Style)
m.Data.Style.UseStyle()
res := []string{}
cursor := m.Style.Cursor
cursor := m.Data.Style.Cursor
if !m.Data.IsActive {
cursor = m.Style.CursorInactive
cursor = m.Data.Style.InactiveCursor
}
d, _ := osui.CompressString(m.Style.Cursor)
d, _ := osui.CompressString(m.Data.Style.Cursor)
empty := strings.Repeat(" ", len(d))
for i, item := range m.Items {
if i == m.SelectedItem {
res = append(res, cursor+colors.Combine(m.Style.SelectedFg, m.Style.SelectedBg)+item+colors.Reset+m.Data.DefaultColor)
res = append(res, cursor+colors.Combine(m.Data.Style.SelectedBackground, m.Data.Style.SelectedBackground)+item+colors.Reset+m.Data.DefaultColor)
} else {
res = append(res, empty+colors.Combine(m.Style.Fg, m.Style.Bg)+item+colors.Reset+m.Data.DefaultColor)
res = append(res, empty+colors.Combine(m.Data.Style.Foreground, m.Data.Style.Background)+item+colors.Reset+m.Data.DefaultColor)
}
}
@@ -57,37 +41,33 @@ func (m *MenuComponent) Render() string {
}
func (m *MenuComponent) Update(key string) bool {
if isKey.Char(key, "s") {
ctx := osui.Context{Key: key}
m.Data.OnUpdate(&ctx)
if ctx.Response != 0 {
return false
}
if isKey.Down(key) {
if m.SelectedItem+1 < len(m.Items) {
m.SelectedItem++
} else {
m.SelectedItem = 0
}
} else if isKey.Char(key, "w") {
} else if isKey.Up(key) {
if m.SelectedItem > 0 {
m.SelectedItem--
} else {
m.SelectedItem = len(m.Items) - 1
}
} else if isKey.Enter(key) {
m.OnSelected(m, true)
return true
} else if isKey.Char(key, "q") {
m.OnSelected(m, false)
m.Data.OnClick()
return true
}
return false
}
func (b *MenuComponent) Params(param MenuParams) *MenuComponent {
b.Style = osui.SetDefaults(&param.Style).(*MenuStyle)
b.OnSelected = param.OnSelected
return b
}
func Menu(items ...string) *MenuComponent {
return &MenuComponent{
func Menu(param osui.Param, items ...string) *MenuComponent {
return param.UseParam(&MenuComponent{
Items: items,
Style: osui.SetDefaults(&MenuStyle{}).(*MenuStyle),
}
}).(*MenuComponent)
}
ui/paginator.go
+4 -11
View File
@@ -34,7 +34,7 @@ func (p *PaginatorComponent) GetComponentData() *osui.ComponentData {
func (p *PaginatorComponent) Render() string {
width, _ := osui.GetTerminalSize()
pgs := strings.Repeat(" ", (width-len(p.Components))/2)
osui.UseStyle(p.Style)
p.Data.Style.UseStyle()
frame := osui.NewFrame(p.Data.Width, p.Data.Height)
for i, c := range p.Components {
data := c.GetComponentData()
@@ -98,15 +98,8 @@ func (p *PaginatorComponent) updateActive(newIndex int) {
}
}
func (b *PaginatorComponent) Params(p interface{}) *PaginatorComponent {
param := p.(PaginatorParams)
b.Style = osui.SetDefaults(&param.Style).(*PaginatorStyle)
return b
}
func Paginator(pages ...osui.Component) *PaginatorComponent {
return &PaginatorComponent{
func Paginator(param osui.Param, pages ...osui.Component) *PaginatorComponent {
return param.UseParam(&PaginatorComponent{
Components: pages,
Style: osui.SetDefaults(&PaginatorStyle{}).(*PaginatorStyle),
}
}).(*PaginatorComponent)
}
ui/text.go
+2 -2
View File
@@ -21,6 +21,6 @@ func (t TextComponent) Render() string {
return t.Text
}
func Text(text string) *TextComponent {
return &TextComponent{Text: text}
func Text(param osui.Param, text string) *TextComponent {
return param.UseParam(&TextComponent{Text: text}).(*TextComponent)
}