Update Neon colors and show color circles in theme picker

- Update NeonMoodTint to use synthwave colors matching Neon voting style (cyan, lime, yellow, orange, magenta) - Replace text label with 5 color circles in theme preview Colors row - Remove unused textColor customization code and picker views - Add .id(moodTint) to Month/Year views for color refresh - Clean up various unused color-related code 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
2025-12-30 00:08:01 -06:00
parent 51c5777c03
commit bea2d3bbc9
58 changed files with 1142 additions and 967 deletions
--- a/Shared/Views/CustomizeView/SubViews/AppThemePickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/AppThemePickerView.swift
@@ -288,12 +288,10 @@ struct AppThemePreviewSheet: View {
                .padding(.horizontal, 20)

            VStack(spacing: 12) {
-                ThemeComponentRow(
+                ThemeColorRow(
                    icon: "paintpalette.fill",
                    title: "Colors",
-                    value: theme.colorTint == .Default ? "Default" :
-                           theme.colorTint == .Neon ? "Neon" :
-                           theme.colorTint == .Pastel ? "Pastel" : "Custom",
+                    moodTint: theme.colorTint,
                    color: .orange
                )

@@ -404,6 +402,48 @@ struct ThemeComponentRow: View {
    }
 }

+// MARK: - Color Row with Circles
+
+struct ThemeColorRow: View {
+    let icon: String
+    let title: String
+    let moodTint: MoodTints
+    let color: Color
+
+    @Environment(\.colorScheme) private var colorScheme
+
+    private let moods: [Mood] = [.great, .good, .average, .bad, .horrible]
+
+    var body: some View {
+        HStack(spacing: 14) {
+            Image(systemName: icon)
+                .font(.title3)
+                .foregroundColor(color)
+                .frame(width: 36, height: 36)
+                .background(color.opacity(0.15))
+                .clipShape(RoundedRectangle(cornerRadius: 8))
+
+            Text(title)
+                .font(.subheadline)
+                .foregroundColor(.secondary)
+
+            Spacer()
+
+            HStack(spacing: 6) {
+                ForEach(moods, id: \.rawValue) { mood in
+                    Circle()
+                        .fill(moodTint.color(forMood: mood))
+                        .frame(width: 20, height: 20)
+                }
+            }
+        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 12)
+        .background(colorScheme == .dark ? Color(.systemGray6) : .white)
+        .clipShape(RoundedRectangle(cornerRadius: 12))
+    }
+}
+
 // MARK: - Preview

 struct AppThemePickerView_Previews: PreviewProvider {
--- a/Shared/Views/CustomizeView/SubViews/CustomWigetView.swift
+++ b/Shared/Views/CustomizeView/SubViews/CustomWigetView.swift
@@ -9,9 +9,10 @@ import SwiftUI

 struct CustomWigetView: View {
    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
    @StateObject private var selectedWidget = CustomWidgetStateViewModel()

+    private var textColor: Color { theme.currentTheme.labelColor }
+
    var body: some View {
        ZStack {
            theme.currentTheme.secondaryBGColor
--- a/Shared/Views/CustomizeView/SubViews/DayFilterPickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/DayFilterPickerView.swift
@@ -9,8 +9,9 @@ import SwiftUI

 struct DayFilterPickerView: View {
    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
    @StateObject private var filteredDays = DaysFilterClass.shared
+
+    private var textColor: Color { theme.currentTheme.labelColor }
    
    let weekdays = [(Calendar.current.shortWeekdaySymbols[0], 1),
                    (Calendar.current.shortWeekdaySymbols[1], 2),
--- a/Shared/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/PersonalityPackPickerView.swift
@@ -12,8 +12,9 @@ struct PersonalityPackPickerView: View {
    @AppStorage(UserDefaultsStore.Keys.personalityPack.rawValue, store: GroupUserDefaults.groupDefaults) private var personalityPack: PersonalityPack = .Default
    @State private var showOver18Alert = false
    @AppStorage(UserDefaultsStore.Keys.showNSFW.rawValue, store: GroupUserDefaults.groupDefaults) private var showNSFW: Bool = false
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
-    
+
+    private var textColor: Color { theme.currentTheme.labelColor }
+
    var body: some View {
        ZStack {
            theme.currentTheme.secondaryBGColor
--- a/Shared/Views/CustomizeView/SubViews/ShapePickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/ShapePickerView.swift
@@ -10,10 +10,11 @@ import SwiftUI
 struct ShapePickerView: View {
    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
    @State var shapeRefreshToggleThing: Bool = false
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
    @AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
    @AppStorage(UserDefaultsStore.Keys.shape.rawValue, store: GroupUserDefaults.groupDefaults) private var shape: BGShape = .circle
-    
+
+    private var textColor: Color { theme.currentTheme.labelColor }
+
    var body: some View {
        ZStack {
            theme.currentTheme.secondaryBGColor
--- a/Shared/Views/CustomizeView/SubViews/TextColorPickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/TextColorPickerView.swift
@@ -1,30 +0,0 @@
-//
-//  TextColorPickerView.swift
-//  Feels (iOS)
-//
-//  Created by Trey Tartt on 4/2/22.
-//
-
-import SwiftUI
-
-struct TextColorPickerView: View {
-    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
-    
-    var body: some View {
-        ZStack {
-            theme.currentTheme.secondaryBGColor
-            ColorPicker(String(localized: "customize_view_view_text_color"), selection: $textColor)
-                .padding()
-                .foregroundColor(textColor)
-        }
-        .fixedSize(horizontal: false, vertical: true)
-        .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
-    }
-}
-
-struct TextColorPickerView_Previews: PreviewProvider {
-    static var previews: some View {
-        TextColorPickerView()
-    }
-}
--- a/Shared/Views/CustomizeView/SubViews/ThemePickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/ThemePickerView.swift
@@ -11,7 +11,8 @@ struct ThemePickerView: View {
    @Environment(\.colorScheme) var colorScheme

    @State private var selectedTheme: Theme = UserDefaultsStore.theme()
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
+
+    private var textColor: Color { selectedTheme.currentTheme.labelColor }

    var body: some View {
        ZStack {
@@ -70,31 +71,8 @@ struct ThemePickerView: View {
            selectedTheme = theme
        }

-        changeTextColor(forTheme: theme)
        EventLogger.log(event: "change_theme_id", withData: ["id": theme.rawValue])
    }
-
-    private func changeTextColor(forTheme theme: Theme) {
-        if [Theme.iFeel, Theme.system].contains(theme) {
-            let currentSystemScheme = UITraitCollection.current.userInterfaceStyle
-            switch currentSystemScheme {
-            case .unspecified:
-                textColor = .black
-            case .light:
-                textColor = .black
-            case .dark:
-                textColor = .white
-            @unknown default:
-                textColor = .black
-            }
-        }
-        if theme == Theme.dark {
-            textColor = .white
-        }
-        if theme == Theme.light {
-            textColor = .black
-        }
-    }
 }

 struct ThemePickerView_Previews: PreviewProvider {
--- a/Shared/Views/CustomizeView/SubViews/TintPickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/TintPickerView.swift
@@ -1,125 +0,0 @@
-//
-//  TintPickerView.swift
-//  Feels (iOS)
-//
-//  Created by Trey Tartt on 4/2/22.
-//
-
-import SwiftUI
-
-struct TintPickerView: View {
-    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
-    @AppStorage(UserDefaultsStore.Keys.customMoodTintUpdateNumber.rawValue, store: GroupUserDefaults.groupDefaults) private var customMoodTintUpdateNumber: Int = 0
-    @AppStorage(UserDefaultsStore.Keys.moodTint.rawValue, store: GroupUserDefaults.groupDefaults) private var moodTint: MoodTints = .Default
-    @StateObject private var customMoodTint = UserDefaultsStore.getCustomMoodTint()
-
-    var body: some View {
-        ZStack {
-            theme.currentTheme.secondaryBGColor
-            VStack {
-                ForEach(MoodTints.defaultOptions, id: \.rawValue) { tint in
-                    HStack {
-                        ForEach(Mood.allValues, id: \.self) { mood in
-                            Circle()
-                                .frame(width: 35, height: 35)
-                                .foregroundColor(
-                                    tint.color(forMood: mood)
-                                )
-                        }
-                        .frame(minWidth: 0, maxWidth: .infinity)
-                    }
-                    .contentShape(Rectangle())
-                    .background(
-                        RoundedRectangle(cornerRadius: 10, style: .continuous)
-                            .fill(moodTint == tint ? theme.currentTheme.bgColor : .clear)
-                            .padding([.top, .bottom], -3)
-                        
-                    )
-                    .onTapGesture {
-                        let impactMed = UIImpactFeedbackGenerator(style: .heavy)
-                        impactMed.impactOccurred()
-                        moodTint = tint
-                        EventLogger.log(event: "change_mood_tint_id", withData: ["id": tint.rawValue])
-                    }
-                    Divider()
-                }
-                
-                ZStack {
-                    Color.clear
-                    
-                    Rectangle()
-                        .frame(height: 35)
-                        .frame(minWidth: 0, maxWidth: .infinity)
-                        .foregroundColor(.clear)
-                        .contentShape(Rectangle())
-                        .onTapGesture {
-                            moodTint = .Custom
-                            let impactMed = UIImpactFeedbackGenerator(style: .heavy)
-                            impactMed.impactOccurred()
-                        }
-                    
-                    HStack {
-                        ColorPicker("", selection: $customMoodTint.colorOne)
-                            .onChange(of: customMoodTint.colorOne) {
-                                saveCustomMoodTint()
-                            }
-                            .labelsHidden()
-                            .frame(minWidth: 0, maxWidth: .infinity)
-
-                        ColorPicker("", selection: $customMoodTint.colorTwo)
-                            .labelsHidden()
-                            .frame(minWidth: 0, maxWidth: .infinity)
-                            .onChange(of: customMoodTint.colorTwo) {
-                                saveCustomMoodTint()
-                            }
-
-                        ColorPicker("", selection: $customMoodTint.colorThree)
-                            .labelsHidden()
-                            .frame(minWidth: 0, maxWidth: .infinity)
-                            .onChange(of: customMoodTint.colorThree) {
-                                saveCustomMoodTint()
-                            }
-
-                        ColorPicker("", selection: $customMoodTint.colorFour)
-                            .labelsHidden()
-                            .frame(minWidth: 0, maxWidth: .infinity)
-                            .onChange(of: customMoodTint.colorFour) {
-                                saveCustomMoodTint()
-                            }
-
-                        ColorPicker("", selection: $customMoodTint.colorFive)
-                            .labelsHidden()
-                            .frame(minWidth: 0, maxWidth: .infinity)
-                            .onChange(of: customMoodTint.colorFive) {
-                                saveCustomMoodTint()
-                            }
-                    }
-                    .background(
-                        Color.clear
-                    )
-                }
-                .background(
-                    RoundedRectangle(cornerRadius: 10, style: .continuous)
-                        .fill(moodTint == .Custom ? theme.currentTheme.bgColor : .clear)
-                        .padding([.top, .bottom], -3)
-                )
-            }
-            .padding()
-        }
-        .fixedSize(horizontal: false, vertical: true)
-        .cornerRadius(Constants.viewsCornerRaidus, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
-    }
-    
-    private func saveCustomMoodTint() {
-        UserDefaultsStore.saveCustomMoodTint(customTint: customMoodTint)
-        moodTint = .Custom
-        EventLogger.log(event: "change_mood_tint_id", withData: ["id": MoodTints.Custom.rawValue])
-        customMoodTintUpdateNumber += 1
-    }
-}
-
-struct TintPickerView_Previews: PreviewProvider {
-    static var previews: some View {
-        TintPickerView()
-    }
-}
--- a/Shared/Views/CustomizeView/SubViews/VotingLayoutPickerView.swift
+++ b/Shared/Views/CustomizeView/SubViews/VotingLayoutPickerView.swift
@@ -9,9 +9,10 @@ import SwiftUI

 struct VotingLayoutPickerView: View {
    @AppStorage(UserDefaultsStore.Keys.theme.rawValue, store: GroupUserDefaults.groupDefaults) private var theme: Theme = .system
-    @AppStorage(UserDefaultsStore.Keys.textColor.rawValue, store: GroupUserDefaults.groupDefaults) private var textColor: Color = DefaultTextColor.textColor
    @AppStorage(UserDefaultsStore.Keys.votingLayoutStyle.rawValue, store: GroupUserDefaults.groupDefaults) private var votingLayoutStyle: Int = 0

+    private var textColor: Color { theme.currentTheme.labelColor }
+
    private var currentLayout: VotingLayoutStyle {
        VotingLayoutStyle(rawValue: votingLayoutStyle) ?? .horizontal
    }