Commit 4ffede00 by tungnq

TODO: Test thử giao diện ios

parent 96d19d3b
...@@ -19,6 +19,8 @@ const Header = props => { ...@@ -19,6 +19,8 @@ const Header = props => {
const IconBack = R.images.icBack; const IconBack = R.images.icBack;
const IconSearch = R.images.icSearch; const IconSearch = R.images.icSearch;
return ( return (
<>
<SafeAreaView>
<View style={styles.headerContainer}> <View style={styles.headerContainer}>
{isSearch && ( {isSearch && (
<TouchableOpacity <TouchableOpacity
...@@ -39,6 +41,8 @@ const Header = props => { ...@@ -39,6 +41,8 @@ const Header = props => {
</TouchableOpacity> </TouchableOpacity>
)} )}
</View> </View>
</SafeAreaView>
</>
); );
}; };
......
...@@ -13,7 +13,7 @@ import Header from "../../../components/Header/Header"; ...@@ -13,7 +13,7 @@ import Header from "../../../components/Header/Header";
const DetailCertificateView = (props) => { const DetailCertificateView = (props) => {
return ( return (
<SafeAreaView style={{flex:1, backgroundColor: R.colors.white}}> <View style={{flex:1,}}>
<Header isBack={true} title={"Chứng chỉ toeic"} /> <Header isBack={true} title={"Chứng chỉ toeic"} />
<ScrollView showsVerticalScrollIndicator={false} style={styles.container}> <ScrollView showsVerticalScrollIndicator={false} style={styles.container}>
...@@ -71,7 +71,7 @@ const DetailCertificateView = (props) => { ...@@ -71,7 +71,7 @@ const DetailCertificateView = (props) => {
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </View>
); );
}; };
......
...@@ -17,7 +17,7 @@ const ListCetificateView = (props) => { ...@@ -17,7 +17,7 @@ const ListCetificateView = (props) => {
const { } = props; const { } = props;
const navigate = useNavigation(); const navigate = useNavigation();
return ( return (
<SafeAreaView style={{flex:1, backgroundColor: R.colors.white}}> <View style={{flex:1, }}>
<Header isBack={true} isSearch={true} title={"Danh sách chứng chỉ"} <Header isBack={true} isSearch={true} title={"Danh sách chứng chỉ"}
/> />
<ScrollView style={styles.container}> <ScrollView style={styles.container}>
...@@ -43,7 +43,7 @@ const ListCetificateView = (props) => { ...@@ -43,7 +43,7 @@ const ListCetificateView = (props) => {
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </View>
); );
}; };
......
...@@ -18,7 +18,7 @@ import CustomTextInput from "../../components/Input/TextFieldCus"; ...@@ -18,7 +18,7 @@ import CustomTextInput from "../../components/Input/TextFieldCus";
const CertificateRegistrationView = (props) => { const CertificateRegistrationView = (props) => {
const { titleHeader, dataList, isSelected, setSelection } = props; const { titleHeader, dataList, isSelected, setSelection } = props;
return ( return (
<SafeAreaView style={{ flex: 1, backgroundColor: R.colors.white }}> <View style={{ flex: 1, }}>
<Header isBack title={I18n.t(titleHeader)} /> <Header isBack title={I18n.t(titleHeader)} />
<ScrollView <ScrollView
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
...@@ -170,7 +170,7 @@ const CertificateRegistrationView = (props) => { ...@@ -170,7 +170,7 @@ const CertificateRegistrationView = (props) => {
/> />
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </View>
); );
}; };
......
...@@ -241,6 +241,7 @@ const ClassScheduleView = ({ ...@@ -241,6 +241,7 @@ const ClassScheduleView = ({
}; };
return ( return (
<SafeAreaView style={styles.container}> <SafeAreaView style={styles.container}>
<ScrollView showsVerticalScrollIndicator={false}> <ScrollView showsVerticalScrollIndicator={false}>
{renderHeader()} {renderHeader()}
......
...@@ -42,7 +42,7 @@ const DebtView = (props) => { ...@@ -42,7 +42,7 @@ const DebtView = (props) => {
); );
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={I18n.t("Debt")} /> <Header isBack title={I18n.t("Debt")} />
<View style={styles.tab_container}> <View style={styles.tab_container}>
...@@ -73,7 +73,7 @@ const DebtView = (props) => { ...@@ -73,7 +73,7 @@ const DebtView = (props) => {
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
keyExtractor={(item) => item.id.toString()} keyExtractor={(item) => item.id.toString()}
/> />
</SafeAreaView> </View>
); );
}; };
......
...@@ -16,7 +16,7 @@ const ExamScheduleView = (props) => { ...@@ -16,7 +16,7 @@ const ExamScheduleView = (props) => {
); );
}; };
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={I18n.t("ExamSchedule")} /> <Header isBack title={I18n.t("ExamSchedule")} />
<View style={styles.container}> <View style={styles.container}>
...@@ -30,7 +30,7 @@ const ExamScheduleView = (props) => { ...@@ -30,7 +30,7 @@ const ExamScheduleView = (props) => {
/> />
</View> </View>
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
...@@ -15,7 +15,7 @@ import CustomTextInput from "../../components/Input/TextFieldCus"; ...@@ -15,7 +15,7 @@ import CustomTextInput from "../../components/Input/TextFieldCus";
const MedicalView = (props) => { const MedicalView = (props) => {
return ( return (
<SafeAreaView style={[styles.container, { backgroundColor: R.colors.white, paddingHorizontal: 0, paddingTop: 0 }]}> <View style={[styles.container, { paddingHorizontal: 0, paddingTop: 0 }]}>
<Header title={"Thông tin y tế"} isBack /> <Header title={"Thông tin y tế"} isBack />
<ScrollView showsVerticalScrollIndicator={false} style={{ paddingHorizontal: 15 }}> <ScrollView showsVerticalScrollIndicator={false} style={{ paddingHorizontal: 15 }}>
<Text style={styles.title_header}>Thông tin bo him y tế</Text> <Text style={styles.title_header}>Thông tin bo him y tế</Text>
...@@ -85,7 +85,7 @@ const MedicalView = (props) => { ...@@ -85,7 +85,7 @@ const MedicalView = (props) => {
marginVertical={0} marginVertical={0}
/> />
</ScrollView> </ScrollView>
</SafeAreaView> </View>
); );
}; };
......
...@@ -6,7 +6,7 @@ import R from "../../assets/R"; ...@@ -6,7 +6,7 @@ import R from "../../assets/R";
const NewDetails = (props) => { const NewDetails = (props) => {
const { titleNewsDetail } = props; const { titleNewsDetail } = props;
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={titleNewsDetail.title} /> <Header isBack title={titleNewsDetail.title} />
<View <View
...@@ -16,7 +16,7 @@ const NewDetails = (props) => { ...@@ -16,7 +16,7 @@ const NewDetails = (props) => {
{titleNewsDetail.content} {titleNewsDetail.content}
</Text> </Text>
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
...@@ -52,7 +52,7 @@ const NotificationView = (props) => { ...@@ -52,7 +52,7 @@ const NotificationView = (props) => {
</TouchableOpacity> </TouchableOpacity>
); );
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header <Header
title={I18n.t("Notification")} title={I18n.t("Notification")}
/> />
...@@ -83,7 +83,7 @@ const NotificationView = (props) => { ...@@ -83,7 +83,7 @@ const NotificationView = (props) => {
)} )}
/> />
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
...@@ -24,7 +24,7 @@ const OutpatientInfomationView = (props) => { ...@@ -24,7 +24,7 @@ const OutpatientInfomationView = (props) => {
const keyExtractor = (item, index) => `history-item-${index}`; const keyExtractor = (item, index) => `history-item-${index}`;
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header title={"Thông tin ngoại trú"} isBack /> <Header title={"Thông tin ngoại trú"} isBack />
<View style={styles.container}> <View style={styles.container}>
<View style={styles.container}> <View style={styles.container}>
...@@ -75,7 +75,7 @@ const OutpatientInfomationView = (props) => { ...@@ -75,7 +75,7 @@ const OutpatientInfomationView = (props) => {
onSubmit={onSubmitRegistration} onSubmit={onSubmitRegistration}
/> />
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
...@@ -18,7 +18,7 @@ const ProfileView = (props) => { ...@@ -18,7 +18,7 @@ const ProfileView = (props) => {
const { phone, setPhone, cmnd, setCmnd, bank, setBank } = props; const { phone, setPhone, cmnd, setCmnd, bank, setBank } = props;
const IconCamera = R.images.icCamera; const IconCamera = R.images.icCamera;
return ( return (
<View style={{ flex: 1}}> <View style={{ flex: 1, }}>
<Header title={"Hồ sơ cá nhân"} isBack /> <Header title={"Hồ sơ cá nhân"} isBack />
<ScrollView showsVerticalScrollIndicator={false} style={{ flex: 1 }}> <ScrollView showsVerticalScrollIndicator={false} style={{ flex: 1 }}>
<View style={styles.container}> <View style={styles.container}>
......
...@@ -16,7 +16,7 @@ const RollCallView = (props) => { ...@@ -16,7 +16,7 @@ const RollCallView = (props) => {
return <ItemList item={item} />; return <ItemList item={item} />;
}; };
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={I18n.t("RollCall")} /> <Header isBack title={I18n.t("RollCall")} />
<View style={styles.container}> <View style={styles.container}>
...@@ -32,7 +32,7 @@ const RollCallView = (props) => { ...@@ -32,7 +32,7 @@ const RollCallView = (props) => {
</View> </View>
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
...@@ -21,7 +21,7 @@ const TrainingPointView = (props) => { ...@@ -21,7 +21,7 @@ const TrainingPointView = (props) => {
const { dataTitle, dataListInfo } = props; const { dataTitle, dataListInfo } = props;
const columnFlex = [1, 2, 2, 2, 2, 1]; const columnFlex = [1, 2, 2, 2, 2, 1];
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={I18n.t("TrainingPoint")} /> <Header isBack title={I18n.t("TrainingPoint")} />
<ScrollView <ScrollView
showsVerticalScrollIndicator={false} showsVerticalScrollIndicator={false}
...@@ -62,7 +62,7 @@ const TrainingPointView = (props) => { ...@@ -62,7 +62,7 @@ const TrainingPointView = (props) => {
</View> </View>
</View> </View>
</ScrollView> </ScrollView>
</SafeAreaView> </View>
); );
}; };
......
...@@ -21,7 +21,7 @@ const TrainingProgramView = (props) => { ...@@ -21,7 +21,7 @@ const TrainingProgramView = (props) => {
); );
}; };
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<Header isBack title={"Chương trình đào tạo"} /> <Header isBack title={"Chương trình đào tạo"} />
<View style={styles.container}> <View style={styles.container}>
...@@ -37,7 +37,7 @@ const TrainingProgramView = (props) => { ...@@ -37,7 +37,7 @@ const TrainingProgramView = (props) => {
/> />
</View> </View>
</View> </View>
</SafeAreaView> </View>
); );
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment