@rentlydev/rently-tuya 0.2.1 → 0.2.3

package/android/src/main/java/com/rentlytuya/dashboard/FirmwareUpdate.kt

@@ -194,8 +194,10 @@ fun FirmwareUpdate(
         title = strings(id = R.string.updateFirmware),
         semiBold = true,
         textModifier = Modifier,
+        primary = isNewVersionAvailable.value,
+        grey = !isNewVersionAvailable.value,
         xl18 = true,
-        textColor = LocalColor.Monochrome.White,
+        textColor = LocalColor.Monochrome.StaticWhite,
         disabled = !isNewVersionAvailable.value || isLoading.value,
         onClick = {
           Heap.trackEvent(eventName = "clickUpdateFirmwareButton")
@@ -285,15 +287,10 @@ fun FirmwareUpdatingScreen(
         ) {
           Box(contentAlignment = Alignment.Center) {
             Image(
-              painter = painterResource(id = R.drawable.green_complete),
+              painter = painterResource(id = R.drawable.update_complete),
               contentDescription = null,
               modifier = Modifier.size(150.dp)
             )
-            Image(
-              painter = painterResource(id = R.drawable.white_complete),
-              contentDescription = null,
-              modifier = Modifier.size(50.dp)
-            )
           }
 
           Spacer(modifier = Modifier.height(36.dp))
@@ -339,7 +336,7 @@ fun FirmwareUpdatingScreen(
                 "${(progress * 100).toInt()}%"
               },
               xl18 = true,
-              white = true,
+              customColor = LocalColor.Monochrome.StaticWhite,
               modifier = Modifier.padding(top = 8.dp)
             )
           }

package/android/src/main/java/com/rentlytuya/dashboard/Messages.kt

@@ -326,7 +326,7 @@ fun MessageItem(
             title = formatMessageDate(message.dateTime),
             bold = true,
             m = true,
-            black = true,
+            secondary = true,
             medium = true
           )
 
@@ -340,7 +340,7 @@ fun MessageItem(
               strings(id = R.string.unableToCaptureDetectedEvents)
             },
             l = true,
-            primary = true,
+            black = true,
             semiBold = true,
             maxLines = 6
           )
@@ -357,7 +357,6 @@ fun MessageItem(
         }
       }
 
-      Divider(thickness = 1.dp)
     }
   }
 }
@@ -468,7 +467,7 @@ private suspend fun fetchMoreMessages(
 private fun formatMessageDate(dateTime: String): String {
     return try {
         val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault())
-        val date = formatter.parse(dateTime)
+        val date = formatter.parse(dateTime)!!
         val outputFormatter = SimpleDateFormat("MM/dd/yyyy hh:mm a", Locale.getDefault())
         outputFormatter.format(date)
     } catch (e: Exception) {

package/android/src/main/java/com/rentlytuya/dashboard/NavController.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.res.Configuration
 import android.os.Build
 import android.util.Log
+import androidx.activity.compose.BackHandler
 import androidx.compose.animation.EnterTransition
 import androidx.compose.animation.ExitTransition
 import androidx.compose.foundation.Image
@@ -46,6 +47,7 @@ import com.rentlytuya.tuya.Tuya
 import com.rentlytuya.tuya.Tuya.TAG
 import com.rentlytuya.tuya.Tuya.isDefaultSettingsUpdated
 import com.rentlytuya.tuya.Tuya.isResident
+import com.rentlytuya.tuya.Tuya.doorbellSetting
 import com.rentlytuya.ui.theme.LocalColor
 import com.rentlytuya.util.DPConstants
 import com.rentlytuya.util.DateUtil.isNotNull
@@ -88,6 +90,7 @@ fun NavController(
   val isWaterMarkEnabled = remember { mutableStateOf(false) }
   val isFlipEnabled = remember { mutableStateOf(false) }
   val isAntiDismantlingAlarmEnabled = remember { mutableStateOf(false) }
+  val isDoorbellCallEnabled = remember { mutableStateOf(false) }
   val nightVisionLevel = remember { mutableStateOf("0") }
   val isMotionDetectionEnabled = remember { mutableStateOf(false) }
   val motionSensitivityLevel = remember { mutableStateOf("0") }
@@ -137,8 +140,15 @@ fun NavController(
     }
   }
 
-  Column(modifier = Modifier.fillMaxSize()) {
+  LaunchedEffect(Unit) {
+    if (doorbellSetting) {
+     //navigate to settings screen
+      isSettings.value = true
+      navController.navigate(ScreenRoutes.SETTINGS)
+    }
+  }
 
+  Column(modifier = Modifier.fillMaxSize()) {
     if (configuration.orientation == Configuration.ORIENTATION_PORTRAIT ||
       (configuration.orientation == Configuration.ORIENTATION_LANDSCAPE &&
         currentDestination.value != ScreenRoutes.DASHBOARD && currentDestination.value != ScreenRoutes.PLAYBACK && currentDestination.value != ScreenRoutes.ACTIVITY_HISTORY)
@@ -147,11 +157,12 @@ fun NavController(
         title = when {
           isFirmwareUpdate.value -> strings(id = R.string.firmwareVersion)
           isFirmwareUpdate.value && isUpdateInProgress.value -> strings(id = R.string.updateFirmware)
-          isAdvancedSettings.value -> strings(id = R.string.advancedSettings)
+          isAdvancedSettings.value -> strings(id = R.string.deviceInformation)
           isStorageSettings.value -> strings(id = R.string.activityStorage)
           currentDestination.value == ScreenRoutes.DASHBOARD -> deviceName.value
           else -> currentDestination.value
         },
+        currentRoute = currentDestination.value,
         onTrailingIconClick = {
           when (currentDestination.value) {
             ScreenRoutes.PLAYBACK -> isDatePickerVisible.value = true
@@ -191,6 +202,7 @@ fun NavController(
         isWaterMarkEnabled = isWaterMarkEnabled,
         isFlipEnabled = isFlipEnabled,
         isAntiDismantlingAlarmEnabled = isAntiDismantlingAlarmEnabled,
+        isDoorbellCallEnabled = isDoorbellCallEnabled,
         nightVisionLevel = nightVisionLevel,
         isMotionDetectionEnabled = isMotionDetectionEnabled,
         motionSensitivityLevel = motionSensitivityLevel,
@@ -295,6 +307,7 @@ fun NavController(
           isWaterMarkEnabled = isWaterMarkEnabled,
           isFlipEnabled = isFlipEnabled,
           isAntiDismantlingAlarmEnabled = isAntiDismantlingAlarmEnabled,
+          isDoorbellCallEnabled = isDoorbellCallEnabled,
           nightVisionLevel = nightVisionLevel,
           isMotionDetectionEnabled = isMotionDetectionEnabled,
           motionSensitivityLevel = motionSensitivityLevel,
@@ -321,17 +334,19 @@ fun NavController(
 @Composable
 fun TopBar(
   title: String,
+  currentRoute: String = "",
   onBack: () -> Unit = {},
   onTrailingIconClick: () -> Unit = {}
 ) {
 
-  val isSpecialTitle = title in listOf(ScreenRoutes.SETTINGS, ScreenRoutes.ACTIVITY_HISTORY, strings(id = R.string.advancedSettings), strings(id = R.string.activityStorage), strings(id = R.string.firmwareVersion), strings(id = R.string.updateFirmware))
+  val isSpecialTitle = title in listOf(ScreenRoutes.SETTINGS, ScreenRoutes.ACTIVITY_HISTORY, strings(id = R.string.deviceInformation), strings(id = R.string.activityStorage), strings(id = R.string.firmwareVersion), strings(id = R.string.updateFirmware))
+  val isDashboard = currentRoute == ScreenRoutes.DASHBOARD
 
   Box(
     modifier = Modifier
       .fillMaxWidth()
       .fillMaxHeight(0.075f)
-      .background(if (isSpecialTitle) LocalColor.Main.Light else LocalColor.Monochrome.Grey)
+      .background(if (isDashboard) LocalColor.Monochrome.DarkGrey else LocalColor.Main.Light)
   ) {
     IconButton(
       modifier = Modifier
@@ -347,9 +362,10 @@ fun TopBar(
       Image(
         modifier = Modifier.size(35.dp),
         painter = painterResource(
-          id = if (isSpecialTitle) R.drawable.ic_action_arrow_backward else R.drawable.ic_arrow_backward_white
+          id = if (isDashboard) R.drawable.ic_arrow_backward_white else R.drawable.ic_action_arrow_backward
         ),
-        contentDescription = "back"
+        contentDescription = "back",
+        colorFilter = if (isDashboard) null else ColorFilter.tint(color = LocalColor.Monochrome.BlackColor)
       )
     }
 
@@ -364,8 +380,7 @@ fun TopBar(
         title = title,
         semiBold = true,
         xl20 = true,
-        white = !isSpecialTitle,
-        black = isSpecialTitle
+        customColor = if (isDashboard) LocalColor.Monochrome.StaticWhite else LocalColor.Monochrome.BlackColor
       )
     }
     if (!isSpecialTitle || title == ScreenRoutes.PLAYBACK || title == ScreenRoutes.ACTIVITY_HISTORY) {
@@ -381,11 +396,7 @@ fun TopBar(
             id = if (title == ScreenRoutes.PLAYBACK || title == ScreenRoutes.ACTIVITY_HISTORY) R.drawable.ic_calendar else R.drawable.ic_setting
           ),
           contentDescription = "trailingIcon",
-          colorFilter = if (title == ScreenRoutes.ACTIVITY_HISTORY) {
-            ColorFilter.tint(color = LocalColor.Monochrome.Grey)
-          } else {
-            null
-          }
+          colorFilter = if (isDashboard) null else ColorFilter.tint(color = LocalColor.Monochrome.BlackColor)
         )
       }
     }
@@ -410,6 +421,10 @@ private fun handleBackNavigation(
     isAdvancedSettings.value = false
     isStorageSettings.value = false
     navController.navigate(ScreenRoutes.SETTINGS)
+  } else if (doorbellSetting && isSettings.value) {
+    // If doorbellSetting is true and we're in settings, finish the activity
+    isSettings.value = false
+    activity.finish()
   } else if (currentDestination.value == ScreenRoutes.DASHBOARD) {
     scope.launch {
       val success = Tuya.disconnect { value -> isLoading.value = value }

package/android/src/main/java/com/rentlytuya/dashboard/OfflineScreen.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import com.facebook.react.ReactApplication
@@ -63,7 +64,7 @@ fun OfflineScreen(
         modifier = Modifier
           .padding(bottom = 15.dp),
         title = strings(id = R.string.connectionFailed),
-        white = true,
+        customColor = LocalColor.Monochrome.StaticWhite,
         xl20 = true,
         bold = true,
         center = true
@@ -73,7 +74,7 @@ fun OfflineScreen(
         modifier = Modifier
           .padding(bottom = 10.dp),
         title = strings(id = R.string.pleaseCheckTheFollowing),
-        white = true,
+        customColor = LocalColor.Monochrome.StaticWhite,
         maxLines = 2
       )
 
@@ -81,7 +82,7 @@ fun OfflineScreen(
         modifier = Modifier
           .padding(start = 10.dp, bottom = 10.dp),
         title = strings(id = R.string.moveYourWiFi),
-        white = true,
+        customColor = LocalColor.Monochrome.StaticWhite,
         maxLines = 2
       )
 
@@ -93,7 +94,7 @@ fun OfflineScreen(
         } else {
           strings(id = R.string.pressTheDoorbellButtonFor15s)
         },
-        white = true,
+        customColor = LocalColor.Monochrome.StaticWhite,
         maxLines = 6
       )
 
@@ -102,7 +103,7 @@ fun OfflineScreen(
           modifier = Modifier
             .padding(start = 10.dp, top = 10.dp),
           title = strings(id = R.string.ensureTheHomeBaseIsPlugged),
-          white = true,
+          customColor = LocalColor.Monochrome.StaticWhite,
           maxLines = 4
         )
       }
@@ -111,7 +112,7 @@ fun OfflineScreen(
         modifier = Modifier
           .padding(top = 25.dp),
         title = strings(id = R.string.firstTimeUsingDoorbell),
-        white = true
+        customColor = LocalColor.Monochrome.StaticWhite
       )
 
       AnchorButton(
@@ -119,13 +120,12 @@ fun OfflineScreen(
           .padding(bottom = 20.dp),
         id = "Connect_Doorbell_To_WiFi",
         title = strings(id = R.string.connectDoorbellToWiFi),
-        primary = true,
+        customColor = LocalColor.Primary.Light,
         underLine = true,
         onClick = {
-          Tuya.deviceId?.let {
             KeylessModule.instance?.sendDataToJS(
               eventName = "RESET_WIFI",
-              deviceId = it,
+              value = Tuya.tuyaProductName ?: "",
               onSuccess = {
                 Log.i(TAG, "Navigate to Add Doorbell Success")
                 activity.finish()
@@ -134,7 +134,6 @@ fun OfflineScreen(
                 Log.i(TAG, "Navigate to Add Doorbell Failed")
               }
             )
-          } ?: Log.i(TAG, "Device ID is null")
         }
       )
 
@@ -148,7 +147,8 @@ fun OfflineScreen(
         xl20 = true,
         black = true,
         iconId = R.drawable.ic_retry,
-        textColor = LocalColor.Primary.Light,
+        textColor = LocalColor.Monochrome.StaticWhite,
+        backgroundColor = LocalColor.Monochrome.Black,
         borderColor = LocalColor.Primary.Light
       ) {
         onReConnect()
@@ -158,7 +158,7 @@ fun OfflineScreen(
         modifier = Modifier
           .padding(bottom = 5.dp),
         title = strings(id = R.string.contactSupport),
-        white = true,
+        customColor = LocalColor.Monochrome.StaticWhite,
         center = true,
         maxLines = 2
       )

package/android/src/main/java/com/rentlytuya/dashboard/Playback.kt

@@ -485,7 +485,7 @@ fun VideoItem(
       .height(78.dp)
       .padding(top = 10.dp)
       .shadow(1.dp)
-      .background(if (selectedItem.value == video) LocalColor.Secondary.Light else LocalColor.Monochrome.White)
+      .background(if (selectedItem.value == video) LocalColor.Main.Dark else LocalColor.Monochrome.White)
       .clickable {
           if (selectedItem.value == video) {
             currentSliderValue.intValue = 0
@@ -508,7 +508,7 @@ fun VideoItem(
     ) {
       Label(
         title = DateUtil.convertTimestampToTime(video.startTime).uppercase(),
-        primary = true,
+        customColor = if (selectedItem.value == video) LocalColor.Monochrome.StaticWhite else LocalColor.Monochrome.BlackColor,
         l = true,
         center = true,
         semiBold = true
@@ -520,7 +520,7 @@ fun VideoItem(
             endTime = video.endTime
           )
         }",
-        secondary = true,
+        customColor = if (selectedItem.value == video) LocalColor.Monochrome.StaticWhite else LocalColor.Primary.Secondary,
         semiBold = true,
         center = true,
         s = true,

package/android/src/main/java/com/rentlytuya/tuya/Settings.kt

@@ -88,6 +88,7 @@ object Settings {
     isWaterMarkEnabled: MutableState<Boolean>,
     isFlipEnabled: MutableState<Boolean>,
     isAntiDismantlingAlarmEnabled: MutableState<Boolean>,
+    isDoorbellCallEnabled: MutableState<Boolean>,
     nightVisionLevel: MutableState<String>,
     isMotionDetectionEnabled: MutableState<Boolean>,
     motionSensitivityLevel: MutableState<String>,
@@ -104,6 +105,7 @@ object Settings {
     usedStorage: MutableState<String>,
     remainingStorageCapacity: MutableState<String>
   ) {
+    isDoorbellCallEnabled.value = Tuya.isDoorbellCallEnabled
     val deviceBean = ThingHomeSdk.getDataInstance().getDeviceBean(deviceId)
     if (deviceBean.isNotNull()) {
       for ((key, value) in deviceBean.getDps()) {
@@ -319,6 +321,31 @@ object Settings {
     )
   }
 
+  fun setEnableDoorbellCall(
+    enable: Boolean,
+    isLoading: MutableState<Boolean>,
+    isDoorbellCallEnabled: MutableState<Boolean>
+  ) {
+    isLoading.value = true
+    Tuya.id?.let {
+      KeylessModule.instance?.sendDataToJS(
+        eventName = "ENABLE_DOORBELL_CALL",
+        value = it,
+        enableValue = enable,
+        onSuccess = {
+          isLoading.value = false
+          isDoorbellCallEnabled.value = enable
+          Log.i(TAG, "Doorbell Call Update Success")
+        },
+        onFailure = {
+          isLoading.value = false
+          isDoorbellCallEnabled.value = !enable
+          Log.i(TAG,"Doorbell Call Update Failed")
+        }
+      )
+    } ?: Log.i(TAG, "ID is null")
+  }
+
   fun setNightVision(
     newMode: String,
     mode: MutableState<String>,
@@ -1038,7 +1065,7 @@ object DefaultSettings {
     Tuya.id?.let {
       KeylessModule.instance?.sendDataToJS(
         eventName = "RESET_DEFAULT_SETTINGS_FLAG",
-        deviceId = it,
+        value = it,
         onSuccess = {
           Log.i(TAG, "Reset Default Settings Success")
         },

package/android/src/main/java/com/rentlytuya/tuya/Tuya.kt

@@ -44,6 +44,7 @@ object Tuya {
   var tuyaProductName: String? = null
   var tuyaProductID: String? = null
   var lastMoveOutDate: String? = null
+  var isDoorbellCallEnabled: Boolean = false
   var resetRequired: Boolean? = null
   var isResident: Boolean = true
   var displayRemoveDoorbellButton: Boolean? = null
@@ -54,9 +55,13 @@ object Tuya {
   var continuousRecording: Boolean = false
   var eventRecording: Boolean = false
   var setSensitivityLow: Boolean = false
+  var darkThemeEnabled: Boolean = false
+  var useSystemSetting: Boolean = false
 
-  val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
+  // For navigation handling for AOSU charging
+  var doorbellSetting: Boolean = false
 
+  val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
   suspend fun login(
     uid: String,
     password: String,

package/android/src/main/java/com/rentlytuya/ui/theme/LocalColor.kt

@@ -1,46 +1,53 @@
 package com.rentlytuya.ui.theme
 
 import android.util.Log
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.graphics.Color
 import com.rentlytuya.tuya.Tuya.TAG
 
 object LocalColor {
 
   object Main {
-    var Light = Color(0xFFf3faff)
-    var Dark = Color(0xFF329ddc)
+    var Light by mutableStateOf(Color(0xFFf3faff))
+    var Dark by mutableStateOf(Color(0xFF329ddc))
   }
 
   object Primary {
-    var Light = Color(0xFF39a1e8)
-    var Secondary = Color(0xFF6a97b5)
-    var Dark = Color(0xFF329ddc)
-    var Medium = Color(0xFF008adc)
+    var Light by mutableStateOf(Color(0xFF39a1e8))
+    var Secondary by mutableStateOf(Color(0xFF6a97b5))
+    var Dark by mutableStateOf(Color(0xFF329ddc))
+    var Medium by mutableStateOf(Color(0xFF008adc))
   }
 
   object Secondary {
-    var White = Color(0xFFf3faff)
-    var Light = Color(0xFFd9edfb)
+    var Light by mutableStateOf(Color(0xFFd9edfb))
   }
 
   object Danger {
-    var Primary = Color(0xFFcb0000)
+    var Primary by mutableStateOf(Color(0xFFcb0000))
+    var Secondary by mutableStateOf(Color(0xFFEF4343))
   }
 
   object Monochrome {
-    var White = Color(0xFFFFFFFF)
-    var LightGrey = Color(0xFF80FFFFFF)
-    var Regular = Color(0xFF86858C)
-    var Medium = Color(0xFF3f4d59)
-    var Grey = Color(0xFF373737)
-    var Black = Color(0xFF000000)
-    var Brown = Color(0xFFB45309)
+    var White by mutableStateOf(Color(0xFFFFFFFF))
+    var BlackColor by mutableStateOf(Color(0xFF000000))
+    var LightGrey by mutableStateOf(Color(0xFF1A1A1A))
+    var DarkGrey by mutableStateOf(Color(0xFF1A1A1A))
+    var Regular by mutableStateOf(Color(0xFF86858C))
+    var Medium by mutableStateOf(Color(0xFF3f4d59))
+    var Grey by mutableStateOf(Color(0xFF373737))
+    var Black by mutableStateOf(Color(0xFF000000))
+    var Brown by mutableStateOf(Color(0xFFB45309))
+    var DatePickerBackground by mutableStateOf(Color(0xFF177BB5))
+    val StaticWhite = Color(0xFFFFFFFF)
   }
 
-  fun setTheme(flavour: String) {
+  fun setTheme(flavour: String, darkThemeEnabled: Boolean = false) {
     when (flavour.lowercase()) {
       "keyless" -> {
-        setSmartHomeTheme()
+        setSmartHomeTheme(darkThemeEnabled)
       }
 
       "progress" -> {
@@ -60,9 +67,15 @@ object LocalColor {
   }
 }
 
-private fun setSmartHomeTheme() {
-  LocalColor.Main.Light = Color(0xFFf3faff)
-  LocalColor.Main.Dark = Color(0xFF329ddc)
+private fun setSmartHomeTheme(darkThemeEnabled: Boolean = false) {
+  LocalColor.Main.Light = if (darkThemeEnabled) Color(0xFF1A1A1A) else Color(0xFFF9FAFB)
+  LocalColor.Main.Dark = Color(0xFF177BB5)
+  LocalColor.Primary.Secondary = if (darkThemeEnabled) Color(0xFFF9FAFB) else Color(0xFF374151)
+  LocalColor.Monochrome.White = if (darkThemeEnabled) Color(0xFF242526) else Color(0xFFFFFFFF)
+  LocalColor.Monochrome.Medium = if (darkThemeEnabled) Color(0xFFF9FAFB) else Color(0xFF3f4d59)
+  LocalColor.Monochrome.Regular = if (darkThemeEnabled) Color(0xFFD1D5DB) else Color(0xFF6B7280)
+  LocalColor.Monochrome.BlackColor = if (darkThemeEnabled) Color(0xFFF9FAFB) else Color(0xFF000000)
+  LocalColor.Monochrome.DatePickerBackground = if (darkThemeEnabled) Color(0xFF373737) else Color(0xFF177BB5)
 }
 
 private fun setProgressTheme() {

package/android/src/main/java/com/rentlytuya/ui/theme/Theme.kt

@@ -8,6 +8,7 @@ import androidx.compose.runtime.SideEffect
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalView
 import androidx.core.view.WindowCompat
+import com.rentlytuya.tuya.Tuya
 
 @Composable
 fun TuyaTheme(
@@ -16,6 +17,17 @@ fun TuyaTheme(
   dynamicColor: Boolean = true,
   content: @Composable () -> Unit
 ) {
+ 
+  val effectiveDark = if (Tuya.useSystemSetting) {
+    darkTheme
+  } else {
+    Tuya.darkThemeEnabled
+  }
+
+  // Modify this if other flavors needs to support dark theme
+  SideEffect {
+    LocalColor.setTheme("keyless", effectiveDark)
+  }
 
   val view = LocalView.current
   if (!view.isInEditMode) {
@@ -23,7 +35,7 @@ fun TuyaTheme(
       val window = (view.context as Activity).window
       // window.statusBarColor = LocalColor.Monochrome.Grey.toArgb()
       window.navigationBarColor = LocalColor.Monochrome.Grey.toArgb()
-      WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
+      WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = effectiveDark
     }
   }
 

package/android/src/main/java/com/rentlytuya/util/KeylessModule.kt

@@ -23,15 +23,27 @@ class KeylessModule(reactContext: ReactApplicationContext) :
 
   fun sendDataToJS(
     eventName: String,
-    deviceId: String,
+    value: String,
+    enableValue: Boolean? = null, // only used for ENABLE_DOORBELL_CALL
     onSuccess: (String) -> Unit,
     onFailure: (String) -> Unit
   ) {
     try {
       val params = WritableNativeMap()
-      // For Update Default Settings value, id is passed
-      val key = if (eventName == "RESET_DEFAULT_SETTINGS_FLAG") "id" else "device_id"
-      params.putString(key, deviceId)
+      //For reset default settings value , id is passed
+      //For reset wifi, tuyaProductName is passed
+      val key = when (eventName) {
+        "RESET_DEFAULT_SETTINGS_FLAG" -> "id"
+        "RESET_WIFI" -> "doorbellType"
+        "REMOVE_CAMERA" -> "device_id"
+        "ENABLE_DOORBELL_CALL" -> "id"
+        else -> "device_id"
+      }
+      params.putString(key, value)
+
+      if (eventName == "ENABLE_DOORBELL_CALL" && enableValue != null) {
+        params.putBoolean("doorbell_calling_enabled", enableValue)
+      }
 
       onSuccessListener = onSuccess
       onFailureListener = onFailure

package/android/src/main/res/values/strings.xml

@@ -19,7 +19,7 @@
   <string name="tapToSpeak">Tap to Speak</string>
 
   <!-- Title -->
-  <string name="advancedSettings">Advanced Settings</string>
+  <string name="deviceInformation">Device Information</string>
   <string name="activityStorage">Activity Storage</string>
   <string name="firmwareVersion">Firmware Version</string>
 
@@ -46,12 +46,14 @@
   <string name="flipScreenDescription">Flip the doorbell camera preview screen.</string>
   <string name="antiDismantlingAlarm">Anti-Dismantling Alarm</string>
   <string name="antiDismantlingAlarmDescription">Enabling this will trigger an alarm sound if the doorbell is forcibly removed from its mounting case.</string>
+  <string name="doorbellCall">Doorbell Call</string>
+  <string name="doorbellCallDescription">Enabling this will initiate doorbell call when someone press doorbell ring button.</string>
   <string name="irNightVision">IR Night Vision</string>
   <string name="nightVision">Night Vision</string>
   <string name="nightVisionDescription">Doorbell camera\'s night vision settings.</string>
   <string name="motionDetection">Motion Detection</string>
   <string name="motionDetectionDescription8s">Triggered motion will send push notifications.</string>
-  <string name="motionDetectionDescription">If motion detection is enabled and motion is detected, the system will record the event and send a push notification.</string>
+  <string name="motionDetectionDescription">If motion detection is enabled and motion is detected, the app will record the event and send a push notification.</string>
   <string name="motionSensitivityLevel">Motion Sensitivity Level</string>
   <string name="storageSettings">Storage Settings</string>
   <string name="storageSetting">Storage Setting</string>

package/ios/components/Alert.swift

@@ -10,8 +10,8 @@ func getAlert(
     primaryAction: @escaping () -> Void,
     secondaryAction: @escaping () -> Void = {}
 ) -> Alert {
-    
-    updateAlertBackgroundColor()
+    // This is commented out for supporting dark mode for system alerts and pickers.
+    // updateAlertBackgroundColor()
 
     return Alert(
         title: Text(title),
@@ -30,8 +30,7 @@ func getAlert(
 }
 
 func getAlertwithSingleButton(title: String, message: String) -> Alert {
-  
-  updateAlertBackgroundColor()
+  // updateAlertBackgroundColor()
   
   return Alert(
     title: Text(title),
@@ -44,7 +43,7 @@ func getAlertwithSingleButton(title: String, message: String) -> Alert {
 
 func getSuccessAlert(title: String, action: (() -> Void)? = nil) -> Alert {
   
-  updateAlertBackgroundColor()
+  // updateAlertBackgroundColor()
   
   if let action = action {
     return Alert(
@@ -62,8 +61,7 @@ func getSuccessAlert(title: String, action: (() -> Void)? = nil) -> Alert {
 }
 
 func getFailureAlert(title: String, action: (() -> Void)? = nil) -> Alert {
-  
-  updateAlertBackgroundColor()
+  // updateAlertBackgroundColor()
 
   if let action = action {
     return Alert(

package/ios/components/AnchorButton.swift

@@ -19,6 +19,7 @@ struct AnchorButton: View {
     var primary: Bool = false
     var secondary: Bool = false
     var black: Bool = false
+    var paleWhite: Bool = false
 
     // Font Weight
     var light: Bool = false
@@ -58,6 +59,7 @@ struct AnchorButton: View {
         if primary { return LocalColor.Primary.light }
         if secondary { return LocalColor.Main.dark }
         if black { return LocalColor.Monochrome.black }
+        if paleWhite { return LocalColor.Monochrome.paleWhite }
         return LocalColor.Primary.light
     }