Commit fd8f9fa4 by tungnq

TODO: Đã sửa lai giao diện một số componet

parent 5b569b78
...@@ -57,12 +57,12 @@ const DropdownSelect = ({ ...@@ -57,12 +57,12 @@ const DropdownSelect = ({
searchable = false, searchable = false,
searchPlaceholder = "Search...", searchPlaceholder = "Search...",
titleColor, // Màu chữ title titleColor = "black", // Màu chữ title
titleFontSize, // Kích thước font title titleFontSize = 12, // Kích thước font title
titleFontWeight, // Độ đậm font title (normal, bold, 100-900) titleFontWeight = "400", // Độ đậm font title (normal, bold, 100-900)
titleFontFamily, // Font family title titleFontFamily = R.fonts.InterMedium, // Font family title
titleFontStyle, // Font style title (normal, italic) titleFontStyle = "normal", // Font style title (normal, italic)
titleTextAlign, // Text align title (left, center, right) titleTextAlign = "left", // Text align title (left, center, right)
titleLineHeight, // Line height title titleLineHeight, // Line height title
titleLetterSpacing, // Letter spacing title titleLetterSpacing, // Letter spacing title
titleTextTransform, // Text transform (none, uppercase, lowercase, capitalize) titleTextTransform, // Text transform (none, uppercase, lowercase, capitalize)
...@@ -98,7 +98,7 @@ const DropdownSelect = ({ ...@@ -98,7 +98,7 @@ const DropdownSelect = ({
keyExtractor, keyExtractor,
width, width,
height, height = 30,
paddingHorizontal, paddingHorizontal,
paddingVertical, paddingVertical,
paddingTop, paddingTop,
......
...@@ -68,8 +68,8 @@ const styles = StyleSheet.create({ ...@@ -68,8 +68,8 @@ const styles = StyleSheet.create({
// UI/UX: Title text // UI/UX: Title text
title: { title: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontsSize12,
fontFamily: R.fonts.InterRegular, fontFamily: R.fonts.InterMedium,
fontWeight: '400', fontWeight: '600',
color: R.colors.black color: R.colors.black
}, },
......
...@@ -28,10 +28,6 @@ const CertificateRegistrationView = (props) => { ...@@ -28,10 +28,6 @@ const CertificateRegistrationView = (props) => {
<DropdownSelect <DropdownSelect
title={"Loại chứng chỉ *"} title={"Loại chứng chỉ *"}
titleFontFamily={R.fonts.InterRegular}
titleFontSize={R.fontsize.fontsSize12}
titleFontWeight={"400"}
titleColor={R.colors.black}
data={dataList} data={dataList}
placeholder="HS" placeholder="HS"
placeholderFontFamily={R.fonts.InterRegular} placeholderFontFamily={R.fonts.InterRegular}
...@@ -43,7 +39,7 @@ const CertificateRegistrationView = (props) => { ...@@ -43,7 +39,7 @@ const CertificateRegistrationView = (props) => {
marginHorizontal={15} marginHorizontal={15}
marginVertical={5} marginVertical={5}
iconColor={R.colors.black} iconColor={R.colors.black}
iconSize={10} iconSize={5}
/> />
<View style={{ marginHorizontal: 15, }}> <View style={{ marginHorizontal: 15, }}>
<CustomTextInput <CustomTextInput
...@@ -134,7 +130,7 @@ const CertificateRegistrationView = (props) => { ...@@ -134,7 +130,7 @@ const CertificateRegistrationView = (props) => {
/> />
</View> </View>
<Text style={{ marginHorizontal: 15, color: R.colors.black }}> <Text style={{ marginHorizontal: 15, color: R.colors.black, fontSize: R.fontsize.fontsSize12, fontWeight: "600", fontFamily: R.fonts.InterMedium }}>
nh chng ch <Text style={{ color: "red" }}>*</Text> nh chng ch <Text style={{ color: "red" }}>*</Text>
</Text> </Text>
<CardButtonImage /> <CardButtonImage />
......
...@@ -32,11 +32,9 @@ const MedicalView = (props) => { ...@@ -32,11 +32,9 @@ const MedicalView = (props) => {
placeholderColor={R.colors.grey_800} placeholderColor={R.colors.grey_800}
borderRadius={10} borderRadius={10}
height={30} height={30}
iconSize={5}
iconColor={R.colors.black} iconColor={R.colors.black}
titleFontWeight={"300"} titleFontWeight={"300"}
fontSize={R.fontsize.fontsSize12}
titleFontSize={R.fontsize.fontsSize12}
titleFontFamily={R.fonts.InterRegular}
/> />
<CustomTextInput <CustomTextInput
title={"Ngày hết hạn BHYT"} title={"Ngày hết hạn BHYT"}
...@@ -64,9 +62,7 @@ const MedicalView = (props) => { ...@@ -64,9 +62,7 @@ const MedicalView = (props) => {
height={30} height={30}
iconColor={R.colors.black} iconColor={R.colors.black}
titleFontWeight={"300"} titleFontWeight={"300"}
fontSize={R.fontsize.fontsSize12} iconSize={5}
titleFontSize={R.fontsize.fontsSize12}
titleFontFamily={R.fonts.InterRegular}
marginBottom={50} marginBottom={50}
marginHorizontal={0} marginHorizontal={0}
marginVertical={0} marginVertical={0}
......
...@@ -38,16 +38,13 @@ const styles = StyleSheet.create({ ...@@ -38,16 +38,13 @@ const styles = StyleSheet.create({
container: { container: {
backgroundColor: R.colors.white , backgroundColor: R.colors.white ,
borderRadius: 15, borderRadius: 15,
marginBottom: 18, marginBottom: 7.5,
padding: 15, padding: 10,
shadowColor: R.colors.black, shadowColor: R.colors.black,
shadowOffset: { shadowOffset: {width: 0.5, height: 2},
width: 0, shadowOpacity: Platform.OS === 'ios' ? 0.25 : 1,
height:2 shadowRadius: 5,
}, elevation: Platform.OS === 'ios' ? 1 : 2,
shadowOpacity: 0.5,
shadowRadius: 1,
elevation: 1,
}, },
text: { text: {
......
...@@ -130,13 +130,9 @@ const RegistrationModal = ({visible, onClose, onNavigateToOther}) => { ...@@ -130,13 +130,9 @@ const RegistrationModal = ({visible, onClose, onNavigateToOther}) => {
borderRadius={10} borderRadius={10}
height={30} height={30}
iconColor={R.colors.black} iconColor={R.colors.black}
iconSize={10} iconSize={5}
marginHorizontal={0} marginHorizontal={0}
marginVertical={0} marginVertical={0}
titleFontWeight={'400'}
fontSize={R.fontsize.fontsSize12}
titleFontSize={R.fontsize.fontsSize12}
titleFontFamily={R.fonts.InterRegular}
/> />
</View> </View>
<View style={{width: '3%'}}></View> <View style={{width: '3%'}}></View>
...@@ -151,13 +147,9 @@ const RegistrationModal = ({visible, onClose, onNavigateToOther}) => { ...@@ -151,13 +147,9 @@ const RegistrationModal = ({visible, onClose, onNavigateToOther}) => {
borderRadius={10} borderRadius={10}
height={30} height={30}
iconColor={R.colors.black} iconColor={R.colors.black}
iconSize={10} iconSize={5}
marginHorizontal={0} marginHorizontal={0}
marginVertical={0} marginVertical={0}
titleFontWeight={'400'}
fontSize={R.fontsize.fontsSize12}
titleFontSize={R.fontsize.fontsSize12}
titleFontFamily={R.fonts.InterRegular}
/> />
</View> </View>
</View> </View>
......
...@@ -93,11 +93,10 @@ const styles = StyleSheet.create({ ...@@ -93,11 +93,10 @@ const styles = StyleSheet.create({
}, },
scrollableList: { scrollableList: {
flex: 1, flex: 1,
paddingHorizontal: 15,
}, },
flatListContent: { flatListContent: {
paddingTop: 10, paddingVertical: 5,
paddingBottom: 10, paddingHorizontal:15
}, },
buttonSection: { buttonSection: {
paddingHorizontal: 15, paddingHorizontal: 15,
......
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