aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShravya Ramesh <shravs1208@gmail.com>2021-02-19 11:31:48 -0800
committerShravya Ramesh <shravs1208@gmail.com>2021-02-19 11:31:48 -0800
commit7695e36491fdd076cd4f388c7258f3bf52cf0a10 (patch)
tree1c6fbc54160c8e0ce4d341230da1abbb12934169
parent2bb7b351a0e509beb9e6d87364471599af402db2 (diff)
fixed
-rw-r--r--src/components/profile/Content.tsx12
-rw-r--r--src/components/taggs/Tagg.tsx6
-rw-r--r--src/routes/Routes.tsx2
-rw-r--r--src/screens/suggestedPeople/SuggestedPeopleScreen.tsx32
4 files changed, 27 insertions, 25 deletions
diff --git a/src/components/profile/Content.tsx b/src/components/profile/Content.tsx
index 86d40f1b..d047cc2f 100644
--- a/src/components/profile/Content.tsx
+++ b/src/components/profile/Content.tsx
@@ -109,10 +109,9 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
const [isStageOnePromptClosed, setIsStageOnePromptClosed] = useState<boolean>(
false,
);
- const [
- isStageThreePromptClosed,
- setIsStageThreePromptClosed,
- ] = useState<boolean>(false);
+ const [isStageThreePromptClosed, setIsStageThreePromptClosed] = useState<
+ boolean
+ >(false);
const onRefresh = useCallback(() => {
const refrestState = async () => {
@@ -309,9 +308,7 @@ const Content: React.FC<ContentProps> = ({y, userXId, screenType}) => {
isBlocked,
}}
/>
- <View style={styles.taggsbarContainer}>
- <TaggsBar {...{y, profileBodyHeight, userXId, screenType}} />
- </View>
+ <TaggsBar {...{y, profileBodyHeight, userXId, screenType}} />
<View style={styles.momentsContainer}>
{userXId && moments.length === 0 && (
<View style={styles.plusIconContainer}>
@@ -418,7 +415,6 @@ const styles = StyleSheet.create({
color: 'gray',
marginVertical: '8%',
},
- taggsbarContainer: {paddingHorizontal: 15},
});
export default Content;
diff --git a/src/components/taggs/Tagg.tsx b/src/components/taggs/Tagg.tsx
index 66694132..1ab09055 100644
--- a/src/components/taggs/Tagg.tsx
+++ b/src/components/taggs/Tagg.tsx
@@ -182,13 +182,15 @@ const styles = StyleSheet.create({
spcontainer: {
justifyContent: 'space-between',
alignItems: 'center',
- marginRight: 34,
+ marginRight: 15,
+ marginLeft: 19,
height: normalize(60),
},
container: {
justifyContent: 'space-between',
alignItems: 'center',
- marginRight: 34,
+ marginRight: 15,
+ marginLeft: 15,
height: normalize(90),
},
iconTap: {
diff --git a/src/routes/Routes.tsx b/src/routes/Routes.tsx
index 1cbc9bc5..bf137445 100644
--- a/src/routes/Routes.tsx
+++ b/src/routes/Routes.tsx
@@ -39,7 +39,7 @@ const Routes: React.FC = () => {
});
if (!userId) {
- userLogin(dispatch, {userId: '', username: ''});
+ // userLogin(dispatch, {userId: '', username: ''});
} else {
SplashScreen.hide();
}
diff --git a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
index 3437cd85..129ea1e8 100644
--- a/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
+++ b/src/screens/suggestedPeople/SuggestedPeopleScreen.tsx
@@ -59,18 +59,20 @@ const SuggestedPeopleScreen: React.FC = () => {
<View style={styles.mainContainer}>
<Text style={styles.title}>Suggested People</Text>
<View style={styles.body}>
- <View style={styles.addUserContainer}>
- <View style={styles.nameInfoContainer}>
- <Text style={styles.firstName}>{firstName}</Text>
- <Text style={styles.username}>{username}</Text>
- </View>
- <TouchableOpacity
- activeOpacity={0.5}
- onPress={() => console.log('Call add friend function')}>
- <View style={styles.addButton}>
- <Text style={styles.addButtonTitle}>{'Add Friend'}</Text>
+ <View style={styles.marginManager}>
+ <View style={styles.addUserContainer}>
+ <View style={styles.nameInfoContainer}>
+ <Text style={styles.firstName}>{firstName}</Text>
+ <Text style={styles.username}>{username}</Text>
</View>
- </TouchableOpacity>
+ <TouchableOpacity
+ activeOpacity={0.5}
+ onPress={() => console.log('Call add friend function')}>
+ <View style={styles.addButton}>
+ <Text style={styles.addButtonTitle}>{'Add Friend'}</Text>
+ </View>
+ </TouchableOpacity>
+ </View>
</View>
<TaggsBar
y={y}
@@ -78,7 +80,9 @@ const SuggestedPeopleScreen: React.FC = () => {
profileBodyHeight={0}
screenType={ScreenType.SuggestedPeople}
/>
- <MutualFriends />
+ <View style={styles.marginManager}>
+ <MutualFriends />
+ </View>
</View>
</View>
<TabsGradient />
@@ -95,12 +99,12 @@ const SuggestedPeopleScreen: React.FC = () => {
const styles = StyleSheet.create({
mainContainer: {
flexDirection: 'column',
- width: SCREEN_WIDTH * 0.9,
+ width: SCREEN_WIDTH,
height: isIPhoneX() ? SCREEN_HEIGHT * 0.85 : SCREEN_HEIGHT * 0.88,
justifyContent: 'space-between',
alignSelf: 'center',
- marginHorizontal: '5%',
},
+ marginManager: {marginHorizontal: '5%'},
image: {
position: 'absolute',
width: SCREEN_WIDTH,