refactor: remove redundant ThemePresets fallback references

datlechin · datlechin · commit c235f04110f1 · 2026-03-14T18:09:29.000+07:00
diff --git a/TablePro/Theme/ThemeEngine.swift b/TablePro/Theme/ThemeEngine.swift
@@ -110,7 +110,7 @@ internal final class ThemeEngine {
     private init() {
         let allThemes = ThemeStorage.loadAllThemes()
         let activeId = ThemeStorage.loadActiveThemeId()
-        let theme = allThemes.first { $0.id == activeId } ?? ThemePresets.defaultLight
+        let theme = allThemes.first { $0.id == activeId } ?? .default
 
         self.activeTheme = theme
         self.colors = ResolvedThemeColors(from: theme)
diff --git a/TablePro/Theme/ThemeStorage.swift b/TablePro/Theme/ThemeStorage.swift
@@ -47,7 +47,7 @@ internal struct ThemeStorage {
 
         // If no bundled themes loaded, use compiled presets as fallback
         if themes.isEmpty {
-            themes = ThemePresets.allBuiltIn
+            themes = [ThemeDefinition.default]
         }
 
         // Load registry themes
@@ -81,7 +81,7 @@ internal struct ThemeStorage {
         }
 
         // Fallback to compiled presets
-        return ThemePresets.allBuiltIn.first { $0.id == id }
+        return id == ThemeDefinition.default.id ? .default : nil
     }
 
     // MARK: - Save User Theme

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ internal struct ThemeStorage {`
`47`	`47`
`48`	`48`	`// If no bundled themes loaded, use compiled presets as fallback`
`49`	`49`	`if themes.isEmpty {`
`50`		`- themes = ThemePresets.allBuiltIn`
	`50`	`+ themes = [ThemeDefinition.default]`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`// Load registry themes`
`@@ -81,7 +81,7 @@ internal struct ThemeStorage {`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// Fallback to compiled presets`
`84`		`- return ThemePresets.allBuiltIn.first { $0.id == id }`
	`84`	`+ return id == ThemeDefinition.default.id ? .default : nil`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`// MARK: - Save User Theme`