@eohjsc/react-native-smart-city 0.4.40 → 0.4.41

package/src/screens/Device/components/SensorDisplayItem.js

@@ -107,11 +107,27 @@ export const SensorDisplayItem = ({
           />
         </View>
       );
-    case 'action':
+    // change response format, todo Bang refactor after fix
+    case 'three_button_action_template': // todo refactor later with backend
+    case 'ThreeButtonActionTemplate':
+    case 'on_off_button_action_template': // todo refactor later with backend
+    case 'OnOffButtonActionTemplate':
+    case 'OnOffSimpleActionTemplate':
+    case 'OnOffSmartLockActionTemplate':
+    case 'one_button_action_template': // todo refactor later with backend
+    case 'OneBigButtonActionTemplate':
+    case 'NumberUpDownActionTemplate':
+    case 'StatesGridActionTemplate':
+    case 'OptionsDropdownActionTemplate':
+    case 'TimerActionTemplate':
+    case 'SmartTiviActionTemplate':
+    case 'color_picker_template':
+    case 'slider_range_template':
+    case 'two_button_action_template':
+    case 'switch_button_action_template':
       return (
         <ActionGroup
           accessibilityLabel={AccessibilityLabel.DEVICE_DETAIL_ACTION_GROUP}
-          actionGroup={configuration}
           doAction={doAction}
           sensor={sensor}
           id={idTemplate}

package/src/screens/Device/detail.js

@@ -701,7 +701,12 @@ const DeviceDetail = ({ route }) => {
           ref={refMenuAction}
           accessibilityLabel={AccessibilityLabel.HEADER_DEVICE_BUTTON_MORE}
         >
-          <Icon name={'more'} size={27} color={Colors.Black} />
+          <Icon
+            name={'ellipsis'}
+            size={27}
+            color={Colors.Black}
+            style={styles.moreIcon}
+          />
         </TouchableOpacity>
       </View>
     ),
@@ -754,18 +759,31 @@ const DeviceDetail = ({ route }) => {
             >
               {display.items.map((item, index) => {
                 return (
-                  <SensorDisplayItem
-                    accessibilityLabel={AccessibilityLabel.SENSOR_DISPLAY_ITEM}
-                    key={(item?.id || index).toString()}
-                    item={item}
-                    evaluate={evaluate}
-                    emergency={onEmergencyButtonPress}
-                    sensor={sensor}
-                    offsetTitle={offsetTitle}
-                    setOffsetTitle={setOffsetTitle}
-                    setShowWindDirection={setShowWindDirection}
-                    background={station?.background}
-                  />
+                  <>
+                    {!item.is_configuration_ready && (
+                      <Text center>{t('bellow_widget_is_not_configured')}</Text>
+                    )}
+                    {!!item.is_configuration_ready &&
+                      !!item.configuration_error && (
+                        <Text center>
+                          {t('bellow_widget_is_wrongly_configured')}
+                        </Text>
+                      )}
+                    <SensorDisplayItem
+                      accessibilityLabel={
+                        AccessibilityLabel.SENSOR_DISPLAY_ITEM
+                      }
+                      key={(item?.id || index).toString()}
+                      item={item}
+                      evaluate={evaluate}
+                      emergency={onEmergencyButtonPress}
+                      sensor={sensor}
+                      offsetTitle={offsetTitle}
+                      setOffsetTitle={setOffsetTitle}
+                      setShowWindDirection={setShowWindDirection}
+                      background={station?.background}
+                    />
+                  </>
                 );
               })}
             </SensorConnectStatusViewHeader>

package/src/screens/Device/styles.js

@@ -97,4 +97,7 @@ export default StyleSheet.create({
     marginLeft: 16,
     marginBottom: 16,
   },
+  moreIcon: {
+    transform: [{ rotate: '90deg' }],
+  },
 });

package/src/screens/Sharing/MemberList.js

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect } from 'react';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { useNavigation, useIsFocused } from '@react-navigation/native';
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
+import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Colors } from '../../configs';
@@ -17,6 +17,8 @@ import { useSCContextSelector } from '../../context';
 import { useBackendPermission } from '../../utils/Permission/backend';
 import { ToastBottomHelper } from '../../utils/Utils';
 
+const isAndroid = Platform.OS === 'android';
+
 const MemberList = ({ route }) => {
   const t = useTranslations();
   const { navigate } = useNavigation();
@@ -69,6 +71,16 @@ const MemberList = ({ route }) => {
     hideStateAlertSharingMenu();
   }, [hideStateAlertSharingMenu, isOwner, leaveUnit, unit.name]);
 
+  const getIconRight = useCallback(() => {
+    if (isOwner) {
+      if (isAndroid) {
+        return 'plus-square';
+      }
+      return 'plus';
+    }
+    return 'ellipsis';
+  }, [isOwner]);
+
   useEffect(() => {
     if (isFocused) {
       onRefresh();
@@ -79,12 +91,13 @@ const MemberList = ({ route }) => {
     <TouchableOpacity
       accessibilityLabel={AccessibilityLabel.MEMBER_LIST_RIGHT_HEADER_TOUCH}
       onPress={onPressRightHeader}
-      style={styles.rightHeader}
+      style={[styles.rightHeader]}
     >
       <IconOutline
-        name={isOwner ? 'plus' : 'more'}
+        name={getIconRight()}
         size={30}
         color={Colors.Black}
+        style={{ transform: [{ rotate: isOwner ? '0deg' : '90deg' }] }}
       />
     </TouchableOpacity>
   );

package/src/screens/Unit/SelectAddToFavorites.js

@@ -214,6 +214,7 @@ const SelectAddToFavorites = memo(({ route }) => {
             ? 'disabled'
             : 'primary'
         }
+        accessibilityLabelPrefix={AccessibilityLabel.BUTTON_SELECT_FAVORITES}
       />
       {loading && <FullLoading />}
     </View>

package/src/screens/Unit/__test__/SelectAddress.test.js

@@ -175,7 +175,7 @@ describe('Test SelectAddress', () => {
     const animateToRegion = jest.fn();
     const mapRef = {
       current: {
-        mapRef,
+        animateToRegion,
       },
     };
     jest.spyOn(React, 'useRef').mockReturnValue(mapRef);

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

@@ -1425,4 +1425,6 @@ export default {
   actions: 'actions',
   value_must_be_less_than_8_character:
     'Value must be less than or equal to 8 characters',
+  bellow_widget_is_not_configured: 'Bellow widget is not configured',
+  bellow_widget_is_wrongly_configured: 'Bellow widget is wrongly configured',
 };

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

@@ -1436,4 +1436,6 @@ export default {
   you_can_only_add_more: 'Bạn chỉ có thể thêm {number}',
   actions: 'hành động',
   value_must_be_less_than_8_character: 'Giá trị phải ít hơn hoặc bằng 8 kí tự',
+  bellow_widget_is_not_configured: 'Tiện ích bên dưới chưa được cấu hình',
+  bellow_widget_is_wrongly_configured: 'Tiện ích bên dưới được cấu hình sai',
 };