diff options
| author | George Rusu <george@tagg.id> | 2021-05-25 13:35:05 -0700 |
|---|---|---|
| committer | George Rusu <george@tagg.id> | 2021-05-25 13:35:05 -0700 |
| commit | 4089ccdc05ffa5e02c6e0be717626cbdc631b8f2 (patch) | |
| tree | e279bfe3b33da17f85fc3ca83cbb1f338e05e4b3 /src/screens/profile | |
| parent | a5ef509d2a1f79d85c76ee766dabe96acac2a989 (diff) | |
| parent | 7f991eef32475165f819dc8b666c5763f0021696 (diff) | |
Merge
Diffstat (limited to 'src/screens/profile')
| -rw-r--r-- | src/screens/profile/CaptionScreen.tsx | 35 | ||||
| -rw-r--r-- | src/screens/profile/IndividualMoment.tsx | 5 | ||||
| -rw-r--r-- | src/screens/profile/MomentCommentsScreen.tsx | 10 | ||||
| -rw-r--r-- | src/screens/profile/MomentUploadPromptScreen.tsx | 8 | ||||
| -rw-r--r-- | src/screens/profile/SocialMediaTaggs.tsx | 6 |
5 files changed, 26 insertions, 38 deletions
diff --git a/src/screens/profile/CaptionScreen.tsx b/src/screens/profile/CaptionScreen.tsx index 731e001c..e2fce032 100644 --- a/src/screens/profile/CaptionScreen.tsx +++ b/src/screens/profile/CaptionScreen.tsx @@ -177,28 +177,13 @@ const CaptionScreen: React.FC<CaptionScreenProps> = ({route, navigation}) => { selectedUsers: taggedUsers, }) } - style={{ - marginHorizontal: '5%', - marginTop: '3%', - flexDirection: 'row', - justifyContent: 'space-between', - alignItems: 'center', - }}> + style={styles.tagFriendsContainer}> <Image source={require('../../assets/icons/tagging/tag-icon.png')} - style={{width: 20, height: 20}} + style={styles.tagIcon} /> <Text style={styles.tagFriendsTitle}>Tag Friends</Text> - <Text - numberOfLines={1} - style={{ - color: 'white', - width: 150, - fontSize: normalize(10), - lineHeight: normalize(11), - letterSpacing: normalize(0.3), - textAlign: 'right', - }}> + <Text numberOfLines={1} style={styles.taggedListContainer}> {taggedList} {taggedList.length > 21 ? '. . .' : ''} </Text> @@ -256,9 +241,21 @@ const styles = StyleSheet.create({ fontWeight: '600', }, tagFriendsContainer: { - flexDirection: 'row', + marginHorizontal: '5%', marginTop: '3%', + flexDirection: 'row', + justifyContent: 'space-between', + alignItems: 'center', + }, + taggedListContainer: { + color: 'white', + width: 150, + fontSize: normalize(10), + lineHeight: normalize(11), + letterSpacing: normalize(0.3), + textAlign: 'right', }, + tagIcon: {width: 20, height: 20}, }); export default CaptionScreen; diff --git a/src/screens/profile/IndividualMoment.tsx b/src/screens/profile/IndividualMoment.tsx index 4baca5b2..515cbacf 100644 --- a/src/screens/profile/IndividualMoment.tsx +++ b/src/screens/profile/IndividualMoment.tsx @@ -1,17 +1,14 @@ -import AsyncStorage from '@react-native-community/async-storage'; import {BlurView} from '@react-native-community/blur'; import {RouteProp} from '@react-navigation/native'; import {StackNavigationProp} from '@react-navigation/stack'; import React from 'react'; -import {Alert, FlatList, StyleSheet, View} from 'react-native'; +import {FlatList, StyleSheet, View} from 'react-native'; import {useSelector} from 'react-redux'; import { IndividualMomentTitleBar, MomentPostContent, MomentPostHeader, } from '../../components'; -import {MOMENT_TAGS_ENDPOINT} from '../../constants'; -import {ERROR_SOMETHING_WENT_WRONG_REFRESH} from '../../constants/strings'; import {MainStackParams} from '../../routes'; import {RootState} from '../../store/rootreducer'; import {MomentType} from '../../types'; diff --git a/src/screens/profile/MomentCommentsScreen.tsx b/src/screens/profile/MomentCommentsScreen.tsx index 4b332b56..402e5f44 100644 --- a/src/screens/profile/MomentCommentsScreen.tsx +++ b/src/screens/profile/MomentCommentsScreen.tsx @@ -44,14 +44,12 @@ const MomentCommentsScreen: React.FC<MomentCommentsScreenProps> = ({route}) => { //Receives comment length from child CommentsContainer const [commentsLength, setCommentsLength] = useState<number>(0); - const [shouldUpdateAllComments, setShouldUpdateAllComments] = React.useState( - true, - ); + const [shouldUpdateAllComments, setShouldUpdateAllComments] = + React.useState(true); //Keeps track of the current comments object in focus so that the application knows which comment to post a reply to - const [commentTapped, setCommentTapped] = useState< - CommentType | CommentThreadType | undefined - >(); + const [commentTapped, setCommentTapped] = + useState<CommentType | CommentThreadType | undefined>(); useEffect(() => { navigation.setOptions({ diff --git a/src/screens/profile/MomentUploadPromptScreen.tsx b/src/screens/profile/MomentUploadPromptScreen.tsx index f0aaffc4..7e04063c 100644 --- a/src/screens/profile/MomentUploadPromptScreen.tsx +++ b/src/screens/profile/MomentUploadPromptScreen.tsx @@ -28,12 +28,8 @@ const MomentUploadPromptScreen: React.FC<MomentUploadPromptScreenProps> = ({ route, navigation, }) => { - const { - screenType, - momentCategory, - profileBodyHeight, - socialsBarHeight, - } = route.params; + const {screenType, momentCategory, profileBodyHeight, socialsBarHeight} = + route.params; return ( <View style={styles.container}> <CloseIcon diff --git a/src/screens/profile/SocialMediaTaggs.tsx b/src/screens/profile/SocialMediaTaggs.tsx index 52d20683..0e2ebb63 100644 --- a/src/screens/profile/SocialMediaTaggs.tsx +++ b/src/screens/profile/SocialMediaTaggs.tsx @@ -85,9 +85,9 @@ const SocialMediaTaggs: React.FC<SocialMediaTaggsProps> = ({ type={socialMediaType} handle={accountData?.handle} /> - {(accountData?.posts as Array< - SimplePostType | TwitterPostType - >).map((post, index) => + {( + accountData?.posts as Array<SimplePostType | TwitterPostType> + ).map((post, index) => socialMediaType === 'Twitter' ? ( <TwitterTaggPost key={index} |
