@rentlydev/rently-tuya 0.2.1 → 0.2.3

package/ios/components/Button.swift

@@ -19,6 +19,9 @@ struct CustomButton: View {
     var secondary: Bool = false
     var tertiary: Bool = false
     var black: Bool = false
+
+    //disabled Button Color
+    var greyDisabled: Bool = false
     
     // Text/Border Color
     var textColor: Color = .black
@@ -42,7 +45,7 @@ struct CustomButton: View {
         if primary {
             return LocalColor.Primary.medium
         } else if secondary {
-            return Color(red: 0.953, green: 0.467, blue: 0.529)
+            return Color(hex: "#EF4343")
         } else if tertiary {
             return LocalColor.Monochrome.regular
         } else if black {
@@ -52,6 +55,18 @@ struct CustomButton: View {
         }
     }
 
+    var disabledButtonColor: Color? {
+        if greyDisabled {
+            return Color(hex: "#6B7280")
+        } else if black {
+          return LocalColor.Monochrome.black
+        }
+      else {
+        return LocalColor.Primary.light
+      }
+      
+    }
+
     var body: some View {
         
         let font: Font = {
@@ -97,7 +112,7 @@ struct CustomButton: View {
                     .frame(maxWidth: .infinity)
             }
             .padding()
-            .background(buttonColor)
+            .background( (Tuya.shared.darkThemefinal && !secondary) ? disabledButtonColor ?? buttonColor : buttonColor)
             .opacity(disabled ? 0.5 : 1)
             .cornerRadius(cornerRadius)
             .overlay(

package/ios/components/CustomDatePicker.swift

@@ -52,7 +52,7 @@ struct CustomDatePicker: View {
                         Spacer()
                     }
                     .frame(maxWidth: .infinity)
-                    .background(LocalColor.Main.dark)
+                    .background(Tuya.shared.darkThemefinal ? Color(hex: "#242526") : LocalColor.Main.dark)
 
                     HStack {
                         Button(action: {
@@ -70,7 +70,7 @@ struct CustomDatePicker: View {
                         Label(
                             title: formatMonthYear(date: displayedDate),
                             xl18: true,
-                            black: true,
+                            blackColor: true,
                             bold: true
                         )
 
@@ -93,7 +93,7 @@ struct CustomDatePicker: View {
                         VStack {
                             Spacer()
                             ProgressView()
-                                .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.black))
+                                .progressViewStyle(CircularProgressViewStyle(tint: LocalColor.Monochrome.blackColor))
                             Spacer()
                         }
                         .frame(maxWidth: .infinity)
@@ -117,7 +117,7 @@ struct CustomDatePicker: View {
                             id: "DatePicker_Cancel",
                             title: "Cancel",
                             l: true,
-                            secondary: true,
+                            paleWhite: true,
                             center: true
                         ) {
                             onCancel()
@@ -205,7 +205,7 @@ struct CalendarView: View {
                             .font(.footnote)
                             .frame(width: 30, height: 30)
                             .background(isSelected ? LocalColor.Main.dark : LocalColor.Monochrome.transparent)
-                            .foregroundColor(isSelected ? LocalColor.Monochrome.white : (isAvailable ? LocalColor.Monochrome.black : LocalColor.Monochrome.regular))
+                            .foregroundColor(isSelected ? LocalColor.Monochrome.whiteColor : (isAvailable ? LocalColor.Monochrome.blackColor : LocalColor.Monochrome.greyColor))
                             .overlay(
                                 Circle()
                                     .stroke(isAvailable ? LocalColor.Main.dark : LocalColor.Monochrome.transparent, lineWidth: 1)

package/ios/components/Label.swift

@@ -22,7 +22,10 @@ struct Label: View {
     var lightGrey: Bool = false
     var grey: Bool = false
     var white: Bool = false
+    var whiteColor: Bool = false
     var black: Bool = false
+    var blackColor: Bool = false
+    var greyColor: Bool = false
     var customColor: Color? = nil
     
     // Font Weight Options
@@ -58,8 +61,10 @@ struct Label: View {
             if secondary { return LocalColor.Primary.secondary }
             if lightGrey { return LocalColor.Monochrome.regular }
             if grey { return LocalColor.Monochrome.medium }
-            if white { return LocalColor.Monochrome.white }
+            if white { return LocalColor.Monochrome.whiteColor }
             if black { return LocalColor.Monochrome.black }
+            if blackColor { return LocalColor.Monochrome.blackColor }
+            if greyColor { return LocalColor.Monochrome.greyColor }
             return LocalColor.Primary.light
         }()
         

package/ios/dashboard/AdvanceSettings.swift

@@ -64,11 +64,11 @@ struct StorageSettings: View {
             VStack(alignment: .leading) {
                 Text("Note:")
                     .font(.custom(LocalFont.FontFamily.bold, size: LocalFont.FontSize.L))
-                    .foregroundColor(LocalColor.Monochrome.black)
+                    .foregroundColor(LocalColor.Monochrome.greyColor)
                 +
                 Text(" Formatting will delete all recorded activities on the SD Card.")
                     .font(.custom(LocalFont.FontFamily.semiBold, size: LocalFont.FontSize.L))
-                    .foregroundColor(LocalColor.Monochrome.black)
+                    .foregroundColor(LocalColor.Monochrome.greyColor)
                 Spacer()
                 HStack {
                     Spacer()
@@ -76,7 +76,7 @@ struct StorageSettings: View {
                         id: "FormatSDCard",
                         title: "Format",
                         secondary: true,
-                        textColor: LocalColor.Monochrome.white,
+                        textColor: LocalColor.Monochrome.whiteColor,
                         semiBold: true,
                         disabled: tuya.sdCardStatus == 4
                     ) {
@@ -107,7 +107,7 @@ struct Item: View {
                     id: title,
                     title: title,
                     l: true,
-                    black: true,
+                    grey: true,
                     semiBold: true
                 )
                 Spacer()
@@ -116,7 +116,7 @@ struct Item: View {
                         id: value,
                         title: value,
                         l: true,
-                        black: true,
+                        lightGrey: true,
                         medium: true,
                         right: true,
                         maxLines: 3

package/ios/dashboard/Dashboard.swift

@@ -15,6 +15,7 @@ struct Dashboard: View {
     @Binding var currentScreen: ScreenState
     @State private var isDoorbellControlVisible = true
     @State private var isPermissionDisclaimerAlertVisible = false
+    @State private var permissionType: String = "microphone"
     @EnvironmentObject var orientationManager: OrientationManager
     
     var body: some View {
@@ -32,7 +33,8 @@ struct Dashboard: View {
                 if tuya.isConnected {
                     DoorbellControls(
                         isDoorbellControlVisible: $isDoorbellControlVisible,
-                        isPermissionDisclaimerAlertVisible: $isPermissionDisclaimerAlertVisible
+                        isPermissionDisclaimerAlertVisible: $isPermissionDisclaimerAlertVisible,
+                        permissionType: $permissionType
                     )
                     .padding(.bottom, 10)
                     .alert(
@@ -46,7 +48,7 @@ struct Dashboard: View {
             }
             .frame(maxWidth: .infinity, maxHeight: .infinity)
             
-            BottomBar(currentScreen: $currentScreen)
+            BottomBar(currentScreen: $currentScreen, isPermissionDisclaimerAlertVisible: $isPermissionDisclaimerAlertVisible, permissionType: $permissionType)
                 .alert(
                     isPresented: $tuya.isRecordingFailure,
                     content: {
@@ -75,6 +77,21 @@ struct Dashboard: View {
                 )
             }
 
+            VStack {
+            }
+            .alert(isPresented: $isPermissionDisclaimerAlertVisible,
+                content: {
+                    getAlert(
+                        title: "Permission Request",
+                        message: "Please provide permission to access your \(permissionType)",
+                        primaryButtonTitle: "Open Settings",
+                        secondaryButtonTitle: "Cancel") {
+                            if let url = URL(string: UIApplication.openSettingsURLString) {
+                                UIApplication.shared.open(url)
+                            }
+                        }
+                }
+            )
         }
         .background(LocalColor.Monochrome.black)
         .onAppear(perform: handleOnAppear)
@@ -129,7 +146,7 @@ struct Dashboard: View {
         }
         
         if tuya.isConnected {
-            tuya.enableMute(enable: false, type: .preview)
+            tuya.enableMute(enable: tuya.doorbell_setting ?? false, type: .preview)
         }
 
         orientationManager.updateOrientationFlag()
@@ -165,6 +182,7 @@ struct DoorbellControls: View {
     @ObservedObject var tuya = Tuya.shared
     @Binding var isDoorbellControlVisible: Bool
     @Binding var isPermissionDisclaimerAlertVisible: Bool
+    @Binding var permissionType: String
     @EnvironmentObject var orientationManager: OrientationManager
     
     private var batteryIcon: String {
@@ -219,7 +237,8 @@ struct DoorbellControls: View {
                             title: tuya.isMicOn ? "Tap to mute" : "Tap to speak",
                             l: true,
                             tertiary: !tuya.isMicOn,
-                            textColor: LocalColor.Monochrome.white,
+                            greyDisabled: !tuya.isMicOn,
+                            textColor: Color.white,
                             medium: tuya.isMicOn,
                             semiBold: true,
                             cornerRadius: 40,
@@ -228,11 +247,17 @@ struct DoorbellControls: View {
                             if tuya.isMicOn {
                                 tuya.stopTalk()
                             } else {
+                                PermissionManager.request(.microphone, granted: {
+                                    tuya.startTalk()
+                                }, denied: {
+                                    permissionType = "microphone"
+                                    isPermissionDisclaimerAlertVisible = true
+                                }
+                                )
                                 // The speaker needs to be un muted when the mic is turned on.
                                 if tuya.isMuted {
                                     tuya.enableMute(enable: false, type: .preview)
                                 }
-                                tuya.startTalk()
                             }
                         }
                         .frame(width: 185, height: 70)
@@ -279,6 +304,8 @@ struct BottomBar: View {
 
     @ObservedObject var tuya = Tuya.shared
     @Binding var currentScreen: ScreenState
+    @Binding var isPermissionDisclaimerAlertVisible: Bool
+    @Binding var permissionType: String
     @EnvironmentObject var orientationManager: OrientationManager
 
     var body: some View {
@@ -310,7 +337,12 @@ struct BottomBar: View {
                             print("Camera not connected. Screenshot action disabled.")
                             return
                         }
-                        tuya.screenshot()
+                        PermissionManager.request(.photos) {
+                            tuya.screenshot()
+                        } denied: {
+                            permissionType = "Photos Library"
+                            isPermissionDisclaimerAlertVisible = true
+                        }
                     }
                 )
                 
@@ -328,7 +360,12 @@ struct BottomBar: View {
                         if tuya.isRecording {
                             tuya.stopRecording()
                         } else {
+                          PermissionManager.request(.photos) {
                             tuya.startRecording()
+                          } denied: {
+                            permissionType = "Photos Library"
+                            isPermissionDisclaimerAlertVisible = true
+                          }
                         }
                     }
                 )

package/ios/dashboard/FirmwareSettings.swift

@@ -15,13 +15,13 @@ struct FirmwareSettings: View {
           if tuya.isFirmwareUpdateInProgress {
             ZStack {
               Circle()
-                .stroke(LocalColor.Primary.medium.opacity(0.2), lineWidth: 6)
+                .stroke(LocalColor.Main.dark.opacity(0.2), lineWidth: 6)
                 .frame(width: 132, height: 132)
                 .padding(20)
               
               Circle()
                 .trim(from: 0.0, to: CGFloat(tuya.firmwareUpdateProgress) / 100)
-                .stroke(LocalColor.Primary.medium, style: StrokeStyle(lineWidth: 6, lineCap: .round))
+                .stroke(LocalColor.Main.dark, style: StrokeStyle(lineWidth: 6, lineCap: .round))
                 .rotationEffect(.degrees(-90))
                 .frame(width: 132, height: 132)
                 .padding(20)
@@ -43,7 +43,7 @@ struct FirmwareSettings: View {
             Spacer()
             Label(title: tuya.firmwareUpdateProgress >= 50 && tuya.firmwareUpdateProgress < 100 ? "Please keep the doorbell powered on while we complete this update. Thank you for your patience." : "This might take a few minutes. During this time you will not be able to use your video doorbell.",
                   l: true,
-                  black: true,
+                  blackColor: true,
                   center: true)
             .padding(20)
           }
@@ -61,26 +61,26 @@ struct FirmwareSettings: View {
                 Label(
                   title: "Current Firmware Version:",
                   l: true,
-                  black: true,
+                  grey: true,
                   semiBold: true
                 )
                 Label(
                   title: (tuya.firmwareNewVersion != nil) ? "New Version Available:" : "",
                   l: true,
-                  black: true,
+                  grey: true,
                   semiBold: true
                 )
                 VStack(alignment: .leading, spacing: 0) {
                   Label(
                     title: Tuya.shared.whatsNew != nil ? "What's new?" : "",
                     l: true,
-                    black: true,
+                    grey: true,
                     semiBold: true
                   )
                   Label(
                     title: Tuya.shared.whatsNew ?? "",
                     l: true,
-                    black: true,
+                    grey: true,
                     semiBold: true
                   )
                   .padding(12)
@@ -91,13 +91,14 @@ struct FirmwareSettings: View {
                 Label(
                   title: Tuya.shared.firmwareVersion ?? "",
                   l: true,
-                  black: true,
+                  lightGrey: true,
                   semiBold: true
                 )
                 
                 Label(
                   title: Tuya.shared.firmwareNewVersion ?? "",
                   l: true,
+                  lightGrey: true,
                   semiBold: true
                 )
                 Spacer()
@@ -146,7 +147,8 @@ struct FirmwareSettings: View {
               id: "UpdateFirmware",
               title: "Update Firmware",
               l: true,
-              textColor: LocalColor.Monochrome.white,
+              greyDisabled: tuya.isAutomaticUpdateEnabled || !tuya.isFirmwareUpdateAvailable || tuya.isFirmwareUpdateInProgress,
+              textColor: LocalColor.Monochrome.whiteColor,
               medium: true,
               semiBold: true,
               disabled: tuya.isAutomaticUpdateEnabled || !tuya.isFirmwareUpdateAvailable || tuya.isFirmwareUpdateInProgress,

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

@@ -5,7 +5,7 @@ enum ScreenState: String {
     case playback = "Playback"
     case messages = "Activity History"
     case settings = "Settings"
-    case advancedSettings = "Advanced Settings"
+    case advancedSettings = "Device Information"
     case storageSettings = "Activity Storage"
     case firmwareUpdateSettings = "Firmware Update"
 }
@@ -22,18 +22,38 @@ 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 {
             return tuya.isFirmwareUpdateInProgress ? "Update Firmware" : "Firmware Version"
         }
-        if isAdvancedSettings { return "Advanced Settings" }
+        if isAdvancedSettings { return "Device Information" }
         if isStorageSettings { return "Activity Storage" }
         return currentScreen == .dashboard ? (tuya.device?.deviceModel.name ?? "Doorbell") : currentScreen.rawValue
     }
     
     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 {
@@ -68,8 +88,12 @@ struct NavigationController: View {
                                     } else if currentScreen == .dashboard {
                                         AppUtility.disconnectAndClose()
                                     } else {
-                                        isSettings = false
-                                        currentScreen = .dashboard
+                                        if Tuya.shared.doorbell_setting ?? false {
+                                            AppUtility.disconnectAndClose()
+                                        } else {
+                                            isSettings = false
+                                            currentScreen = .dashboard
+                                        }
                                     }
                                 }
                             }
@@ -85,6 +109,11 @@ struct NavigationController: View {
                             }
                         }
                     )
+                    .onAppear {
+                      if currentScreen == .dashboard && Tuya.shared.doorbell_setting ?? false {
+                        currentScreen = .settings
+                      }
+                    }
                 }
 
                 ZStack {
@@ -125,6 +154,7 @@ struct NavigationController: View {
                 }
             }
         }
+        .id(themeUpdateTrigger)
         .onChange(of: currentScreen) { newValue in
             HeapAnalytics.trackEvent(eventName: "\(newValue.rawValue) Screen")
         }
@@ -143,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 {
@@ -151,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()
             }
@@ -171,7 +214,7 @@ struct TopBar: View {
                 title: title,
                 xl20: true,
                 white: !isSpecialTitle,
-                black: isSpecialTitle,
+                greyColor: isSpecialTitle,
                 semiBold: true
             )
 
@@ -184,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)
 
@@ -199,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/OfflineScreen.swift

@@ -70,17 +70,15 @@ struct OfflineScreen: View {
                     center: true,
                     underLine: true
                 ) {
-                    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.")
-                                    AppUtility.disconnectAndClose()
+                    KeylessListener.emitter.resetWifiForDoorbell(
+                        withTuyaProductName: tuya.tuyaProductName ?? "") { success, message in
+                            if success {
+                                print("Tuya: Successfully navigated to the 'Add Doorbell' screen.")
+                                AppUtility.disconnectAndClose()
                                 } else {
                                     print("Tuya: Failed to navigate to the 'Add Doorbell' screen.")
                                 }
                             }
-                    }
                 }
                 .frame(maxWidth: .infinity, alignment: .center)
                 .padding(.bottom, 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)