From 4ec594d00b897ac9882a65a60f0523bbe5dbcb0f Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Wed, 3 Feb 2021 07:41:39 -0800 Subject: New screen to request permission to contacts --- src/routes/main/MainStackNavigator.tsx | 3 +++ src/routes/main/MainStackScreen.tsx | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'src/routes') diff --git a/src/routes/main/MainStackNavigator.tsx b/src/routes/main/MainStackNavigator.tsx index bd838ef2..e038d2c2 100644 --- a/src/routes/main/MainStackNavigator.tsx +++ b/src/routes/main/MainStackNavigator.tsx @@ -14,6 +14,9 @@ export type MainStackParams = { Search: { screenType: ScreenType; }; + RequestContactsAccess: { + screenType: ScreenType; + }; Profile: { userXId: string | undefined; screenType: ScreenType; diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 3e425101..8042d267 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -12,6 +12,7 @@ import { MomentUploadPromptScreen, NotificationsScreen, ProfileScreen, + RequestContactsAccess, SearchScreen, SocialMediaTaggs, } from '../../screens'; @@ -47,7 +48,14 @@ const MainStackScreen: React.FC = ({route}) => { case ScreenType.Profile: return 'Profile'; case ScreenType.Search: - return 'Search'; + // Check if user responded to access contacts and return appropriate screen + // When app is opened, load the value from Async Storage to react native store + // Every time the user clicks on this tab + // Retrieve the information from the store + // If responded is true, show search screen + // Else, show RequestContactsAccess + // If user responds, update store and Async and remove popup + return 'RequestContactsAccess'; case ScreenType.Notifications: return 'Notifications'; } @@ -91,9 +99,14 @@ const MainStackScreen: React.FC = ({route}) => { }} /> {isSearchTab && ( + // )} -- cgit v1.2.3-70-g09d2 From bbc7d3b3169e145708c6646a6f4003fc2735f1fb Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Wed, 3 Feb 2021 10:51:11 -0800 Subject: Enabled button functionality --- src/routes/main/MainStackScreen.tsx | 39 ++++++++++++++++++---------- src/screens/search/RequestContactsAccess.tsx | 27 ++++++++++++++++--- 2 files changed, 48 insertions(+), 18 deletions(-) (limited to 'src/routes') diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 8042d267..15695288 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -1,6 +1,7 @@ +import AsyncStorage from '@react-native-community/async-storage'; import {RouteProp} from '@react-navigation/native'; import {StackNavigationOptions} from '@react-navigation/stack'; -import React from 'react'; +import React, {useState} from 'react'; import { CaptionScreen, CategorySelection, @@ -43,6 +44,14 @@ const MainStackScreen: React.FC = ({route}) => { const isSearchTab = screenType === ScreenType.Search; const isNotificationsTab = screenType === ScreenType.Notifications; + AsyncStorage.getItem('respondedToAccessContacts').then((value) => + setRespondedToAccessContacts(value ? value : 'false'), + ); + + const [respondedToAccessContacts, setRespondedToAccessContacts] = useState( + 'false', + ); + const initialRouteName = (() => { switch (screenType) { case ScreenType.Profile: @@ -55,7 +64,7 @@ const MainStackScreen: React.FC = ({route}) => { // If responded is true, show search screen // Else, show RequestContactsAccess // If user responds, update store and Async and remove popup - return 'RequestContactsAccess'; + return 'Search'; case ScreenType.Notifications: return 'Notifications'; } @@ -98,18 +107,20 @@ const MainStackScreen: React.FC = ({route}) => { screenType, }} /> - {isSearchTab && ( - // - - )} + {isSearchTab && + (respondedToAccessContacts && respondedToAccessContacts === 'true' ? ( + + ) : ( + + ))} {isNotificationsTab && ( { const navigation = useNavigation(); + + const handleAllowAccess = async () => { + checkPermission().then((permission) => { + if (permission === 'undefined') { + requestPermission().then((response) => { + if (response === 'authorized' || response === 'denied') { + navigation.navigate('Search'); + } + }); + } + }); + await AsyncStorage.setItem('respondedToAccessContacts', 'true'); + }; + + const handleDontAllowAccess = async () => { + await AsyncStorage.setItem('respondedToAccessContacts', 'true'); + navigation.navigate('Search'); + }; + return ( { { - console.log('Show IOS opoup'); - }} + onPress={handleAllowAccess} style={styles.allowButton}> Allow Contacts navigation.pop()}> + onPress={handleDontAllowAccess}> Don’t Allow -- cgit v1.2.3-70-g09d2 From a3019b1be25db59c5c80305c8bc6769254a222cd Mon Sep 17 00:00:00 2001 From: Shravya Ramesh Date: Wed, 3 Feb 2021 11:33:56 -0800 Subject: removed unnecessary comment --- src/routes/main/MainStackScreen.tsx | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/routes') diff --git a/src/routes/main/MainStackScreen.tsx b/src/routes/main/MainStackScreen.tsx index 15695288..76fc55e0 100644 --- a/src/routes/main/MainStackScreen.tsx +++ b/src/routes/main/MainStackScreen.tsx @@ -57,13 +57,6 @@ const MainStackScreen: React.FC = ({route}) => { case ScreenType.Profile: return 'Profile'; case ScreenType.Search: - // Check if user responded to access contacts and return appropriate screen - // When app is opened, load the value from Async Storage to react native store - // Every time the user clicks on this tab - // Retrieve the information from the store - // If responded is true, show search screen - // Else, show RequestContactsAccess - // If user responds, update store and Async and remove popup return 'Search'; case ScreenType.Notifications: return 'Notifications'; -- cgit v1.2.3-70-g09d2