v/GTT
1
0
Fork 0
mirror of https://github.com/eeeXun/GTT.git synced 2025-05-15 23:30:27 -07:00
Code Issues Projects Releases Wiki Activity

refactor: move module color to style

Browse Source 
- rename control.go to style.go
- remove windowStyle struct, don't need it
- rename global variable style to uiStyle
This commit is contained in:
eeeXun 2023-02-14 15:25:40 +08:00
parent df42efc81d
commit c5cdbcb99a
5 changed files with 169 additions and 173 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
config.go
View File

@ -4,14 +4,14 @@ import (
"fmt"
"os"
"github.com/eeeXun/gtt/internal/color"
"github.com/eeeXun/gtt/internal/style"
"github.com/eeeXun/gtt/internal/translate"
config "github.com/spf13/viper"
)
var (
// settings
style = color.NewStyle()
uiStyle = style.NewStyle()
hideBelow bool
)
@ -78,9 +78,9 @@ func configInit() {
}
translator = translators[config.GetString("translator")]
hideBelow = config.GetBool("hide_below")
style.Theme = config.GetString("theme")
style.Transparent = config.GetBool("transparent")
style.SetSrcBorderColor(config.GetString("source.borderColor")).
uiStyle.Theme = config.GetString("theme")
uiStyle.Transparent = config.GetBool("transparent")
uiStyle.SetSrcBorderColor(config.GetString("source.borderColor")).
SetDstBorderColor(config.GetString("destination.borderColor"))
// set argument language
if len(*srcLangArg) > 0 {
@ -121,21 +121,21 @@ func updateConfig() {
changed = true
config.Set("hide_below", hideBelow)
}
if config.GetString("theme") != style.Theme {
if config.GetString("theme") != uiStyle.Theme {
changed = true
config.Set("theme", style.Theme)
config.Set("theme", uiStyle.Theme)
}
if config.GetBool("transparent") != style.Transparent {
if config.GetBool("transparent") != uiStyle.Transparent {
changed = true
config.Set("transparent", style.Transparent)
config.Set("transparent", uiStyle.Transparent)
}
if config.GetString("source.borderColor") != style.SrcBorderStr() {
if config.GetString("source.borderColor") != uiStyle.SrcBorderStr() {
changed = true
config.Set("source.borderColor", style.SrcBorderStr())
config.Set("source.borderColor", uiStyle.SrcBorderStr())
}
if config.GetString("destination.borderColor") != style.DstBorderStr() {
if config.GetString("destination.borderColor") != uiStyle.DstBorderStr() {
changed = true
config.Set("destination.borderColor", style.DstBorderStr())
config.Set("destination.borderColor", uiStyle.DstBorderStr())
}
if changed {

92
internal/color/control.go
View File

@ -1,92 +0,0 @@
package color
import (
"github.com/gdamore/tcell/v2"
)
type windowStyle struct {
borderColor string
}
type Style struct {
src windowStyle
dst windowStyle
backgroundColor string
foregroundColor string
selectedColor string
prefixColor string
labelColor string
pressColor string
highLightColor string
Theme string
Transparent bool
}
func NewStyle() *Style {
return &Style{
backgroundColor: "bg",
foregroundColor: "fg",
selectedColor: "gray",
prefixColor: "cyan",
labelColor: "yellow",
pressColor: "purple",
highLightColor: "orange",
}
}
func (s Style) BackgroundColor() tcell.Color {
if s.Transparent {
return tcell.ColorDefault
}
return themes[s.Theme][s.backgroundColor]
}
func (s Style) ForegroundColor() tcell.Color {
return themes[s.Theme][s.foregroundColor]
}
func (s Style) SelectedColor() tcell.Color {
return themes[s.Theme][s.selectedColor]
}
func (s Style) PrefixColor() tcell.Color {
return themes[s.Theme][s.prefixColor]
}
func (s Style) LabelColor() tcell.Color {
return themes[s.Theme][s.labelColor]
}
func (s Style) PressColor() tcell.Color {
return themes[s.Theme][s.pressColor]
}
func (s Style) HighLightColor() tcell.Color {
return themes[s.Theme][s.highLightColor]
}
func (s Style) SrcBorderColor() tcell.Color {
return themes[s.Theme][s.src.borderColor]
}
func (s Style) DstBorderColor() tcell.Color {
return themes[s.Theme][s.dst.borderColor]
}
func (s Style) SrcBorderStr() string {
return s.src.borderColor
}
func (s Style) DstBorderStr() string {
return s.dst.borderColor
}
func (s *Style) SetSrcBorderColor(color string) *Style {
s.src.borderColor = color
return s
}
func (s *Style) SetDstBorderColor(color string) *Style {
s.dst.borderColor = color
return s
}

2
internal/color/color.go → internal/style/color.go
View File

@ -1,4 +1,4 @@
package color
package style
import (
"github.com/gdamore/tcell/v2"

88
internal/style/style.go Normal file
View File

@ -0,0 +1,88 @@
package style
import (
"github.com/gdamore/tcell/v2"
)
type style struct {
srcBorderColor string
dstBorderColor string
backgroundColor string
foregroundColor string
selectedColor string
prefixColor string
labelColor string
pressColor string
highLightColor string
Theme string
Transparent bool
}
func NewStyle() *style {
return &style{
backgroundColor: "bg",
foregroundColor: "fg",
selectedColor: "gray",
prefixColor: "cyan",
labelColor: "yellow",
pressColor: "purple",
highLightColor: "orange",
}
}
func (s style) BackgroundColor() tcell.Color {
if s.Transparent {
return tcell.ColorDefault
}
return themes[s.Theme][s.backgroundColor]
}
func (s style) ForegroundColor() tcell.Color {
return themes[s.Theme][s.foregroundColor]
}
func (s style) SelectedColor() tcell.Color {
return themes[s.Theme][s.selectedColor]
}
func (s style) PrefixColor() tcell.Color {
return themes[s.Theme][s.prefixColor]
}
func (s style) LabelColor() tcell.Color {
return themes[s.Theme][s.labelColor]
}
func (s style) PressColor() tcell.Color {
return themes[s.Theme][s.pressColor]
}
func (s style) HighLightColor() tcell.Color {
return themes[s.Theme][s.highLightColor]
}
func (s style) SrcBorderColor() tcell.Color {
return themes[s.Theme][s.srcBorderColor]
}
func (s style) DstBorderColor() tcell.Color {
return themes[s.Theme][s.dstBorderColor]
}
func (s style) SrcBorderStr() string {
return s.srcBorderColor
}
func (s style) DstBorderStr() string {
return s.dstBorderColor
}
func (s *style) SetSrcBorderColor(color string) *style {
s.srcBorderColor = color
return s
}
func (s *style) SetDstBorderColor(color string) *style {
s.dstBorderColor = color
return s
}

134
ui.go
View File

@ -4,7 +4,7 @@ import (
"fmt"
"strconv"
"github.com/eeeXun/gtt/internal/color"
"github.com/eeeXun/gtt/internal/style"
"github.com/eeeXun/gtt/internal/translate"
"github.com/gdamore/tcell/v2"
"github.com/rivo/tview"
@ -66,18 +66,18 @@ func updateTranslateWindow() {
func updateBackgroundColor() {
// input/output
srcInput.SetTextStyle(tcell.StyleDefault.
Background(style.BackgroundColor()).
Foreground(style.ForegroundColor())).
SetBackgroundColor(style.BackgroundColor())
dstOutput.SetBackgroundColor(style.BackgroundColor())
Background(uiStyle.BackgroundColor()).
Foreground(uiStyle.ForegroundColor())).
SetBackgroundColor(uiStyle.BackgroundColor())
dstOutput.SetBackgroundColor(uiStyle.BackgroundColor())
defOutput.SetTextStyle(tcell.StyleDefault.
Background(style.BackgroundColor()).
Foreground(style.ForegroundColor())).
SetBackgroundColor(style.BackgroundColor())
Background(uiStyle.BackgroundColor()).
Foreground(uiStyle.ForegroundColor())).
SetBackgroundColor(uiStyle.BackgroundColor())
posOutput.SetTextStyle(tcell.StyleDefault.
Background(style.BackgroundColor()).
Foreground(style.ForegroundColor())).
SetBackgroundColor(style.BackgroundColor())
Background(uiStyle.BackgroundColor()).
Foreground(uiStyle.ForegroundColor())).
SetBackgroundColor(uiStyle.BackgroundColor())
// dropdown
for _, dropdown := range []*tview.DropDown{
@ -90,58 +90,58 @@ func updateBackgroundColor() {
srcBorderDropDown,
dstBorderDropDown} {
dropdown.SetListStyles(tcell.StyleDefault.
Background(style.BackgroundColor()).
Foreground(style.ForegroundColor()),
Background(uiStyle.BackgroundColor()).
Foreground(uiStyle.ForegroundColor()),
tcell.StyleDefault.
Background(style.SelectedColor()).
Foreground(style.PrefixColor())).
SetBackgroundColor(style.BackgroundColor())
Background(uiStyle.SelectedColor()).
Foreground(uiStyle.PrefixColor())).
SetBackgroundColor(uiStyle.BackgroundColor())
}
// key map
keyMapMenu.SetBackgroundColor(style.BackgroundColor())
keyMapMenu.SetBackgroundColor(uiStyle.BackgroundColor())
}
func updateBorderColor() {
// input/output
srcInput.SetBorderColor(style.SrcBorderColor()).
SetTitleColor(style.SrcBorderColor())
dstOutput.SetBorderColor(style.DstBorderColor()).
SetTitleColor(style.DstBorderColor())
defOutput.SetBorderColor(style.SrcBorderColor()).
SetTitleColor(style.SrcBorderColor())
posOutput.SetBorderColor(style.DstBorderColor()).
SetTitleColor(style.DstBorderColor())
srcInput.SetBorderColor(uiStyle.SrcBorderColor()).
SetTitleColor(uiStyle.SrcBorderColor())
dstOutput.SetBorderColor(uiStyle.DstBorderColor()).
SetTitleColor(uiStyle.DstBorderColor())
defOutput.SetBorderColor(uiStyle.SrcBorderColor()).
SetTitleColor(uiStyle.SrcBorderColor())
posOutput.SetBorderColor(uiStyle.DstBorderColor()).
SetTitleColor(uiStyle.DstBorderColor())
// dropdown
for _, srcDropDown := range []*tview.DropDown{srcLangDropDown, srcBorderDropDown} {
srcDropDown.SetBorderColor(style.SrcBorderColor()).
SetTitleColor(style.SrcBorderColor())
srcDropDown.SetBorderColor(uiStyle.SrcBorderColor()).
SetTitleColor(uiStyle.SrcBorderColor())
}
for _, dstDropDown := range []*tview.DropDown{dstLangDropDown, dstBorderDropDown} {
dstDropDown.SetBorderColor(style.DstBorderColor()).
SetTitleColor(style.DstBorderColor())
dstDropDown.SetBorderColor(uiStyle.DstBorderColor()).
SetTitleColor(uiStyle.DstBorderColor())
}
}
func updateNonConfigColor() {
// input/output
srcInput.SetSelectedStyle(tcell.StyleDefault.
Background(style.SelectedColor()).
Foreground(style.ForegroundColor()))
dstOutput.SetTextColor(style.ForegroundColor())
Background(uiStyle.SelectedColor()).
Foreground(uiStyle.ForegroundColor()))
dstOutput.SetTextColor(uiStyle.ForegroundColor())
defOutput.SetSelectedStyle(tcell.StyleDefault.
Background(style.SelectedColor()).
Foreground(style.ForegroundColor()))
Background(uiStyle.SelectedColor()).
Foreground(uiStyle.ForegroundColor()))
posOutput.SetSelectedStyle(tcell.StyleDefault.
Background(style.SelectedColor()).
Foreground(style.ForegroundColor()))
Background(uiStyle.SelectedColor()).
Foreground(uiStyle.ForegroundColor()))
// dropdown
for _, noLabelDropDown := range []*tview.DropDown{srcLangDropDown, dstLangDropDown} {
noLabelDropDown.SetFieldBackgroundColor(style.SelectedColor()).
SetFieldTextColor(style.ForegroundColor()).
SetPrefixTextColor(style.PrefixColor())
noLabelDropDown.SetFieldBackgroundColor(uiStyle.SelectedColor()).
SetFieldTextColor(uiStyle.ForegroundColor()).
SetPrefixTextColor(uiStyle.PrefixColor())
}
for _, labelDropDown := range []*tview.DropDown{
translatorDropDown,
@ -150,27 +150,27 @@ func updateNonConfigColor() {
hideBelowDropDown,
srcBorderDropDown,
dstBorderDropDown} {
labelDropDown.SetLabelColor(style.LabelColor()).
SetFieldBackgroundColor(style.SelectedColor()).
SetFieldTextColor(style.ForegroundColor()).
SetPrefixTextColor(style.PrefixColor())
labelDropDown.SetLabelColor(uiStyle.LabelColor()).
SetFieldBackgroundColor(uiStyle.SelectedColor()).
SetFieldTextColor(uiStyle.ForegroundColor()).
SetPrefixTextColor(uiStyle.PrefixColor())
}
// button
for _, button := range []*tview.Button{langButton, styleButton, keyMapButton} {
button.SetLabelColor(style.ForegroundColor()).
SetBackgroundColorActivated(style.PressColor()).
SetLabelColorActivated(style.ForegroundColor()).
SetBackgroundColor(style.SelectedColor())
button.SetLabelColor(uiStyle.ForegroundColor()).
SetBackgroundColorActivated(uiStyle.PressColor()).
SetLabelColorActivated(uiStyle.ForegroundColor()).
SetBackgroundColor(uiStyle.SelectedColor())
}
// key map
keyMapMenu.SetTextColor(style.ForegroundColor()).
keyMapMenu.SetTextColor(uiStyle.ForegroundColor()).
SetText(fmt.Sprintf(keyMapText,
fmt.Sprintf("%.6x",
style.HighLightColor().TrueColor().Hex()))).
SetBorderColor(style.HighLightColor()).
SetTitleColor(style.HighLightColor())
uiStyle.HighLightColor().TrueColor().Hex()))).
SetBorderColor(uiStyle.HighLightColor()).
SetTitleColor(uiStyle.HighLightColor())
}
func updateAllColor() {
@ -247,8 +247,8 @@ func uiInit() {
srcLangDropDown.SetBorder(true)
dstLangDropDown.SetBorder(true)
themeDropDown.SetLabel("Theme: ").
SetOptions(color.AllTheme, nil).
SetCurrentOption(IndexOf(style.Theme, color.AllTheme))
SetOptions(style.AllTheme, nil).
SetCurrentOption(IndexOf(uiStyle.Theme, style.AllTheme))
hideBelowDropDown.SetLabel("Hide below: ").
SetOptions([]string{"true", "false"}, nil).
SetCurrentOption(
@ -257,27 +257,27 @@ func uiInit() {
transparentDropDown.SetLabel("Transparent: ").
SetOptions([]string{"true", "false"}, nil).
SetCurrentOption(
IndexOf(strconv.FormatBool(style.Transparent),
IndexOf(strconv.FormatBool(uiStyle.Transparent),
[]string{"true", "false"}))
srcBorderDropDown.SetLabel("Border Color: ").
SetOptions(color.Palette, nil).
SetOptions(style.Palette, nil).
SetCurrentOption(
IndexOf(style.SrcBorderStr(),
color.Palette)).
IndexOf(uiStyle.SrcBorderStr(),
style.Palette)).
SetBorder(true).
SetTitle("Source")
dstBorderDropDown.SetLabel("Border Color: ").
SetOptions(color.Palette, nil).
SetOptions(style.Palette, nil).
SetCurrentOption(
IndexOf(style.DstBorderStr(),
color.Palette)).
IndexOf(uiStyle.DstBorderStr(),
style.Palette)).
SetBorder(true).
SetTitle("Destination")
// key map
keyMapMenu.SetDynamicColors(true).
SetText(fmt.Sprintf(keyMapText,
fmt.Sprintf("%.6x", style.HighLightColor().TrueColor().Hex()))).
fmt.Sprintf("%.6x", uiStyle.HighLightColor().TrueColor().Hex()))).
SetBorder(true).
SetTitle("Key Map")
@ -372,12 +372,12 @@ func uiInit() {
dstLangDropDown.SetDoneFunc(langDropDownHandler)
themeDropDown.SetDoneFunc(styleDropDownHandler).
SetSelectedFunc(func(text string, index int) {
style.Theme = text
uiStyle.Theme = text
updateAllColor()
})
transparentDropDown.SetDoneFunc(styleDropDownHandler).
SetSelectedFunc(func(text string, index int) {
style.Transparent, _ = strconv.ParseBool(text)
uiStyle.Transparent, _ = strconv.ParseBool(text)
updateBackgroundColor()
})
hideBelowDropDown.SetDoneFunc(styleDropDownHandler).
@ -387,12 +387,12 @@ func uiInit() {
})
srcBorderDropDown.SetDoneFunc(styleDropDownHandler).
SetSelectedFunc(func(text string, index int) {
style.SetSrcBorderColor(text)
uiStyle.SetSrcBorderColor(text)
updateBorderColor()
})
dstBorderDropDown.SetDoneFunc(styleDropDownHandler).
SetSelectedFunc(func(text string, index int) {
style.SetDstBorderColor(text)
uiStyle.SetDstBorderColor(text)
updateBorderColor()
})
keyMapMenu.SetDoneFunc(func(key tcell.Key) {
@ -426,10 +426,10 @@ func mainPageHandler(event *tcell.EventKey) *tcell.EventKey {
switch key {
case tcell.KeyCtrlT:
// Toggle transparent
style.Transparent = !style.Transparent
uiStyle.Transparent = !uiStyle.Transparent
updateBackgroundColor()
transparentDropDown.SetCurrentOption(
IndexOf(strconv.FormatBool(style.Transparent),
IndexOf(strconv.FormatBool(uiStyle.Transparent),
[]string{"true", "false"}))
case tcell.KeyCtrlBackslash:
hideBelow = !hideBelow