@eohjsc/react-native-smart-city 0.7.3-rc10 → 0.7.3-rc11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.3-rc10",
+  "version": "0.7.3-rc11",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/Action/__test__/ItemQuickAction.test.js

@@ -1,8 +1,8 @@
+import { IconOutline } from '@ant-design/icons-react-native';
 import { factory } from 'factory-girl';
 import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import Toast from 'react-native-toast-message';
-import AntDesign from 'react-native-vector-icons/AntDesign';
 import { act, create } from 'react-test-renderer';
 import { Colors } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
@@ -94,7 +94,7 @@ describe('Test ItemQuickAction', () => {
       await buttonOnActionPress.props.onPress();
     });
 
-    const icon = instance.findByType(AntDesign);
+    const icon = instance.findByType(IconOutline);
     expect(icon.props.color).toEqual(Colors.TextGray);
   });
 

package/src/commons/ActionGroup/__test__/index.test.js

@@ -413,7 +413,7 @@ describe('Test ActionGroup', () => {
             config: 5,
             is_on_value: 0,
             action: 'action1-47b3-43f6-ba45-83cd1cf5d8f2',
-            icon: 'upcircle',
+            icon: 'up-circle',
             text: 'Text',
             action_data: actionData,
           },
@@ -421,7 +421,7 @@ describe('Test ActionGroup', () => {
             config: 6,
             is_on_value: 0,
             action: 'action2-47b3-43f6-ba45-83cd1cf5d8f2',
-            icon: 'upcircle',
+            icon: 'up-circle',
             text: 'Text',
             action_data: actionData,
           },

package/src/commons/DateTimeRangeChange/DateTimeButton.js

@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
     marginHorizontal: 8,
     flexDirection: 'row',
     justifyContent: 'space-between',
-    width: 150,
+    width: 130,
     alignItems: 'center',
   },
   txtTime: {

package/src/commons/Device/HorizontalBarChart.js

@@ -1,11 +1,46 @@
-import React, { memo, useEffect, useMemo, useState } from 'react';
-import { View, StyleSheet } from 'react-native';
 import { isEmpty } from 'lodash';
+import React, { memo, useEffect, useMemo, useState } from 'react';
+import { StyleSheet, View } from 'react-native';
 
 import { Colors } from '../../configs';
 import { getMaxValueIndex } from '../../utils/chartHelper/getMaxValueIndex';
 import Highcharts from '../Highcharts';
 
+// https://github.com/facebook/hermes/issues/114#issuecomment-887106990
+// 'show source' unstable, work sometime, use this to generate formatter function
+
+// function formatter() {
+//   'show source';
+//   const { unit, price } = JSON.parse(this.series.name);
+//   const textColor =
+//     this.color === '#00979D'
+//       ? this.y === 0
+//         ? '#262626'
+//         : '#FFFFFF'
+//       : '#262626';
+//   const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
+//   const costStyle = valueStyle + 'font-weight:bold;';
+//   let label = `<span style="${valueStyle}">` + `${this.y}${unit}`;
+//   if (price === '' || price === null || isNaN(price)) {
+//     return label + '</span>';
+//   }
+//   const formatMoney = (number) => {
+//     const formatNumber = number.toFixed();
+//     return (
+//       parseInt(formatNumber, 10)
+//         .toFixed(0)
+//         .toString()
+//         .replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1.') + 'đ'
+//     );
+//   };
+//   return (
+//     label +
+//     `/<span style="${costStyle}">` +
+//     formatMoney(this.y * price) +
+//     '</span></span>'
+//   );
+// }
+
 const HorizontalBarChart = memo(({ datas, config }) => {
   const [chartOptions, setChartOptions] = useState({
     chart: {
@@ -57,38 +92,23 @@ const HorizontalBarChart = memo(({ datas, config }) => {
         dataLabels: {
           enabled: true,
           useHTML: true,
-          formatter: function () {
-            const { unit, price } = JSON.parse(this.series.name);
-            const textColor =
-              this.color === '#00979D'
-                ? this.y === 0
-                  ? '#262626'
-                  : '#FFFFFF'
-                : '#262626';
-            const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
-            const costStyle = valueStyle + 'font-weight:bold;';
-
-            let label = `<span style="${valueStyle}">` + `${this.y}${unit}`;
-            if (price === '' || price === null || isNaN(price)) {
-              return label + '</span>';
-            }
-
-            const formatMoney = (number) => {
-              const formatNumber = number.toFixed();
-              return (
-                parseInt(formatNumber, 10)
-                  .toFixed(0)
-                  .toString()
-                  .replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1.') + 'đ'
-              );
-            };
-            return (
-              label +
-              `/<span style="${costStyle}">` +
-              formatMoney(this.y * price) +
-              '</span></span>'
-            );
-          },
+          formatter: `function formatter() {
+    var _JSON$parse = JSON.parse(this.series.name),
+      unit = _JSON$parse.unit,
+      price = _JSON$parse.price;
+    var textColor = this.color === '#00979D' ? this.y === 0 ? '#262626' : '#FFFFFF' : '#262626';
+    var valueStyle = "color:" + textColor + ";font-weight:normal;font-size:12px;";
+    var costStyle = valueStyle + 'font-weight:bold;';
+    var label = "<span style=\\"" + valueStyle + "\\">" + ("" + this.y + unit);
+    if (price === '' || price === null || isNaN(price)) {
+      return label + '</span>';
+    }
+    var formatMoney = function formatMoney(number) {
+      var formatNumber = number.toFixed();
+      return parseInt(formatNumber, 10).toFixed(0).toString().replace(/(\\d)(?=(\\d\\d\\d)+(?!\\d))/g, '$1.') + 'đ';
+    };
+    return label + ("/<span style=\\"" + costStyle + "\\">") + formatMoney(this.y * price) + '</span></span>';
+  }`,
           align: 'right',
           inside: false,
         },

package/src/commons/Grid/GridItem.js

@@ -3,7 +3,15 @@ import { TouchableWithoutFeedback, View } from 'react-native';
 import styles from './GridItemStyles';
 
 const GridItem = memo(
-  ({ icon, accessibilityLabel, selected, onPress, item, children }) => {
+  ({
+    icon,
+    accessibilityLabel,
+    selected,
+    onPress,
+    item,
+    children,
+    style = {},
+  }) => {
     const isActive = selected && styles.active;
 
     return (
@@ -11,7 +19,7 @@ const GridItem = memo(
         onPress={() => onPress && onPress(item)}
         accessibilityLabel={accessibilityLabel}
       >
-        <View style={[styles.container, isActive]}>{children}</View>
+        <View style={[styles.container, style, isActive]}>{children}</View>
       </TouchableWithoutFeedback>
     );
   }

package/src/commons/IconComponent/index.js

@@ -1,4 +1,4 @@
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { IconFill, IconOutline } from '@ant-design/icons-react-native';
 import React, { memo, useMemo } from 'react';
 import { StyleSheet } from 'react-native';
 import { Colors } from '../../configs';
@@ -30,7 +30,7 @@ const IconComponent = memo(
         } else if (newIcon.includes('TwoTone')) {
           newIcon = newIcon.substring(0, newIcon.length - 'TwoTone'.length);
         }
-        newIcon = newIcon.replace(/[A-Z]/g, (m) => m.toLowerCase());
+        newIcon = newIcon.replace(/[A-Z]/g, (m) => '-' + m.toLowerCase());
       }
       return newIcon;
     }, [icon]);
@@ -62,7 +62,7 @@ const IconComponent = memo(
       );
     } else if (icon.includes('Filled')) {
       return (
-        <AntDesign
+        <IconFill
           name={displayIcon}
           color={colorIcon}
           size={size}
@@ -76,7 +76,7 @@ const IconComponent = memo(
           ? 'poweroff'
           : displayIcon;
       return (
-        <AntDesign
+        <IconOutline
           name={iconCT}
           color={colorIcon}
           size={size}

package/src/commons/OneTapTemplate/__test__/StatesGridActionTemplate.test.js

@@ -27,7 +27,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 1,
           action: '800ff454-4e2a-4a38-bad6-1bded728193e',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 41,
           text: 'Auto',
         },
@@ -35,7 +35,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 2,
           action: '4e43da81-469e-4d23-a66b-2656db7cf196',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 42,
           text: 'Cool',
         },
@@ -43,7 +43,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 3,
           action: '63f1bbfa-0e42-4401-9ea2-4aa07327ff26',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 44,
           text: 'Dry',
         },
@@ -51,7 +51,7 @@ describe('Test StatesGridActionTemplate', () => {
           config: 1024,
           is_on_value: 4,
           action: '8ba3e471-dd84-478b-87f3-6008aead8804',
-          icon: 'upcircle',
+          icon: 'up-circle',
           icon_kit: 43,
           text: 'Fan Only',
         },

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -1,17 +1,17 @@
 import React, { useMemo, useState } from 'react';
-import { View, TouchableOpacity, FlatList } from 'react-native';
+import { View } from 'react-native';
 
-import styles from './Styles/SetupSensorStyles';
-import { useTranslations } from '../../../hooks/Common/useTranslations';
-import Text from '../../../commons/Text';
 import { useNavigation, useRoute } from '@react-navigation/native';
-import NewActionWrapper from './NewActionWrapper';
+import { Button } from '../../../commons';
+import TextInput from '../../../commons/Form/TextInput';
 import GridItem from '../../../commons/Grid/GridItem';
-import Routes from '../../../utils/Route';
 import ModalCustom from '../../../commons/Modal/ModalCustom';
+import Text from '../../../commons/Text';
+import { useTranslations } from '../../../hooks/Common/useTranslations';
+import Routes from '../../../utils/Route';
 import { ToastBottomHelper } from '../../../utils/Utils';
-import CheckBox from '@react-native-community/checkbox';
-import TextInput from '../../../commons/Form/TextInput';
+import NewActionWrapper from './NewActionWrapper';
+import styles from './Styles/SetupSensorStyles';
 
 const valueEvaluationToOptions = (valueEvaluation) => {
   if (valueEvaluation.template === 'range') {
@@ -54,7 +54,7 @@ const SetupConfigCondition = () => {
         value: '<',
       },
       {
-        label: `${t('is')} (=)`,
+        label: `${t('is_equal')} (=)`,
         value: '=',
       },
       {
@@ -132,41 +132,44 @@ const SetupConfigCondition = () => {
         style={styles.modal}
       >
         <View style={styles.modalContent}>
-          <Text type="Body">
+          <Text type="Body" bold style={styles.titleCondition}>
             {t('when_value_is', { config_name: config.name })}
           </Text>
-          <FlatList
-            renderHeader={t('condition')}
-            data={normalConditions}
-            renderItem={({ item }) => {
+          <View style={styles.flatListCondition}>
+            {normalConditions.map((item) => {
               return (
-                <View>
-                  <Text>{item.label}</Text>
-                  <CheckBox
-                    onChange={() => {
-                      automate.condition = item.value;
-                      setCustomCondition(item.value);
-                    }}
-                    value={item.value === customCondition}
-                  />
-                </View>
+                <GridItem
+                  onPress={() => {
+                    automate.condition = item.value;
+                    setCustomCondition(item.value);
+                  }}
+                  selected={item.value === customCondition}
+                  style={styles.gridItem}
+                >
+                  <Text type="Body">{item.label}</Text>
+                </GridItem>
               );
-            }}
-          />
+            })}
+          </View>
+
           <View style={styles.inputValue}>
-            <Text>{t('value')}</Text>
             <TextInput
               keyboardType="decimal-pad"
               type="number"
               maxLength={10}
+              placeholder={t('value')}
               onChange={(value) => {
                 const floatValue = parseFloat(value.replace(',', '.'));
                 automate.value = floatValue;
               }}
-              style={styles.numberInput}
+              textInputStyle={styles.numberInput}
+              wrapStyle={styles.wrapTextInput}
             />
           </View>
-          <TouchableOpacity
+
+          <Button
+            type="primary"
+            title={t('continue')}
             testID={'continue_button'}
             onPress={() => {
               if (
@@ -179,9 +182,9 @@ const SetupConfigCondition = () => {
               setIsShowModal(false);
               navigate(Routes.ValueChangeName, { automate, closeScreen });
             }}
-          >
-            <Text>{t('continue')}</Text>
-          </TouchableOpacity>
+            style={styles.buttonContinue}
+            textSemiBold={false}
+          />
         </View>
       </ModalCustom>
     </NewActionWrapper>

package/src/screens/Automate/AddNewAction/Styles/SetupSensorStyles.js

@@ -1,5 +1,5 @@
 import { StyleSheet } from 'react-native';
-import { Theme, Colors } from '../../../../configs';
+import { Colors, Theme } from '../../../../configs';
 
 export default StyleSheet.create({
   ...Theme,
@@ -11,10 +11,9 @@ export default StyleSheet.create({
   },
   inputValue: { marginBottom: 10 },
   numberInput: {
-    borderRadius: 5,
+    borderRadius: 8,
     borderWidth: 1,
-    height: 38,
-    marginTop: 10,
+    height: 50,
   },
   boxDevices: {
     flexWrap: 'wrap',
@@ -43,4 +42,21 @@ export default StyleSheet.create({
     width: '100%',
     borderRadius: 10,
   },
+  titleCondition: {
+    marginBottom: 16,
+  },
+  wrapTextInput: {
+    marginTop: 0,
+  },
+  flatListCondition: {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+  },
+  gridItem: {
+    width: 'fit-content',
+  },
+  buttonContinue: {
+    flex: 0,
+  },
 });

package/src/screens/Automate/AddNewAction/__test__/ChooseAction.test.js

@@ -162,7 +162,7 @@ describe('Test ChooseAction', () => {
               is_on_value: 1,
               action: '800ff454-4e2a-4a38-bad6-1bded728193e',
               allow_config_store_value: true,
-              icon: 'upcircle',
+              icon: 'up-circle',
               icon_kit: 41,
               text: 'Auto',
             },

package/src/screens/Automate/AddNewAction/__test__/SetupConfigCondition.test.js

@@ -1,18 +1,17 @@
+import { useRoute } from '@react-navigation/native';
 import React from 'react';
+import { TouchableWithoutFeedback } from 'react-native';
 import { act, create } from 'react-test-renderer';
-import { SCProvider } from '../../../../context';
-import { mockSCStore } from '../../../../context/mockStore';
-import SetupConfigCondition from '../SetupConfigCondition';
-import { useRoute } from '@react-navigation/native';
-import { ToastBottomHelper } from '../../../../utils/Utils';
 import { Text } from '../../../../commons';
-import GridItem from '../../../../commons/Grid/GridItem';
-import { TouchableWithoutFeedback } from 'react-native';
-import Routes from '../../../../utils/Route';
-import { ModalCustom } from '../../../../commons/Modal';
 import { showAllGridItems } from '../../../../commons/ActionTemplate/__test__/utils';
 import TextInput from '../../../../commons/Form/TextInput';
-import CheckBox from '@react-native-community/checkbox';
+import GridItem from '../../../../commons/Grid/GridItem';
+import { ModalCustom } from '../../../../commons/Modal';
+import { SCProvider } from '../../../../context';
+import { mockSCStore } from '../../../../context/mockStore';
+import Routes from '../../../../utils/Route';
+import { ToastBottomHelper } from '../../../../utils/Utils';
+import SetupConfigCondition from '../SetupConfigCondition';
 
 jest.mock('react', () => {
   return {
@@ -214,8 +213,10 @@ describe('Test SetupConfigCondition', () => {
     });
     expect(modal.props.isVisible).toBeFalsy();
 
+    const modalGridItems = instance.findAllByType(GridItem);
+
     await act(async () => {
-      instance.findAllByType(CheckBox)[0].props.onChange();
+      modalGridItems[1].findByType(TouchableWithoutFeedback).props.onPress();
     });
 
     const input = instance.findByType(TextInput);

package/src/screens/Automate/SetSchedule/components/RowItem.js

@@ -1,9 +1,9 @@
+import { IconOutline } from '@ant-design/icons-react-native';
 import React from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import AntDesign from 'react-native-vector-icons/AntDesign';
+import { TouchableOpacity, View } from 'react-native';
 import Text from '../../../../commons/Text';
-import styles from '../styles/RowItemStyles';
 import { Colors } from '../../../../configs';
+import styles from '../styles/RowItemStyles';
 
 const RowItem = ({ title, value, icon = null, arrow = false, onPress }) => {
   return (
@@ -17,8 +17,8 @@ const RowItem = ({ title, value, icon = null, arrow = false, onPress }) => {
         </Text>
       </View>
       <View style={[styles.itemRight, arrow && styles.center]}>
-        {arrow && <AntDesign name="right" color={Colors.Gray7} />}
-        {icon && <AntDesign name={icon} size={17} color={Colors.Black} />}
+        {arrow && <IconOutline name="right" color={Colors.Gray7} />}
+        {icon && <IconOutline name={icon} size={17} color={Colors.Black} />}
       </View>
     </TouchableOpacity>
   );

package/src/screens/Notification/components/NotificationItem.js

@@ -3,6 +3,7 @@ import moment from 'moment';
 import React, { memo, useCallback, useState } from 'react';
 import { Image, TouchableOpacity, View } from 'react-native';
 
+import Notify from '../../../../assets/images/Notify.svg';
 import IconComponent from '../../../commons/IconComponent';
 import Text from '../../../commons/Text';
 import { API, Colors, SCConfig } from '../../../configs';
@@ -16,7 +17,6 @@ import { useTranslations } from '../../../hooks/Common/useTranslations';
 import { axiosPost } from '../../../utils/Apis/axios';
 import Routes from '../../../utils/Route';
 import styles from '../styles/NotificationItemStyles';
-import Notify from '../../../../assets/images/Notify.svg';
 
 const NotificationItem = memo(({ item }) => {
   const t = useTranslations();
@@ -72,7 +72,7 @@ const NotificationItem = memo(({ item }) => {
           },
           iconContent: (
             <IconComponent
-              icon={'addusergroup'}
+              icon="usergroup-add"
               style={styles.backgroundSummer}
             />
           ),

package/src/utils/I18n/translations/en.js

@@ -840,7 +840,7 @@ export default {
   select_unit_members: 'Select from Unit members',
   select_contacts: 'Select contacts',
   no_contact: 'No contacts',
-  is: 'is',
+  is_equal: 'is equal',
   is_below: 'is below',
   is_above: 'is above',
   text_notification_content_air_quality_high:

package/src/utils/I18n/translations/vi.js

@@ -94,8 +94,8 @@ export default {
   verify: 'Xác nhận',
   text_new_unit: 'Địa điểm',
   text_sub_units: 'Khu vực',
+  is_equal: 'bằng',
   is_below: 'dưới',
-  is: 'bằng',
   is_above: 'trên',
   edit_actions_list: 'Chỉnh sửa danh sách hành động',
   des_edit_actions_list: