Commit d330a628 by tungnq

TODO: Đã chỉnh sửa giao diện điểm rèn luyện

parent ff461bcc
...@@ -55,7 +55,8 @@ const colors = { ...@@ -55,7 +55,8 @@ const colors = {
greyBlue_soft_50: 'rgba(221, 222, 238, 0.5)', greyBlue_soft_50: 'rgba(221, 222, 238, 0.5)',
// 🟢 Green // 🟢 Green
green500: 'rgba(0, 255, 123, 1)', // green green500: 'rgba(0, 255, 123, 1)', // green
green:'rgba(0, 255, 21, 1)', green:'rgb(0, 128, 0)',
// 🟠 Orange/Yellow // 🟠 Orange/Yellow
orange500: '#F39A2B', // orange, yellow (trùng mã) orange500: '#F39A2B', // orange, yellow (trùng mã)
......
...@@ -6,10 +6,13 @@ const ItemNav = ({ item }) => { ...@@ -6,10 +6,13 @@ const ItemNav = ({ item }) => {
return ( return (
<View style={styles.container}> <View style={styles.container}>
<Text style={styles.text}>{item.address}</Text> <Text style={styles.text}>{item.address}</Text>
<Text style={[styles.text,{fontFamily:R.fonts.InterRegular}]}>Thi gian c trú: {item.timeStay}</Text> <Text style={[styles.text,{fontFamily:R.fonts.InterMedium}]}>Thi gian c trú:{' '}
<View style={{ flexDirection: "row"}}> <Text style={[styles.text,{fontFamily:R.fonts.InterRegular}]}>{item.timeStay}</Text></Text>
<Text style={[styles.text, { flex: 3,fontFamily:R.fonts.InterRegular }]}>Ngày đăng kí: {item.registrationDate}</Text> <View style={{ flexDirection: "row", justifyContent: "space-between"}}>
<View style={[styles.text, { flex:2.5,fontFamily:R.fonts.InterRegular }]}> <Text style={[styles.text, { fontFamily:R.fonts.InterMedium }]}>Ngày đăng kí:{' '}
<Text style={[styles.text,{fontFamily:R.fonts.InterRegular}]}>
{item.registrationDate}</Text></Text>
<View style={[styles.text, { fontFamily:R.fonts.InterRegular }]}>
<Text <Text
style={[ style={[
styles.text, styles.text,
...@@ -21,8 +24,10 @@ const ItemNav = ({ item }) => { ...@@ -21,8 +24,10 @@ const ItemNav = ({ item }) => {
</Text> </Text>
</View> </View>
</View> </View>
<Text style={[styles.text, { fontFamily:R.fonts.InterRegular }]}>Quan h vi ch tr:{item.relation}</Text> <Text style={[styles.text, { fontFamily:R.fonts.InterMedium }]}>Quan h vi ch tr:{' '}
<Text style={[styles.text, { fontFamily:R.fonts.InterRegular }] }>Lý do: {item.reason}</Text> <Text style={[styles.text,{fontFamily:R.fonts.InterRegular}]}>{item.relation}</Text></Text>
<Text style={[styles.text, { fontFamily:R.fonts.InterMedium }] }>Lý do:{' '}
<Text style={[styles.text,{fontFamily:R.fonts.InterRegular}]}>{item.reason}</Text></Text>
</View> </View>
); );
}; };
......
...@@ -4,7 +4,6 @@ import { ...@@ -4,7 +4,6 @@ import {
View, View,
StyleSheet, StyleSheet,
FlatList, FlatList,
SafeAreaView,
} from "react-native"; } from "react-native";
import R from "../../assets/R"; import R from "../../assets/R";
import Header from "../../components/Header/Header"; import Header from "../../components/Header/Header";
...@@ -33,8 +32,8 @@ const OutpatientInfomationView = (props) => { ...@@ -33,8 +32,8 @@ const OutpatientInfomationView = (props) => {
<Text style={[styles.text, styles.addressText]}> <Text style={[styles.text, styles.addressText]}>
134/44/9 Nguyên xá, Bc T Liêm, Hà Ni 134/44/9 Nguyên xá, Bc T Liêm, Hà Ni
</Text> </Text>
<Text style={[styles.text, styles.addressText]}> <Text style={[styles.text, styles.addressText, {fontFamily: R.fonts.InterMedium, fontWeight: '600'}]}>
Thi gian bt đầu cư chú: 20/11/2024 Thi gian bt đầu cư chú: <Text style={{fontFamily: R.fonts.InterRegular}}>20/11/2024</Text>
</Text> </Text>
<Text style={[styles.text, styles.historyTitle]}> <Text style={[styles.text, styles.historyTitle]}>
Lch s đăng ký Lch s đăng ký
......
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