diff options
| author | Ivan Chen <ivan@thetaggid.com> | 2021-02-10 11:22:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-10 11:22:48 -0500 |
| commit | 18f7a890d13aad0bead329cece6c093e60609151 (patch) | |
| tree | 880fe1b37a0895094312ebda933ae7f6497bd7cd /src/routes | |
| parent | c5e4bfbba73090b9fa3d422ddf31aaa915d032df (diff) | |
| parent | 0d51e6f2b860a7bfe559284e9e3a10a7dd0e6e63 (diff) | |
Merge branch 'master' into hotfix-header-refactor
Diffstat (limited to 'src/routes')
| -rw-r--r-- | src/routes/main/MainStackNavigator.tsx | 3 | ||||
| -rw-r--r-- | src/routes/main/MainStackScreen.tsx | 11 | ||||
| -rw-r--r-- | src/routes/tabs/NavigationBar.tsx | 9 |
3 files changed, 23 insertions, 0 deletions
diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index 74993af9..f3aa7fc6 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -11,6 +11,9 @@ import { } from '../../types'; export type MainStackParams = { + SuggestedPeople: { + screenType: ScreenType; + }; Search: { screenType: ScreenType; }; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index f8f93eb0..99446432 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -19,6 +19,7 @@ import { RequestContactsAccess, SearchScreen, SocialMediaTaggs, + SuggestedPeopleScreen, } from '../../screens'; import {ScreenType} from '../../types'; import {AvatarHeaderHeight, SCREEN_WIDTH} from '../../utils'; @@ -46,6 +47,7 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { // const isProfileTab = screenType === ScreenType.Profile; const isSearchTab = screenType === ScreenType.Search; const isNotificationsTab = screenType === ScreenType.Notifications; + const isSuggestedPeopleTab = screenType === ScreenType.SuggestedPeople; AsyncStorage.getItem('respondedToAccessContacts').then((value) => setRespondedToAccessContacts(value ? value : 'false'), @@ -63,6 +65,8 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { return 'Search'; case ScreenType.Notifications: return 'Notifications'; + case ScreenType.SuggestedPeople: + return 'SuggestedPeople'; } })(); @@ -103,6 +107,13 @@ const MainStackScreen: React.FC<MainStackProps> = ({route}) => { initialParams={{screenType}} /> )} + {isSuggestedPeopleTab && ( + <MainStack.Screen + name="SuggestedPeople" + component={SuggestedPeopleScreen} + initialParams={{screenType}} + /> + )} <MainStack.Screen name="CaptionScreen" component={CaptionScreen} diff --git a/src/routes/tabs/NavigationBar.tsx b/src/routes/tabs/NavigationBar.tsx index 7d29ab67..49713d66 100644 --- a/src/routes/tabs/NavigationBar.tsx +++ b/src/routes/tabs/NavigationBar.tsx @@ -55,6 +55,10 @@ const NavigationBar: React.FC = () => { ); case 'Profile': return <NavigationIcon tab="Profile" disabled={!focused} />; + case 'SuggestedPeople': + return ( + <NavigationIcon tab="SuggestedPeople" disabled={!focused} /> + ); default: return <Fragment />; } @@ -73,6 +77,11 @@ const NavigationBar: React.FC = () => { }, }}> <Tabs.Screen + name="SuggestedPeople" + component={MainStackScreen} + initialParams={{screenType: ScreenType.SuggestedPeople}} + /> + <Tabs.Screen name="Search" component={MainStackScreen} initialParams={{screenType: ScreenType.Search}} |
