Revert "feat(ui): garden rain mode, settings, and growth fixes"

This reverts commit cbbf296.

Author: bschellenberger2600

internal/config/defaults.go

@@ -114,13 +114,9 @@ mainline_patterns = []
 show_rain_animation = true
 
 # Animation mode: "basic" (rain drops), "advanced" (clouds + rain + flowers),
-# "garden" (advanced layout + garden pacing), or "matrix" (falling code characters)
+# or "matrix" (falling code characters)
 rain_animation_mode = "basic"
 
-# Garden-only (ignored unless rain_animation_mode = "garden"):
-# garden_bloom_preset = "calm"   # calm | normal | fast
-# garden_moisture_cap = "off"    # off | soft | tight
-
 # Show flavor quotes in the TUI banner
 show_startup_quote = true
 

internal/config/loader.go

@@ -97,8 +97,6 @@ func setDefaults(v *viper.Viper) {
 	v.SetDefault("ui.startup_quote_interval_sec", defaults.UI.StartupQuoteIntervalSec)
 	v.SetDefault("ui.rain_tick_ms", defaults.UI.RainTickMS)
 	v.SetDefault("ui.color_profile", defaults.UI.ColorProfile)
-	v.SetDefault("ui.garden_bloom_preset", defaults.UI.GardenBloomPreset)
-	v.SetDefault("ui.garden_moisture_cap", defaults.UI.GardenMoistureCap)
 }
 
 // Bounded lock acquisition for config.toml: SaveConfig runs from the TUI on

internal/config/types.go

@@ -1,8 +1,6 @@
 // Package config defines the git-rain configuration schema and related constants.
 package config
 
-import "strings"
-
 // Config represents the complete git-rain configuration
 type Config struct {
 	Global GlobalConfig `mapstructure:"global" toml:"global"`
@@ -59,17 +57,9 @@ type UIConfig struct {
 	ShowRainAnimation bool `mapstructure:"show_rain_animation" toml:"show_rain_animation"`
 
 	// Animation mode: "basic" (rain drops), "advanced" (clouds + rain + flowers),
-	// "garden" (advanced layout + optional garden pacing), or "matrix" (falling code glyphs).
+	// or "matrix" (falling code glyphs in the same column pattern).
 	RainAnimationMode string `mapstructure:"rain_animation_mode" toml:"rain_animation_mode"`
 
-	// GardenBloomPreset tweaks bottom-row growth thresholds when RainAnimationMode is "garden".
-	// Values: "calm", "normal", "fast". Empty uses "normal".
-	GardenBloomPreset string `mapstructure:"garden_bloom_preset" toml:"garden_bloom_preset"`
-
-	// GardenMoistureCap limits rain accumulation per column in garden mode.
-	// Values: "off", "soft", "tight". Empty uses "off".
-	GardenMoistureCap string `mapstructure:"garden_moisture_cap" toml:"garden_moisture_cap"`
-
 	// Show flavor quotes: TUI banner plus CLI motivation lines.
 	ShowStartupQuote bool `mapstructure:"show_startup_quote" toml:"show_startup_quote"`
 
@@ -101,28 +91,8 @@ const (
 	UIRainAnimationBasic    = "basic"
 	UIRainAnimationAdvanced = "advanced"
 	UIRainAnimationMatrix   = "matrix"
-	UIRainAnimationGarden   = "garden"
-
-	UIGardenBloomCalm   = "calm"
-	UIGardenBloomNormal = "normal"
-	UIGardenBloomFast   = "fast"
-
-	UIGardenMoistureOff   = "off"
-	UIGardenMoistureSoft  = "soft"
-	UIGardenMoistureTight = "tight"
 )
 
-// UIRainAnimationUsesAdvancedLayout reports whether the mode uses the advanced
-// rain field (cloud row, bottom flower row, drop spawn band).
-func UIRainAnimationUsesAdvancedLayout(mode string) bool {
-	switch strings.TrimSpace(strings.ToLower(mode)) {
-	case UIRainAnimationAdvanced, UIRainAnimationGarden:
-		return true
-	default:
-		return false
-	}
-}
-
 // UIColorProfiles returns valid built-in UI color profile names.
 func UIColorProfiles() []string {
 	return []string{

internal/ui/config_view.go

@@ -25,102 +25,6 @@ const (
 	configRowComingSoon
 )
 
-// Garden settings are shown directly under "Rain animation mode" (row index 4).
-// Logical indices 0–len(configRows)-1 are the static menu; len(configRows)+
-// offset are the garden-only rows (see logicalRowIndex).
-var gardenSettingsConfigRows = []configRow{
-	{label: "Garden bloom pace", kind: configRowEnum, options: []string{
-		config.UIGardenBloomCalm,
-		config.UIGardenBloomNormal,
-		config.UIGardenBloomFast,
-	}},
-	{label: "Garden moisture cap", kind: configRowEnum, options: []string{
-		config.UIGardenMoistureOff,
-		config.UIGardenMoistureSoft,
-		config.UIGardenMoistureTight,
-	}},
-}
-
-func normalizedRainAnimMode(cfg *config.Config) string {
-	if cfg == nil || strings.TrimSpace(cfg.UI.RainAnimationMode) == "" {
-		return config.UIRainAnimationBasic
-	}
-	return cfg.UI.RainAnimationMode
-}
-
-func gardenSettingsRowCount(cfg *config.Config) int {
-	if cfg != nil && strings.EqualFold(strings.TrimSpace(cfg.UI.RainAnimationMode), config.UIRainAnimationGarden) {
-		return len(gardenSettingsConfigRows)
-	}
-	return 0
-}
-
-func visibleConfigRowCount(cfg *config.Config) int {
-	return len(configRows) + gardenSettingsRowCount(cfg)
-}
-
-// logicalRowIndex maps a visible menu index to the legacy row id used in
-// configRowValue / applyConfigChange (garden rows use ids len(configRows)..).
-func logicalRowIndex(visibleI int, cfg *config.Config) int {
-	g := gardenSettingsRowCount(cfg)
-	if g == 0 {
-		return visibleI
-	}
-	if visibleI < 5 {
-		return visibleI
-	}
-	if visibleI < 5+g {
-		return len(configRows) + (visibleI - 5)
-	}
-	return visibleI - g
-}
-
-func configRowAt(visibleI int, cfg *config.Config) configRow {
-	li := logicalRowIndex(visibleI, cfg)
-	if li >= len(configRows) {
-		gi := li - len(configRows)
-		if gi >= 0 && gi < len(gardenSettingsConfigRows) {
-			return gardenSettingsConfigRows[gi]
-		}
-		return configRows[len(configRows)-1]
-	}
-	return configRows[li]
-}
-
-func clampConfigCursor(cfg *config.Config, cur int) int {
-	n := visibleConfigRowCount(cfg)
-	if n <= 0 {
-		return 0
-	}
-	if cur >= n {
-		return n - 1
-	}
-	if cur < 0 {
-		return 0
-	}
-	return cur
-}
-
-func normalizedGardenBloom(s string) string {
-	s = strings.TrimSpace(strings.ToLower(s))
-	switch s {
-	case config.UIGardenBloomCalm, config.UIGardenBloomNormal, config.UIGardenBloomFast:
-		return s
-	default:
-		return config.UIGardenBloomNormal
-	}
-}
-
-func normalizedGardenMoisture(s string) string {
-	s = strings.TrimSpace(strings.ToLower(s))
-	switch s {
-	case config.UIGardenMoistureOff, config.UIGardenMoistureSoft, config.UIGardenMoistureTight:
-		return s
-	default:
-		return config.UIGardenMoistureOff
-	}
-}
-
 var configRows = []configRow{
 	{label: "Default mode", kind: configRowEnum, options: []string{
 		"sync-default",
@@ -137,7 +41,6 @@ var configRows = []configRow{
 		config.UIRainAnimationBasic,
 		config.UIRainAnimationAdvanced,
 		config.UIRainAnimationMatrix,
-		config.UIRainAnimationGarden,
 	}},
 	{label: "Show flavor quotes", kind: configRowBool},
 	{label: "Flavor quote behavior", kind: configRowEnum, options: []string{
@@ -154,11 +57,11 @@ var configRows = []configRow{
 	{label: "Custom hex palette", kind: configRowComingSoon},
 }
 
-func configRowValue(visibleI int, cfg *config.Config) string {
+func configRowValue(i int, cfg *config.Config) string {
 	if cfg == nil {
 		return ""
 	}
-	switch logicalRowIndex(visibleI, cfg) {
+	switch i {
 	case 0:
 		return cfg.Global.DefaultMode
 	case 1:
@@ -196,23 +99,18 @@ func configRowValue(visibleI int, cfg *config.Config) string {
 		return cfg.UI.ColorProfile
 	case 10:
 		return "coming soon"
-	case 11:
-		return normalizedGardenBloom(cfg.UI.GardenBloomPreset)
-	case 12:
-		return normalizedGardenMoisture(cfg.UI.GardenMoistureCap)
 	}
 	return ""
 }
 
-func applyConfigChange(visibleI int, cfg *config.Config, dir int) {
+func applyConfigChange(i int, cfg *config.Config, dir int) {
 	if cfg == nil {
 		return
 	}
-	row := configRowAt(visibleI, cfg)
-	li := logicalRowIndex(visibleI, cfg)
+	row := configRows[i]
 	switch row.kind {
 	case configRowBool:
-		switch li {
+		switch i {
 		case 1:
 			cfg.Global.DisableScan = !cfg.Global.DisableScan
 		case 3:
@@ -222,7 +120,7 @@ func applyConfigChange(visibleI int, cfg *config.Config, dir int) {
 		}
 	case configRowEnum:
 		opts := row.options
-		cur := configRowValue(visibleI, cfg)
+		cur := configRowValue(i, cfg)
 		idx := 0
 		for j, o := range opts {
 			if o == cur {
@@ -231,7 +129,7 @@ func applyConfigChange(visibleI int, cfg *config.Config, dir int) {
 			}
 		}
 		idx = (idx + dir + len(opts)) % len(opts)
-		switch li {
+		switch i {
 		case 0:
 			cfg.Global.DefaultMode = opts[idx]
 		case 2:
@@ -252,10 +150,6 @@ func applyConfigChange(visibleI int, cfg *config.Config, dir int) {
 			applyRainTickChange(cfg, opts, dir)
 		case 9:
 			cfg.UI.ColorProfile = opts[idx]
-		case 11:
-			cfg.UI.GardenBloomPreset = opts[idx]
-		case 12:
-			cfg.UI.GardenMoistureCap = opts[idx]
 		}
 	case configRowComingSoon:
 		// reserved
@@ -313,13 +207,12 @@ func (m RepoSelectorModel) updateConfigView(msg tea.KeyMsg, cmds []tea.Cmd) (tea
 		}
 
 	case "down", "j":
-		if m.configCursor < visibleConfigRowCount(m.cfg)-1 {
+		if m.configCursor < len(configRows)-1 {
 			m.configCursor++
 		}
 
 	case " ", "right", "l":
 		applyConfigChange(m.configCursor, m.cfg, +1)
-		m.configCursor = clampConfigCursor(m.cfg, m.configCursor)
 		if m.cfg != nil {
 			applyColorProfile(m.cfg.UI.ColorProfile)
 		}
@@ -328,7 +221,6 @@ func (m RepoSelectorModel) updateConfigView(msg tea.KeyMsg, cmds []tea.Cmd) (tea
 
 	case "left", "h":
 		applyConfigChange(m.configCursor, m.cfg, -1)
-		m.configCursor = clampConfigCursor(m.cfg, m.configCursor)
 		if m.cfg != nil {
 			applyColorProfile(m.cfg.UI.ColorProfile)
 		}
@@ -381,8 +273,7 @@ func (m RepoSelectorModel) viewConfig() string {
 	valueStyle := lipgloss.NewStyle().Foreground(activeProfile().configValue).Bold(true)
 	dimStyle := lipgloss.NewStyle().Foreground(activeProfile().configDim)
 
-	for i := 0; i < visibleConfigRowCount(m.cfg); i++ {
-		row := configRowAt(i, m.cfg)
+	for i, row := range configRows {
 		cur := " "
 		if m.configCursor == i {
 			cur = ">"
@@ -452,7 +343,6 @@ func (m RepoSelectorModel) syncRuntimeFromConfig(cmds []tea.Cmd) (RepoSelectorMo
 	m.rainAnimationMode = m.cfg.UI.RainAnimationMode
 	if m.rainBg != nil {
 		m.rainBg.Mode = m.rainAnimationMode
-		m.rainBg.ApplyGardenFromConfig(m.cfg)
 	}
 	m.showStartupQuote = m.cfg.UI.ShowStartupQuote
 	m.startupQuoteBehavior = m.cfg.UI.StartupQuoteBehavior