@rentlydev/rently-tuya 0.2.1 → 0.2.3

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 {
@@ -198,6 +198,26 @@ struct Settings: View {
                     dpKey: ThingSmartCameraDPKey.init(rawValue: "231")
                 )
             }
+            SettingsManager.shared.toggleSwitch(
+                id: "doorbellCallSwitch",
+                title: "Doorbell Call",
+                description: "Enabling this will initiate doorbell call when someone press doorbell ring button.",
+                isChecked: $tuya.isDoorbellCallEnabled,
+                onToggle: { newValue in
+                    tuya.settingsLoader = true
+                    if let id = tuya.id {
+                        KeylessListener.emitter.enableDoorbellCall(withID: id, enabled: newValue) { success, message in
+                            if success {
+                                print("Tuya: Doorbell call updated to \(newValue)")
+                            }
+                            else {
+                                print("Tuya: Doorbell call update failed")
+                            }
+                            tuya.settingsLoader = false
+                        }
+                    }
+                }
+            )
             NightVisionPicker
         }
     }
@@ -233,7 +253,7 @@ struct Settings: View {
             SettingsManager.shared.toggleSwitch(
                 id: "motionDetectionSwitch",
                 title: "Motion Detection",
-                description: is8s ? "Triggered motion will send push notifications." : "If motion detection is enabled and motion is detected, the system will record the event and send a push notification.",
+                description: is8s ? "Triggered motion will send push notifications." : "If motion detection is enabled and motion is detected, the app will record the event and send a push notification.",
                 isChecked: is8s || isAosu ? $tuya.isMotionDetectionEnabled : $tuya.isPIRDetectionEnabled,
                 dpKey: is8s || isAosu ? ThingSmartCameraDPKey.motionDetectDPName : ThingSmartCameraDPKey.init(rawValue: "240")
             )
@@ -323,7 +343,7 @@ struct Settings: View {
                     Label(
                         title: "Storage Settings",
                         l: true,
-                        black: true
+                        grey: true
                     )
                     
                     let description = sdCardStatusDescription(for: tuya.sdCardStatus)
@@ -378,7 +398,7 @@ struct Settings: View {
                     Label(
                       title: "Wi-Fi Signal Strength",
                       l: true,
-                      black: true
+                      grey: true
                     )
         
                     Spacer()
@@ -407,7 +427,7 @@ struct Settings: View {
                 Label(
                   title: "Reset Wi-Fi",
                   l: true,
-                  black: true
+                  grey: true
                 )
         
                 Spacer()
@@ -425,19 +445,17 @@ struct Settings: View {
                 withCancelButton: true,
                 secondaryButtonTitle: "Cancel",
                 primaryAction: {
-                    if let cameraType = tuya.cameraType {
-                        KeylessListener.emitter.resetWifiForDoorbell(
-                            withDeviceID: cameraType.devId) { success, message in
-                                if success {
-                                    print("Tuya: Successfully navigated to the 'Add Doorbell' screen.")
-                                    isResetWifiAlertVisible = false
-                                    AppUtility.disconnectAndClose()
-                                } else {
-                                    print("Tuya: Failed to navigate to the 'Add Doorbell' screen.")
-                                    isResetWifiAlertVisible = false
-                                }
+                    KeylessListener.emitter.resetWifiForDoorbell(
+                        withTuyaProductName: tuya.tuyaProductName ?? "") { success, message in
+                            if success {
+                                print("Tuya: Successfully navigated to the 'Add Doorbell' screen.")
+                                isResetWifiAlertVisible = false
+                                AppUtility.disconnectAndClose()
+                            } else {
+                                print("Tuya: Failed to navigate to the 'Add Doorbell' screen.")
+                                isResetWifiAlertVisible = false
                             }
-                    }
+                        }
                 }
                 )
             }
@@ -474,7 +492,7 @@ struct Settings: View {
                 Label(
                     title: "Power Source",
                     l: true,
-                    black: true
+                    grey: true
                 )
                 
                 Spacer()
@@ -525,12 +543,12 @@ struct Settings: View {
     }
     
     private var AdvancedSettingsSection: some View {
-        Section(header: Label(title: "Advanced Settings", s: true, lightGrey: true, bold: true)) {
+        Section(header: Label(title: "Device Information", s: true, lightGrey: true, bold: true)) {
             HStack {
                 Label(
                     title: "Device Info",
                     l: true,
-                    black: true
+                    grey: true
                 )
                 
                 Spacer()
@@ -553,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

@@ -148,10 +148,15 @@ namespace JS {
       NSString *serial_no() const;
       NSString *flavour() const;
       bool doorbell_default_settings_updated() const;
+      bool doorbell_calling_enabled() const;
       bool motion_detection() const;
       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) {}
     private:
@@ -415,6 +420,11 @@ inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::doorbell_defa
   id const p = _v[@"doorbell_default_settings_updated"];
   return RCTBridgingToBool(p);
 }
+inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::doorbell_calling_enabled() const
+{
+  id const p = _v[@"doorbell_calling_enabled"];
+  return RCTBridgingToBool(p);
+}
 inline bool JS::NativeRentlyTuya::SpecOpenCameraLivePreviewParams::motion_detection() const
 {
   id const p = _v[@"motion_detection"];
@@ -435,6 +445,26 @@ 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"];
+  return RCTBridgingToBool(p);
+}
 inline NSString *JS::NativeRentlyTuya::SpecRegisterForPushNotificationParams::token() const
 {
   id const p = _v[@"token"];

package/ios/listener/KeylessListener.swift

@@ -14,7 +14,7 @@ open class KeylessListener: RCTEventEmitter {
     }
     
     open override func supportedEvents() -> [String] {
-        return ["REMOVE_CAMERA", "RESET_WIFI", "RESET_DEFAULT_SETTINGS_FLAG"]
+        return ["REMOVE_CAMERA", "RESET_WIFI", "RESET_DEFAULT_SETTINGS_FLAG", "ENABLE_DOORBELL_CALL"]
     }
 
     @objc static public override func requiresMainQueueSetup() -> Bool {
@@ -28,10 +28,9 @@ open class KeylessListener: RCTEventEmitter {
         self.keylessListenerCallback = callback
     }
 
-    @objc func resetWifiForDoorbell(withDeviceID deviceID: String, callback: @escaping (Bool, String) -> Void) {
-        guard !deviceID.isEmpty else { return }
-        
-        KeylessListener.emitter.sendEvent(withName: "RESET_WIFI", body: ["device_id": deviceID])
+    @objc func resetWifiForDoorbell(withTuyaProductName tuyaProductName: String, callback: @escaping (Bool, String) -> Void) {
+
+        KeylessListener.emitter.sendEvent(withName: "RESET_WIFI", body: ["doorbellType": tuyaProductName])
         self.keylessListenerCallback = callback
     }
 
@@ -42,6 +41,13 @@ open class KeylessListener: RCTEventEmitter {
         self.keylessListenerCallback = callback
     }
 
+    @objc func enableDoorbellCall(withID id: String, enabled: Bool, callback: @escaping (Bool, String) -> Void) {
+        guard !id.isEmpty else { return }
+        
+        KeylessListener.emitter.sendEvent(withName: "ENABLE_DOORBELL_CALL", body: ["id": id, "doorbell_calling_enabled": enabled])
+        self.keylessListenerCallback = callback
+    }
+
     // Callbacks received from react native
     @objc func successCallback(_ command: String) {
         DispatchQueue.main.async {

package/ios/listener/RentlyTuya.mm

@@ -93,10 +93,15 @@ RCT_EXPORT_MODULE()
     @"serial_no": params.serial_no(),
     @"flavour": params.flavour(),
     @"doorbell_default_settings_updated": @(params.doorbell_default_settings_updated()),
+    @"doorbell_calling_enabled": @(params.doorbell_calling_enabled()),
     @"motion_detection": @(params.motion_detection()),
     @"continuous_recording": @(params.continuous_recording()),
     @"event_recording": @(params.event_recording()),
-    @"set_sensitivity_low": @(params.set_sensitivity_low())
+    @"set_sensitivity_low": @(params.set_sensitivity_low()),
+    @"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

@@ -185,6 +185,7 @@ public class RentlyTuyaImpl: NSObject {
     }
     
     let lastMoveoutAt = params["last_moveout_at"] as? String
+    let isDoorbellCallEnabled = params["doorbell_calling_enabled"] as? Bool ?? false
     let resetRequired = params["resetRequired"] as? Bool
     let isResident = params["isResident"] as? Bool ?? true
     let displayRemoveDoorbellButton = params["display_remove_doorbell_button"] as? Bool
@@ -197,12 +198,17 @@ 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
     let propertyCredentialUsername = params["propertyCredentialUsername"] as? String
     let propertyCredentialPassword = params["propertyCredentialPassword"] as? String
     
     Tuya.shared.lastMoveoutAt = lastMoveoutAt
+    Tuya.shared.isDoorbellCallEnabled = isDoorbellCallEnabled
     Tuya.shared.resetRequired = resetRequired
     Tuya.shared.isResident = isResident
     Tuya.shared.displayRemoveDoorbellButton = displayRemoveDoorbellButton
@@ -217,6 +223,10 @@ 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 {
       Tuya.shared.eventRecording = true
@@ -230,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
     }
 }
 

package/ios/tuya/CameraManager.swift

@@ -76,7 +76,7 @@ class CameraManager: NSObject, ThingSmartCameraDelegate {
             Tuya.shared.changeResolution(resolution: .high)
         }
         DispatchQueue.global(qos: .userInitiated).async {
-            Tuya.shared.enableMute(enable: false, type: .preview)
+            Tuya.shared.enableMute(enable: Tuya.shared.doorbell_setting ?? false, type: .preview)
         }
     }
     

package/ios/tuya/Tuya.swift

@@ -38,6 +38,8 @@ class Tuya: NSObject, ObservableObject {
     @Published var isFlipEnabled: Bool = false
     @Published var isAntiDismantlingAlarmEnabled: Bool = false
     @Published var nightVisionLevel: String = ThingSmartCameraNightvision.auto.rawValue
+    @Published var isDoorbellCallEnabled: Bool = false
+
     @Published var isMotionDetectionEnabled: Bool = false
     @Published var motionSensitivityLevel: String = ThingSmartCameraMotion.low.rawValue
     @Published var isPIRDetectionEnabled: Bool = false
@@ -52,6 +54,11 @@ class Tuya: NSObject, ObservableObject {
     @Published var totalCapacity = 0.0
     @Published var remainingCapacity = 0.0
     @Published var used = 0.0
+    @Published var darkThemeEnabled: Bool = false
+    @Published var darkThemefinal: Bool = false
+    @Published var useSystemTheme: Bool = false
+    @Published var currentSystemColorScheme: String = "light"
+
 
     @Published var wifiSignalStrength: String = ""
     
@@ -82,6 +89,7 @@ class Tuya: NSObject, ObservableObject {
     var serialNumber: String? = nil
     var id: String? = nil
     var flavour: String = "smarthome"
+    var doorbell_setting: Bool? = false
     
     // Default Settings values
     var isDefaultSettingsUpdated: Bool = false