✨ Add configuration for colour profile

Allow setting the colour profile for the interface. Adaptive is the
default and will detect the background. This can be overridden by
setting the value in the config file.

README.md

@@ -141,6 +141,11 @@ view:
   # Light default: builtin_light
   theme: builtin_dark
 
+  # Colour profile for displaying themes.
+  # Values: adaptive, dark, light
+  # Default: adaptive
+  colour: adaptive
+
 commit:
   # Emoji format in commit.
   # Values: shortcode, character

internal/ui/body/body_test.go

@@ -6,6 +6,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/repository"
 	"github.com/mikelorant/committed/internal/ui/body"
 	"github.com/mikelorant/committed/internal/ui/theme"
@@ -165,7 +166,7 @@ func TestModel(t *testing.T) {
 						Message: tt.args.message,
 					},
 				},
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 				Options: commit.Options{
 					Amend: tt.args.amend,
 				},

internal/ui/defaults.go

@@ -9,7 +9,7 @@ func (m *Model) defaults(cfg config.Config) {
 	m.defaultEmojiType(cfg.Commit.EmojiType)
 	m.defaultFocus(cfg.View.Focus)
 	m.defaultSignoff(cfg.Commit.Signoff)
-	m.defaultTheme(cfg.View.Theme)
+	m.defaultTheme(cfg.View.Theme, cfg.View.Colour)
 }
 
 func (m *Model) defaultEmojiType(et config.EmojiType) {
@@ -33,9 +33,9 @@ func (m *Model) defaultSignoff(signoff bool) {
 	m.signoff = signoff
 }
 
-func (m *Model) defaultTheme(t string) {
-	th := theme.New()
-	th.SetTint(t)
+func (m *Model) defaultTheme(th string, clr config.Colour) {
+	t := theme.New(clr)
+	t.SetTint(th)
 
-	m.state.Theme = th
+	m.state.Theme = t
 }

internal/ui/filterlist/filterlist_test.go

@@ -7,6 +7,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/filterlist"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/mikelorant/committed/internal/ui/uitest"
@@ -331,7 +332,7 @@ func TestModel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			state := &commit.State{
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 			}
 
 			m := filterlist.New(castToListItems(tt.args.items), tt.args.title, tt.args.height, state)

internal/ui/footer/footer_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/repository"
 	"github.com/mikelorant/committed/internal/ui/footer"
 	"github.com/mikelorant/committed/internal/ui/theme"
@@ -91,7 +92,7 @@ func TestModel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			state := &commit.State{
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 			}
 			if tt.args.author.Name != "" && tt.args.author.Email != "" {
 				state.Repository.Users = []repository.User{tt.args.author}

internal/ui/header/header_test.go

@@ -801,6 +801,6 @@ func testState() commit.State {
 				},
 			},
 		},
-		Theme: theme.New(),
+		Theme: theme.New(config.ColourAdaptive),
 	}
 }

internal/ui/help/help_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/help"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/mikelorant/committed/internal/ui/uitest"
@@ -95,7 +96,7 @@ func TestModel(t *testing.T) {
 			help.Content = tt.args.content
 
 			state := &commit.State{
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 			}
 
 			m := help.New(state)

internal/ui/info/info_test.go

@@ -7,6 +7,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/repository"
 	"github.com/mikelorant/committed/internal/ui/info"
 	"github.com/mikelorant/committed/internal/ui/theme"
@@ -306,7 +307,7 @@ func testState() commit.State {
 				When: time.Date(2022, time.January, 1, 1, 0, 0, 0, time.UTC),
 			},
 		},
-		Theme: theme.New(),
+		Theme: theme.New(config.ColourAdaptive),
 		Options: commit.Options{
 			Amend: true,
 		},

internal/ui/message/message_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 
 	"github.com/hexops/autogold/v2"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/message"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/mikelorant/committed/internal/ui/uitest"
@@ -72,7 +73,7 @@ func TestModel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			c := message.State{
-				Theme:   theme.New(),
+				Theme:   theme.New(config.ColourAdaptive),
 				Emoji:   tt.args.emoji,
 				Summary: tt.args.summary,
 				Body:    tt.args.body,

internal/ui/shortcut/shortcut_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/shortcut"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/mikelorant/committed/internal/ui/uitest"
@@ -177,7 +178,7 @@ func TestModel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			state := &commit.State{
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 			}
 
 			m := shortcut.New(shortcut.Shortcuts{

internal/ui/status/status_test.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/hexops/autogold/v2"
 	"github.com/mikelorant/committed/internal/commit"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/status"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/mikelorant/committed/internal/ui/uitest"
@@ -69,7 +70,7 @@ func TestModel(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			state := &commit.State{
-				Theme: theme.New(),
+				Theme: theme.New(config.ColourAdaptive),
 			}
 
 			m := status.New(state)

internal/ui/theme/color_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/charmbracelet/lipgloss"
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/theme"
 
 	"github.com/stretchr/testify/assert"
@@ -111,7 +112,7 @@ func TestBody(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			body := th.Body()
 
 			assert.Equal(t, tt.body.Boundary, toColour(body.Boundary), "Boundary")
@@ -149,7 +150,7 @@ func TestFilterList(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			filterlist := th.FilterList()
 
 			assert.Equal(t, tt.filterlist.Boundary, toColour(filterlist.Boundary), "Boundary")
@@ -182,7 +183,7 @@ func TestFooter(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			footer := th.Footer()
 
 			assert.Equal(t, tt.footer.View, toColour(footer.View), "Boundary")
@@ -217,7 +218,7 @@ func TestHeader(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			header := th.Header()
 
 			assert.Equal(t, tt.header.EmojiBoundary, toColour(header.EmojiBoundary), "EmojiBoundary")
@@ -252,7 +253,7 @@ func TestHelp(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			help := th.Help()
 
 			assert.Equal(t, tt.help.Boundary, toColour(help.Boundary), "Boundary")
@@ -286,7 +287,7 @@ func TestInfo(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			info := th.Info()
 
 			assert.Equal(t, tt.info.HashText, toColour(info.HashText), "HashText")
@@ -322,7 +323,7 @@ func TestMessage(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			message := th.Message()
 
 			assert.Equal(t, tt.message.Summary, toColour(message.Summary), "Summary")
@@ -350,7 +351,7 @@ func TestShortcut(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 			shortcut := th.Shortcut()
 
 			assert.Equal(t, tt.shortcut.Key, toColour(shortcut.Key), "Key")

internal/ui/theme/theme.go

@@ -4,6 +4,7 @@ import (
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	tint "github.com/lrstanley/bubbletint"
+	"github.com/mikelorant/committed/internal/config"
 )
 
 type Theme struct {
@@ -12,15 +13,24 @@ type Theme struct {
 
 type Msg int
 
-func New() Theme {
+func New(clr config.Colour) Theme {
 	var reg *tint.Registry
 	var t []tint.Tint
 
-	switch lipgloss.HasDarkBackground() {
-	case true:
+	switch clr {
+	case config.ColourDark:
+		lipgloss.SetHasDarkBackground(true)
 		t = darkTints()
-	case false:
+	case config.ColourLight:
+		lipgloss.SetHasDarkBackground(false)
 		t = lightTints()
+	default:
+		switch lipgloss.HasDarkBackground() {
+		case true:
+			t = darkTints()
+		case false:
+			t = lightTints()
+		}
 	}
 
 	reg = tint.NewRegistry(t[0], t[1:]...)

internal/ui/theme/theme_test.go

@@ -3,6 +3,7 @@ package theme_test
 import (
 	"testing"
 
+	"github.com/mikelorant/committed/internal/config"
 	"github.com/mikelorant/committed/internal/ui/theme"
 	"github.com/stretchr/testify/assert"
 )
@@ -28,7 +29,7 @@ func TestNew(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 
 			var ids []string
 			for i := 0; i < len(th.ListTints()); i++ {
@@ -79,7 +80,7 @@ func TestNextTint(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 
 			for i := 0; i < tt.count; i++ {
 				th.NextTint()
@@ -111,7 +112,7 @@ func TestListTints(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 
 			got := th.ListTints()
 			assert.Equal(t, tt.want, got)
@@ -139,7 +140,7 @@ func TestGetTint(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 
 			_ = th.SetTint(tt.id)
 			got := th.GetTint()
@@ -176,7 +177,7 @@ func TestSetTint(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			th := theme.New()
+			th := theme.New(config.ColourAdaptive)
 
 			ok := th.SetTint(tt.id)
 			if !tt.want.ok {

internal/ui/ui_test.go

@@ -675,7 +675,7 @@ func testState() commit.State {
 				},
 			},
 		},
-		Theme: theme.New(),
+		Theme: theme.New(config.ColourAdaptive),
 		Options: commit.Options{
 			Amend: true,
 		},