@eohjsc/react-native-smart-city 0.7.36 → 0.7.37

package/package.json

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

package/src/commons/Device/ItemDevice.js

@@ -151,7 +151,7 @@ const styles = StyleSheet.create({
   androidStyle: {
     lineHeight: 22,
     includeFontPadding: false,
-    marginBottom: 8,
+    marginVertical: 8,
   },
   lineHeight20: {
     lineHeight: 20,

package/src/commons/Header/Styles/HeaderCustomStyles.js

@@ -10,7 +10,7 @@ export default StyleSheet.create({
     paddingLeft: 7,
     paddingRight: 10,
     paddingBottom: 6,
-    paddingTop: getStatusBarHeight() + 20,
+    paddingTop: getStatusBarHeight() + 30,
   },
   separator: {
     borderBottomWidth: 0.5,

package/src/commons/HeaderAni/index.js

@@ -10,7 +10,7 @@ import { AccessibilityLabel } from '../../configs/Constants';
 
 const screenHeight = Constants.height;
 const default_height = 45;
-const paddingIos = getStatusBarHeight() + 20;
+const paddingIos = getStatusBarHeight() + 30;
 export const title_height = 44;
 export const heightHeader = default_height + title_height + paddingIos;
 

package/src/commons/MenuActionAddnew/index.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback } from 'react';
-import { FlatList, StyleSheet, View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
 import { Colors } from '../../configs';
@@ -8,7 +8,6 @@ import ImageButton from '../ImageButton';
 import { ModalCustom } from '../Modal';
 import packageJson from '../../../package.json';
 
-const keyExtractor = (item) => item.id.toString();
 const MenuActionAddnew = memo(
   ({ visible, hideModal, dataActions, onItemClick }) => {
     const t = useTranslations();
@@ -21,25 +20,6 @@ const MenuActionAddnew = memo(
       [onItemClick]
     );
 
-    const renderItem = useCallback(
-      ({ item }) => {
-        return (
-          <View
-            style={{
-              ...styles.action,
-              flexBasis: `${100 / numColumns}%`,
-            }}
-          >
-            <ImageButton onPress={() => onPress(item)} image={item.image} />
-            <View style={styles.actionTextWrap}>
-              <Text styles={styles.actionText}>{item.text}</Text>
-            </View>
-          </View>
-        );
-      },
-      [numColumns, onPress]
-    );
-
     return (
       <ModalCustom
         isVisible={visible}
@@ -53,15 +33,23 @@ const MenuActionAddnew = memo(
               <Text style={styles.modalHeaderText}>{t('add_new')}</Text>
             </View>
 
-            <FlatList
-              bounces={false}
-              numColumns={numColumns}
-              contentContainerStyle={styles.actionWrapper}
-              data={dataActions}
-              keyExtractor={keyExtractor}
-              renderItem={renderItem}
-              scrollIndicatorInsets={{ right: 1 }}
-            />
+            <View style={styles.actionWrapper}>
+              {dataActions.map((item) => (
+                <View
+                  key={item.id.toString()}
+                  style={[styles.action, { width: `${100 / numColumns}%` }]}
+                >
+                  <ImageButton
+                    onPress={() => onPress(item)}
+                    image={item.image}
+                  />
+                  <View style={styles.actionTextWrap}>
+                    <Text style={styles.actionText}>{item.text}</Text>
+                  </View>
+                </View>
+              ))}
+            </View>
+
             <View style={styles.modalHeader}>
               <Text
                 style={styles.modalHeaderText}
@@ -88,7 +76,6 @@ const styles = StyleSheet.create({
     borderRadius: 10,
   },
   modalWrapper: {
-    flex: 1,
     flexDirection: 'column',
     backgroundColor: Colors.White,
     borderRadius: 10,
@@ -110,7 +97,8 @@ const styles = StyleSheet.create({
   },
   actionWrapper: {
     padding: 16,
-    flex: 1,
+    flexDirection: 'row',
+    flexWrap: 'wrap',
   },
   action: {
     marginBottom: 25,

package/src/commons/Unit/HeaderUnit/index.js

@@ -106,8 +106,7 @@ const HeaderUnit = memo(({ transparent, unit }) => {
 
 export default HeaderUnit;
 
-const stickyHeaderHeight =
-  Device.TopbarHeight + (Device.isIOS ? 0 : StatusBar.currentHeight);
+const stickyHeaderHeight = Device.TopbarHeight + (Device.isIOS ? 0 : 30);
 
 const styles = StyleSheet.create({
   container: {

package/src/commons/WrapParallaxScrollView/index.js

@@ -10,8 +10,7 @@ import FImage from '../FImage';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import ParallaxScrollView from '../../libs/react-native-parallax-scroll-view';
 
-const stickyHeaderHeight =
-  Device.TopbarHeight + (Device.isIOS ? 0 : StatusBar.currentHeight);
+const stickyHeaderHeight = Device.TopbarHeight + (Device.isIOS ? 0 : 30);
 
 const WrapParallaxScrollView = ({ children, unit, onRefresh }) => {
   const { name = '', background } = unit;

package/src/configs/Device.js

@@ -17,6 +17,6 @@ export default {
   isIOS: Platform.OS === 'ios',
   isIphoneX,
   ToolbarHeight: isIphoneX ? 44 : Platform.OS === 'ios' ? 20 : 0,
-  TopbarHeight: isIphoneX ? 88 : Platform.OS === 'ios' ? 64 : 44, //incule toolbar
+  TopbarHeight: isIphoneX ? 88 : Platform.OS === 'ios' ? 64 : 50, //incule toolbar
   androidSmallHeight: Platform.OS === 'android' && height < 600,
 };

package/src/screens/Automate/index.js

@@ -34,7 +34,6 @@ const Automate = () => {
   const isFocused = useIsFocused();
   const { setOptions, navigate } = useNavigation();
   const [automatesData, setAutomatesData] = useState([]);
-  const [isLoading, setIsLoading] = useState(false);
   const { name: currentRouteName } = useRoute();
   const starredScriptIds = useSCContextSelector(
     (state) => state.automate.starredScriptIds
@@ -55,8 +54,11 @@ const Automate = () => {
   }, [automatesData, starredScriptIds]);
 
   const getAutomates = useCallback(async () => {
-    setIsLoading(true);
-    const { success, data } = await axiosGet(API.AUTOMATE.GET_SMART());
+    const { success, data } = await axiosGet(
+      API.AUTOMATE.GET_SMART(),
+      {},
+      true
+    );
     if (success && data && data.length) {
       const multiUnit = data[0];
       const haveAutomates = data
@@ -67,7 +69,6 @@ const Automate = () => {
         .filter((unit) => !unit.automates.length);
       setAutomatesData([multiUnit, ...haveAutomates, ...notHaveAutomates]);
     }
-    setIsLoading(false);
   }, []);
 
   const onPressItem = useCallback(
@@ -224,7 +225,6 @@ const Automate = () => {
 
   return (
     <View style={styles.wrap}>
-      {isLoading && <Loading />}
       <FlatList
         keyExtractor={keyExtractor}
         data={sortedAutomateData}

package/src/screens/Notification/index.js

@@ -51,7 +51,9 @@ const Notification = memo(() => {
 
   const fetchNotifications = useCallback(async (pageParam) => {
     const { success, data } = await axiosGet(
-      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(pageParam)
+      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(pageParam),
+      {},
+      true
     );
     if (success) {
       setNotifications((preState) => preState.concat(data.results));
@@ -69,7 +71,9 @@ const Notification = memo(() => {
   const onRefresh = useCallback(async () => {
     setPage(1);
     const { success, data } = await axiosGet(
-      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1)
+      API.NOTIFICATION.LIST_EOH_NOTIFICATIONS(1),
+      {},
+      true
     );
     if (success) {
       setNotifications(data.results);

package/src/screens/SharedUnit/index.js

@@ -51,7 +51,8 @@ const Shared = () => {
   const filterSharedUnits = useCallback(async (field, config) => {
     const { success, data } = await axiosGet(
       API.UNIT.FILTER_SHARED_UNITS(field),
-      config
+      config,
+      true
     );
     if (success) {
       setSharedUnits(data);

package/src/screens/SubUnit/AddSubUnitStyles.js

@@ -9,7 +9,7 @@ export default StyleSheet.create({
   wrap: {
     flex: 1,
     backgroundColor: Colors.Gray2,
-    paddingTop: getStatusBarHeight() + 10,
+    paddingTop: getStatusBarHeight() + 30,
   },
   padding: {
     paddingHorizontal: 16,