From 96c46ac20f062aaf814f02184ce8c05ffc860a15 Mon Sep 17 00:00:00 2001 From: Ivan Chen Date: Thu, 5 Nov 2020 22:13:49 -0500 Subject: [TMA-344] Tabs bar margin, Social Taggs margin (#108) * fixed margin for smaller screen * fixed header avatar * cleaned up code, improved logic * yarn lint * dynamically calculate avatar and header * changed back tint color and use 1% for tabs bar margin * last edit to avatar size Co-authored-by: Husam Salhab <47015061+hsalhab@users.noreply.github.com> --- src/components/profile/FollowUnfollow.tsx | 2 +- src/components/profile/ProfileHeader.tsx | 12 ++++++++---- src/components/profile/ProfilePreview.tsx | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/components/profile') diff --git a/src/components/profile/FollowUnfollow.tsx b/src/components/profile/FollowUnfollow.tsx index bb1e9ef7..fa224be3 100644 --- a/src/components/profile/FollowUnfollow.tsx +++ b/src/components/profile/FollowUnfollow.tsx @@ -15,7 +15,7 @@ const FollowUnfollow: React.FC = ({ handleFollowUnfollow()}> - {!followed ? `Follow` : `Unfollow`} + {!followed ? 'Follow' : 'Unfollow'} ); }; diff --git a/src/components/profile/ProfileHeader.tsx b/src/components/profile/ProfileHeader.tsx index f3ef5dfa..0b56a787 100644 --- a/src/components/profile/ProfileHeader.tsx +++ b/src/components/profile/ProfileHeader.tsx @@ -5,15 +5,19 @@ import FollowCount from './FollowCount'; import {View, Text, StyleSheet} from 'react-native'; import {SCREEN_HEIGHT, SCREEN_WIDTH} from '../../utils'; import {AuthContext, ProfileContext} from '../../routes/'; -import { ProfilePreviewType } from 'src/types'; +import {ProfilePreviewType} from 'src/types'; type ProfileHeaderProps = { - isProfileView: boolean, - numFollowing: number, + isProfileView: boolean; + numFollowing: number; numFollowers: number; }; -const ProfileHeader: React.FC = ({isProfileView, numFollowing, numFollowers}) => { +const ProfileHeader: React.FC = ({ + isProfileView, + numFollowing, + numFollowers, +}) => { const { profile: {name}, } = isProfileView diff --git a/src/components/profile/ProfilePreview.tsx b/src/components/profile/ProfilePreview.tsx index 6848f993..7bbc3fb6 100644 --- a/src/components/profile/ProfilePreview.tsx +++ b/src/components/profile/ProfilePreview.tsx @@ -149,7 +149,7 @@ const ProfilePreview: React.FC = ({ }; //With @ sign if on search screen. - const usernameToDisplay = !isComment ? `@` + username : username; + const usernameToDisplay = !isComment ? '@' + username : username; const usernameStyle = isComment ? styles.commentUsername : styles.searchUsername; -- cgit v1.2.3-70-g09d2