@rentlydev/rently-tuya 0.2.2 → 0.2.4

package/ios/dashboard/Messages.swift

@@ -24,7 +24,7 @@ struct Messages: View {
             ZStack {
                 if tuya.messagesLoader && messages.isEmpty {
                     ProgressView()
-                        .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.black))
+                        .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.blackColor))
                         .frame(maxWidth: .infinity, maxHeight: .infinity)
                 } else if messages.isEmpty {
                     NoMessages()
@@ -157,6 +157,7 @@ struct NoMessages: View {
             Label(
                 id: "noMessages",
                 title: "No activity available at the moment.",
+                blackColor: true,
                 bold: true,
                 maxLines: 2
             )
@@ -176,13 +177,14 @@ struct MessageItem: View {
                     Label(
                         title: formattedDateTime ?? message.dateTime,
                         m: true,
-                        black: true
+                        lightGrey: true
                     )
                     .padding(.bottom, 3)
                 
                 Label(
                     title: (message.attachPic != nil) ? message.msgContent : "Unable to capture detected events because the doorbell's battery is too low. Please charge it to ensure events are detected and recorded.",
-                    l: true
+                    l: true,
+                    grey: true
                 )
                 .padding(.bottom, 4)
                 

package/ios/dashboard/NavigationController.swift

@@ -22,6 +22,8 @@ struct NavigationController: View {
     @State private var updateSettingsTask: Task<Void, Never>? = nil
     @EnvironmentObject var orientationManager: OrientationManager
     @ObservedObject var tuya = Tuya.shared
+    @Environment(\.colorScheme) private var colorScheme
+    @State private var themeUpdateTrigger: Int = 0
 
     private var topBarTitle: String {
         if isFirmwareUpdateSettings {
@@ -33,7 +35,25 @@ struct NavigationController: View {
     }
     
     private var isSpecialTitle: Bool {
-        [.settings, .messages, .advancedSettings, .storageSettings, .firmwareUpdateSettings].contains(currentScreen)
+        [.settings, .messages, .advancedSettings, .storageSettings, .firmwareUpdateSettings, .playback].contains(currentScreen)
+    }
+
+    private func onThemeChanged(_ scheme: ColorScheme) {
+        guard tuya.useSystemTheme else { return }
+        DispatchQueue.main.async {
+            tuya.currentSystemColorScheme = scheme == .dark ? "dark" : "light"
+            tuya.darkThemefinal = tuya.currentSystemColorScheme == "dark"
+
+            Themes.configureTheme(for: tuya.flavour, darkThemeEnabled: tuya.darkThemefinal)
+        
+            if let windowScene = UIApplication.shared.connectedScenes
+                .compactMap({ $0 as? UIWindowScene })
+                .first(where: { $0.activationState == .foregroundActive }),
+                let window = windowScene.windows.first(where: { $0.isKeyWindow }) {
+                    window.overrideUserInterfaceStyle = tuya.darkThemefinal ? .dark : .light
+                }
+            themeUpdateTrigger += 1
+        }
     }
     
     var body: some View {
@@ -134,6 +154,7 @@ struct NavigationController: View {
                 }
             }
         }
+        .id(themeUpdateTrigger)
         .onChange(of: currentScreen) { newValue in
             HeapAnalytics.trackEvent(eventName: "\(newValue.rawValue) Screen")
         }
@@ -152,7 +173,15 @@ struct NavigationController: View {
                 }
             }
         }
+        .onChange(of: colorScheme) { newScheme in
+            onThemeChanged(newScheme)
+        }
         .onReceive(NotificationCenter.default.publisher(for: UIApplication.didEnterBackgroundNotification)) { _ in
+            if tuya.useSystemTheme {
+                let interfaceStyle = UITraitCollection.current.userInterfaceStyle
+                tuya.currentSystemColorScheme = interfaceStyle == .dark ? "dark" : "light"
+                onThemeChanged(interfaceStyle == .dark ? .dark : .light)
+            }
             if currentScreen == .playback {
                 tuya.pausePlayback()
             } else {
@@ -160,6 +189,11 @@ struct NavigationController: View {
             }
         }
         .onReceive(NotificationCenter.default.publisher(for: UIApplication.willEnterForegroundNotification)) { _ in
+            if tuya.useSystemTheme {
+                let interfaceStyle = UITraitCollection.current.userInterfaceStyle
+                tuya.currentSystemColorScheme = interfaceStyle == .dark ? "dark" : "light"
+                onThemeChanged(interfaceStyle == .dark ? .dark : .light)
+            }
             if currentScreen == .dashboard {
                 tuya.connect()
             }
@@ -180,7 +214,7 @@ struct TopBar: View {
                 title: title,
                 xl20: true,
                 white: !isSpecialTitle,
-                black: isSpecialTitle,
+                greyColor: isSpecialTitle,
                 semiBold: true
             )
 
@@ -193,7 +227,7 @@ struct TopBar: View {
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(width: 22, height: 22)
-                    .foregroundColor(isSpecialTitle ? LocalColor.Monochrome.black : LocalColor.Monochrome.white)
+                    .foregroundColor(isSpecialTitle ? LocalColor.Monochrome.greyColor : LocalColor.Monochrome.whiteColor)
                 }
                 .padding(.leading, 5)
 
@@ -208,7 +242,7 @@ struct TopBar: View {
                         .resizable()
                         .aspectRatio(contentMode: .fit)
                         .frame(width: 24, height: 24)
-                        .foregroundColor(title == "Activity History" ? LocalColor.Monochrome.grey : LocalColor.Monochrome.white)
+                        .foregroundColor(title == "Activity History" || title == "Playback" ? LocalColor.Monochrome.greyColor : LocalColor.Monochrome.whiteColor)
                     }
                     .padding(.trailing, 5)
                 }

package/ios/dashboard/Playback.swift

@@ -86,7 +86,7 @@ struct Playback: View {
             
         if tuya.playbackLoader {
             ProgressView()
-                .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.black))
+                .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.blackColor))
         }
                 
         CustomDatePicker(
@@ -293,7 +293,7 @@ struct PlaybackList: View {
                         id: "noPlaybackVideos",
                         title: "No Playback videos available at the moment.",
                         xl18: true,
-                        black: true,
+                        blackColor: true,
                         semiBold: true,
                         center: true
                     )
@@ -342,7 +342,8 @@ struct VideoItem: View {
                 Label(
                     title: "\(convertTimestampToTime(item["startTime"] as? Int))",
                     l: true,
-                    primary: true,
+                    grey: !isSelected,
+                    white: isSelected,
                     bold: true,
                     left: true
                 )
@@ -350,7 +351,8 @@ struct VideoItem: View {
                 Label(
                     title: ("Duration: \(calculateVideoDuration(from: item["startTime"] as? Int, to: item["endTime"] as? Int))"),
                     m: true,
-                    secondary: true,
+                    lightGrey: !isSelected,
+                    white: isSelected,
                     left: true
                 )
                 .padding(.top, 5)
@@ -360,7 +362,7 @@ struct VideoItem: View {
             Spacer()
         }
         .frame(maxWidth: /*@START_MENU_TOKEN@*/.infinity/*@END_MENU_TOKEN@*/)
-        .background(isSelected ? LocalColor.Secondary.light : LocalColor.Monochrome.white)
+        .background(isSelected ? LocalColor.Main.dark : LocalColor.Monochrome.white)
         .cornerRadius(5)
         .padding(.top, 8)
         .padding(.horizontal, 10)

package/ios/dashboard/PreviewManager.swift

@@ -102,15 +102,31 @@ struct PreviewView: UIViewRepresentable {
     }
 }
 
-func openLivePreview(appFlavor: String) {
-    
+func openLivePreview(appFlavor: String, darkThemeEnabled: Bool = false, useSystemTheme: Bool = false, currentSystemColorScheme: String = "light") {
+    Tuya.shared.darkThemeEnabled = darkThemeEnabled
+    Tuya.shared.useSystemTheme = useSystemTheme
+    Tuya.shared.currentSystemColorScheme = currentSystemColorScheme
+    if useSystemTheme {
+        let interfaceStyle = UITraitCollection.current.userInterfaceStyle
+        Tuya.shared.currentSystemColorScheme = interfaceStyle == .dark ? "dark" : "light"
+    }
+    Tuya.shared.darkThemefinal = useSystemTheme ? (Tuya.shared.currentSystemColorScheme == "dark") : darkThemeEnabled
     DispatchQueue.main.async {
-        Themes.configureTheme(for: appFlavor)
+        Themes.configureTheme(for: appFlavor, darkThemeEnabled: Tuya.shared.darkThemefinal)
+        
+        if let windowScene = UIApplication.shared.connectedScenes
+            .compactMap({ $0 as? UIWindowScene })
+            .first(where: { $0.activationState == .foregroundActive }),
+           let window = windowScene.windows.first(where: { $0.isKeyWindow }) {
+            window.overrideUserInterfaceStyle = Tuya.shared.darkThemefinal ? .dark : .light
+        }
+        
         let orientationManager = OrientationManager()
         let dashboardView = NavigationController().environmentObject(orientationManager)
         let hostingController = UIHostingController(rootView: dashboardView)
         hostingController.modalPresentationStyle = .fullScreen
-         if let windowScene = UIApplication.shared.connectedScenes
+        
+        if let windowScene = UIApplication.shared.connectedScenes
             .first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
            let rootVC = windowScene.windows.first(where: { $0.isKeyWindow })?.rootViewController {
             rootVC.present(hostingController, animated: true, completion: nil)

package/ios/dashboard/Settings.swift

@@ -162,7 +162,7 @@ struct Settings: View {
             
             if tuya.settingsLoader {
                 ProgressView()
-                    .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.black))
+                    .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.blackColor))
             }
         }
         .onAppear {
@@ -343,7 +343,7 @@ struct Settings: View {
                     Label(
                         title: "Storage Settings",
                         l: true,
-                        black: true
+                        grey: true
                     )
                     
                     let description = sdCardStatusDescription(for: tuya.sdCardStatus)
@@ -398,7 +398,7 @@ struct Settings: View {
                     Label(
                       title: "Wi-Fi Signal Strength",
                       l: true,
-                      black: true
+                      grey: true
                     )
         
                     Spacer()
@@ -427,7 +427,7 @@ struct Settings: View {
                 Label(
                   title: "Reset Wi-Fi",
                   l: true,
-                  black: true
+                  grey: true
                 )
         
                 Spacer()
@@ -492,7 +492,7 @@ struct Settings: View {
                 Label(
                     title: "Power Source",
                     l: true,
-                    black: true
+                    grey: true
                 )
                 
                 Spacer()
@@ -548,7 +548,7 @@ struct Settings: View {
                 Label(
                     title: "Device Info",
                     l: true,
-                    black: true
+                    grey: true
                 )
                 
                 Spacer()
@@ -571,7 +571,7 @@ struct Settings: View {
                     title: "Remove Doorbell",
                     l: true,
                     secondary: true,
-                    textColor: LocalColor.Monochrome.white,
+                    textColor: LocalColor.Monochrome.whiteColor,
                     semiBold: true
                 ) {
                     isRemoveDoorbellAlertVisible = true

package/ios/generated/RNRentlyTuyaSpec/RNRentlyTuyaSpec.h

@@ -153,6 +153,9 @@ namespace JS {
       bool continuous_recording() const;
       bool event_recording() const;
       bool set_sensitivity_low() const;
+      bool darkThemeEnabled() const;
+      bool useSystemTheme() const;
+      NSString *currentSystemColorScheme() const;
       bool doorbell_setting() const;
 
       SpecOpenCameraLivePreviewParams(NSDictionary *const v) : _v(v) {}
@@ -442,6 +445,21 @@ inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::set_sensitivi
   id const p = _v[@"set_sensitivity_low"];
   return RCTBridgingToBool(p);
 }
+inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::darkThemeEnabled() const
+{
+  id const p = _v[@"darkThemeEnabled"];
+  return RCTBridgingToBool(p);
+}
+inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::useSystemTheme() const
+{
+  id const p = _v[@"useSystemTheme"];
+  return RCTBridgingToBool(p);
+}
+inline NSString *JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::currentSystemColorScheme() const
+{
+  id const p = _v[@"currentSystemColorScheme"];
+  return RCTBridgingToString(p);
+}
 inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::doorbell_setting() const
 {
   id const p = _v[@"doorbell_setting"];

package/ios/listener/RentlyTuya.mm

@@ -98,7 +98,10 @@ RCT_EXPORT_MODULE()
     @"continuous_recording": @(params.continuous_recording()),
     @"event_recording": @(params.event_recording()),
     @"set_sensitivity_low": @(params.set_sensitivity_low()),
-    @"doorbell_setting": @(params.doorbell_setting())
+    @"doorbell_setting": @(params.doorbell_setting()),
+    @"darkThemeEnabled": @(params.darkThemeEnabled()),
+    @"useSystemTheme": @(params.useSystemTheme()),
+    @"currentSystemColorScheme": params.currentSystemColorScheme()
   };
   
   [[RentlyTuyaImpl shared] openCameraLivePreview:paramsDict withResolve:resolve withReject:reject];

package/ios/listener/RentlyTuyaImpl.swift

@@ -198,6 +198,9 @@ public class RentlyTuyaImpl: NSObject {
     let continuousRecording = params["continuous_recording"] as? Bool ?? false
     let eventRecording = params["event_recording"] as? Bool ?? false
     let setSensitivityLow = params["set_sensitivity_low"] as? Bool ?? false
+    let darkThemeEnabled = params["darkThemeEnabled"] as? Bool ?? false
+    let useSystemTheme = params["useSystemTheme"] as? Bool ?? false
+    let currentSystemColorScheme = params["currentSystemColorScheme"] as? String ?? "light"
     let doorbell_setting = params["doorbell_setting"] as? Bool ?? false
     
     // Property Credentials
@@ -220,6 +223,9 @@ public class RentlyTuyaImpl: NSObject {
     Tuya.shared.eventRecording = eventRecording
     Tuya.shared.setSensitivityLow = setSensitivityLow
     Tuya.shared.flavour = flavour
+    Tuya.shared.darkThemeEnabled = darkThemeEnabled
+    Tuya.shared.useSystemTheme = useSystemTheme
+    Tuya.shared.currentSystemColorScheme = currentSystemColorScheme
     Tuya.shared.doorbell_setting = doorbell_setting
     
     if !Tuya.shared.continuousRecording && !Tuya.shared.eventRecording {
@@ -234,7 +240,7 @@ public class RentlyTuyaImpl: NSObject {
       homeId: homeId,
       completion: { success, errorMessage, error in
         if (success) {
-          openLivePreview(appFlavor: Tuya.shared.flavour)
+          openLivePreview(appFlavor: Tuya.shared.flavour, darkThemeEnabled: Tuya.shared.darkThemeEnabled, useSystemTheme: Tuya.shared.useSystemTheme, currentSystemColorScheme: Tuya.shared.currentSystemColorScheme)
           resolve(true)
         } else {
           reject("sync_failed", errorMessage, error)

package/ios/theme/LocalColor.swift

@@ -1,38 +1,84 @@
 import SwiftUI
 
 struct LocalColor {
+    struct Background {
+        static var primary: Color = Color(hex: "#F9FAFB")
+        static var secondary: Color = Color.white
+        static var tertiary: Color = Color(hex: "#1A1A1A")
+    }
+    struct Surface {
+        static var primary: Color = Color.white
+        static var secondary: Color = Color(hex: "#242526")
+    }
+    struct Text {
+        static var primary: Color = Color(hex: "#374151")
+        static var secondary: Color = Color(hex: "#6B7280")
+        static var tertiary: Color = Color(hex: "#D1D5DB")
+        static var inverted: Color = Color.white
+    }
+    struct Accent {
+        static var primary: Color = Color(hex: "#177BB5")
+        static var secondary: Color = Color(hex: "#177BB5")
+    }
+    struct Border {
+        static var primary: Color = Color(hex: "#D1D5DB")
+    }
+    struct Custom {
+        static let brown = Color(#colorLiteral(red: 0.7064316869, green: 0.3275339603, blue: 0.03773720562, alpha: 1))
+    }
     struct Main {
-        static var light = Color(hex: "#f3faff")
-        static var dark = Color(hex: "#329ddc")
+        static var light: Color {
+            get { Background.primary }
+            set { Background.primary = newValue }
+        }
+        static var dark: Color {
+            get { Accent.primary }
+            set { Accent.primary = newValue }
+        }
     }
-
     struct Primary {
         static let light = Color(#colorLiteral(red: 0, green: 0.6419225335, blue: 0.9344936609, alpha: 1))
-        static let secondary = Color(#colorLiteral(red: 0.3606210351, green: 0.5981844068, blue: 0.7222386599, alpha: 1))
-        static let dark = Color(#colorLiteral(red: 0, green: 0.6262267828, blue: 0.8854203224, alpha: 1))
+        static var secondary: Color {
+            get { Text.primary }
+            set { Text.primary = newValue }
+        }
         static let medium = Color(#colorLiteral(red: 0, green: 0.5515162945, blue: 0.8891028762, alpha: 1))
     }
     
     struct Secondary {
-        static let white = Color(#colorLiteral(red: 0.9466181397, green: 0.9815257192, blue: 1, alpha: 1))
         static let light = Color(#colorLiteral(red: 0.8319713473, green: 0.9325252771, blue: 0.9908282161, alpha: 1))
     }
-    
-    struct Danger {
-        static let primary = Color(#colorLiteral(red: 0.8711757064, green: 0, blue: 0, alpha: 1))
-    }
-    
     struct Monochrome {
-        static let white = Color.white
-        static let regular = Color(#colorLiteral(red: 0.5263667703, green: 0.5214033127, blue: 0.5515511632, alpha: 1))
-        static let medium = Color(#colorLiteral(red: 0.2326147854, green: 0.3040209115, blue: 0.3540382385, alpha: 1))
-        static let grey = Color(#colorLiteral(red: 0.2156862617, green: 0.2156862617, blue: 0.2156862617, alpha: 1))
+        static var white: Color {
+            get { Surface.primary }
+            set { Surface.primary = newValue }
+        }
+        static var whiteColor: Color {
+            get { Text.inverted }
+            set { Text.inverted = newValue }
+        }
         static let black = Color.black
+        static var blackColor: Color {
+            get { Text.primary }
+            set { Text.primary = newValue }
+        }
+        static var regular: Color {
+            get { Text.secondary }
+            set { Text.secondary = newValue }
+        }
+        static var medium: Color {
+            get { Text.primary }
+            set { Text.primary = newValue }
+        }
+        static let grey = Color(#colorLiteral(red: 0.2156862617, green: 0.2156862617, blue: 0.2156862617, alpha: 1))
+        static var greyColor: Color {
+            get { Text.primary }
+            set { Text.primary = newValue }
+        }
+        static var paleWhite: Color {
+            get { Text.tertiary }
+            set { Text.tertiary = newValue }
+        }
         static let transparent = Color.clear
     }
-
-    struct Custom {
-      static let brown = Color(#colorLiteral(red: 0.7064316869, green: 0.3275339603, blue: 0.03773720562, alpha: 1))
-    }
-    
 }

package/ios/theme/Theme.swift

@@ -1,39 +1,176 @@
 import SwiftUI
 
+
+protocol ColorPalette {
+    var backgroundPrimary: Color { get }
+    var backgroundSecondary: Color { get }
+    var backgroundTertiary: Color { get }
+    var surfacePrimary: Color { get }
+    var surfaceSecondary: Color { get }
+    var textPrimary: Color { get }
+    var textSecondary: Color { get }
+    var textTertiary: Color { get }
+    var textInverted: Color { get }
+    var accentPrimary: Color { get }
+    var accentSecondary: Color { get }
+    var borderPrimary: Color { get }
+}
+
+struct SmartHomeLightPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#F9FAFB")
+    let backgroundSecondary = Color.white
+    let backgroundTertiary = Color(hex: "#F9FAFB")
+    let surfacePrimary = Color.white
+    let surfaceSecondary = Color.white
+    let textPrimary = Color(hex: "#374151")
+    let textSecondary = Color(hex: "#6B7280")
+    let textTertiary = Color(hex: "#4B5563")
+    let textInverted = Color.white
+    let accentPrimary = Color(hex: "#177BB5")
+    let accentSecondary = Color(hex: "#177BB5")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+struct SmartHomeDarkPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#1A1A1A")
+    let backgroundSecondary = Color(hex: "#242526")
+    let backgroundTertiary = Color(hex: "#1A1A1A")
+    let surfacePrimary = Color(hex: "#242526")
+    let surfaceSecondary = Color(hex: "#242526")
+    let textPrimary = Color(hex: "#F9FAFB")
+    let textSecondary = Color(hex: "#D1D5DB")
+    let textTertiary = Color(hex: "#D1D5DB")
+    let textInverted = Color(hex: "#F9FAFB")
+    let accentPrimary = Color(hex: "#177BB5")
+    let accentSecondary = Color(hex: "#177BB5")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+
+struct BellanetLightPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#E9F0FF")
+    let backgroundSecondary = Color.white
+    let backgroundTertiary = Color(hex: "#E9F0FF")
+    let surfacePrimary = Color.white
+    let surfaceSecondary = Color.white
+    let textPrimary = Color(hex: "#374151")
+    let textSecondary = Color(hex: "#6B7280")
+    let textTertiary = Color(hex: "#4B5563")
+    let textInverted = Color.white
+    let accentPrimary = Color(hex: "#0B1E44")
+    let accentSecondary = Color(hex: "#0B1E44")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+struct BellanetDarkPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#0B1E44")
+    let backgroundSecondary = Color(hex: "#1A2B50")
+    let backgroundTertiary = Color(hex: "#0B1E44")
+    let surfacePrimary = Color(hex: "#1A2B50")
+    let surfaceSecondary = Color(hex: "#1A2B50")
+    let textPrimary = Color(hex: "#F9FAFB")
+    let textSecondary = Color(hex: "#D1D5DB")
+    let textTertiary = Color(hex: "#D1D5DB")
+    let textInverted = Color(hex: "#F9FAFB")
+    let accentPrimary = Color(hex: "#E9F0FF")
+    let accentSecondary = Color(hex: "#E9F0FF")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+
+struct CoveyHomesLightPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#FAF6F6")
+    let backgroundSecondary = Color.white
+    let backgroundTertiary = Color(hex: "#FAF6F6")
+    let surfacePrimary = Color.white
+    let surfaceSecondary = Color.white
+    let textPrimary = Color(hex: "#374151")
+    let textSecondary = Color(hex: "#6B7280")
+    let textTertiary = Color(hex: "#4B5563")
+    let textInverted = Color.white
+    let accentPrimary = Color(hex: "#99855E")
+    let accentSecondary = Color(hex: "#99855E")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+struct CoveyHomesDarkPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#2A2420")
+    let backgroundSecondary = Color(hex: "#3A3430")
+    let backgroundTertiary = Color(hex: "#2A2420")
+    let surfacePrimary = Color(hex: "#3A3430")
+    let surfaceSecondary = Color(hex: "#3A3430")
+    let textPrimary = Color(hex: "#F9FAFB")
+    let textSecondary = Color(hex: "#D1D5DB")
+    let textTertiary = Color(hex: "#D1D5DB")
+    let textInverted = Color(hex: "#F9FAFB")
+    let accentPrimary = Color(hex: "#99855E")
+    let accentSecondary = Color(hex: "#99855E")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+struct ProgressLightPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#EFF5F4")
+    let backgroundSecondary = Color.white
+    let backgroundTertiary = Color(hex: "#EFF5F4")
+    let surfacePrimary = Color.white
+    let surfaceSecondary = Color.white
+    let textPrimary = Color(hex: "#374151")
+    let textSecondary = Color(hex: "#6B7280")
+    let textTertiary = Color(hex: "#4B5563")
+    let textInverted = Color.white
+    let accentPrimary = Color(hex: "#279989")
+    let accentSecondary = Color(hex: "#279989")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+struct ProgressDarkPalette: ColorPalette {
+    let backgroundPrimary = Color(hex: "#1A2726")
+    let backgroundSecondary = Color(hex: "#2A3736")
+    let backgroundTertiary = Color(hex: "#1A2726")
+    let surfacePrimary = Color(hex: "#2A3736")
+    let surfaceSecondary = Color(hex: "#2A3736")
+    let textPrimary = Color(hex: "#F9FAFB")
+    let textSecondary = Color(hex: "#D1D5DB")
+    let textTertiary = Color(hex: "#D1D5DB")
+    let textInverted = Color(hex: "#F9FAFB")
+    let accentPrimary = Color(hex: "#279989")
+    let accentSecondary = Color(hex: "#279989")
+    let borderPrimary = Color(hex: "#D1D5DB")
+}
+
+
 struct Themes {
-    static func configureTheme(for flavor: String) {
+    static func configureTheme(for flavor: String, darkThemeEnabled: Bool = false) {
+        let palette: ColorPalette
         switch flavor.lowercased() {
         case "keyless":
-            configureSmartHomeTheme()
+            palette = darkThemeEnabled ? SmartHomeDarkPalette() : SmartHomeLightPalette()
         case "bellanet":
-            configureBellanetTheme()
+            palette = darkThemeEnabled ? BellanetDarkPalette() : BellanetLightPalette()
         case "coveyhomes":
-            configureCoveyHomesTheme()
+            palette = darkThemeEnabled ? CoveyHomesDarkPalette() : CoveyHomesLightPalette()
         case "progress":
-            configureProgressTheme()
+            palette = darkThemeEnabled ? ProgressDarkPalette() : ProgressLightPalette()
         default:
-            configureSmartHomeTheme()
+            palette = darkThemeEnabled ? SmartHomeDarkPalette() : SmartHomeLightPalette()
         }
+        
+        applyPalette(palette)
     }
-
-    private static func configureSmartHomeTheme() {
-        LocalColor.Main.light = Color(hex: "#f3faff")
-        LocalColor.Main.dark = Color(hex: "#329ddc")
-    }
-
-    private static func configureBellanetTheme() {
-        LocalColor.Main.light = Color(hex: "#E9F0FF")
-        LocalColor.Main.dark = Color(hex: "#0B1E44")
-    }
-
-    private static func configureCoveyHomesTheme() {
-        LocalColor.Main.light = Color(hex: "#FAF6F6")
-        LocalColor.Main.dark = Color(hex: "#99855E")
-    }
-
-    private static func configureProgressTheme() {
-        LocalColor.Main.light = Color(hex: "#EFF5F4")
-        LocalColor.Main.dark = Color(hex: "#279989")
+    
+    private static func applyPalette(_ palette: ColorPalette) {
+        LocalColor.Background.primary = palette.backgroundPrimary
+        LocalColor.Background.secondary = palette.backgroundSecondary
+        LocalColor.Background.tertiary = palette.backgroundTertiary
+        LocalColor.Surface.primary = palette.surfacePrimary
+        LocalColor.Surface.secondary = palette.surfaceSecondary
+        LocalColor.Text.primary = palette.textPrimary
+        LocalColor.Text.secondary = palette.textSecondary
+        LocalColor.Text.tertiary = palette.textTertiary
+        LocalColor.Text.inverted = palette.textInverted
+        LocalColor.Accent.primary = palette.accentPrimary
+        LocalColor.Accent.secondary = palette.accentSecondary
+        LocalColor.Border.primary = palette.borderPrimary
     }
 }