feat: add 15 new color tokens to ColorTheme and ColorThemeStore

Iakov Senatov · Iakov Senatov · commit 3d34f0c47f84 · 2026-02-28T17:08:59.000+01:00
Tokens: hiddenFile, markedFile, parentEntry, archivePath, markedCount,
columnName/Size/Kind/Date, dividerNormal/Active, panelBorderActive/Inactive,
warmWhite, filterActive. All 4 presets updated with theme-appropriate values.
AppStorage hex overrides + applyOverrides + countOverrides + applyPreset reset.
diff --git a/GUI/Sources/Config/DesignTokens.swift b/GUI/Sources/Config/DesignTokens.swift
@@ -37,7 +37,7 @@ enum DesignTokens {
     static let panelBg = Color(nsColor: .controlBackgroundColor)
 
     /// Warm white background for active panel and session table
-    static let warmWhite = Color(#colorLiteral(red: 0.9744921875, green: 0.9672388187, blue: 0.9454787124, alpha: 0.9061729754))
+    static var warmWhite: Color { ColorThemeStore.shared.activeTheme.warmWhite }
 
     /// Separator color
     static let separator = Color(nsColor: .separatorColor)
diff --git a/GUI/Sources/Features/Panels/FilePanelView.swift b/GUI/Sources/Features/Panels/FilePanelView.swift
@@ -12,6 +12,7 @@ import SwiftUI
 // MARK: - File panel view for one side (left or right)
 struct FilePanelView: View {
     @Environment(AppState.self) var appState
+    @State private var colorStore = ColorThemeStore.shared
     @State private var viewModel: FilePanelViewModel
     let containerWidth: CGFloat
     @Binding var leftPanelWidth: CGFloat
@@ -132,8 +133,8 @@ struct FilePanelView: View {
             RoundedRectangle(cornerRadius: DesignTokens.radius, style: .continuous)
                 .stroke(
                     focused
-                        ? Color(#colorLiteral(red: 0.50, green: 0.50, blue: 0.55, alpha: 0.55))
-                        : Color(#colorLiteral(red: 0.45, green: 0.45, blue: 0.50, alpha: 0.38)),
+                        ? colorStore.activeTheme.panelBorderActive
+                        : colorStore.activeTheme.panelBorderInactive,
                     lineWidth: 1.5
                 )
         }
diff --git a/GUI/Sources/Features/Panels/FileRow.swift b/GUI/Sources/Features/Panels/FileRow.swift
@@ -293,7 +293,7 @@ struct FileRow: View {
     // MARK: - Column colors - per-column accent when not selected, white when selected+active
     private func cellColor(for col: ColumnID) -> Color {
         if isParentEntry { return Color(nsColor: .systemGray).opacity(0.6) }
-        if file.isHidden { return Color(#colorLiteral(red: 0.3767382812, green: 0.3767382812, blue: 0.3767382812, alpha: 1)) }
+        if file.isHidden { return colorStore.activeTheme.hiddenFileColor }
         return col.columnColor
     }
 
diff --git a/GUI/Sources/Features/Panels/FileRowView.swift b/GUI/Sources/Features/Panels/FileRowView.swift
@@ -38,13 +38,13 @@ struct FileRowView: View {
 
     private var nameColor: Color {
         if isMarked {
-            return Color(#colorLiteral(red: 0.45, green: 0.0, blue: 0.0, alpha: 1))
+            return colorStore.activeTheme.markedFileColor
         }
         if isParentEntry {
-            return Color(#colorLiteral(red: 0.2, green: 0.2, blue: 0.7, alpha: 1))
+            return colorStore.activeTheme.parentEntryColor
         }
         if file.isHidden {
-            return Color(#colorLiteral(red: 0.38, green: 0.38, blue: 0.38, alpha: 1))
+            return colorStore.activeTheme.hiddenFileColor
         }
         if file.isSymbolicLink {
             return colorStore.activeTheme.symlinkColor
@@ -79,7 +79,7 @@ struct FileRowView: View {
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(width: DesignTokens.Row.iconSize + 2, height: DesignTokens.Row.iconSize + 2)
-                    .foregroundStyle(Color(#colorLiteral(red: 0.15, green: 0.15, blue: 0.65, alpha: 1)))
+                    .foregroundStyle(colorStore.activeTheme.parentEntryColor)
                     .allowsHitTesting(false)
                     .layoutPriority(1)
 
@@ -109,7 +109,7 @@ struct FileRowView: View {
                     if isMarked {
                         Image(systemName: "checkmark.circle.fill")
                             .font(.system(size: 11))
-                            .foregroundStyle(Color(#colorLiteral(red: 0.45, green: 0.0, blue: 0.0, alpha: 1)))
+                            .foregroundStyle(colorStore.activeTheme.markedFileColor)
                     }
 
                     Text(file.nameStr)
diff --git a/GUI/Sources/Features/Panels/FileTable/ColumnLayoutModel.swift b/GUI/Sources/Features/Panels/FileTable/ColumnLayoutModel.swift
@@ -96,16 +96,20 @@ enum ColumnID: String, CaseIterable, Codable, Identifiable {
         }
     }
 
-    /// Per-column content text color (used in file rows)
+    /// Per-column content text color from active theme
     var columnColor: Color {
+        columnColor(from: ColorThemeStore.shared.activeTheme)
+    }
+    /// Per-column content text color from a given theme
+    func columnColor(from theme: ColorTheme) -> Color {
         switch self {
-            case .name:                          return Color(#colorLiteral(red: 0.05, green: 0.10, blue: 0.30, alpha: 1.0))  // dark navy
-            case .size:                          return Color(#colorLiteral(red: 0.50, green: 0.05, blue: 0.18, alpha: 1.0))  // dark raspberry
-            case .kind:                          return Color(#colorLiteral(red: 0.28, green: 0.14, blue: 0.05, alpha: 1.0))  // dark brown
+            case .name:                          return theme.columnNameColor
+            case .size:                          return theme.columnSizeColor
+            case .kind:                          return theme.columnKindColor
             case .dateModified, .dateCreated,
-                 .dateLastOpened, .dateAdded:    return Color(#colorLiteral(red: 0.05, green: 0.28, blue: 0.10, alpha: 1.0))  // dark green
-            case .childCount:                    return Color(#colorLiteral(red: 0.05, green: 0.10, blue: 0.30, alpha: 1.0))  // dark navy
-            default:                             return Color(#colorLiteral(red: 0.20, green: 0.20, blue: 0.20, alpha: 1.0))  // dark grey
+                 .dateLastOpened, .dateAdded:    return theme.columnDateColor
+            case .childCount:                    return theme.columnNameColor
+            default:                             return theme.panelText
         }
     }
 
diff --git a/GUI/Sources/Features/Panels/Filter/PanelFilterBar.swift b/GUI/Sources/Features/Panels/Filter/PanelFilterBar.swift
@@ -83,7 +83,7 @@ struct PanelFilterBar: View {
             RoundedRectangle(cornerRadius: 6, style: .continuous)
                 .stroke(
                     isFocused
-                        ? Color(#colorLiteral(red: 0.25, green: 0.55, blue: 1.0, alpha: 1.0)).opacity(0.8)
+                        ? ColorThemeStore.shared.activeTheme.filterActiveColor
                         : Color(nsColor: .separatorColor).opacity(0.6),
                     lineWidth: isFocused ? 1.5 : 0.5
                 )
diff --git a/GUI/Sources/Features/Panels/PanelDividerView.swift b/GUI/Sources/Features/Panels/PanelDividerView.swift
@@ -30,8 +30,8 @@ enum PanelDividerStyle {
     static let hitAreaWidth: CGFloat = 24
     static let normalWidth: CGFloat = 2.0
     static let activeWidth: CGFloat = 5.0
-    static let normalColor = Color(#colorLiteral(red: 0.42, green: 0.42, blue: 0.46, alpha: 0.55))
-    static let activeColor = Color(#colorLiteral(red: 0.2196078449, green: 0.007843137719, blue: 0.8549019694, alpha: 1)).opacity(0.90)
+    static var normalColor: Color { ColorThemeStore.shared.activeTheme.dividerNormalColor }
+    static var activeColor: Color { ColorThemeStore.shared.activeTheme.dividerActiveColor }
     static let minPanelWidth: CGFloat = 80
 }
 
diff --git a/GUI/Sources/Features/Panels/SelectionStatusBar.swift b/GUI/Sources/Features/Panels/SelectionStatusBar.swift
@@ -13,6 +13,7 @@ import FileModelKit
 struct SelectionStatusBar: View {
     @Environment(AppState.self) var appState
     let panelSide: PanelSide
+    @State private var colorStore = ColorThemeStore.shared
 
     private var markedCount: Int { appState.markedCount(for: panelSide) }
     private var markedSize: Int64 { appState.markedTotalSize(for: panelSide) }
@@ -64,10 +65,10 @@ struct SelectionStatusBar: View {
                 HStack(spacing: 4) {
                     Image(systemName: "checkmark.circle.fill")
                         .font(.system(size: 10))
-                        .foregroundStyle(Color(#colorLiteral(red: 0.7, green: 0.0, blue: 0.0, alpha: 1)))
+                        .foregroundStyle(colorStore.activeTheme.markedCountColor)
                     Text(L10n.Selection.markedCount(markedCount))
                         .font(.system(size: 11, weight: .medium))
-                        .foregroundStyle(Color(#colorLiteral(red: 0.7, green: 0.0, blue: 0.0, alpha: 1)))
+                        .foregroundStyle(colorStore.activeTheme.markedCountColor)
                 }
                 Text("•").foregroundStyle(.secondary)
                 Text(L10n.Selection.markedSize(formattedSize))
diff --git a/GUI/Sources/FindFiles/Engine/FindFilesArchiveSearcher.swift b/GUI/Sources/FindFiles/Engine/FindFilesArchiveSearcher.swift
diff --git a/GUI/Sources/FindFiles/FindFilesResultsView.swift b/GUI/Sources/FindFiles/FindFilesResultsView.swift
diff --git a/GUI/Sources/Settings/SettingsColorsPane.swift b/GUI/Sources/Settings/SettingsColorsPane.swift
diff --git a/GUI/Sources/SplitLine/DividerAppearance.swift b/GUI/Sources/SplitLine/DividerAppearance.swift

Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ struct FileRow: View {`
`293`	`293`	`// MARK: - Column colors - per-column accent when not selected, white when selected+active`
`294`	`294`	`private func cellColor(for col: ColumnID) -> Color {`
`295`	`295`	`if isParentEntry { return Color(nsColor: .systemGray).opacity(0.6) }`
`296`		`- if file.isHidden { return Color(#colorLiteral(red: 0.3767382812, green: 0.3767382812, blue: 0.3767382812, alpha: 1)) }`
	`296`	`+ if file.isHidden { return colorStore.activeTheme.hiddenFileColor }`
`297`	`297`	`return col.columnColor`
`298`	`298`	`}`
`299`	`299`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ struct PanelFilterBar: View {`
`83`	`83`	`RoundedRectangle(cornerRadius: 6, style: .continuous)`
`84`	`84`	`.stroke(`
`85`	`85`	`isFocused`
`86`		`- ? Color(#colorLiteral(red: 0.25, green: 0.55, blue: 1.0, alpha: 1.0)).opacity(0.8)`
	`86`	`+ ? ColorThemeStore.shared.activeTheme.filterActiveColor`
`87`	`87`	`: Color(nsColor: .separatorColor).opacity(0.6),`
`88`	`88`	`lineWidth: isFocused ? 1.5 : 0.5`
`89`	`89`	`)`