Merge branch 'tung_ui' of http://git.dcv.vn/tungnq/AppUms_Student into tung_ui

src/screens/home/header.js

-import { Image, StyleSheet, TextInput, View } from "react-native";
+import { Image, SafeAreaView, StatusBar, StyleSheet, TextInput, View } from "react-native";
 import React from "react";
 import R from "../../assets/R";
 const customHeader = (props) => {
@@ -39,7 +39,7 @@ const customHeader = (props) => {
           style={styles.input}
         />
       </View>
-    </View>
+    </SafeAreaView>
   );
 };
 
@@ -49,7 +49,6 @@ const styles = StyleSheet.create({
   container: {
     flexDirection: "row",
     marginHorizontal: 15,
-    maxHeight: 40,
   },
   size_box:{
     width: '20%',
@@ -65,6 +64,7 @@ const styles = StyleSheet.create({
     borderColor: R.colors.gray280,
     borderRadius: 100,
     borderWidth: 1,
+    maxHeight:40,
     paddingHorizontal: 14,
     paddingVertical: 5
   },

src/screens/home/view.js

@@ -8,9 +8,18 @@ import {
   ScrollView,
   TouchableWithoutFeedback,
   Keyboard,
-  SafeAreaView,
   Image,
   StatusBar, // FEATURE: Import StatusBar để control status bar
+  Platform,
+  SafeAreaView,  // FEATURE: Check platform iOS/Android
+} from "react-native";
+import HeaderCus from "../home/header";
+import R from "../../assets/R";
+import I18n from "../../helper/i18/i18n";
+import ItemGrid from "./item";
+import styles from "./style";
+import { useNavigation } from "@react-navigation/native";
+import * as SCREENNAME from "../../routers/ScreenNames";
   Platform, // FEATURE: Check platform iOS/Android
 } from 'react-native';
 import HeaderCus from '../home/header';
@@ -110,6 +119,27 @@ const HomeView = props => {
     </View>
   );
 
+  return (
+
+    
+      <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
+    
+          <View style={styles.container_body}>
+                 
+            <ImageBackground
+              source={R.images.igBackgroundSlider}
+              style={[styles.background_header, {
+              }]}
+            >
+              <HeaderCus
+                pathLogo={R.images.igLogo}
+                width={75}
+                height={36}
+                textInput={R.colors.white}
+                backgroundInput={R.colors.backgroundInputSearch}
+                textLabel={I18n.t("Search")}
+                textColorLabel={R.colors.white}
+              />
   const renderBody = () => {
     return (
       <View style={[{flex: 1}]}>
@@ -134,6 +164,20 @@ const HomeView = props => {
               showsVerticalScrollIndicator={false}
               style={styles.scroll}
               bounces={false} 
+              overScrollMode="never" 
+            >
+              {renderMenuSection("Học tập", menuDataStudy)}
+              {renderMenuSection("Cá nhân", menuDataIndividual)}
+              {renderMenuSection("Dịch vụ trực tuyến", menuDataOnlineSer)}
+            </ScrollView>
+          </View>
+            {renderProfileCard()}
+          </ImageBackground>
+
+          <ScrollView
+            showsVerticalScrollIndicator={false}
+            style={styles.scroll}
+            bounces={false}
             overScrollMode="never">
             {renderMenuSection('Học tập', menuDataStudy)}
             {renderMenuSection('Cá nhân', menuDataIndividual)}
@@ -151,7 +195,6 @@ const HomeView = props => {
       <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
         {renderBody()}
       </TouchableWithoutFeedback>
-    </SafeAreaView>
   );
 };
 

src/screens/profile/view.js

@@ -18,7 +18,7 @@ const ProfileView = (props) => {
   const { phone, setPhone, cmnd, setCmnd, bank, setBank } = props;
   const IconCamera = R.images.icCamera;
   return (
-     <View style={{ flex: 1, }}>
+     <View style={{ flex: 1, backgroundColor:R.colors.white}}>
         <Header title={"Hồ sơ cá nhân"} isBack />
           <ScrollView showsVerticalScrollIndicator={false} style={{ flex: 1 }}>
         <View style={styles.container}>