From faecd66faf9d8c106259860da1817d6059938ccd Mon Sep 17 00:00:00 2001
From: Shravya Ramesh <shravs1208@gmail.com>
Date: Thu, 21 Jan 2021 02:45:51 -0800
Subject: switched from modal to full screen  view

---
 src/screens/profile/MomentCommentsScreen.tsx | 130 +++++++++++++--------------
 1 file changed, 62 insertions(+), 68 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx
index ebe4da28..3008728e 100644
--- a/src/screens/profile/MomentCommentsScreen.tsx
+++ b/src/screens/profile/MomentCommentsScreen.tsx
@@ -1,17 +1,19 @@
 import * as React from 'react';
-import {RouteProp, useNavigation} from '@react-navigation/native';
-import {ProfileStackParams} from '../../routes/main';
-import {CenteredView, CommentTile} from '../../components';
-import {CommentType} from '../../types';
-import {ScrollView, StyleSheet, Text, View} from 'react-native';
-import {SCREEN_WIDTH} from '../../utils/screenDimensions';
-import {Button} from 'react-native-elements';
-import {AddComment} from '../../components/';
-import {useEffect} from 'react';
+import { RouteProp, useNavigation } from '@react-navigation/native';
+import { ProfileStackParams } from '../../routes/main';
+import { CommentTile, TabsGradient } from '../../components';
+import { CommentType } from '../../types';
+import { StyleSheet, Text, View } from 'react-native';
+import { SCREEN_HEIGHT, SCREEN_WIDTH } from '../../utils/screenDimensions';
+import { Button } from 'react-native-elements';
+import { AddComment } from '../../components/';
+import { useEffect } from 'react';
 import AsyncStorage from '@react-native-community/async-storage';
-import {getMomentComments} from '../..//services';
-import {useDispatch} from 'react-redux';
-import {logout} from '../../store/actions';
+import { getMomentComments } from '../..//services';
+import { useDispatch } from 'react-redux';
+import { logout } from '../../store/actions';
+import { SafeAreaView } from 'react-native-safe-area-context';
+import Animated from 'react-native-reanimated';
 
 /**
  * Comments Screen for an image uploaded
@@ -28,9 +30,9 @@ interface MomentCommentsScreenProps {
   route: MomentCommentsScreenRouteProps;
 }
 
-const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => {
+const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({ route }) => {
   const navigation = useNavigation();
-  const {moment_id, screenType} = route.params;
+  const { moment_id, screenType } = route.params;
   const [commentsList, setCommentsList] = React.useState([]);
   const [newCommentsAvailable, setNewCommentsAvailable] = React.useState(true);
   const dispatch = useDispatch();
@@ -51,13 +53,13 @@ const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => {
   }, [dispatch, moment_id, newCommentsAvailable]);
 
   return (
-    <CenteredView>
-      <View style={styles.modalView}>
+    <View style={styles.background}>
+      <SafeAreaView>
         <View style={styles.header}>
           <Button
             title="X"
-            buttonStyle={styles.button}
-            titleStyle={styles.buttonText}
+            buttonStyle={styles.headerButton}
+            titleStyle={styles.headerButtonText}
             onPress={() => {
               navigation.pop();
             }}
@@ -66,72 +68,64 @@ const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => {
             {commentsList.length + ' Comments'}
           </Text>
         </View>
-        <ScrollView
-          style={styles.modalScrollView}
-          contentContainerStyle={styles.modalScrollViewContent}>
-          {commentsList &&
-            commentsList.map((comment: CommentType) => (
-              <CommentTile
-                key={comment.comment_id}
-                comment_object={comment}
-                screenType={screenType}
-              />
-            ))}
-        </ScrollView>
-        <AddComment
-          setNewCommentsAvailable={setNewCommentsAvailable}
-          moment_id={moment_id}
-        />
-      </View>
-    </CenteredView>
+        <View style={styles.body}>
+          <Animated.ScrollView
+            style={styles.scrollView}
+            contentContainerStyle={styles.scrollViewContent}>
+            {commentsList &&
+              commentsList.map((comment: CommentType) => (
+                <CommentTile
+                  key={comment.comment_id}
+                  comment_object={comment}
+                  screenType={screenType}
+                />
+              ))}
+          </Animated.ScrollView>
+          <AddComment
+            setNewCommentsAvailable={setNewCommentsAvailable}
+            moment_id={moment_id}
+          />
+        </View>
+      </SafeAreaView>
+      <TabsGradient />
+    </View>
   );
 };
 
 const styles = StyleSheet.create({
-  header: {flexDirection: 'row'},
+  background: {
+    backgroundColor: 'white',
+    height: '100%',
+  },
+  header: { justifyContent: 'center', padding: '3%' },
   headerText: {
-    position: 'relative',
-    left: '180%',
+    position: 'absolute',
     alignSelf: 'center',
-    fontSize: 18,
-    fontWeight: '500',
+    fontSize: 20.5,
+    fontWeight: '600',
   },
-  container: {
-    position: 'relative',
-    top: '5%',
-    left: '5%',
-    backgroundColor: 'white',
-    borderRadius: 5,
-    width: SCREEN_WIDTH / 1.1,
-    height: '55%',
-  },
-  button: {
+  headerButton: {
     backgroundColor: 'transparent',
+    width: 30,
+    aspectRatio: 1,
+    padding: 0,
+    alignSelf: 'flex-start',
   },
-  buttonText: {
+  headerButtonText: {
     color: 'black',
     fontSize: 18,
     fontWeight: '400',
   },
-  modalView: {
-    width: '85%',
-    height: '70%',
-    backgroundColor: '#fff',
-    shadowColor: '#000',
-    shadowOpacity: 30,
-    shadowOffset: {width: 0, height: 2},
-    shadowRadius: 5,
-    borderRadius: 8,
-    paddingBottom: 15,
-    paddingHorizontal: 20,
+  body: {
+    width: SCREEN_WIDTH,
+    height: (4.9 / 6) * SCREEN_HEIGHT,
     paddingTop: 5,
-    justifyContent: 'space-between',
   },
-  modalScrollViewContent: {
-    justifyContent: 'center',
+  scrollView: {
+    paddingHorizontal: 20,
   },
-  modalScrollView: {
-    marginBottom: 10,
+  scrollViewContent: {
+    justifyContent: 'center',
   },
 });
 
-- 
cgit v1.2.3-70-g09d2


From 322d499bdb7e1e7f8426fc1366dbb90943a3169d Mon Sep 17 00:00:00 2001
From: Shravya Ramesh <shravs1208@gmail.com>
Date: Thu, 21 Jan 2021 08:43:19 -0800
Subject: format document

---
 src/screens/profile/MomentCommentsScreen.tsx | 32 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/screens')

diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx
index 3008728e..f9df6c88 100644
--- a/src/screens/profile/MomentCommentsScreen.tsx
+++ b/src/screens/profile/MomentCommentsScreen.tsx
@@ -1,18 +1,18 @@
 import * as React from 'react';
-import { RouteProp, useNavigation } from '@react-navigation/native';
-import { ProfileStackParams } from '../../routes/main';
-import { CommentTile, TabsGradient } from '../../components';
-import { CommentType } from '../../types';
-import { StyleSheet, Text, View } from 'react-native';
-import { SCREEN_HEIGHT, SCREEN_WIDTH } from '../../utils/screenDimensions';
-import { Button } from 'react-native-elements';
-import { AddComment } from '../../components/';
-import { useEffect } from 'react';
+import {RouteProp, useNavigation} from '@react-navigation/native';
+import {ProfileStackParams} from '../../routes/main';
+import {CommentTile, TabsGradient} from '../../components';
+import {CommentType} from '../../types';
+import {StyleSheet, Text, View} from 'react-native';
+import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils/screenDimensions';
+import {Button} from 'react-native-elements';
+import {AddComment} from '../../components/';
+import {useEffect} from 'react';
 import AsyncStorage from '@react-native-community/async-storage';
-import { getMomentComments } from '../..//services';
-import { useDispatch } from 'react-redux';
-import { logout } from '../../store/actions';
-import { SafeAreaView } from 'react-native-safe-area-context';
+import {getMomentComments} from '../..//services';
+import {useDispatch} from 'react-redux';
+import {logout} from '../../store/actions';
+import {SafeAreaView} from 'react-native-safe-area-context';
 import Animated from 'react-native-reanimated';
 
 /**
@@ -30,9 +30,9 @@ interface MomentCommentsScreenProps {
   route: MomentCommentsScreenRouteProps;
 }
 
-const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({ route }) => {
+const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => {
   const navigation = useNavigation();
-  const { moment_id, screenType } = route.params;
+  const {moment_id, screenType} = route.params;
   const [commentsList, setCommentsList] = React.useState([]);
   const [newCommentsAvailable, setNewCommentsAvailable] = React.useState(true);
   const dispatch = useDispatch();
@@ -97,7 +97,7 @@ const styles = StyleSheet.create({
     backgroundColor: 'white',
     height: '100%',
   },
-  header: { justifyContent: 'center', padding: '3%' },
+  header: {justifyContent: 'center', padding: '3%'},
   headerText: {
     position: 'absolute',
     alignSelf: 'center',
-- 
cgit v1.2.3-70-g09d2


From 57159d867579100ec25f5d1dccf87acc8275615f Mon Sep 17 00:00:00 2001
From: Shravya Ramesh <shravs1208@gmail.com>
Date: Thu, 21 Jan 2021 14:34:11 -0800
Subject: back arrow + minor styling

---
 src/assets/icons/back-arrow.svg              |  1 +
 src/screens/profile/MomentCommentsScreen.tsx | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)
 create mode 100644 src/assets/icons/back-arrow.svg

(limited to 'src/screens')

diff --git a/src/assets/icons/back-arrow.svg b/src/assets/icons/back-arrow.svg
new file mode 100644
index 00000000..aa203dea
--- /dev/null
+++ b/src/assets/icons/back-arrow.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 385.86 696.76"><defs><style>.cls-1{fill:none;stroke:#000;stroke-linecap:round;stroke-linejoin:round;stroke-width:77.17px;}</style></defs><polyline class="cls-1" points="347.28 38.58 38.58 351.69 347.28 658.17"/></svg>
\ No newline at end of file
diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx
index f9df6c88..b2611b62 100644
--- a/src/screens/profile/MomentCommentsScreen.tsx
+++ b/src/screens/profile/MomentCommentsScreen.tsx
@@ -3,9 +3,8 @@ import {RouteProp, useNavigation} from '@react-navigation/native';
 import {ProfileStackParams} from '../../routes/main';
 import {CommentTile, TabsGradient} from '../../components';
 import {CommentType} from '../../types';
-import {StyleSheet, Text, View} from 'react-native';
+import {StyleSheet, Text, TouchableOpacity, View} from 'react-native';
 import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils/screenDimensions';
-import {Button} from 'react-native-elements';
 import {AddComment} from '../../components/';
 import {useEffect} from 'react';
 import AsyncStorage from '@react-native-community/async-storage';
@@ -14,6 +13,7 @@ import {useDispatch} from 'react-redux';
 import {logout} from '../../store/actions';
 import {SafeAreaView} from 'react-native-safe-area-context';
 import Animated from 'react-native-reanimated';
+import BackIcon from '../../assets/icons/back-arrow.svg';
 
 /**
  * Comments Screen for an image uploaded
@@ -56,14 +56,13 @@ const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => {
     <View style={styles.background}>
       <SafeAreaView>
         <View style={styles.header}>
-          <Button
-            title="X"
-            buttonStyle={styles.headerButton}
-            titleStyle={styles.headerButtonText}
+          <TouchableOpacity
+            style={styles.headerButton}
             onPress={() => {
               navigation.pop();
-            }}
-          />
+            }}>
+            <BackIcon height={'100%'} width={'100%'} color={'white'} />
+          </TouchableOpacity>
           <Text style={styles.headerText}>
             {commentsList.length + ' Comments'}
           </Text>
@@ -105,10 +104,10 @@ const styles = StyleSheet.create({
     fontWeight: '600',
   },
   headerButton: {
-    backgroundColor: 'transparent',
-    width: 30,
+    width: '5%',
     aspectRatio: 1,
     padding: 0,
+    marginLeft: '5%',
     alignSelf: 'flex-start',
   },
   headerButtonText: {
@@ -119,7 +118,7 @@ const styles = StyleSheet.create({
   body: {
     width: SCREEN_WIDTH,
     height: (4.9 / 6) * SCREEN_HEIGHT,
-    paddingTop: 5,
+    paddingTop: '3%',
   },
   scrollView: {
     paddingHorizontal: 20,
-- 
cgit v1.2.3-70-g09d2