Merge branch 'master' of https://github.com/jesus-collective/mobile

jesus-collective · Mar 19, 2021 · 19364be · 19364be
2 parents a5f391b + c419e8d
commit 19364be
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 18 deletions.
diff --git a/components/MessageBoard/MessageBoard.css b/components/MessageBoard/MessageBoard.css
@@ -41,11 +41,12 @@
   border-radius: 10px;
   border: 1px;
   margin-left: 10px;
-  height: 300px;
+  height: 850px;
   /* width: 85%;
   left: 50px; */
   margin-left: 30px;
-  bottom: 50px;
+  /* bottom: 50px; */
+  top: 2rem;
 }
 
 .customToolbar {

diff --git a/components/MessageBoard/MessageListDirect.tsx b/components/MessageBoard/MessageListDirect.tsx
@@ -288,13 +288,23 @@ class MessageListDirectImpl extends JCComponent<Props, State> {
     return (
       <Card
         key={index}
-        style={{
-          borderRadius: 10,
-          minHeight: 50,
-          borderColor: "#ffffff",
-          marginLeft: isReply ? 50 : 0,
-          marginBottom: 35,
-        }}
+        style={
+          style == "courseResponse"
+            ? {
+                borderRadius: 10,
+                minHeight: 50,
+                borderColor: "#ffffff",
+                marginLeft: isReply ? 50 : 0,
+                marginBottom: 20,
+              }
+            : {
+                borderRadius: 10,
+                minHeight: 50,
+                borderColor: "#ffffff",
+                marginLeft: isReply ? 50 : 0,
+                marginBottom: 35,
+              }
+        }
       >
         <CardItem style={this.styles.style.eventPageMessageBoard}>
           <Left style={this.styles.style.eventPageMessageBoardLeft}>
@@ -404,7 +414,7 @@ class MessageListDirectImpl extends JCComponent<Props, State> {
           }
           inverted={this.props.inputAt === "bottom"}
           onEndReached={!this.state.fetchingData ? () => this.getMoreDirectMessages() : undefined}
-          style={{ height: this.props.style == "courseResponse" ? "6rem" : 0.5 * height }}
+          style={{ height: this.props.style == "courseResponse" ? null : 0.5 * height }}
           ListFooterComponent={() => this.messagesLoader()}
           refreshing={this.state.fetchingData}
           onEndReachedThreshold={0.1}

diff --git a/components/courseStyles.tsx b/components/courseStyles.tsx
@@ -331,7 +331,7 @@ const courseStyles = EStyleSheet.create({
           marginTop: 30,
           borderRadius: 4,
           shadowOffset: { width: 0, height: 5 },
-          shadowColor: "rgba(0, 0, 0, 0.45)",
+          shadowColor: "rgba(0, 0, 0, 0.19)",
           shadowRadius: 30,
           height: "auto",
           width: 446,
@@ -352,7 +352,7 @@ const courseStyles = EStyleSheet.create({
           marginTop: 30,
           borderRadius: 4,
           shadowOffset: { width: 0, height: 5 },
-          shadowColor: "rgba(0, 0, 0, 0.45)",
+          shadowColor: "rgba(0, 0, 0, 0.19)",
           shadowRadius: 30,
           height: "auto",
           width: 446,
@@ -371,10 +371,11 @@ const courseStyles = EStyleSheet.create({
           marginTop: 30,
           borderRadius: 4,
           shadowOffset: { width: 0, height: 5 },
-          shadowColor: "rgba(0, 0, 0, 0.45)",
+          shadowColor: "rgba(0, 0, 0, 0.19)",
           shadowRadius: 30,
           height: "auto",
           width: 446,
+          paddingTop: 30,
         }
       : {
           flex: 70,
@@ -388,6 +389,7 @@ const courseStyles = EStyleSheet.create({
           borderRadius: 4,
           height: "auto",
           width: 446,
+          paddingTop: 30,
         },
   courseAssignmentMainContainer:
     Platform.OS === "web"
@@ -886,6 +888,13 @@ const courseStyles = EStyleSheet.create({
     alignSelf: "flex-end",
     marginRight: 6,
   },
+  courseAccordionIcons: {
+    color: "#000000",
+    width: 18,
+    height: 18,
+    top: 2,
+    marginRight: 5,
+  },
 
   "@media (min-width: 350) and (max-width: 768)": {
     courseAssignmentScreenRightCard: {

diff --git a/screens/CourseOverviewScreen/Accordion.tsx b/screens/CourseOverviewScreen/Accordion.tsx
@@ -22,8 +22,22 @@ export default class Accordion extends Component<Props, State> {
   render() {
     return (
       <View>
-        <TouchableOpacity onPress={() => this.toggleExpand()}>{this.props.header}</TouchableOpacity>
-        <View />
+        <TouchableOpacity
+          onPress={() => this.toggleExpand()}
+          style={{
+            width: "100%",
+            borderRadius: 4,
+            backgroundColor: "#F0493E",
+            paddingTop: 13,
+            paddingBottom: 13,
+            paddingLeft: 20,
+            paddingRight: 20,
+            marginTop: 20,
+            marginBottom: 20,
+          }}
+        >
+          {this.props.header}
+        </TouchableOpacity>
         {this.state.expanded && this.props.children}
       </View>
     )

diff --git a/screens/CourseOverviewScreen/CourseOverviewScreen.web.tsx b/screens/CourseOverviewScreen/CourseOverviewScreen.web.tsx
@@ -1016,11 +1016,12 @@ export default class CourseScreen extends JCComponent<Props, State> {
                                   <>
                                     <Text
                                       style={{
-                                        fontFamily: "Graphik-Regular-App",
+                                        fontFamily: "Graphik-SemiBold-App",
                                         fontSize: 16,
                                         lineHeight: 24,
                                         letterSpacing: -0.3,
-                                        color: "#333333",
+                                        color: "#ffffff",
+                                        alignSelf: "center",
                                       }}
                                     >
                                       Week {index1 + 1} - {item.title}
@@ -1031,7 +1032,21 @@ export default class CourseScreen extends JCComponent<Props, State> {
                                 <View>
                                   {item.lessons.items.map((lesson, index2: number) => {
                                     return (
-                                      <Text key={index2}>
+                                      <Text
+                                        key={index2}
+                                        style={{
+                                          fontFamily: "Graphik-Regular-App",
+                                          fontSize: 16,
+                                          lineHeight: 24,
+                                          letterSpacing: -0.3,
+                                          color: "#333333",
+                                          paddingLeft: 20,
+                                        }}
+                                      >
+                                        <Image
+                                          style={this.styles.style.courseAccordionIcons}
+                                          source={require("../../assets/svg/document.svg")}
+                                        />
                                         {index1 + 1}.{index2 + 1} - {lesson.name}
                                       </Text>
                                     )