feat: add config to model; use config for styling

Author: Broderick-Westrope

internal/config/config.go

@@ -15,29 +15,31 @@ type Config struct {
 	GameEnds     bool   // Whether or not the game ends when the max level is reached
 
 	// The styling for the game in all modes
-	Theme struct {
-		Colours struct {
-			TetriminoCells struct {
-				I string
-				O string
-				T string
-				S string
-				Z string
-				J string
-				L string
-			}
-			EmptyCell string
-			GhostCell string
-		}
-		Characters struct {
-			Tetriminos string
-			EmptyCell  string
-			GhostCell  string
+	Theme Theme
+}
+
+type Theme struct {
+	Colours struct {
+		TetriminoCells struct {
+			I string
+			O string
+			T string
+			S string
+			Z string
+			J string
+			L string
 		}
+		EmptyCell string
+		GhostCell string
+	}
+	Characters struct {
+		Tetriminos string
+		EmptyCell  string
+		GhostCell  string
 	}
 }
 
-func GetConfig() (*Config, error) {
+func GetConfig(path string) (*Config, error) {
 	var c Config
 
 	c.QueueLength = 5
@@ -60,7 +62,7 @@ func GetConfig() (*Config, error) {
 	c.Theme.Characters.EmptyCell = "▕ "
 	c.Theme.Characters.GhostCell = "░░"
 
-	_, err := toml.DecodeFile("config.toml", &c)
+	_, err := toml.DecodeFile(path, &c)
 	if err != nil {
 		if errors.Is(err, os.ErrNotExist) {
 			return &c, nil

internal/marathon/model.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/Broderick-Westrope/tetrigo/internal/config"
 	"github.com/Broderick-Westrope/tetrigo/tetris"
 	"github.com/charmbracelet/bubbles/help"
 	"github.com/charmbracelet/bubbles/key"
@@ -24,6 +25,7 @@ type Model struct {
 	scoring    *tetris.Scoring
 	bag        *tetris.Bag
 	timer      stopwatch.Model
+	cfg        *config.Config
 }
 
 func InitialModel(level uint) *Model {
@@ -54,7 +56,7 @@ func InitialModel(level uint) *Model {
 }
 
 func (m Model) Init() tea.Cmd {
-	return tea.Batch(m.fall.stopwatch.Init(), m.timer.Init())
+	return tea.Batch(m.fall.stopwatch.Init(), m.timer.Init(), configCmd("config.toml"))
 }
 
 func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -111,6 +113,12 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		if err != nil {
 			panic(fmt.Errorf("failed to lower tetrimino (tick): %w", err))
 		}
+	case configMsg:
+		if msg.err != nil {
+			panic(fmt.Errorf("failed to load config: %w", msg.err))
+		}
+		m.styles = CreateStyles(&msg.cfg.Theme)
+		m.cfg = msg.cfg
 	}
 
 	var cmd tea.Cmd
@@ -282,3 +290,18 @@ func (m *Model) lowerTetrimino() (bool, error) {
 
 	return false, nil
 }
+
+type configMsg struct {
+	err error
+	cfg *config.Config
+}
+
+func configCmd(path string) tea.Cmd {
+	return func() tea.Msg {
+		cfg, err := config.GetConfig(path)
+		return configMsg{
+			err: err,
+			cfg: cfg,
+		}
+	}
+}

internal/marathon/style.go

@@ -1,6 +1,9 @@
 package marathon
 
-import "github.com/charmbracelet/lipgloss"
+import (
+	"github.com/Broderick-Westrope/tetrigo/internal/config"
+	"github.com/charmbracelet/lipgloss"
+)
 
 type Styles struct {
 	Playfield       lipgloss.Style
@@ -44,3 +47,30 @@ func defaultStyles() *Styles {
 	}
 	return &s
 }
+
+func CreateStyles(theme *config.Theme) *Styles {
+	s := Styles{
+		Playfield:    lipgloss.NewStyle().Border(lipgloss.RoundedBorder()).Padding(0),
+		ColIndicator: lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.EmptyCell)),
+		TetriminoStyles: map[byte]lipgloss.Style{
+			'I': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.I)),
+			'O': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.O)),
+			'T': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.T)),
+			'S': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.S)),
+			'Z': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.Z)),
+			'J': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.J)),
+			'L': lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.TetriminoCells.L)),
+		},
+		GhostCell: lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Colours.GhostCell)),
+		Hold: holdStyles{
+			View:  lipgloss.NewStyle().Width(10).Height(5).Border(lipgloss.RoundedBorder(), true, false, true, true).Align(lipgloss.Center, lipgloss.Center),
+			Label: lipgloss.NewStyle().Width(10).PaddingLeft(1).PaddingBottom(1),
+			Item:  lipgloss.NewStyle().Width(10).Height(2).Align(lipgloss.Center, lipgloss.Center),
+		},
+		Information:  lipgloss.NewStyle().Width(13).Align(lipgloss.Left, lipgloss.Top),
+		RowIndicator: lipgloss.NewStyle().Foreground(lipgloss.Color(theme.Characters.EmptyCell)).Align(lipgloss.Left).Padding(0, 1, 0),
+		Bag:          lipgloss.NewStyle().PaddingTop(1),
+	}
+	return &s
+
+}