Use colors from configuration and fallback to default hard coded values.

wmalik · Feb 2, 2023 · 8f1425e · 8f1425e
1 parent 6357384
commit 8f1425e
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/internal/browser/handle.go b/internal/browser/handle.go
@@ -55,7 +55,12 @@ func HandleCommandDefault() error {
 		log.Fatalln(err)
 	}
 
-	cfg, err := config.ReadConfig()
+	cfgPath, err := config.GetConfigPath()
+	if err != nil {
+		log.Fatalln(err)
+	}
+
+	cfg, err := config.ReadConfig(cfgPath)
 	if err != nil {
 		log.Fatalln(err)
 	}
@@ -85,7 +90,7 @@ func HandleCommandDefault() error {
 	}
 	defer f.Close()
 
-	model := NewModelWithItems(repos, gitConf.StoragePath(), gu)
+	model := NewModelWithItems(repos, gitConf.StoragePath(), gu, *cfg)
 	for {
 		if err := tea.NewProgram(model, tea.WithAltScreen(), tea.WithMouseAllMotion()).Start(); err != nil {
 			log.Fatalln(err)

diff --git a/internal/browser/model.go b/internal/browser/model.go
@@ -5,6 +5,7 @@ import (
 	"sort"
 	"time"
 
+	"github.com/wmalik/ogit/internal/config"
 	"github.com/wmalik/ogit/internal/db"
 	"github.com/wmalik/ogit/internal/gitutils"
 
@@ -31,12 +32,15 @@ type Model struct {
 	gu *gitutils.GitUtils
 }
 
-func NewModelWithItems(repos []db.Repository, storagePath string, gu *gitutils.GitUtils) *Model {
+func NewModelWithItems(repos []db.Repository, storagePath string, gu *gitutils.GitUtils, cfg config.Config) *Model {
 	listItems := sortItemsCloned(toItems(repos, storagePath))
-	m := list.NewModel(listItems, listItemDelegate(), 0, 0)
+	m := list.NewModel(listItems, listItemDelegate(cfg), 0, 0)
 	m.StatusMessageLifetime = time.Second * 60
 	m.Title = fmt.Sprintf("[ogit] [%s]", storagePath)
-	m.Styles.Title = titleBarStyle
+	m.Styles.Title = list.DefaultStyles().TitleBar.
+		Foreground(getColor(cfg.Colors.TitleBarFG, defaultTitleFg)).
+		Background(getColor(cfg.Colors.TitleBarBG, defaultTitleBg)).
+		Padding(0, 1)
 	m.AdditionalShortHelpKeys = availableKeyBindingsCB
 	m.KeyMap.GoToStart.SetKeys("home")
 	m.KeyMap.GoToStart.SetHelp("home", "go to start")

diff --git a/internal/browser/style.go b/internal/browser/style.go
@@ -1,7 +1,6 @@
 package browser
 
 import (
-	"github.com/charmbracelet/bubbles/list"
 	"github.com/charmbracelet/lipgloss"
 )
 
@@ -17,13 +16,11 @@ var bottomStatusBarStyle = lipgloss.NewStyle().Height(1).Faint(true)
 var clonedRepoStyle = lipgloss.NewStyle().
 	Foreground(lipgloss.AdaptiveColor{Light: "#030303", Dark: "#dddddd"})
 
-var dimmedColor = lipgloss.AdaptiveColor{Light: "#79787a", Dark: "#7F7C82"}
-var selectedColorBg = lipgloss.AdaptiveColor{Light: "#A49FA5", Dark: "#333333"}
-var selectedColorFg = lipgloss.AdaptiveColor{Light: "#79787a", Dark: "#7F7C82"}
-var titleBarStyle = list.DefaultStyles().TitleBar.
-	Background(lipgloss.AdaptiveColor{Light: "#5b186e", Dark: "#5b186e"}).
-	Foreground(lipgloss.AdaptiveColor{Light: "#f5f2f6", Dark: "#f5f2f6"}).
-	Padding(0, 1)
+var defaultDimmedColorFg = lipgloss.AdaptiveColor{Light: "#79787a", Dark: "#7F7C82"}
+var defaultSelectedColorBg = lipgloss.AdaptiveColor{Light: "#A49FA5", Dark: "#333333"}
+var defaultSelectedColorFg = lipgloss.AdaptiveColor{Light: "#79787a", Dark: "#7F7C82"}
+var defaultTitleFg = lipgloss.AdaptiveColor{Light: "#f5f2f6", Dark: "#f5f2f6"}
+var defaultTitleBg = lipgloss.AdaptiveColor{Light: "#5b186e", Dark: "#5b186e"}
 
 func statusMessageStyle(str string) string {
 	return lipgloss.NewStyle().
@@ -36,3 +33,10 @@ func statusError(str string) string {
 		Foreground(lipgloss.AdaptiveColor{Light: "#eb4f34", Dark: "#eb4f34"}).
 		Render(str)
 }
+
+func getColor(color *lipgloss.AdaptiveColor, defaultColor lipgloss.AdaptiveColor) lipgloss.AdaptiveColor {
+	if color == nil {
+		return defaultColor
+	}
+	return *color
+}
diff --git a/internal/browser/update.go b/internal/browser/update.go
@@ -6,6 +6,7 @@ import (
 	"log"
 	"os"
 
+	"github.com/wmalik/ogit/internal/config"
 	"github.com/wmalik/ogit/internal/shell"
 	"github.com/wmalik/ogit/internal/utils"
 
@@ -186,8 +187,11 @@ func handleKeyMsg(msg tea.KeyMsg, m *Model, selected repoItem) tea.Cmd {
 }
 
 // listItemDelegate configures general behaviour/styling of the list items.
-func listItemDelegate() list.DefaultDelegate {
+func listItemDelegate(cfg config.Config) list.DefaultDelegate {
 	d := list.NewDefaultDelegate()
+	dimmedColor := getColor(cfg.Colors.DimmedColorFG, defaultDimmedColorFg)
+	selectedColorFg := getColor(cfg.Colors.SelectedColorFG, defaultSelectedColorFg)
+	selectedColorBg := getColor(cfg.Colors.SelectedColorBG, defaultSelectedColorBg)
 	d.Styles.NormalTitle = d.Styles.NormalTitle.Foreground(dimmedColor)
 	d.Styles.SelectedTitle = d.Styles.SelectedTitle.Background(selectedColorBg).Foreground(selectedColorFg)
 	d.ShowDescription = false