From ab7fa09af967e0a8cf2ca53dfb24f8bc8a6886f7 Mon Sep 17 00:00:00 2001 From: Ashm Walia <40498934+ashmgarv@users.noreply.github.com> Date: Sun, 18 Oct 2020 16:37:32 -0700 Subject: [TMA 279] Ability to search and view someone's profile (#58) * Batch one : major changes * WIP checkpoint * The one before the final touch * Probable final touch * ran yarn lint D: * linter broke something * fixed a small bug * Addressed a small nitpick * Well abstracted now Co-authored-by: Ivan Chen --- src/routes/profile/Profile.tsx | 40 ++++++++++++++++++++++++++++++------- src/routes/profile/ProfileStack.tsx | 6 +++++- 2 files changed, 38 insertions(+), 8 deletions(-) (limited to 'src/routes/profile') diff --git a/src/routes/profile/Profile.tsx b/src/routes/profile/Profile.tsx index eaf5f3aa..b39b726e 100644 --- a/src/routes/profile/Profile.tsx +++ b/src/routes/profile/Profile.tsx @@ -1,14 +1,36 @@ import React from 'react'; +import { + ProfileScreen, + CaptionScreen, + SocialMediaTaggs, + SearchScreen, +} from '../../screens'; +import {RouteProp} from '@react-navigation/native'; +import {ProfileStack, ProfileStackParams} from './ProfileStack'; import {AvatarTitle} from '../../components'; -import {ProfileScreen, CaptionScreen, SocialMediaTaggs} from '../../screens'; -import {ProfileStack} from './ProfileStack'; -const Profile: React.FC = () => { +type ProfileScreenRouteProps = RouteProp; + +interface ProfileScreenProps { + route: ProfileScreenRouteProps; +} + +const Profile: React.FC = ({route}) => { + const {isProfileView} = route.params; return ( - + + {isProfileView ? ( + + ) : ( + + )} { headerTransparent: true, headerBackTitleVisible: false, headerTintColor: 'white', - headerTitle: () => , + headerTitle: () => , }} /> - + {!isProfileView ? ( + + ) : ( + + )} ); }; diff --git a/src/routes/profile/ProfileStack.tsx b/src/routes/profile/ProfileStack.tsx index c1da67c1..63ab9a10 100644 --- a/src/routes/profile/ProfileStack.tsx +++ b/src/routes/profile/ProfileStack.tsx @@ -1,10 +1,14 @@ import {createStackNavigator} from '@react-navigation/stack'; export type ProfileStackParams = { - Profile: undefined; + Search: undefined; + Profile: { + isProfileView: boolean; + }; SocialMediaTaggs: { socialMediaType: string; socialMediaHandle: string; + isProfileView: boolean; }; CaptionScreen: {title: string; image: object}; }; -- cgit v1.2.3-70-g09d2