@eohjsc/react-native-smart-city 0.4.88 → 0.4.90

package/package.json

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

package/src/commons/Sharing/WrapHeaderScrollable.js

@@ -7,8 +7,6 @@ import {
   View,
 } from 'react-native';
 import { ActivityIndicator } from '@ant-design/react-native';
-import { isIphoneX } from 'react-native-iphone-x-helper';
-
 import { Colors, Theme } from '../../configs';
 import HeaderAni, { heightHeader } from '../../commons/HeaderAni';
 import Text from '../../commons/Text';
@@ -83,7 +81,7 @@ const WrapHeaderScrollable = ({
           />
         }
         contentInset={{
-          top: heightHeader - (isIphoneX() ? 32 : 0),
+          top: heightHeader,
         }}
         contentOffset={{
           y: -heightHeader,
@@ -116,8 +114,8 @@ const styles = StyleSheet.create({
   scrollView: {
     flex: 1,
     paddingTop: Platform.select({
-      ios: 15,
-      android: heightHeader + 16,
+      ios: 0,
+      android: heightHeader,
     }),
   },
   contentContainerStyle: {

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { View } from 'react-native';
+import { Keyboard, TouchableWithoutFeedback, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import styles from './Styles/SetupScriptDelayStyles';
 import { HeaderCustom } from '../../../commons';
@@ -55,25 +55,27 @@ const SetupScriptDelay = ({ route }) => {
   return (
     <View style={styles.wrap}>
       <HeaderCustom isShowClose onClose={goBack} title={t('wait')} />
-      <View style={styles.container}>
-        <_TextInput
-          label={t('set_timeout_seconds')}
-          placeholder={t('maximum_3600_seconds')}
-          keyboardType="numeric"
-          textInputStyle={styles.inputNumber}
-          value={delay}
-          onChange={onChangeTitle}
-          maxLength={4}
-          accessibilityLabel={AccessibilityLabel.AUTOMATE_INPUT_DELAY}
-          autoFocus
-        />
-        <BottomButtonView
-          style={styles.bottomButtonView}
-          mainTitle={t('save')}
-          onPressMain={onNext}
-          typeMain={canSave ? 'primary' : 'disabled'}
-        />
-      </View>
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
+        <View style={styles.container}>
+          <_TextInput
+            label={t('set_timeout_seconds')}
+            placeholder={t('maximum_3600_seconds')}
+            keyboardType="numeric"
+            textInputStyle={styles.inputNumber}
+            value={delay}
+            onChange={onChangeTitle}
+            maxLength={4}
+            accessibilityLabel={AccessibilityLabel.AUTOMATE_INPUT_DELAY}
+            autoFocus
+          />
+          <BottomButtonView
+            style={styles.bottomButtonView}
+            mainTitle={t('save')}
+            onPressMain={onNext}
+            typeMain={canSave ? 'primary' : 'disabled'}
+          />
+        </View>
+      </TouchableWithoutFeedback>
     </View>
   );
 };

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

@@ -1,5 +1,5 @@
 import React, { useCallback, useMemo, useState } from 'react';
-import { View } from 'react-native';
+import { Keyboard, TouchableWithoutFeedback, View } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import styles from './Styles/SetupScriptNotifyStyles';
 import { HeaderCustom } from '../../../commons';
@@ -59,32 +59,33 @@ const SetupScriptNotify = ({ route }) => {
   return (
     <View style={styles.wrap}>
       <HeaderCustom isShowClose onClose={goBack} title={t('notification')} />
-      <View style={styles.container}>
-        <_TextInput
-          placeholder={t('title_notification')}
-          onChange={onChangeTitle}
-          textInputStyle={styles.textTitle}
-          value={notify?.title}
-          accessibilityLabel={AccessibilityLabel.AUTOMATE_TITLE_NOTIFY}
-          autoFocus
-        />
-        <_TextInput
-          placeholder={t('message_notification')}
-          onChange={onChangeMessage}
-          textInputStyle={styles.textMessage}
-          value={notify?.message}
-          accessibilityLabel={AccessibilityLabel.AUTOMATE_MESSAGE_NOTIFY}
-          multiline={true}
-          maxLength={255}
-        />
-
-        <BottomButtonView
-          style={styles.bottomButtonView}
-          mainTitle={t('save')}
-          onPressMain={onNext}
-          typeMain={canSave ? 'primary' : 'disabled'}
-        />
-      </View>
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
+        <View style={styles.container}>
+          <_TextInput
+            placeholder={t('title_notification')}
+            onChange={onChangeTitle}
+            textInputStyle={styles.textTitle}
+            value={notify?.title}
+            accessibilityLabel={AccessibilityLabel.AUTOMATE_TITLE_NOTIFY}
+            autoFocus
+          />
+          <_TextInput
+            placeholder={t('message_notification')}
+            onChange={onChangeMessage}
+            textInputStyle={styles.textMessage}
+            value={notify?.message}
+            accessibilityLabel={AccessibilityLabel.AUTOMATE_MESSAGE_NOTIFY}
+            multiline={true}
+            maxLength={255}
+          />
+          <BottomButtonView
+            style={styles.bottomButtonView}
+            mainTitle={t('save')}
+            onPressMain={onNext}
+            typeMain={canSave ? 'primary' : 'disabled'}
+          />
+        </View>
+      </TouchableWithoutFeedback>
     </View>
   );
 };

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

@@ -21,6 +21,7 @@ export default StyleSheet.create({
   },
   textMessage: {
     height: 500,
+    textAlignVertical: 'top',
     borderWidth: 1,
     borderColor: Colors.Gray4,
     borderStyle: 'solid',

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

@@ -11,6 +11,7 @@ import _TextInput from '../../../../commons/Form/TextInput';
 import BottomButtonView from '../../../../commons/BottomButtonView';
 import { ToastBottomHelper } from '../../../../utils/Utils';
 import SetupScriptDelay from '../SetupScriptDelay';
+import { TouchableWithoutFeedback } from 'react-native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -55,6 +56,10 @@ describe('Test SetupScriptDelay', () => {
       inputs[0].props.onChange('u');
     });
     expect(button.props.typeMain).toEqual('disabled');
+    const touchable = instance.findAllByType(TouchableWithoutFeedback);
+    await act(async () => {
+      touchable[0].props.onPress();
+    });
     await act(async () => {
       inputs[0].props.onChange('0');
     });

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

@@ -11,6 +11,7 @@ import SetupScriptNotify from '../SetupScriptNotify';
 import _TextInput from '../../../../commons/Form/TextInput';
 import BottomButtonView from '../../../../commons/BottomButtonView';
 import { ToastBottomHelper } from '../../../../utils/Utils';
+import { TouchableWithoutFeedback } from 'react-native';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -53,6 +54,12 @@ describe('Test SetupScriptNotify', () => {
 
     await act(async () => {
       inputs[0].props.onChange('Title');
+    });
+    const touchable = instance.findAllByType(TouchableWithoutFeedback);
+    await act(async () => {
+      touchable[0].props.onPress();
+    });
+    await act(async () => {
       inputs[1].props.onChange('Message');
     });
     const button = instance.findByType(BottomButtonView);

package/src/screens/Automate/ScriptDetail/index.js

@@ -218,12 +218,14 @@ const ScriptDetail = ({ route }) => {
         onGoBack={goBack}
       >
         <View style={styles.wrapContent}>
-          <View style={styles.row}>
-            <Text type="H3" semibold>
-              {t('enable_this_script')}
-            </Text>
-            <Switch checked={enableScript} onChange={onChangeSwitch} />
-          </View>
+          {!!can_edit && !!enableScript && (
+            <View style={styles.row}>
+              <Text type="H3" semibold>
+                {t('enable_this_script')}
+              </Text>
+              <Switch checked={enableScript} onChange={onChangeSwitch} />
+            </View>
+          )}
           <Text type="H3" semibold>
             {t('how_to_start')}
           </Text>

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

@@ -16,6 +16,7 @@ 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();
@@ -442,7 +443,7 @@ const NotificationItem = memo(({ item }) => {
               },
             });
           },
-          iconContent: <Image source={logo} style={styles.logo} />,
+          iconContent: <Notify />,
         };
       default:
         return null;
@@ -498,7 +499,7 @@ const NotificationItem = memo(({ item }) => {
               {sub_content}
             </Text>
           )}
-          <Text color={Colors.Gray7} type="Label" style={[styles.time]}>
+          <Text color={Colors.Gray7} type="Label">
             {timeFormat}
           </Text>
         </View>

package/src/screens/Notification/index.js

@@ -99,7 +99,6 @@ const Notification = memo(() => {
         onLoadMore={handleOnLoadMore}
         onRefresh={onRefresh}
         disableLoadMore={page >= maxPageNotification}
-        styleScrollView={styles.styleScrollView}
       >
         {notifications.map((item, index) => (
           <NotificationItem item={item} key={index} />

package/src/screens/Notification/styles/NotificationItemStyles.js

@@ -3,9 +3,9 @@ import { Colors } from '../../../configs';
 
 export default StyleSheet.create({
   container: {
-    paddingHorizontal: 16,
-    paddingTop: 16,
-    paddingBottom: 16,
+    paddingHorizontal: 10,
+    paddingTop: 10,
+    paddingBottom: 10,
     flexDirection: 'row',
     backgroundColor: Colors.White,
   },
@@ -21,35 +21,22 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
   },
+  iconNotification: {
+    width: '46%',
+  },
   viewRight: {
     flexShrink: 1,
   },
-  time: {
-    marginTop: 12,
-  },
-  iconNotification: {
-    width: '46%',
+  textNotification: {
+    lineHeight: 23,
   },
   backgroundSummer: {
     width: '46%',
     color: Colors.Summer,
   },
-  border: {
-    color: Colors.Primary,
-    paddingTop: 8,
-    paddingBottom: 8,
-    paddingHorizontal: 16,
-    borderColor: Colors.Primary,
-    borderWidth: 1,
-    borderRadius: 50,
-    width: 120,
-  },
   logo: {
     width: 20,
     height: 20,
     resizeMode: 'contain',
   },
-  textNotification: {
-    lineHeight: 23,
-  },
 });

package/src/screens/Notification/styles/indexStyles.js

@@ -1,7 +1,6 @@
 import { StyleSheet } from 'react-native';
 
 import { Colors } from '../../../configs';
-import { getStatusBarHeight } from '../../../configs/Constants';
 
 export default StyleSheet.create({
   wrap: {
@@ -17,7 +16,4 @@ export default StyleSheet.create({
   iconPlus: {
     marginRight: 22,
   },
-  styleScrollView: {
-    marginTop: getStatusBarHeight(),
-  },
 });