chore(player): Simplify style creation

gabe565 · Apr 28, 2024 · ffb4f9d · ffb4f9d
1 parent e26abba
commit ffb4f9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 12 deletions.
diff --git a/internal/movie/help.go b/internal/movie/help.go
@@ -6,20 +6,20 @@ import (
 )
 
 func newHelp(renderer *lipgloss.Renderer) help.Model {
-	keyStyle := lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{
+	keyStyle := renderer.NewStyle().Foreground(lipgloss.AdaptiveColor{
 		Light: "246",
 		Dark:  "242",
-	}).Renderer(renderer)
+	})
 
-	descStyle := lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{
+	descStyle := renderer.NewStyle().Foreground(lipgloss.AdaptiveColor{
 		Light: "249",
 		Dark:  "239",
-	}).Renderer(renderer)
+	})
 
-	sepStyle := lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{
+	sepStyle := renderer.NewStyle().Foreground(lipgloss.AdaptiveColor{
 		Light: "253",
 		Dark:  "237",
-	}).Renderer(renderer)
+	})
 
 	return help.Model{
 		ShortSeparator: " • ",

diff --git a/internal/movie/player_styles.go b/internal/movie/player_styles.go
@@ -22,23 +22,20 @@ func NewStyles(m *Movie, renderer *lipgloss.Renderer) Styles {
 	selectedColor := lipgloss.AdaptiveColor{Light: "12", Dark: "4"}
 
 	s := Styles{
-		Screen: lipgloss.NewStyle().
-			Renderer(renderer).
+		Screen: renderer.NewStyle().
 			Width(m.Width).
 			Height(m.Height).
 			Border(lipgloss.RoundedBorder()).
 			BorderForeground(borderColor).
 			Foreground(lipgloss.AdaptiveColor{Light: "0", Dark: "15"}),
 
-		Progress: lipgloss.NewStyle().
-			Renderer(renderer).
+		Progress: renderer.NewStyle().
 			Margin(1, 0).
 			Foreground(borderColor).
 			Border(lipgloss.InnerHalfBlockBorder(), false, true).
 			BorderForeground(borderColor),
 
-		Options: lipgloss.NewStyle().
-			Renderer(renderer).
+		Options: renderer.NewStyle().
 			Padding(0, 2).
 			MarginBottom(1).
 			Border(lipgloss.InnerHalfBlockBorder()).