Commit dd76d0fc by tungnq

TODO: Đã chính sửa giao diện

parent d1739806
...@@ -115,13 +115,13 @@ const styles = StyleSheet.create({ ...@@ -115,13 +115,13 @@ const styles = StyleSheet.create({
}, },
moreEventsText: { moreEventsText: {
fontSize: R.sizes.xs, fontSize: R.sizes.xs,
color: R.colors.grey_100, color: R.colors.gray,
textAlign: 'center', textAlign: 'center',
}, },
modalBackdrop: { modalBackdrop: {
flex: 1, flex: 1,
backgroundColor: R.colors.grey_200, backgroundColor: R.colors.grayBorderInputTextHeader,
justifyContent: 'flex-end', justifyContent: 'flex-end',
}, },
bottomSheet: { bottomSheet: {
...@@ -137,7 +137,7 @@ const styles = StyleSheet.create({ ...@@ -137,7 +137,7 @@ const styles = StyleSheet.create({
dragHandle: { dragHandle: {
width: 40, width: 40,
height: 4, height: 4,
backgroundColor: R.colors.grey_200, backgroundColor: R.colors.gray,
borderRadius: 2, borderRadius: 2,
alignSelf: 'center', alignSelf: 'center',
marginTop: 10, marginTop: 10,
...@@ -150,8 +150,8 @@ const styles = StyleSheet.create({ ...@@ -150,8 +150,8 @@ const styles = StyleSheet.create({
marginBottom: 20, marginBottom: 20,
}, },
bottomSheetTitle: { bottomSheetTitle: {
fontSize: R.fontsize.fontSizeHeader1, fontSize: R.fontsize.fontSizeContent,
fontFamily: R.fonts.InterMedium, fontFamily: R.fonts.fontMedium,
color: R.colors.black, color: R.colors.black,
flex: 1, flex: 1,
}, },
...@@ -159,14 +159,14 @@ const styles = StyleSheet.create({ ...@@ -159,14 +159,14 @@ const styles = StyleSheet.create({
width: 30, width: 30,
height: 30, height: 30,
borderRadius: 15, borderRadius: 15,
backgroundColor: R.colors.grey_200, backgroundColor: R.colors.gray,
alignItems: 'center', alignItems: 'center',
justifyContent: 'center', justifyContent: 'center',
}, },
closeButtonText: { closeButtonText: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontsSize12,
color: R.colors.grey_800, color: R.colors.black,
fontFamily: R.fonts.InterRegular, fontFamily: R.fonts.fontRegular,
}, },
noEventsContainer: { noEventsContainer: {
...@@ -176,9 +176,9 @@ const styles = StyleSheet.create({ ...@@ -176,9 +176,9 @@ const styles = StyleSheet.create({
paddingVertical: 40, paddingVertical: 40,
}, },
noEventsText: { noEventsText: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontSizeContent,
fontFamily: R.fonts.InterRegular, fontFamily: R.fonts.fontRegular,
color: R.colors.grey_800, color: R.colors.gray,
fontWeight: '400' fontWeight: '400'
}, },
eventCard: { eventCard: {
...@@ -205,25 +205,25 @@ const styles = StyleSheet.create({ ...@@ -205,25 +205,25 @@ const styles = StyleSheet.create({
marginRight: 15, marginRight: 15,
}, },
eventTime: { eventTime: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontSizeContent,
fontFamily: R.fonts.InterMedium, fontFamily: R.fonts.fontMedium,
color: R.colors.blue500, color: R.colors.blue,
fontWeight: '600', fontWeight: '600',
}, },
eventContent: { eventContent: {
flex: 1, flex: 1,
}, },
eventTitle: { eventTitle: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontSizeContent,
fontFamily: R.fonts.InterMedium, fontFamily: R.fonts.fontMedium,
color: R.colors.black, color: R.colors.black,
fontWeight: '600', fontWeight: '600',
marginBottom: 4, marginBottom: 4,
}, },
eventDescription: { eventDescription: {
fontSize: R.fontsize.fontsSize12, fontSize: R.fontsize.fontSizeContent,
fontFamily: R.fonts.InterRegular, fontFamily: R.fonts.fontRegular,
color: R.colors.grey_800, color: R.colors.gray,
}, },
}); });
......
...@@ -242,14 +242,16 @@ const ClassScheduleView = ({ ...@@ -242,14 +242,16 @@ const ClassScheduleView = ({
return ( return (
<SafeAreaView style={styles.container}> <View style={styles.container}>
<ScrollView showsVerticalScrollIndicator={false}> <ScrollView showsVerticalScrollIndicator={false}>
{renderHeader()} <View style={styles.body}>
{renderWeekDays()} {renderHeader()}
{renderCalendarGrid()} {renderWeekDays()}
{renderCalendarGrid()}
</View>
</ScrollView> </ScrollView>
{renderBottomSheet()} {renderBottomSheet()}
</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