TODO: Đã hoàn thiện xong giao diện màn hình lịch học

src/screens/academic_advisor/style.js

@@ -35,15 +35,21 @@ const styles = StyleSheet.create({
         justifyContent:'center',
         borderColor:R.colors.grayBorderInputTextHeader,
     },
+    text_title:{
+        fontSize:R.fontsize.fontSizeContent,
+        fontWeight:'600',
+        color:R.colors.black,
+        fontFamily:R.fonts.fontMedium,
+    },
     text:{
-        fontSize:R.sizes.sm,
+        fontSize:R.fontsize.fontSizeContent,
         color:R.colors.black,
         fontFamily:R.fonts.fontRegular,
         fontWeight:'400',
     },
     containerCard:{
         padding:10,
-        marginBottom:15,
+        marginBottom:15 ,
         borderRadius:10,
         backgroundColor:R.colors.white,
         shadowColor:R.colors.black,

src/screens/academic_advisor/view.js

 import React from 'react';
-import {Text, View, TouchableOpacity, StyleSheet, SafeAreaView, FlatList} from 'react-native';
+import {
+  Text,
+  View,
+  TouchableOpacity,
+  StyleSheet,
+  SafeAreaView,
+  FlatList,
+} from 'react-native';
 import styles from './style';
 import Header from '../../components/Header/Header';
 import Button from '../../components/Button';
 import R from '../../assets/R';
-import*as SCREENNAME from '../../routers/ScreenNames';
-import { useNavigation } from '@react-navigation/native';
-const ClassActivityView = (props) => {
-  const {dataList,setDataList} = props;
+import * as SCREENNAME from '../../routers/ScreenNames';
+import {useNavigation} from '@react-navigation/native';
+const ClassActivityView = props => {
+  const {dataList, setDataList} = props;
   const navigate = useNavigation();
-  const renderItem =({
-    item,
-  }) => {
+  const renderItem = ({item}) => {
     return (
       <View style={styles.containerCard}>
-      <Text style={styles.text}>Lớp sinh hoạt: {item.class_activity}</Text>
-      <View style={styles.containerText}>
-        <Text style={styles.text}>Khoá: {item.course}</Text>
-        <View style={styles.sizedBox}></View>
-        <Text style={styles.text}>Hệ ĐT: {item.training_system}</Text>
-      </View>
-        <Text style={styles.text}>Lớp theo khoa: {item.class_by_course}</Text>
-        <Text style={styles.text}>Khoa: {item.science}</Text>
-        <Text style={styles.text}>Lớp trưởng: {item.class_leader}</Text>
+        <Text style={styles.text_title}>Lớp sinh hoạt:{' '}
+          <Text style={styles.text}>{item.class_activity}</Text>
+          </Text>
+        <View style={styles.containerText}>
+          <Text style={styles.text_title}>Khoá: {' '}
+            <Text style={styles.text}>{item.course}</Text>
+            </Text>
+          <View style={styles.sizedBox}></View>
+          <Text style={styles.text_title}>Hệ ĐT: {' '}
+            <Text style={styles.text}>{item.training_system}</Text>
+            </Text>
+        </View>
+        <Text style={styles.text_title}>Lớp theo khoa: {' '}
+          <Text style={styles.text}>{item.class_by_course}</Text>
+          </Text>
+        <Text style={styles.text_title}>Khoa: {' '}
+          <Text style={styles.text}>{item.science}</Text>
+          </Text>
+        <Text style={styles.text_title}>Lớp trưởng: {' '}
+          <Text style={styles.text}>{item.class_leader}</Text>
+          </Text>
         <View style={styles.containerButton}>
-          <Button 
-          title='Chi tiết'
-          onPress={()=>{navigate.navigate(SCREENNAME.LISTSTUDENTCLASS)}}
-          backgroundColor={R.colors.blue}
-          textColor={R.colors.white}
-          height={30}
-          borderRadius={15}
-          fontSize={R.sizes.sm}
-          fontWeight={'600'}
-          fontFamily={R.fonts.fontMedium}
-          paddingHorizontal={15}
-          paddingVertical={3}
-        
+          <Button
+            title="Chi tiết"
+            onPress={() => {
+              navigate.navigate(SCREENNAME.LISTSTUDENTCLASS);
+            }}
+            backgroundColor={R.colors.blue}
+            textColor={R.colors.white}
+            height={30}
+            borderRadius={15}
+            fontSize={R.sizes.sm}
+            fontWeight={'600'}
+            fontFamily={R.fonts.fontMedium}
+            paddingHorizontal={15}
+            paddingVertical={3}
           />
         </View>
-    </View>
-    )
-  }
+      </View>
+    );
+  };
   return (
-    < View style={styles.container}>
-      <Header title={'Danh sách lớp sinh hoạt'} isBack/>
+    <View style={styles.container}>
+      <Header title={'Danh sách lớp sinh hoạt'} isBack />
       <View style={styles.body}>
         <View style={styles.card}>
           <TouchableOpacity style={styles.btnCard}>
@@ -53,14 +71,12 @@ const ClassActivityView = (props) => {
         </View>
         <FlatList
           data={dataList || []}
-          renderItem={renderItem} 
+          renderItem={renderItem}
           showsVerticalScrollIndicator={false}
           vertical
           keyExtractor={(item, index) => `${index}`}
         />
-      
       </View>
-   
     </View>
   );
 };

src/screens/class_schedule/filter3day/style.js

@@ -40,7 +40,7 @@ const styles = StyleSheet.create({
   },
   daysHeaderContainer: {
     flexDirection: 'row',
-    backgroundColor: R.colors.gray,
+    backgroundColor: R.colors.grayBorderInputTextHeader,
     borderBottomWidth: 1,
     borderBottomColor: R.colors.gray2,
   },

src/screens/class_schedule/filterWeek/style.js

@@ -43,6 +43,7 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     borderRightWidth: 1,
     borderRightColor: R.colors.gray,
+    marginBottom: 5,
   },
   dayHeaderText: {
     fontSize: R.fontsize.fontSizeLabel,
@@ -63,10 +64,14 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   dayHeaderNumberToday: {
-    color: R.colors.blue, 
+    color: R.colors.white, 
     fontFamily: R.fonts.fontMedium,
     fontSize: R.fontsize.fontSizeContent,
     fontWeight: '600',
+    backgroundColor: R.colors.blue,
+    borderRadius: 15,
+    paddingHorizontal: 8,
+    paddingVertical: 2,
   },
   timeSlotsContainer: {
     flex: 1,

src/screens/class_schedule/filterday/style.js

@@ -113,8 +113,8 @@ const styles = StyleSheet.create({
     fontWeight: '400',
     backgroundColor: R.colors.blue,
     borderRadius: 15,
-    paddingHorizontal: 4,
-    paddingVertical: 3,
+    paddingHorizontal: 8,
+    paddingVertical: 2,
   },
   eventTime: {
     fontSize: R.fontsize.fontSizeContent,

src/screens/class_schedule/style.js

@@ -91,8 +91,8 @@ const styles = StyleSheet.create({
     fontFamily: R.fonts.fontSemiBold,
     backgroundColor: R.colors.blue,
     borderRadius: 15,
-    paddingHorizontal: 4,
-    paddingVertical: 3,
+    paddingHorizontal: 8,
+    paddingVertical: 2,
   },
 
   eventsContainer: {