edit ui

src/Screens/Account/AccountView.js

@@ -72,7 +72,7 @@ const styles = StyleSheet.create({
   container: {
     flexDirection: 'row',
     paddingHorizontal: 30,
-    marginTop: 20,
+
     justifyContent: 'space-between',
     flexWrap: 'wrap',
   },

src/Screens/AccountVerification/Tab/Profile.js

@@ -213,7 +213,7 @@ const Profile = (props) => {
 const styles = StyleSheet.create({
   btnSend: {
     width: '100%',
-    marginBottom: 30,
+    marginBottom: 10,
   },
   btnNext: {
     borderRadius: 30,

src/Screens/Authen/ConfirmEmail.js

@@ -29,7 +29,7 @@ const ConfirmEmail = (props) => {
         platform: Platform.OS,
         otp_by: value,
       });
-      console.log(res.data);
+
       props.hideLoading();
       if (res.data.code == 200) {
         navigate.navigate(CONFIRMOTP, {email: value});

src/Screens/Home/Footer.js

@@ -13,7 +13,7 @@ const Footer = (props) => {
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
           <Text style={styles.txt}>Doanh thu của đội</Text>
-          <Text style={styles.txtMoney}>$ {toPriceVnd(1500000)} Đ</Text>
+          <Text style={styles.txtMoney}>{toPriceVnd(1500000)} Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>
           <Icon name={'right'} size={20} color={'#707070'} />
@@ -26,7 +26,7 @@ const Footer = (props) => {
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
           <Text style={styles.txt}>Doanh thu nhà tài trợ</Text>
-          <Text style={styles.txtMoney}>$ {toPriceVnd(1500000)} Đ</Text>
+          <Text style={styles.txtMoney}>{toPriceVnd(1500000)} Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>
           <Icon name={'right'} size={20} color={'#707070'} />
@@ -39,7 +39,7 @@ const Footer = (props) => {
         </View>
         <View style={{flex: 1, paddingHorizontal: 15}}>
           <Text style={styles.txt}>Đầu tư</Text>
-          <Text style={styles.txtMoney}>$ {toPriceVnd(1500000)} Đ</Text>
+          <Text style={styles.txtMoney}>{toPriceVnd(1500000)} Đ</Text>
         </View>
         <View style={{justifyContent: 'center', alignItems: 'center'}}>
           <Icon name={'right'} size={20} color={'#707070'} />

src/Screens/Menu/Profile/Tab/GeneralInfor.js

@@ -43,7 +43,7 @@ const GeneralInfor = (props) => {
     <KeyboardAvoidingView
       behavior={Platform.Os === 'ios' ? 'padding' : 'height'}
       style={{flex: 1}}
-      keyboardVerticalOffset={-50}>
+      keyboardVerticalOffset={-500}>
       <ScrollView style={{flex: 1}} showsVerticalScrollIndicator={false}>
         <View style={styles.container}>
           <TextField
@@ -95,15 +95,17 @@ const GeneralInfor = (props) => {
           />
 
           <TextMulti value={props.user.address} title={'Địa chỉ'} />
+
+          <View style={{height: 40}} />
+          <View style={{justifyContent: 'center', alignItems: 'center'}}>
+            <TouchableOpacity
+              onPress={() => console.log('Hello')}
+              style={styles.btn}>
+              <Text style={styles.txtBtn}>Cập nhật</Text>
+            </TouchableOpacity>
+          </View>
         </View>
       </ScrollView>
-      <View style={styles.footer}>
-        <TouchableOpacity
-          onPress={() => console.log('Hello')}
-          style={styles.btn}>
-          <Text style={styles.txtBtn}>Cập nhật</Text>
-        </TouchableOpacity>
-      </View>
     </KeyboardAvoidingView>
   );
 };
@@ -147,7 +149,7 @@ const styles = StyleSheet.create({
     marginBottom: 30,
   },
   btn: {
-    width: WIDTHXD(521),
+    width: 180,
     height: HEIGHTXD(120),
     borderRadius: 10,
     backgroundColor: '#1C6AF6',

src/Screens/MethodPay/Item.js

@@ -38,7 +38,7 @@ export default React.memo(Item);
 const styles = StyleSheet.create({
   container: {
     marginTop: 10,
-    height: HEIGHTXD(320),
+    paddingVertical: 5,
     shadowColor: '#000',
     shadowOffset: {
       width: 0,

src/Screens/NewFeed/DetailNew.js

@@ -6,7 +6,6 @@ import {WebView} from 'react-native-webview';
 import {root} from '../../apis/url';
 
 const DepositView = (props) => {
-  console.log('Link', root + '/api/v1/news/posts?id=' + props.route.params.id);
   return (
     <View style={{flex: 1}}>
       <HeaderBack isWhite={true} title={'Chi tiết'} />

src/Screens/NewFeed/Tab1/Tab1.js

@@ -97,7 +97,6 @@ const NewFeed = (props) => {
           {fillters.map((e) => (
             <TouchableOpacity
               onPress={() => {
-                console.log(e.id);
                 setSelected(e.id);
               }}
               key={e.id}
@@ -119,7 +118,7 @@ const NewFeed = (props) => {
       <View style={{flex: 1, paddingHorizontal: 10}}>
         <FlatList
           showsVerticalScrollIndicator={false}
-          keyExtractor={(item, index) => item.id}
+          keyExtractor={(item, index) => item.id + 'a'}
           refreshing={isRefresh}
           onRefresh={() => onRefresh()}
           onEndReachedThreshold={0.01}

src/Screens/NewFeed/Tab1/item.js

@@ -18,7 +18,11 @@ const Item = (props) => {
       <Text numberOfLines={2} style={styles.txtTitle}>
         {title}
       </Text>
-      <Text style={styles.txtDate}>{published_at}</Text>
+      <View style={styles.row}>
+        <Icon name={'calendar'} style={{marginRight: 10}} size={15} />
+        <Text style={styles.txtDate}>{published_at}</Text>
+      </View>
+
       <Image source={{uri: image}} resizeMode={'cover'} style={styles.img} />
     </TouchableOpacity>
   );
@@ -36,13 +40,12 @@ const styles = StyleSheet.create({
   },
 
   txtTitle: {
-    fontSize: getFontXD(46),
+    fontSize: getFontXD(42),
     color: 'black',
     fontWeight: 'bold',
   },
   txtDate: {
-    fontSize: getFontXD(46),
-    fontStyle: 'italic',
+    fontSize: getFontXD(36),
     color: '#A2A2A2',
   },
   img: {
@@ -51,6 +54,10 @@ const styles = StyleSheet.create({
     borderRadius: 5,
     marginTop: 5,
   },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
 });
 
 export default Item;

src/Screens/Notification/NotificaitonView.js

@@ -66,7 +66,7 @@ const NotificaitonView = (props) => {
 
   return (
     <View style={{flex: 1}}>
-      <HeaderDrawer isWhite={false} title={'Thông báo'} />
+      <HeaderDrawer isWhite={true} title={'Thông báo'} />
       <View style={styles.headerContainer}>
         <FlatList
           showsHorizontalScrollIndicator={false}

src/components/Button.js

@@ -15,18 +15,13 @@ const Button = (props) => {
   return (
     <TouchableOpacity style={styles.container} onPress={onClick}>
       <ImageBackground
-        imageStyle={{
-          borderRadius: 20,
-          height: HEIGHTXD(150),
-          width: '100%',
-        }}
+        resizeMode={'cover'}
         style={{
-          height: HEIGHTXD(150),
-          width: WIDTHXD(1005),
+          height: 50,
+          width: 300,
           justifyContent: 'center',
           alignItems: 'center',
           borderRadius: 20,
-          width: '100%',
         }}
         source={R.images.bgBtn}>
         <Text style={styles.txt}>{title}</Text>

src/components/Header/Header.js

@@ -42,7 +42,6 @@ const HeaderHome = (props) => {
   };
 
   const onModalClick = () => {
-    console.log('Option click', isSelected);
     setOpenModal(false);
   };
 

src/components/Header/ModalOption.js

@@ -24,9 +24,7 @@ const ModalOption = (props) => {
   const {isOpen, closeModal, onChangePicker, onClick} = props;
   const [isDatePickerVisible, setDatePickerVisibility] = useState(false);
 
-  const dateConfirm = (props) => {
-    console.log('Hello');
-  };
+  const dateConfirm = (props) => {};
 
   return (
     <View style={styles.centeredView}>

src/components/Input/TextMulti.js

@@ -18,6 +18,7 @@ const TextField = (props) => {
       </Text>
       <TextInput
         maxLength={maxLength}
+        textAlign={'left'}
         value={value}
         onChangeText={(val) => onChangeText(val)}
         multiline={true}
@@ -25,6 +26,8 @@ const TextField = (props) => {
         placeholderTextColor={R.colors.placeHolder}
         autoCapitalize="none"
         style={{
+          textAlignVertical: 'top',
+          textAlign: 'left',
           color: 'black',
           maxHeight: HEIGHTXD(259),
           minHeight: HEIGHTXD(169),

src/components/Picker/PickerImg.js

@@ -36,7 +36,7 @@ const PickerImg = (props) => {
       multiple: true,
     }).then((images) => {
       setModalVisible(false);
-      console.log('images---', images);
+
       const temp = images.map((e) => e.path);
       onClickImage(temp);
     });
@@ -49,7 +49,7 @@ const PickerImg = (props) => {
       height: 400,
     }).then((image) => {
       setModalVisible(false);
-      console.log(image);
+
       onClickImage(image[0].path);
     });
   };

src/routers/PlussModal.js

@@ -113,8 +113,8 @@ const styles = StyleSheet.create({
   },
   wraper: {
     backgroundColor: R.colors.white,
-    width: WIDTHXD(175),
-    height: WIDTHXD(175),
+    width: WIDTHXD(160),
+    height: WIDTHXD(160),
     justifyContent: 'center',
     alignItems: 'center',
     position: 'absolute',

src/routers/TabNavigation.js

@@ -73,7 +73,7 @@ const TabNavigator = (props) => {
           name="Screen4"
           component={NewFeed}
           options={{
-            tabBarLabel: 'Thông tin',
+            tabBarLabel: 'Tin tức',
             tabBarIcon: ({color, size}) => (
               <Ionicons name="newspaper-outline" size={size} color={color} />
             ),