@ledvance/base 1.3.7 → 1.3.9

package/localazy.json

@@ -889,7 +889,18 @@
                 "MATCH:thermostat_difference",
                 "MATCH:thermostat_refresh",
                 "MATCH:thermostat_quicktemp",
-                "MATCH:thermostat_energysaving"
+                "MATCH:thermostat_energysaving",
+                "MATCH:thermostat_editauto",
+                "MATCH:add_new_trigger_time_icon_selection_headline_text",
+                "MATCH:thermostat_setscope",
+                "MATCH:thermostat_settime",
+                "MATCH:thermostat_starttime",
+                "MATCH:thermostat_endtime",
+                "MATCH:thermostat_error",
+                "MATCH:thermostat_maxtime",
+                "MATCH:thermostat_schedule",
+                "MATCH:thermostat_unit",
+                "MATCH:thermostat_comforttemp"
             ],
             "replacements": {
                 "REGEX:% %1\\$s.*?\\)%": "{0}",

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/base",
   "pid": [],
   "uiid": "",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "scripts": {
     "prepublishOnly": "python update-localazy.py"
   },

package/src/components/AdvanceCard.tsx

@@ -3,6 +3,7 @@ import { StyleSheet, Text, View, ViewProps } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
 import Card from 'components/Card'
 import Spacer from 'components/Spacer'
+import ThemeType from '../config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -38,7 +39,7 @@ export function getAdvancedStatusColor(status: AdvancedStatus): string {
 }
 
 export interface AdvanceCardProps extends PropsWithChildren<ViewProps> {
-  theme?: any
+  theme?: ThemeType
   data: AdvancedData
   onPress: () => void
 }
@@ -61,11 +62,11 @@ const AdvanceCard = (props: AdvanceCardProps) => {
         props.children ?
           props.children :
           <View style={styles.titleBg}>
-            <Text style={{...styles.title, color: props.theme.global.fontColor}}>{props.data.title}</Text>
+            <Text style={{...styles.title, color: props.theme?.global.fontColor}}>{props.data.title}</Text>
             <Spacer height={cx(8)} />
             {
               (!!props.data.subtitles) && props.data.subtitles.map((subtitle, index) => (
-                <Text style={{...styles.subtitle, color: props.theme.global.secondFontColor}} key={`${subtitle}_${index}`}>{subtitle}</Text>
+                <Text style={{...styles.subtitle, color: props.theme?.global.secondFontColor}} key={`${subtitle}_${index}`}>{subtitle}</Text>
               ))
             }
           </View>

package/src/components/ApplyForDeviceItem.tsx

@@ -4,12 +4,13 @@ import { Utils } from 'tuya-panel-kit'
 import { DeviceInfo } from '../api/native'
 import Spacer from './Spacer'
 import res from '../res'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 export interface ApplyForDeviceItemProps {
-  theme?: any
+  theme?: ThemeType
   deviceInfo: DeviceInfo
 }
 
@@ -18,7 +19,7 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
   const styles = StyleSheet.create({
     root: {
       marginHorizontal: cx(8),
-      backgroundColor: props.theme.global.background,
+      backgroundColor: props.theme?.global.background,
       flexDirection: 'row',
       alignItems: 'center'
     },
@@ -36,7 +37,7 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
     deviceName: {
       flex: 1,
       marginStart: cx(8),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
@@ -48,12 +49,12 @@ const ApplyForDeviceItem = (props: ApplyForDeviceItemProps) => {
       height: cx(16),
       display: 'flex',
       justifyContent: 'center',
-      backgroundColor: props.theme.tag.background,
+      backgroundColor: props.theme?.tag.background,
       borderRadius: cx(8),
     },
     roomName: {
       marginHorizontal: cx(12),
-      color: props.theme.tag.fontColor,
+      color: props.theme?.tag.fontColor,
       fontSize: cx(10),
       fontFamily: 'helvetica_neue_lt_std_roman',
     },

package/src/components/ApplyForDeviceList.tsx

@@ -6,12 +6,13 @@ import Spacer from './Spacer'
 import ApplyForDeviceItem from './ApplyForDeviceItem'
 import { Utils } from 'tuya-panel-kit'
 import { useReactive, useUpdateEffect } from 'ahooks'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 export interface ApplyForDeviceListProps {
-  theme?: any
+  theme?: ThemeType
   devices: DeviceInfo[]
   expand?: boolean
   onExpandChange?: (expand: boolean) => void
@@ -30,10 +31,10 @@ const ApplyForDeviceList = (props: ApplyForDeviceListProps) => {
     deviceList: {
       marginHorizontal: cx(16),
       paddingVertical: cx(8),
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
     },
     spacer: {
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
     }
   })
 

package/src/components/ApplyForText.tsx

@@ -3,12 +3,13 @@ import React from 'react'
 import { Utils } from 'tuya-panel-kit'
 import res from '../res/index'
 import I18n from '../i18n/index'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 export interface ApplyForTextProps {
-  theme?: any
+  theme?: ThemeType
   expand: boolean
   onExpandChange: (expand: boolean) => void
 }
@@ -21,13 +22,13 @@ const ApplyForText = (props: ApplyForTextProps) => {
       marginStart: cx(16),
     },
     text: {
-      color: props.theme.global.secondFontColor,
+      color: props.theme?.global.secondFontColor,
       fontSize: cx(16),
       letterSpacing: cx(0.12),
       fontFamily: 'helvetica_neue_lt_std_bd',
     },
     icon: {
-      tintColor: props.theme.global.secondFontColor,
+      tintColor: props.theme?.global.secondFontColor,
       width: cx(24),
       height: cx(24),
     },

package/src/components/Card.tsx

@@ -1,12 +1,13 @@
 import {Platform, StyleProp, TouchableOpacity, View, ViewProps, ViewStyle} from 'react-native'
 import React, {PropsWithChildren} from 'react'
 import {Utils} from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 interface CardProps extends PropsWithChildren<ViewProps> {
-  theme?: any
+  theme?: ThemeType
   shadowHeight?: number | undefined
   onPress?: () => void
   onLongPress?: () => void
@@ -19,9 +20,9 @@ const Card = (props: CardProps) => {
     <View
       style={[{
         overflow: Platform.OS === 'ios' ? undefined : 'hidden',
-        backgroundColor: props.theme.card.background,
+        backgroundColor: props.theme?.card.background,
         elevation: shadowHeight,
-        shadowColor: props.theme.card.shadowColor,
+        shadowColor: props.theme?.card.shadowColor,
         shadowOpacity: 0.2,
         shadowRadius: shadowHeight,
         shadowOffset: {

package/src/components/ColorTempAdjustView.tsx

@@ -7,12 +7,13 @@ import LdvSlider from './ldvSlider'
 import {Utils} from 'tuya-panel-kit'
 import I18n from '../i18n/index'
 import {cctToColor} from '../utils/cctUtils'
+import ThemeType from '../config/themeType'
 
 const {convertX: cx} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 export interface ColorTempAdjustViewProps {
-  theme?: any
+  theme?: ThemeType
   colorTemp: number
   brightness: number
   minBrightness?: number

package/src/components/CustomListDialog.tsx

@@ -4,6 +4,7 @@ import TextButton from './TextButton'
 import Dialog from './Dialog'
 import React from 'react'
 import { Utils } from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
@@ -15,7 +16,7 @@ interface ListData {
 }
 
 interface CustomListDialogProps extends ViewProps {
-  theme?: any
+  theme?: ThemeType
   itemStyle?: StyleProp<ViewStyle>
   show: boolean
   onDismiss: () => void
@@ -26,11 +27,11 @@ interface CustomListDialogProps extends ViewProps {
 const CustomListDialog = (props: CustomListDialogProps) => {
   const styles = StyleSheet.create({
     popoverItemText: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
     },
     disableItemText: {
-      color: props.theme.global.disabledFontColor,
+      color: props.theme?.global.disabledFontColor,
       fontSize: cx(16),
     },
     line: {

package/src/components/DeleteButton.tsx

@@ -1,12 +1,13 @@
 import React from 'react'
 import { StyleProp, Text, TextStyle, TouchableOpacity, ViewStyle } from 'react-native'
 import { Utils } from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 interface DeleteButtonProps {
-  theme?: any
+  theme?: ThemeType
   text: string,
   onPress: () => void,
   style?: StyleProp<ViewStyle>,
@@ -23,13 +24,13 @@ const DeleteButton = (props: DeleteButtonProps) => {
       style={[{
         width: '100%',
         height: cx(50),
-        backgroundColor: props.theme.button.delete,
+        backgroundColor: props.theme?.button.delete,
         alignItems: 'center',
         justifyContent: 'center',
         borderRadius: cx(8),
       }, style]}>
       <Text style={[{
-        color: props.theme.button.fontColor,
+        color: props.theme?.button.fontColor,
         fontSize: cx(16),
         fontFamily: 'helvetica_neue_lt_std_bd',
       }, textStyle]}>{text}</Text>

package/src/components/DrawToolView.tsx

@@ -13,6 +13,7 @@ import DeleteButton from './DeleteButton'
 import Stepper from './Stepper'
 import StripLightView from './StripLightView'
 import { nativeEventEmitter } from '../api/nativeEventEmitter'
+import ThemeType from '../config/themeType'
 
 const { convertX: cx } = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -23,7 +24,7 @@ export type Node = {
 }
 
 interface DrawToolViewProps extends PropsWithChildren<ViewProps> {
-  theme?: any
+  theme?: ThemeType
   title?: string
   switchLed?: boolean
   showEnable?: boolean
@@ -105,7 +106,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
       const s = Math.round(mapFloatToRange(props.s / 100, 30, 100))
       return hsv2Hex(props.h, s, 100)
     }
-    return props.theme.card.background
+    return props.theme?.card.background
   }, [props.isColorMode, props.h, props.s])
 
   const ledNumValidator = (num?: number) => {
@@ -120,7 +121,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
       alignItems: 'center',
     },
     title: {
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontSize: cx(16),
       marginLeft: cx(10),
       fontFamily: 'helvetica_neue_lt_std_bd',
@@ -139,7 +140,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
     <Card style={{ marginHorizontal: cx(24) }}>
       <LdvSwitch
         title={props.title || I18n.getLang('light_sources_tile_tw_lighting_headline')}
-        color={props.theme.card.background}
+        color={props.theme?.card.background}
         colorAlpha={1}
         enable={!!props.switchLed}
         showSwitch={!!props.showEnable}
@@ -152,7 +153,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                         props.setAdjustType(1)
                       }}>
                       <Image
-                          style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? props.theme.icon.primary : props.theme.icon.normal }]}
+                          style={[styles.adjustButton, { tintColor: props.adjustType === 1 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
                           source={res.ic_paint_bucket} />
                   </TouchableOpacity>
                 {!props.hideDisableLight && <TouchableOpacity
@@ -160,7 +161,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                       props.setAdjustType(3)
                     }}>
                     <Image
-                        style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? props.theme.icon.primary : props.theme.icon.normal }]}
+                        style={[styles.adjustButton, { tintColor: props.adjustType === 3 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
                         source={res.ic_disabled_light} />
                 </TouchableOpacity>}
                 {!props.hideColorize && <TouchableOpacity
@@ -168,7 +169,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                       props.setAdjustType(2)
                     }}>
                     <Image
-                        style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? props.theme.icon.primary : props.theme.icon.normal }]}
+                        style={[styles.adjustButton, { tintColor: props.adjustType === 2 ? props.theme?.icon.primary : props.theme?.icon.normal }]}
                         source={res.ic_colorize} />
                 </TouchableOpacity>}
                 {!props.hideLedNum && <TouchableOpacity
@@ -178,10 +179,10 @@ const DrawToolView = (props: DrawToolViewProps) => {
                     style={[styles.adjustButton, {
                       alignItems: 'center',
                       justifyContent: 'center',
-                      backgroundColor: props.theme.icon.primary,
+                      backgroundColor: props.theme?.icon.primary,
                       borderRadius: cx(5),
                     }]}>
-                    <Text style={{ color: props.theme.global.fontColor, fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
+                    <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(18), fontWeight: 'bold' }}>{props.ledNum || 5}</Text>
                 </TouchableOpacity>}
               </View>
               <StripLightView
@@ -229,9 +230,9 @@ const DrawToolView = (props: DrawToolViewProps) => {
                 containerStyle={{ marginHorizontal: cx(16), alignItems: 'center' }}
                 style={{ marginHorizontal: cx(16), marginTop: cx(50) }}>
                 <Spacer />
-                <Text style={{ color: props.theme.global.fontColor, fontSize: cx(14) }}>{I18n.getLang('string_lights_set_bulbs_title')}</Text>
+                <Text style={{ color: props.theme?.global.fontColor, fontSize: cx(14) }}>{I18n.getLang('string_lights_set_bulbs_title')}</Text>
                 <Spacer height={cx(10)}/>
-                <Text style={{color: props.theme.global.secondFontColor}}>{I18n.getLang('string_lights_set_bulbs_description_text')}</Text>
+                <Text style={{color: props.theme?.global.secondFontColor}}>{I18n.getLang('string_lights_set_bulbs_description_text')}</Text>
                 <Spacer />
                 <Stepper
                     min={5}
@@ -247,7 +248,7 @@ const DrawToolView = (props: DrawToolViewProps) => {
                 <Spacer />
                 <DeleteButton
                     text={I18n.getLang('auto_scan_system_wifi_confirm')}
-                    style={{ width: cx(150), height: cx(40), backgroundColor: ledNumValidator(state.ledNum) ? props.theme.button.primary : props.theme.button.disabled }}
+                    style={{ width: cx(150), height: cx(40), backgroundColor: ledNumValidator(state.ledNum) ? props.theme?.button.primary : props.theme?.button.disabled }}
                     textStyle={{ fontSize: cx(14) }}
                     onPress={() => {
                       if (!ledNumValidator(state.ledNum)) return

package/src/components/FanAdjustView.tsx

@@ -9,12 +9,13 @@ import Spacer from './Spacer'
 import res from '../res'
 import Segmented from './Segmented'
 import Popup from './Popup'
+import ThemeType from '../config/themeType'
 
 const {convertX: cx} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
 
 interface FanAdjustViewProps extends ViewProps {
-  theme?: any
+  theme?: ThemeType
   hideEnable?: boolean
   fanEnable: boolean
   fanSpeed: number
@@ -69,7 +70,7 @@ export function FanAdjustViewContent(props: FanAdjustViewProps) {
           <View style={{flexDirection: 'row', marginBottom: cx(2), alignItems: 'center'}}>
               <Text style={{
                 marginRight: cx(5),
-                color: props.theme.global.fontColor,
+                color: props.theme?.global.fontColor,
               }}>{I18n.getLang('ceiling_fan_tile_uvc_fan_direction')}</Text>
               <TouchableOpacity onPress={() => Popup({
                 title: I18n.getLang('ceiling_fan_direction_info_headline'),
@@ -77,17 +78,17 @@ export function FanAdjustViewContent(props: FanAdjustViewProps) {
                 content: <View>
                   <Text style={{
                     fontWeight: 'bold',
-                    color: props.theme.global.fontColor,
+                    color: props.theme?.global.fontColor,
                   }}>{I18n.getLang('ceiling_fan_direction_info_description_text')}</Text>
                   <Spacer/>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_1_headline')}</Text>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_1_text')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_1_headline')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_1_text')}</Text>
                   <Spacer/>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_2_headline')}</Text>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_2_text')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_2_headline')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_direction_info_option_2_text')}</Text>
                 </View>,
               })}>
-                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme.icon.primary}} source={res.ic_info}/>
+                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={res.ic_info}/>
               </TouchableOpacity>
           </View>
           <Segmented
@@ -100,24 +101,24 @@ export function FanAdjustViewContent(props: FanAdjustViewProps) {
 
       {props.fanEnable && props.isSupportMode && <View style={{marginHorizontal: cx(16)}}>
           <View style={{flexDirection: 'row', marginBottom: cx(2), alignItems: 'center'}}>
-              <Text style={{marginRight: cx(5), color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_tile_uvc_fan_mode')}</Text>
+              <Text style={{marginRight: cx(5), color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_tile_uvc_fan_mode')}</Text>
               <TouchableOpacity onPress={() => Popup({
                 title: I18n.getLang('ceiling_fan_mode_info_headline'),
                 confirmText: I18n.getLang('ceiling_fan_direction_info_button_label'),
                 content: <View>
                   <Text style={{
                     fontWeight: 'bold',
-                    color: props.theme.global.fontColor,
+                    color: props.theme?.global.fontColor,
                   }}>{I18n.getLang('ceiling_fan_mode_info_description_text')}</Text>
                   <Spacer/>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_1_headline')}</Text>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_1_text')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_1_headline')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_1_text')}</Text>
                   <Spacer/>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_2_headline')}</Text>
-                  <Text style={{color: props.theme.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_2_text')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_2_headline')}</Text>
+                  <Text style={{color: props.theme?.global.fontColor}}>{I18n.getLang('ceiling_fan_mode_info_option_2_text')}</Text>
                 </View>,
               })}>
-                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme.icon.primary}} source={res.ic_info}/>
+                  <Image style={{width: cx(16), height: cx(16), tintColor: props.theme?.icon.primary}} source={res.ic_info}/>
               </TouchableOpacity>
           </View>
           <Segmented

package/src/components/InfoText.tsx

@@ -2,12 +2,13 @@ import {Image, ImageStyle, StyleProp, StyleSheet, Text, TextStyle, View, ViewPro
 import React from 'react'
 import {Utils} from 'tuya-panel-kit'
 import Spacer from './Spacer'
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 interface InfoTextProps extends ViewProps {
-  theme?: any
+  theme?: ThemeType
   icon: string | number
   text: string
   contentColor?: string
@@ -17,7 +18,7 @@ interface InfoTextProps extends ViewProps {
 }
 
 const InfoText = (props: InfoTextProps) => {
-  const contentColor = props.contentColor || props.theme.global.secondFontColor
+  const contentColor = props.contentColor || props.theme?.global.secondFontColor
   const source = typeof props.icon === 'string' ? {uri: props.icon} : props.icon
   return (
     <View style={[styles.root, props.style]}>

package/src/components/Page.tsx

@@ -5,11 +5,12 @@ import { useNavigation } from '@react-navigation/native'
 import {Dialog, Toast, Utils} from 'tuya-panel-kit'
 import I18n from '@i18n'
 import LdvTopName from './ldvTopName'
+import ThemeType from '../config/themeType'
 
 const { withTheme } = Utils.ThemeUtils
 
 interface PageProps extends PropsWithChildren<ViewProps> {
-  theme?: any
+  theme?: ThemeType
   rightButtonDisabled?: boolean
   backText: string
   onBackClick?: () => void
@@ -69,7 +70,7 @@ const Page = (props: PageProps) => {
 
   return (
     <>
-      <View style={[{ flex: 1, position: 'relative', backgroundColor: props.theme.global.backgroud }, props.style]}>
+      <View style={[{ flex: 1, position: 'relative', backgroundColor: props.theme?.global.backgroud }, props.style]}>
         <LDVTopBar
           title={props.backText}
           onBackPress={

package/src/components/Popup.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import {Text, TouchableOpacity, View} from 'react-native'
 import {Popup, Utils} from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
 
 const {convertX: cx, height} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -12,14 +13,14 @@ interface InformationPopupProps {
 }
 
 const InformationPopup = (props: InformationPopupProps) => {
-  const TitleNode = withTheme(({theme}: {theme?: any}) => {
+  const TitleNode = withTheme(({theme}: {theme?: ThemeType}) => {
     return (
       <View style={{flexDirection: 'row', height: cx(80), justifyContent: 'space-between'}}>
         <View style={{flexDirection: 'column-reverse', flex: 1, alignItems: 'center', paddingLeft: cx(12)}}>
           <Text style={{
             fontSize: cx(16),
             fontWeight: 'bold',
-            color: theme.global.fontColor,
+            color: theme?.global.fontColor,
             paddingBottom: cx(12),
 
           }}>{props.title}</Text>
@@ -36,7 +37,7 @@ const InformationPopup = (props: InformationPopupProps) => {
           <Text
             style={{
               fontSize: cx(12),
-              color: theme.button.primary,
+              color: theme?.button.primary,
             }}
           >
             {props.confirmText}

package/src/components/Segmented.tsx

@@ -1,6 +1,7 @@
 import React, {ReactNode} from 'react'
 import {StyleSheet, Text, TouchableOpacity, View, ViewStyle} from 'react-native'
 import {Utils} from 'tuya-panel-kit'
+import ThemeType from '../config/themeType'
 
 const {convertX: cx} = Utils.RatioUtils
 const { withTheme } = Utils.ThemeUtils
@@ -11,7 +12,7 @@ interface SegmentedItem {
 }
 
 interface SegmentedProps {
-  theme?: any
+  theme?: ThemeType
   value?: string | number
   options?: SegmentedItem[]
   onChange?: (v: string | number) => void
@@ -23,7 +24,7 @@ const Segmented = (props: SegmentedProps) => {
     wrap_container: {
       flexDirection: 'row',
       height: cx(42),
-      backgroundColor: props.theme.segment.background,
+      backgroundColor: props.theme?.segment.background,
       padding: cx(2),
       borderRadius: cx(8),
     },
@@ -31,7 +32,7 @@ const Segmented = (props: SegmentedProps) => {
       flex: 1,
       alignItems: 'center',
       justifyContent: 'center',
-      backgroundColor: props.theme.container.background,
+      backgroundColor: props.theme?.container.background,
     },
     segmented_item_first: {
       borderBottomLeftRadius: cx(8),
@@ -42,14 +43,14 @@ const Segmented = (props: SegmentedProps) => {
       borderTopRightRadius: cx(8),
     },
     segmented_item_check: {
-      backgroundColor: props.theme.button.primary,
+      backgroundColor: props.theme?.button.primary,
     },
     segmented_text: {
       fontSize: cx(16),
-      color: props.theme.global.secondFontColor,
+      color: props.theme?.global.secondFontColor,
     },
     segmented_text_check: {
-      color: props.theme.button.fontColor,
+      color: props.theme?.button.fontColor,
     },
   })
   return (

package/src/components/SocketItem.tsx

@@ -4,12 +4,13 @@ import Card from "components/Card";
 import Spacer from "components/Spacer";
 import { Dialog, SwitchButton, Utils } from "tuya-panel-kit";
 import I18n from "../i18n";
+import ThemeType from '../config/themeType'
 
 const cx = Utils.RatioUtils.convertX
 const { withTheme } = Utils.ThemeUtils
 
 interface SocketItemProps extends PropsWithChildren<ViewProps>{
-  theme?: any
+  theme?: ThemeType
   title: string
   name: string
   icon: any
@@ -29,7 +30,7 @@ function SocketItem(props: SocketItemProps) {
     },
     title: {
       fontSize: cx(16),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontFamily: 'helvetica_neue_lt_std_bd',
       fontWeight: 'bold',
     },
@@ -43,7 +44,7 @@ function SocketItem(props: SocketItemProps) {
     },
     name: {
       fontSize: cx(14),
-      color: props.theme.global.fontColor,
+      color: props.theme?.global.fontColor,
       fontFamily: 'helvetica_neue_lt_std_roman',
     },
   })