@rentlydev/rently-tuya 0.2.1 → 0.2.3

package/android/src/main/java/com/rentlytuya/RentlyTuyaModule.kt

@@ -76,6 +76,8 @@ class RentlyTuyaModule(private val reactContext: ReactApplicationContext) :
     scope.launch(exceptionHandler) {
       Tuya.lastMoveOutDate =
         if (params.hasKey("last_moveout_at")) params.getString("last_moveout_at") else null
+      Tuya.isDoorbellCallEnabled =
+        if (params.hasKey("doorbell_calling_enabled")) params.getBoolean("doorbell_calling_enabled") else false
       Tuya.resetRequired =
         if (params.hasKey("resetRequired")) params.getBoolean("resetRequired") else null
       Tuya.isResident = if (params.hasKey("isResident")) params.getBoolean("isResident") else true
@@ -98,6 +100,14 @@ class RentlyTuyaModule(private val reactContext: ReactApplicationContext) :
         if (params.hasKey("event_recording")) params.getBoolean("event_recording") else false
       Tuya.setSensitivityLow =
         if (params.hasKey("set_sensitivity_low")) params.getBoolean("set_sensitivity_low") else false
+      Tuya.darkThemeEnabled =
+        if (params.hasKey("darkThemeEnabled")) params.getBoolean("darkThemeEnabled") else false
+      Tuya.useSystemSetting =
+        if (params.hasKey("useSystemSetting")) params.getBoolean("useSystemSetting") else false
+
+      // For navigation handling for AOSU charging
+      Tuya.doorbellSetting =
+        if (params.hasKey("doorbell_setting")) params.getBoolean("doorbell_setting") else false
 
       // If both event and continuous recording are false, set event recording to true - NB: Only for 8s Doorbell
       if (!Tuya.eventRecording && !Tuya.continuousRecording) {

package/android/src/main/java/com/rentlytuya/alerts/PermissionAlert.kt

@@ -61,7 +61,7 @@ fun PermissionAlert(
             .height(50.dp),
           id = "AudioPermission_NotNow",
           title = strings(id = R.string.notNow),
-          textColor = LocalColor.Monochrome.White,
+          textColor = LocalColor.Monochrome.StaticWhite,
           primary = true,
           semiBold = true
         ) {
@@ -74,7 +74,7 @@ fun PermissionAlert(
             .height(50.dp),
           id = "AudioPermission_Agree",
           title = strings(id = R.string.agree),
-          textColor = LocalColor.Monochrome.White,
+          textColor = LocalColor.Monochrome.StaticWhite,
           primary = true,
           semiBold = true
         ) {

package/android/src/main/java/com/rentlytuya/components/AnchorButton.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.semantics.contentDescription
 import androidx.compose.ui.semantics.semantics
@@ -34,6 +35,7 @@ fun AnchorButton(
   // Color
   primary: Boolean = false,
   black: Boolean = false,
+  customColor: Color? = null,
   // Font Weight
   light: Boolean = false,
   medium: Boolean = false,
@@ -50,9 +52,9 @@ fun AnchorButton(
   onClick: () -> Unit = {}
 ) {
 
-  val textColor = when {
+  val textColor = customColor ?: when {
     primary -> LocalColor.Primary.Light
-    black -> LocalColor.Monochrome.Black
+    black -> LocalColor.Monochrome.BlackColor
     else -> LocalColor.Primary.Light
   }
 

package/android/src/main/java/com/rentlytuya/components/Button.kt

@@ -48,6 +48,7 @@ fun Button(
   grey: Boolean = false,
   black: Boolean = false,
   textColor: Color?,
+  backgroundColor: Color? = null,
   borderColor: Color? = null,
   // Font Weight
   light: Boolean = false,
@@ -61,11 +62,11 @@ fun Button(
   onClick: () -> Unit = {}
 ) {
 
-  val buttonColor = when {
+  val buttonColor = backgroundColor ?: when {
     primary -> LocalColor.Primary.Medium
-    secondary -> Color(0xFFf37787)
+    secondary -> LocalColor.Danger.Secondary
     white -> LocalColor.Monochrome.White
-    grey -> LocalColor.Monochrome.LightGrey
+    grey -> LocalColor.Monochrome.Grey
     black -> LocalColor.Monochrome.Black
     else -> LocalColor.Primary.Light
   }
@@ -134,7 +135,7 @@ fun Button(
           fontSize = fontSize,
           fontFamily = fontFamily,
           textAlign = TextAlign.Center,
-          color = textColor!!,
+          color = if (disabled) textColor!!.copy(alpha = 0.5f) else textColor!!,
           maxLines = 1,
           overflow = TextOverflow.Clip,
           modifier = Modifier

package/android/src/main/java/com/rentlytuya/components/CustomDatePicker.kt

@@ -86,21 +86,21 @@ fun DatePicker(
         Column(
           modifier = Modifier
             .fillMaxWidth()
-            .background(LocalColor.Main.Dark)
+            .background(LocalColor.Monochrome.DatePickerBackground)
             .padding(start = 15.dp, top = 20.dp, bottom = 30.dp)
         ) {
           Label(
             modifier = Modifier.padding(bottom = 20.dp),
             title = "Select date",
             l = true,
-            white = true,
+            customColor = LocalColor.Monochrome.StaticWhite,
             bold = true
           )
           Label(
             title = LocalDate.ofEpochDay(tempDate / 86400000)
               .format(DateTimeFormatter.ofPattern("MMM dd yyyy")),
             xl34 = true,
-            white = true,
+            customColor = LocalColor.Monochrome.StaticWhite,
             bold = true
           )
         }
@@ -126,7 +126,8 @@ fun DatePicker(
             ) {
               Icon(
                 Icons.AutoMirrored.Filled.ArrowBack,
-                contentDescription = "Previous Month"
+                contentDescription = "Previous Month",
+                tint = LocalColor.Main.Dark
               )
             }
 
@@ -147,7 +148,8 @@ fun DatePicker(
             ) {
               Icon(
                 Icons.AutoMirrored.Filled.ArrowForward,
-                contentDescription = "Next Month"
+                contentDescription = "Next Month",
+                tint = LocalColor.Main.Dark
               )
             }
           }
@@ -234,7 +236,7 @@ fun DatePicker(
                     title = (day + 1).toString(),
                     m = true,
                     bold = isSelected,
-                    white = isSelected,
+                    customColor = if (isSelected) LocalColor.Monochrome.StaticWhite else null,
                     black = !isSelected
                   )
                 }
@@ -261,7 +263,7 @@ fun DatePicker(
               modifier = Modifier.padding(5.dp),
               id = "DatePicker_OK",
               title = strings(id = R.string.ok).uppercase(),
-              black = true,
+              customColor = LocalColor.Main.Dark,
               semiBold = true
             ) {
               selectedDate = tempDate

package/android/src/main/java/com/rentlytuya/components/Divider.kt

@@ -23,17 +23,13 @@ fun Divider(
   modifier: Modifier = Modifier,
   thickness: Dp = 1.dp,
   direction: DividerDirection = DividerDirection.Horizontal,
-  primary: Boolean = false,
 ) {
   val targetThickness = when (thickness) {
     Dp.Hairline -> (1f / LocalDensity.current.density).dp
     else -> thickness
   }
 
-  val color = when {
-    primary -> LocalColor.Secondary.Light
-    else -> LocalColor.Secondary.Light
-  }
+  val color = LocalColor.Monochrome.LightGrey
 
   Box(
     when (direction) {

package/android/src/main/java/com/rentlytuya/components/Label.kt

@@ -82,7 +82,7 @@ fun Label(
     lightGrey -> LocalColor.Monochrome.Regular
     grey -> LocalColor.Monochrome.Medium
     white -> LocalColor.Monochrome.White
-    black -> LocalColor.Monochrome.Black
+    black -> LocalColor.Monochrome.BlackColor
     else -> LocalColor.Primary.Light
   }
 

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

@@ -52,6 +52,7 @@ import com.rentlytuya.ui.theme.LocalFont.FontSize
 import com.rentlytuya.util.DateUtil.isNotNull
 import com.rentlytuya.util.Util.strings
 import androidx.compose.foundation.Image
+import androidx.compose.ui.graphics.ColorFilter
 
 
 @Composable
@@ -96,12 +97,11 @@ fun AdvancedSettings(
         modifier = Modifier
           .fillMaxSize()
           .background(LocalColor.Main.Light)
-          .padding(top = 15.dp)
+          .padding(vertical = 15.dp, horizontal = 12.dp)
       ) {
         Column(
           modifier = Modifier
             .background(LocalColor.Monochrome.White)
-            .padding(horizontal = 10.dp)
         ) {
           Item(
             title = strings(id = R.string.productName),
@@ -183,6 +183,7 @@ fun StorageSettings(
     modifier = Modifier
       .fillMaxSize()
       .background(LocalColor.Main.Light)
+      .padding(horizontal = 12.dp)
   ) {
     Column(
       modifier = Modifier
@@ -192,19 +193,19 @@ fun StorageSettings(
       Item(
         title = strings(id = R.string.totalCapacity),
         value = totalStorageCapacity.value,
-        background = LocalColor.Main.Light
+        background = LocalColor.Monochrome.White
       )
 
       Item(
         title = strings(id = R.string.used),
         value = usedStorage.value,
-        background = LocalColor.Main.Light
+        background = LocalColor.Monochrome.White
       )
 
       Item(
         title = strings(id = R.string.remainingCapacity),
         value = remainingStorageCapacity.value,
-        background = LocalColor.Main.Light
+        background = LocalColor.Monochrome.White
       )
 
         val annotatedText = buildAnnotatedString {
@@ -214,7 +215,7 @@ fun StorageSettings(
               SpanStyle(
                   fontFamily = LocalFont.FontFamily.medium,
                   fontWeight = FontWeight.Bold,
-                  color = LocalColor.Monochrome.Black,
+                  color = LocalColor.Monochrome.BlackColor,
                   fontSize = FontSize.L
               ),
               start = 0,
@@ -226,7 +227,7 @@ fun StorageSettings(
           addStyle(
               SpanStyle(
                   fontFamily = LocalFont.FontFamily.medium,
-                  color = LocalColor.Monochrome.Black,
+                  color = LocalColor.Monochrome.BlackColor,
                   fontSize = FontSize.L
               ),
               start = length - message.length,
@@ -264,7 +265,7 @@ fun StorageSettings(
             .height(50.dp),
           id = "FormatSDCard",
           title = strings(id = R.string.format),
-          textColor = LocalColor.Monochrome.White,
+          textColor = LocalColor.Monochrome.StaticWhite,
           secondary = true,
           semiBold = true,
           disabled = storageFunctionType.intValue == 4
@@ -356,13 +357,14 @@ fun Item(
                 .size(12.dp),
               painter = painterResource(id = R.drawable.ic_arrow_blue_right),
               contentDescription = "rightArrow",
+              colorFilter = ColorFilter.tint(LocalColor.Monochrome.BlackColor)
             )
           }
         }
       }
 
       Divider(
-        thickness = 1.dp
+        thickness = 0.5.dp
       )
     }
   }

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

@@ -339,8 +339,8 @@ fun BoxScope.DoorbellControls(
           } else {
             strings(id = R.string.charging)
           },
-          white = true,
-          s = true
+          s = true,
+          customColor = LocalColor.Monochrome.StaticWhite
         )
       }
     }
@@ -365,7 +365,7 @@ fun BoxScope.DoorbellControls(
           semiBold = true,
           grey = true,
           disabled = isLoading.value,
-          textColor = LocalColor.Monochrome.White,
+          textColor = LocalColor.Monochrome.StaticWhite,
           cornerRadius = 20.dp,
           onClick = {
             Tuya.changeResolution(
@@ -390,7 +390,7 @@ fun BoxScope.DoorbellControls(
         medium = isMicOn.value,
         semiBold = true,
         disabled = isLoading.value,
-        textColor = LocalColor.Monochrome.White,
+        textColor = LocalColor.Monochrome.StaticWhite,
         cornerRadius = 40.dp,
         onClick = {
           if (PermissionHandler.arePermissionsGranted(context, permissions)) {

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

@@ -8,6 +8,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.MutableInteractionSource
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
@@ -27,6 +28,7 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
@@ -35,13 +37,11 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.navigation.NavController
-import com.facebook.react.ReactApplication
 import com.rentlytuya.R
 import com.rentlytuya.alerts.RemoveDoorbellAlert
 import com.rentlytuya.alerts.RemoveDoorbellFailureAlert
 import com.rentlytuya.alerts.ResetWifiAlert
 import com.rentlytuya.components.Button
-import com.rentlytuya.components.Divider
 import com.rentlytuya.components.Label
 import com.rentlytuya.components.LoadingIndicator
 import com.rentlytuya.components.Switch
@@ -54,6 +54,7 @@ import com.rentlytuya.util.KeylessModule
 import com.rentlytuya.util.Util.isLandscape
 import com.rentlytuya.util.Util.strings
 import com.rentlytuya.alerts.SuccessAlert
+import com.rentlytuya.tuya.Tuya.doorbellSetting
 
 enum class MotionSensitivityLevel(val level: String) {
   HIGH("High"),
@@ -90,6 +91,7 @@ fun DoorbellSettings(
   isWaterMarkEnabled: MutableState<Boolean>,
   isFlipEnabled: MutableState<Boolean>,
   isAntiDismantlingAlarmEnabled: MutableState<Boolean>,
+  isDoorbellCallEnabled: MutableState<Boolean>,
   nightVisionLevel: MutableState<String>,
   isMotionDetectionEnabled: MutableState<Boolean>,
   motionSensitivityLevel: MutableState<String>,
@@ -119,7 +121,11 @@ fun DoorbellSettings(
       isAdvancedSettings.value = false
       isStorageSettings.value = false
       navController.navigate(ScreenRoutes.SETTINGS)
-    } else {
+    } else if (doorbellSetting && isSettings.value) {
+      // If doorbellSetting is true and we're in settings, finish the activity
+      isSettings.value = false
+      activity.finish()
+    }else {
       isSettings.value = false
       navController.navigate(ScreenRoutes.DASHBOARD)
     }
@@ -144,10 +150,9 @@ fun DoorbellSettings(
     isResetWifiAlertVisible = isResetWifiAlertVisible.value,
     onDismiss = { isResetWifiAlertVisible.value = false },
     onReset = {
-      Tuya.deviceId?.let {
         KeylessModule.instance?.sendDataToJS(
           eventName = "RESET_WIFI",
-          deviceId = it,
+          value = Tuya.tuyaProductName ?: "",
           onSuccess = {
             Log.i(TAG, "Navigate to Add Doorbell Success")
             isResetWifiAlertVisible.value = false
@@ -158,7 +163,6 @@ fun DoorbellSettings(
             isResetWifiAlertVisible.value = false
           }
         )
-      } ?: Log.i(TAG, "Device ID is null")
     }
   )
 
@@ -181,7 +185,7 @@ fun DoorbellSettings(
 
         KeylessModule.instance?.sendDataToJS(
           eventName = "REMOVE_CAMERA",
-          deviceId = it,
+          value = it,
           onSuccess = {
             Log.i(TAG, "Remove Doorbell Success")
             isLoading.value = false
@@ -222,7 +226,9 @@ fun DoorbellSettings(
 
     else -> {
       LazyColumn(
-        modifier = Modifier.fillMaxSize()
+        modifier = Modifier
+          .fillMaxSize()
+          .background(LocalColor.Main.Light)
       ) {
         item {
           Heading(title = strings(id = R.string.basicSettings))
@@ -276,6 +282,21 @@ fun DoorbellSettings(
             )
           }
         }
+        item {
+          SettingsItem(
+            title = strings(id = R.string.doorbellCall),
+            description = strings(id = R.string.doorbellCallDescription),
+            withSwitch = true,
+            checked = isDoorbellCallEnabled.value,
+            onToggle = {
+              Settings.setEnableDoorbellCall(
+                enable = it,
+                isLoading = isLoading,
+                isDoorbellCallEnabled = isDoorbellCallEnabled
+              )
+            }
+          )
+        }
         item {
           SettingsItem(
             title = strings(id = R.string.irNightVision),
@@ -641,7 +662,7 @@ fun DoorbellSettings(
         }
 
         item {
-          Heading(title = strings(id = R.string.advancedSettings))
+          Heading(title = strings(id = R.string.deviceInformation))
         }
         item {
           SettingsItem(
@@ -666,7 +687,7 @@ fun DoorbellSettings(
                   .height(50.dp),
                 id = "RemoveDoorbell",
                 title = strings(id = R.string.removeDoorbell),
-                textColor = LocalColor.Monochrome.White,
+                textColor = LocalColor.Monochrome.StaticWhite,
                 secondary = true,
                 m = true,
                 semiBold = true
@@ -687,7 +708,7 @@ fun Heading(title: String) {
     modifier = Modifier
       .fillMaxWidth()
       .height(40.dp)
-      .background(LocalColor.Monochrome.White),
+      .background(LocalColor.Main.Light),
     verticalAlignment = Alignment.CenterVertically
   ) {
     Label(
@@ -723,117 +744,117 @@ fun SettingsItem(
     mutableStateOf(false)
   }
 
-  Column(modifier = Modifier.background(LocalColor.Main.Light)) {
-    Row(
-      modifier = Modifier
-        .fillMaxWidth()
-        .clickable(
-          interactionSource = remember { MutableInteractionSource() },
-          indication = if (withDropDown || onClick.isNotNull()) ripple() else null
-        ) {
-          if (withDropDown) isDropDownVisible.value = true else onClick?.invoke()
-        }
-        .padding(horizontal = 20.dp),
-      horizontalArrangement = Arrangement.SpaceBetween,
-      verticalAlignment = Alignment.CenterVertically
-    ) {
-      Column(
-        modifier = Modifier
-          .fillMaxWidth(0.7f)
-          .padding(vertical = 10.dp)
-      ) {
-        Label(
-          modifier = Modifier,
-          id = title.lowercase(),
-          title = title,
-          m = true,
-          grey = true,
-          semiBold = true,
-        )
-
-        if (description.isNotBlank()) {
-          Label(
-            modifier = Modifier
-              .padding(top = 5.dp),
-            id = title.lowercase() + "Description",
-            title = description,
-            maxLines = 6,
-            s = true,
-            lightGrey = true,
-            medium = true,
-            lineHeight = 15.sp
-          )
-        }
-      }
-
+  Box(modifier = Modifier
+    .padding( horizontal = 12.dp)
+    .background(LocalColor.Monochrome.White))
+  {
+    Column(modifier = Modifier) {
       Row(
         modifier = Modifier
-          .fillMaxWidth(),
-        horizontalArrangement = Arrangement.End,
+          .fillMaxWidth()
+          .clickable(
+            interactionSource = remember { MutableInteractionSource() },
+            indication = if (withDropDown || onClick.isNotNull()) ripple() else null
+          ) {
+            if (withDropDown) isDropDownVisible.value = true else onClick?.invoke()
+          }
+          .padding(horizontal = 12.dp),
+        horizontalArrangement = Arrangement.SpaceBetween,
         verticalAlignment = Alignment.CenterVertically
       ) {
-        when {
-          withSwitch -> {
-            Switch(
-              id = title + "Switch",
-              checked = checked,
-              onChange = onToggle
-            )
-          }
+        Column(
+          modifier = Modifier
+            .fillMaxWidth(0.7f)
+            .padding(vertical = 10.dp)
+        ) {
+          Label(
+            modifier = Modifier,
+            id = title.lowercase(),
+            title = title,
+            m = true,
+            black = true,
+            semiBold = true,
+          )
 
-          withDropDown -> {
-            PopUp(
-              isVisible = isDropDownVisible,
-              dropDownTitle = dropDownTitle,
-              dropDownList = dropDownList,
-              selectedOption = selectedOption,
-              onDropDownItemSelected = onDropDownItemSelected,
+          if (description.isNotBlank()) {
+            Label(
+              modifier = Modifier
+                .padding(top = 5.dp),
+              id = title.lowercase() + "Description",
+              title = description,
+              maxLines = 6,
+              s = true,
+              lightGrey = true,
+              medium = true,
+              lineHeight = 15.sp
             )
           }
+        }
 
-          else -> {
-            if (leftIcon == true) {
-              Image(
-                modifier = Modifier
-                  .width(24.dp)
-                  .height(24.dp)
-                  .padding(end = 5.dp),
-                painter = painterResource(id = R.drawable.ic_warning),
-                contentDescription = "warningIcon",
+        Row(
+          modifier = Modifier
+            .fillMaxWidth(),
+          horizontalArrangement = Arrangement.End,
+          verticalAlignment = Alignment.CenterVertically
+        ) {
+          when {
+            withSwitch -> {
+              Switch(
+                id = title + "Switch",
+                checked = checked,
+                onChange = onToggle
               )
             }
-            if (additionalInfo != "") {
-              Label(
-                modifier = Modifier
-                  .padding(end = 5.dp),
-                id = title.lowercase(),
-                title = additionalInfo,
-                maxLines = 1,
-                m = true,
-                black = true,
-                semiBold = true
+
+            withDropDown -> {
+              PopUp(
+                isVisible = isDropDownVisible,
+                dropDownTitle = dropDownTitle,
+                dropDownList = dropDownList,
+                selectedOption = selectedOption,
+                onDropDownItemSelected = onDropDownItemSelected,
               )
             }
 
-            if (rightArrow) {
-              Image(
-                modifier = Modifier
-                  .size(18.dp)
-                  .padding(top = 5.dp),
-                painter = painterResource(id = R.drawable.ic_arrow_blue_right),
-                contentDescription = "rightArrow",
-              )
+            else -> {
+              if (leftIcon == true) {
+                Image(
+                  modifier = Modifier
+                    .width(24.dp)
+                    .height(24.dp)
+                    .padding(end = 5.dp),
+                  painter = painterResource(id = R.drawable.ic_warning),
+                  contentDescription = "warningIcon",
+                )
+              }
+              if (additionalInfo != "") {
+                Label(
+                  modifier = Modifier
+                    .padding(end = 5.dp),
+                  id = title.lowercase(),
+                  title = additionalInfo,
+                  maxLines = 1,
+                  m = true,
+                  black = true,
+                  semiBold = true
+                )
+              }
+              if (rightArrow) {
+                Image(
+                  modifier = Modifier
+                    .size(18.dp)
+                    .padding(top = 5.dp),
+                  painter = painterResource(id = R.drawable.ic_arrow_blue_right),
+                  contentDescription = "rightArrow",
+                  colorFilter = ColorFilter.tint(LocalColor.Monochrome.BlackColor)
+                )
+              }
             }
           }
         }
       }
     }
 
-    Divider(
-      modifier = Modifier
-        .padding(horizontal = 10.dp),
-      thickness = 1.dp
-    )
   }
 }
 
@@ -873,6 +894,7 @@ fun PopUp(
         .size(12.dp),
       painter = painterResource(id = R.drawable.ic_arrow_blue_right),
       contentDescription = "rightArrow",
+      colorFilter = ColorFilter.tint(LocalColor.Monochrome.BlackColor)
     )
   }