Merge branch 'master' into tma552-adjust-styles-and-sizes

# Conflicts:
#	src/screens/profile/MomentCommentsScreen.tsx

1 files changed, 17 insertions, 5 deletions

diff --git a/src/components/comments/AddComment.tsx b/src/components/comments/AddComment.tsx
index f8c0b6bc..c6c816b9 100644
--- a/src/components/comments/AddComment.tsx
+++ b/src/components/comments/AddComment.tsx
@@ -12,6 +12,7 @@ import {postMomentComment} from '../../services';
 import {logout} from '../../store/actions';
 import {useSelector, useDispatch} from 'react-redux';
 import {RootState} from '../../store/rootreducer';
+import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils';
 
 /**
  * This file provides the add comment view for a user.
@@ -69,7 +70,7 @@ const AddComment: React.FC<AddCommentProps> = ({
   return (
     <KeyboardAvoidingView
       behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-      keyboardVerticalOffset={130}>
+      keyboardVerticalOffset={(1 / 9) * SCREEN_HEIGHT}>
       <View style={styles.container}>
         <Image
           style={styles.avatar}
@@ -79,8 +80,10 @@ const AddComment: React.FC<AddCommentProps> = ({
               : require('../../assets/images/avatar-placeholder.png')
           }
         />
+
         <TaggBigInput
           style={styles.text}
+          containerStyle={styles.textContainer}
           multiline
           placeholder="Add a comment....."
           placeholderTextColor="gray"
@@ -93,10 +96,18 @@ const AddComment: React.FC<AddCommentProps> = ({
   );
 };
 const styles = StyleSheet.create({
-  container: {flexDirection: 'row'},
+  container: {
+    flexDirection: 'row',
+    justifyContent: 'flex-start',
+    width: SCREEN_WIDTH,
+    marginTop: '5%',
+  },
+  textContainer: {
+    width: '100%',
+    alignItems: 'flex-start',
+    marginVertical: 11,
+  },
   text: {
-    position: 'relative',
-    right: '18%',
     backgroundColor: 'white',
     width: '70%',
     paddingLeft: '2%',
@@ -109,7 +120,8 @@ const styles = StyleSheet.create({
     height: 40,
     width: 40,
     borderRadius: 30,
-    marginRight: 15,
+    marginRight: 10,
+    marginLeft: 20,
   },
 });