Commit f50fe522 by tungnq

TODO: Tối ưu hóa style cho các component: điều chỉnh kích thước và loại bỏ border không cần thiết

parent 7963c796
...@@ -68,10 +68,10 @@ const styles = StyleSheet.create({ ...@@ -68,10 +68,10 @@ const styles = StyleSheet.create({
}, },
studentCard: { studentCard: {
backgroundColor: R.colors.white, backgroundColor: R.colors.white,
marginVertical: 10, marginVertical: 7.5,
borderRadius: 15, borderRadius: 15,
marginHorizontal: 15, marginHorizontal: 15,
padding: 15, padding: 10,
shadowColor: R.colors.black, shadowColor: R.colors.black,
shadowOffset: {width: 0.5, height: 2}, shadowOffset: {width: 0.5, height: 2},
......
...@@ -90,8 +90,6 @@ const styles = StyleSheet.create({ ...@@ -90,8 +90,6 @@ const styles = StyleSheet.create({
paddingVertical: 4, paddingVertical: 4,
}, },
dayHeaderTextToday: { dayHeaderTextToday: {
color: R.colors.blue,
fontWeight: '700',
}, },
// ==================== TIME SLOTS CONTAINER ==================== // ==================== TIME SLOTS CONTAINER ====================
......
...@@ -88,9 +88,9 @@ const IncomingDocumentView = props => { ...@@ -88,9 +88,9 @@ const IncomingDocumentView = props => {
onPress={() => {}} onPress={() => {}}
backgroundColor={R.colors.orange} backgroundColor={R.colors.orange}
textColor={R.colors.white} textColor={R.colors.white}
height={25} height={30}
borderRadius={15} borderRadius={15}
fontSize={11} fontSize={R.fontsize.fontSizeContent}
fontWeight={'600'} fontWeight={'600'}
fontFamily={R.fonts.fontMedium} fontFamily={R.fonts.fontMedium}
paddingHorizontal={15} paddingHorizontal={15}
...@@ -104,10 +104,10 @@ const IncomingDocumentView = props => { ...@@ -104,10 +104,10 @@ const IncomingDocumentView = props => {
} }
backgroundColor={R.colors.blue} backgroundColor={R.colors.blue}
textColor={R.colors.white} textColor={R.colors.white}
height={25} height={30}
width={90} width={90}
borderRadius={15} borderRadius={15}
fontSize={11} fontSize={R.fontsize.fontSizeContent}
fontWeight={'600'} fontWeight={'600'}
fontFamily={R.fonts.fontMedium} fontFamily={R.fonts.fontMedium}
paddingHorizontal={15} paddingHorizontal={15}
...@@ -128,10 +128,8 @@ const IncomingDocumentView = props => { ...@@ -128,10 +128,8 @@ const IncomingDocumentView = props => {
); );
}; };
const renderTabView = () => {
return ( return (
<View style={styles.container}>
<Header title={'Danh sách văn bản đến'} isBack />
<View style={styles.body}>
<View style={styles.cardTabView}> <View style={styles.cardTabView}>
<FlatList <FlatList
data={dataListTabView} data={dataListTabView}
...@@ -142,7 +140,23 @@ const IncomingDocumentView = props => { ...@@ -142,7 +140,23 @@ const IncomingDocumentView = props => {
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
/> />
</View> </View>
);
};
const renderBody = () => {
return (
<View style={styles.body}>
{renderTabView()}
{renderCard()}
{renderListIncomingDocument()}
</View>
)
}
const renderCard = () => {
return (
<View style={{marginBottom: 15}}> <View style={{marginBottom: 15}}>
<View style={styles.card}> <View style={styles.card}>
<TouchableOpacity style={styles.btnCard}> <TouchableOpacity style={styles.btnCard}>
...@@ -163,10 +177,7 @@ const IncomingDocumentView = props => { ...@@ -163,10 +177,7 @@ const IncomingDocumentView = props => {
<View style={styles.box_3}> <View style={styles.box_3}>
<View style={styles.searchBox}> <View style={styles.searchBox}>
<Image <Image source={R.images.icSearch} style={{width: 20, height: 20}} />
source={R.images.icSearch}
style={{width: 20, height: 20}}
/>
<View style={{flex: 1}}> <View style={{flex: 1}}>
<TextInput <TextInput
placeholder="Tìm kiếm" placeholder="Tìm kiếm"
...@@ -183,9 +194,12 @@ const IncomingDocumentView = props => { ...@@ -183,9 +194,12 @@ const IncomingDocumentView = props => {
</View> </View>
</View> </View>
</View> </View>
);
{renderListIncomingDocument()} };
</View> return (
<View style={styles.container}>
<Header title={'Danh sách văn bản đến'} isBack />
{renderBody()}
</View> </View>
); );
}; };
......
...@@ -91,8 +91,6 @@ const styles = StyleSheet.create({ ...@@ -91,8 +91,6 @@ const styles = StyleSheet.create({
marginHorizontal: 15, marginHorizontal: 15,
marginVertical:7.5, marginVertical:7.5,
borderRadius: 15, borderRadius: 15,
borderWidth: 1,
borderColor: R.colors.grayBorderInputTextHeader,
backgroundColor: R.colors.white, backgroundColor: R.colors.white,
shadowColor: R.colors.black, shadowColor: R.colors.black,
shadowOffset: {width: 0.5, height: 2}, shadowOffset: {width: 0.5, height: 2},
......
...@@ -32,7 +32,7 @@ const DetailRollCallView = props => { ...@@ -32,7 +32,7 @@ const DetailRollCallView = props => {
backgroundColor={R.colors.orange} backgroundColor={R.colors.orange}
textColor={R.colors.white} textColor={R.colors.white}
fontSize={12} fontSize={12}
height={35} height={30}
width={150} width={150}
/> />
<Button /> <Button />
...@@ -48,7 +48,7 @@ const DetailRollCallView = props => { ...@@ -48,7 +48,7 @@ const DetailRollCallView = props => {
backgroundColor={R.colors.blue} backgroundColor={R.colors.blue}
textColor={R.colors.white} textColor={R.colors.white}
fontSize={12} fontSize={12}
height={35} height={30}
width={150} width={150}
/> />
<Button /> <Button />
......
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