@ledvance/group-ui-biz-bundle 1.0.77 → 1.0.78

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/group-ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.0.77",
+  "version": "1.0.78",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/modules/flags/FlagEditPage.tsx

@@ -23,6 +23,7 @@ import { showDialog } from '@ledvance/base/src/utils/common'
 import { cctToColor } from '@ledvance/base/src/utils/cctUtils'
 
 const cx = Utils.RatioUtils.convertX
+const { withTheme } = Utils.ThemeUtils
 
 export interface FlagEditParams {
   mode: 'add' | 'edit'
@@ -32,7 +33,7 @@ export interface FlagEditParams {
   modDeleteFlag: (mode: 'add' | 'edit' | 'del', currentMood: FlagUiInfo, options?: FlagOption) => Promise<Result<any>>
 }
 
-const FlagEditPage = () => {
+const FlagEditPage = (props: { theme?: any }) => {
   const navigation = useNavigation()
   const params = cloneDeep(useRoute().params as FlagEditParams)
   const state = useReactive({
@@ -79,6 +80,102 @@ const FlagEditPage = () => {
     return state.mood.name.length > 0 && state.mood.name.length < 33 && !nameRepeat && (params.mode === 'add' || !checkMoodDataChanged)
   }, [nameRepeat, state.mood.name, checkMoodDataChanged, params.mode])
 
+
+  const styles = StyleSheet.create({
+    root: {
+      flex: 1,
+      flexDirection: 'column',
+    },
+    name: {
+      marginHorizontal: cx(24),
+    },
+    adjustCard: {
+      marginVertical: cx(12),
+      marginHorizontal: cx(24),
+    },
+    fanAdjustCard: {
+      marginHorizontal: cx(24),
+    },
+    lightLine: {
+      flexDirection: 'row',
+      marginHorizontal: cx(16),
+    },
+    light: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(18),
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+    transitionMode: {
+      marginHorizontal: cx(16),
+    },
+    preview: {
+      width: cx(20),
+      height: cx(20),
+      marginStart: cx(12),
+      borderRadius: cx(4),
+    },
+    nodesAdjust: {
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    adjustButtons: {
+      width: cx(44),
+      marginStart: cx(16),
+    },
+    adjustButton: {
+      width: cx(44),
+      height: cx(44),
+    },
+    nodeList: {
+      flex: 1,
+      marginHorizontal: cx(16),
+    },
+    nodeItem: {
+      flexDirection: 'row',
+      alignItems: 'center',
+    },
+    nodeBlock: {
+      flex: 1,
+      height: cx(40),
+      borderRadius: cx(8),
+      borderWidth: 1,
+      borderColor: props.theme.card.border
+    },
+    nodeDeleteBtn: {
+      width: cx(24),
+      height: cx(30),
+      justifyContent: 'center',
+      alignItems: 'center',
+    },
+    nodeDeleteIcon: {
+      width: cx(16),
+      height: cx(16),
+    },
+    nodeAddBtn: {
+      height: cx(40),
+      justifyContent: 'center',
+      alignItems: 'center',
+      marginEnd: cx(26),
+      borderRadius: cx(8),
+      borderWidth: cx(1),
+      borderStyle: 'dashed',
+      borderColor: props.theme.addNode.border,
+      backgroundColor: props.theme.addNode.background,
+    },
+    deleteBtn: {
+      width: '100%',
+      height: cx(50),
+      backgroundColor: props.theme.button.delete,
+      borderRadius: cx(8),
+    },
+    deleteBtnText: {
+      color: props.theme.button.fontColor,
+      fontSize: cx(16),
+      fontFamily: 'helvetica_neue_lt_std_bd',
+    },
+  })
+
+
   return (
     <Page
       backText={I18n.getLang('Feature_devicepanel_flags')}
@@ -116,57 +213,57 @@ const FlagEditPage = () => {
             }}
             maxLength={33}
             showError={state.mood.name.length > 32 || nameRepeat}
-            tipColor={nameRepeat ? '#f00' : undefined}
+            tipColor={nameRepeat ? props.theme.global.error : undefined}
             tipIcon={nameRepeat ? res.ic_text_field_input_error : undefined}
             errorText={I18n.getLang(nameRepeat ? 'string_light_pp_field_sm_add_error1' : 'add_new_dynamic_mood_alert_text')} />
           {(params.moduleParams.isMixLight || params.moduleParams.isCeilingLight) && <><Card style={styles.adjustCard}>
-            <Spacer height={cx(16)} />
-            <View style={styles.lightLine}>
-              <Text style={styles.light}>
-                {I18n.getLang('light_sources_tile_main_lighting_headline')}
-              </Text>
-              <View style={[styles.preview, { backgroundColor: getColorBlockColor(true) }]} />
-            </View>
-            <Spacer />
-            <ColorTempAdjustView
-              isSupportBrightness={!!params.moduleParams.isSupportBrightness}
-              isSupportTemperature={!!params.moduleParams.isSupportTemperature}
-              colorTemp={state.currentWhiteNode.colorTemp}
-              brightness={state.currentWhiteNode.brightness}
-              onCCTChange={(cct) => {
-                state.currentWhiteNode.colorTemp = cct
-              }}
-              onCCTChangeComplete={(cct) => {
-                state.currentWhiteNode.colorTemp = cct
-                state.mood.whiteColors = state.mood.whiteColors.map((item, idx) => {
-                  if (idx === state.whitePaintBucketIdx) {
-                    return {
-                      ...state.mood.whiteColors[idx],
-                      colorTemp: cct
-                    }
-                  }
-                  return item
-                })
-              }}
-              onBrightnessChange={(bright) => {
-                state.currentWhiteNode.brightness = bright
-              }}
-              onBrightnessChangeComplete={(bright) => {
-                state.currentWhiteNode.brightness = bright
-                state.mood.whiteColors = state.mood.whiteColors.map((item, idx) => {
-                  if (idx === state.whitePaintBucketIdx) {
-                    return {
-                      ...state.mood.whiteColors[idx],
-                      brightness: bright
-                    }
-                  }
-                  return item
-                })
-              }}
-            />
-            <Spacer height={cx(16)} />
+              <Spacer height={cx(16)} />
+              <View style={styles.lightLine}>
+                  <Text style={styles.light}>
+                    {I18n.getLang('light_sources_tile_main_lighting_headline')}
+                  </Text>
+                  <View style={[styles.preview, { backgroundColor: getColorBlockColor(true) }]} />
+              </View>
+              <Spacer />
+              <ColorTempAdjustView
+                  isSupportBrightness={!!params.moduleParams.isSupportBrightness}
+                  isSupportTemperature={!!params.moduleParams.isSupportTemperature}
+                  colorTemp={state.currentWhiteNode.colorTemp}
+                  brightness={state.currentWhiteNode.brightness}
+                  onCCTChange={(cct) => {
+                    state.currentWhiteNode.colorTemp = cct
+                  }}
+                  onCCTChangeComplete={(cct) => {
+                    state.currentWhiteNode.colorTemp = cct
+                    state.mood.whiteColors = state.mood.whiteColors.map((item, idx) => {
+                      if (idx === state.whitePaintBucketIdx) {
+                        return {
+                          ...state.mood.whiteColors[idx],
+                          colorTemp: cct
+                        }
+                      }
+                      return item
+                    })
+                  }}
+                  onBrightnessChange={(bright) => {
+                    state.currentWhiteNode.brightness = bright
+                  }}
+                  onBrightnessChangeComplete={(bright) => {
+                    state.currentWhiteNode.brightness = bright
+                    state.mood.whiteColors = state.mood.whiteColors.map((item, idx) => {
+                      if (idx === state.whitePaintBucketIdx) {
+                        return {
+                          ...state.mood.whiteColors[idx],
+                          brightness: bright
+                        }
+                      }
+                      return item
+                    })
+                  }}
+              />
+              <Spacer height={cx(16)} />
           </Card>
-            <Spacer />
+              <Spacer />
           </>}
           <Card style={styles.adjustCard}>
             <Spacer height={cx(16)} />
@@ -177,16 +274,16 @@ const FlagEditPage = () => {
             </View>
             <Spacer height={cx(10)} />
             {(!params.moduleParams.isStripLight && !params.moduleParams.isCeilingLight) && <>
-              <LdvSlider
-                title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
-                value={state.mood.speed}
-                onValueChange={value => {
-                  state.mood.speed = value
-                }}
-                onSlidingComplete={value => {
-                  state.mood.speed = value
-                }} />
-              <Spacer height={cx(16)} />
+                <LdvSlider
+                    title={I18n.getLang('add_new_dynamic_mood_lights_field_speed_topic_text')}
+                    value={state.mood.speed}
+                    onValueChange={value => {
+                      state.mood.speed = value
+                    }}
+                    onSlidingComplete={value => {
+                      state.mood.speed = value
+                    }} />
+                <Spacer height={cx(16)} />
             </>}
             <View style={styles.nodesAdjust}>
               <View style={styles.adjustButtons}>
@@ -195,7 +292,7 @@ const FlagEditPage = () => {
                     state.colorPaintBucketSelected = true
                   }}>
                   <Image
-                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? '#f60' : '#666' }]}
+                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme.icon.primary : props.theme.icon.normal }]}
                     source={res.ic_paint_bucket} />
                 </TouchableOpacity>
                 <TouchableOpacity
@@ -203,7 +300,7 @@ const FlagEditPage = () => {
                     state.colorPaintBucketSelected = false
                   }}>
                   <Image
-                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? '#666' : '#f60' }]}
+                    style={[styles.adjustButton, { tintColor: state.colorPaintBucketSelected ? props.theme.icon.normal : props.theme.icon.primary }]}
                     source={res.ic_colorize} />
                 </TouchableOpacity>
               </View>
@@ -235,7 +332,7 @@ const FlagEditPage = () => {
                           style={[
                             styles.nodeDeleteIcon,
                             {
-                              tintColor: state.mood.colors.length < 3 ? '#ccc' : '#666',
+                              tintColor: state.mood.colors.length < 3 ? props.theme.icon.disable : props.theme.icon.normal,
                             },
                           ]}
                           source={res.ic_mood_del} />
@@ -266,7 +363,7 @@ const FlagEditPage = () => {
                           style={{
                             width: cx(18),
                             height: cx(18),
-                            tintColor: '#000',
+                            tintColor: props.theme.global.fontColor,
                           }}
                           source={{ uri: res.add }} />
                       </TouchableOpacity>
@@ -321,29 +418,29 @@ const FlagEditPage = () => {
           </Card>
           <Spacer />
           {params.mode === 'edit' &&
-            <View style={{ marginTop: cx(20), marginHorizontal: cx(24) }}>
-              <TextButton
-                style={styles.deleteBtn}
-                textStyle={styles.deleteBtnText}
-                text={I18n.getLang('flag_deleteflag')}
-                onPress={() => {
-                  showDialog({
-                    method: 'confirm',
-                    title: I18n.getLang('flag_deletepopup'),
-                    subTitle: I18n.getLang('strip_light_static_mood_edit_dialog_text'),
-                    onConfirm: async (_, { close }) => {
-                      close()
-                      if (state.loading) return
-                      state.loading = true
-                      const res = await params.modDeleteFlag('del', state.mood)
-                      if (res.success) {
-                        state.loading = false
-                        navigation.goBack()
-                      }
-                    }
-                  })
-                }} />
-            </View>}
+              <View style={{ marginTop: cx(20), marginHorizontal: cx(24) }}>
+                  <TextButton
+                      style={styles.deleteBtn}
+                      textStyle={styles.deleteBtnText}
+                      text={I18n.getLang('flag_deleteflag')}
+                      onPress={() => {
+                        showDialog({
+                          method: 'confirm',
+                          title: I18n.getLang('flag_deletepopup'),
+                          subTitle: I18n.getLang('strip_light_static_mood_edit_dialog_text'),
+                          onConfirm: async (_, { close }) => {
+                            close()
+                            if (state.loading) return
+                            state.loading = true
+                            const res = await params.modDeleteFlag('del', state.mood)
+                            if (res.success) {
+                              state.loading = false
+                              navigation.goBack()
+                            }
+                          }
+                        })
+                      }} />
+              </View>}
           <Spacer />
         </View>
       </ScrollView>
@@ -351,98 +448,4 @@ const FlagEditPage = () => {
   )
 }
 
-const styles = StyleSheet.create({
-  root: {
-    flex: 1,
-    flexDirection: 'column',
-  },
-  name: {
-    marginHorizontal: cx(24),
-  },
-  adjustCard: {
-    marginVertical: cx(12),
-    marginHorizontal: cx(24),
-  },
-  fanAdjustCard: {
-    marginHorizontal: cx(24),
-  },
-  lightLine: {
-    flexDirection: 'row',
-    marginHorizontal: cx(16),
-  },
-  light: {
-    color: '#000',
-    fontSize: cx(18),
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-  transitionMode: {
-    marginHorizontal: cx(16),
-  },
-  preview: {
-    width: cx(20),
-    height: cx(20),
-    marginStart: cx(12),
-    borderRadius: cx(4),
-  },
-  nodesAdjust: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  adjustButtons: {
-    width: cx(44),
-    marginStart: cx(16),
-  },
-  adjustButton: {
-    width: cx(44),
-    height: cx(44),
-  },
-  nodeList: {
-    flex: 1,
-    marginHorizontal: cx(16),
-  },
-  nodeItem: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  nodeBlock: {
-    flex: 1,
-    height: cx(40),
-    borderRadius: cx(8),
-    borderWidth: 1,
-    borderColor: '#ccc'
-  },
-  nodeDeleteBtn: {
-    width: cx(24),
-    height: cx(30),
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  nodeDeleteIcon: {
-    width: cx(16),
-    height: cx(16),
-  },
-  nodeAddBtn: {
-    height: cx(40),
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginEnd: cx(26),
-    borderRadius: cx(8),
-    borderWidth: cx(1),
-    borderStyle: 'dashed',
-    borderColor: '#666',
-    backgroundColor: '#f6f6f6',
-  },
-  deleteBtn: {
-    width: '100%',
-    height: cx(50),
-    backgroundColor: '#666',
-    borderRadius: cx(8),
-  },
-  deleteBtnText: {
-    color: '#fff',
-    fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
-  },
-})
-
-export default FlagEditPage
+export default withTheme(FlagEditPage)

package/src/modules/flags/FlagItem.tsx

@@ -6,8 +6,10 @@ import MoodColorsLine from '@ledvance/base/src/components/MoodColorsLine'
 import Spacer from '@ledvance/base/src/components/Spacer'
 
 const cx = Utils.RatioUtils.convertX
+const { withTheme } = Utils.ThemeUtils
 
 interface RecommendMoodItemProps {
+  theme?: any
   enable: boolean
   title: string
   colors: string[]
@@ -17,9 +19,33 @@ interface RecommendMoodItemProps {
   onSwitch: (enable: boolean) => void
 }
 
-export default function FlagItem(props: RecommendMoodItemProps) {
+const FlagItem = (props: RecommendMoodItemProps) => {
   const icon = typeof props.icon === 'number' ? props.icon : { uri: props.icon }
 
+  const styles = StyleSheet.create({
+    card: {
+      marginHorizontal: cx(24),
+    },
+    headline: {
+      flexDirection: 'row',
+      marginHorizontal: cx(16),
+      justifyContent: 'space-between',
+    },
+    headText: {
+      color: props.theme.global.fontColor,
+      fontSize: cx(16),
+      fontFamily: 'helvetica_neue_lt_std_bd',
+      lineHeight: cx(20),
+      flex: 1
+    },
+    gradientItem: {
+      alignItems: 'center',
+    },
+    gradient: {
+      borderRadius: cx(8),
+    },
+  })
+
   return (
     <Card
       style={[styles.card, props.style]}
@@ -40,7 +66,7 @@ export default function FlagItem(props: RecommendMoodItemProps) {
         <View style={styles.gradientItem}>
           <MoodColorsLine
             type={'separate'}
-            nodeStyle={{ borderColor: '#ccc', borderWidth: 1 }}
+            nodeStyle={{ borderColor: props.theme.card.border, borderWidth: 1 }}
             colors={props.colors} />
         </View>
         <Spacer height={cx(16)} />
@@ -49,43 +75,4 @@ export default function FlagItem(props: RecommendMoodItemProps) {
   )
 }
 
-const styles = StyleSheet.create({
-  card: {
-    marginHorizontal: cx(24),
-  },
-  headline: {
-    flexDirection: 'row',
-    marginHorizontal: cx(16),
-    justifyContent: 'space-between',
-  },
-  headText: {
-    color: '#000',
-    fontSize: cx(16),
-    fontFamily: 'helvetica_neue_lt_std_bd',
-    lineHeight: cx(20),
-    flex: 1
-  },
-  gradientItem: {
-    alignItems: 'center',
-  },
-  gradient: {
-    borderRadius: cx(8),
-  },
-  moodTypeItem: {
-    flexDirection: 'row',
-  },
-  moodTypeLabel: {
-    marginStart: cx(16),
-    paddingHorizontal: cx(12.5),
-    backgroundColor: '#E6E7E8',
-    borderRadius: cx(8),
-  },
-  moodTypeLabelText: {
-    height: cx(16),
-    color: '#000000DD',
-    fontSize: cx(10),
-    textAlignVertical: 'center',
-    fontFamily: 'helvetica_neue_lt_std_roman',
-    lineHeight: cx(16),
-  },
-})
+export default withTheme(FlagItem)

package/src/modules/flags/FlagPage.tsx

@@ -14,12 +14,13 @@ import { cloneDeep, difference, last, map, range } from "lodash";
 import { ui_biz_routerKey } from "../../navigation/Routers";
 import res from "@ledvance/base/src/res";
 import { hsv2Hex } from "@ledvance/base/src/utils";
-import { SceneNodeTransitionMode } from "@ledvance/group-ui-biz-bundle/src/modules/mood/SceneInfo";
+import { SceneNodeTransitionMode } from "../mood/SceneInfo";
 import TextField from "@ledvance/base/src/components/TextField";
 import { useParams } from "@ledvance/base/src/hooks/Hooks";
 import { WorkMode } from "@ledvance/base/src/utils/interface";
 import { showDialog } from "@ledvance/base/src/utils/common";
 const cx = Utils.RatioUtils.convertX
+const { withTheme } = Utils.ThemeUtils
 
 export interface FlagPageProps {
   isMixLight?: boolean
@@ -29,10 +30,10 @@ export interface FlagPageProps {
   isMatterLight?: boolean
   isSupportTemperature?: boolean
   isSupportBrightness?: boolean
-  switchLedCode: string  
+  switchLedCode: string
 }
 
-const FlagPage = () => {
+const FlagPage = (props: { theme?: any }) => {
   const params = useParams<FlagPageProps>()
   const devInfo = useDeviceInfo()
   const uaGroupInfo = useUAGroupInfo()
@@ -146,7 +147,7 @@ const FlagPage = () => {
       loading={state.loading}
     >
       <View style={{flexDirection: 'row', display: 'flex', alignItems: 'center'}}>
-        <TextField 
+        <TextField
           value={state.searchText}
           onChangeText={text => {
             state.searchText = text
@@ -155,21 +156,21 @@ const FlagPage = () => {
           style={{ marginHorizontal: cx(24), flex: 1 }}
         />
         <TouchableOpacity style={{paddingRight: cx(24)}}
-          onPress={() =>{
-            showDialog({
-              method: 'confirm',
-              title: I18n.getLang('flag_resetbutton'),
-              subTitle: I18n.getLang('flag_resetdescription'),
-              onConfirm: async (_, {close}) =>{
-                close()
-                state.loading = true 
-                await getRemoteFlagInfo(true)
-                state.loading = false 
-              }
-            })
-          }}
+                          onPress={() =>{
+                            showDialog({
+                              method: 'confirm',
+                              title: I18n.getLang('flag_resetbutton'),
+                              subTitle: I18n.getLang('flag_resetdescription'),
+                              onConfirm: async (_, {close}) =>{
+                                close()
+                                state.loading = true
+                                await getRemoteFlagInfo(true)
+                                state.loading = false
+                              }
+                            })
+                          }}
         >
-          <Image source={res.ic_refresh} style={{width: cx(24), height: cx(24)}}/>
+          <Image source={res.ic_refresh} style={{width: cx(24), height: cx(24), tintColor: props.theme.global.fontColor}}/>
         </TouchableOpacity>
       </View>
       <FlatList
@@ -216,4 +217,4 @@ export const newFlag = (id: number) => {
   }
 }
 
-export default FlagPage
+export default withTheme(FlagPage)