diff --git a/App.js b/App.js
index 7989aff..ce49989 100644
--- a/App.js
+++ b/App.js
@@ -26,27 +26,6 @@ import MediaView from './components/MediaView.js';
import { useSnapshot } from 'valtio';
import GlobalState from './contexts/GlobalState.js';
import NewGroup from './Views/NewGroup.js';
-import * as Linking2 from 'expo-linking';
-
-import { Linking } from 'expo';
-
-const handleDeepLink = (url) => {
- // Handle the deep linking URL here
- alert('Deep link:', url);
-}
-
-const checkDeepLinking = async () => {
- // Check if the app was opened by a deep linking URL
- const initialUrl = await Linking.getInitialURL();
- if (initialUrl) {
- handleDeepLink(initialUrl);
- }
-
- // Add an event listener to handle deep linking URLs
- Linking.addEventListener('url', (event) => {
- handleDeepLink(event.url);
- });
-}
const Tab = createBottomTabNavigator();
@@ -104,20 +83,13 @@ async function registerForPushNotificationsAsync() {
}
-
-const MainNavigation = ({route}) => {
+const MainNavigation = ({ route }) => {
const gState = useSnapshot(GlobalState);
const viewer = gState.me;
const [expoPushToken, setExpoPushToken] = useState('');
const [notification, setNotification] = useState(false);
const notificationListener = useRef();
const responseListener = useRef();
- const url = Linking2.useURL();
- useEffect(() => {
- // Do something with url
- alert(url);
- }, [url]);
-
useEffect(() => {
registerForPushNotificationsAsync().then(async (token) => {
let isLoggedIn = await API.isLoggedIn();
@@ -125,7 +97,6 @@ const MainNavigation = ({route}) => {
API.registerToken(token);
return setExpoPushToken(token);
});
- checkDeepLinking();
// This listener is fired whenever a notification is received while the app is foregrounded
notificationListener.current = Notifications.addNotificationReceivedListener(notification => {
@@ -140,10 +111,10 @@ const MainNavigation = ({route}) => {
});
const interval = setInterval(async () => {
- if(await API.isLoggedIn()){
+ if (await API.isLoggedIn()) {
let me = await API.getMe();
//console.log(JSON.stringify(viewer), JSON.stringify(me))
- if(JSON.stringify(viewer) !== JSON.stringify(me)){
+ if (JSON.stringify(viewer) !== JSON.stringify(me)) {
console.log("Updating me")
GlobalState.me = me;
}
@@ -160,108 +131,108 @@ const MainNavigation = ({route}) => {
return (
<>
-
- (
-
- ),
- header: () => { <> },
- }}
- listeners={({ navigation, route }) => ({
- tabPress: e => {
- navigation.navigate('Feed', {reRender: Math.random()});
- },
- })}
+
+ (
+
+ ),
+ header: () => { <> },
+ }}
+ listeners={({ navigation, route }) => ({
+ tabPress: e => {
+ navigation.navigate('Feed', { reRender: Math.random() });
+ },
+ })}
- />
- (
-
- ),
- header: () => { <> },
- }}
- />
- (
-
- ),
- tabBarButton: (props) => (
-
- {props.children}
-
- ),
- header: () => { <> },
- }}
- listeners={({ navigation, route }) => ({
- tabPress: e => {
- //console.log("listener", route)
- if(route.name !== "NewPost"){
- // Target current profile if one in route
- navigation.navigate('NewPost', {toProfile: route.params?.profileid});
- } else {
- //Send function on child
- navigation.navigate('NewPost', {toProfile: route.params?.profileid, sendNow: true});
- }
- },
- })}
- />
- (
-
- ),
- header: () => { <> },
- }}
- />
- (
-
- ),
- header: () => { <> },
- }}
- listeners={({ navigation, route }) => ({
- tabPress: e => {
- navigation.navigate('MyProfile', {profileid: viewer._id});
- },
- })}
- />
- {/*
+ />
+ (
+
+ ),
+ header: () => { <> },
+ }}
+ />
+ (
+
+ ),
+ tabBarButton: (props) => (
+
+ {props.children}
+
+ ),
+ header: () => { <> },
+ }}
+ listeners={({ navigation, route }) => ({
+ tabPress: e => {
+ //console.log("listener", route)
+ if (route.name !== "NewPost") {
+ // Target current profile if one in route
+ navigation.navigate('NewPost', { toProfile: route.params?.profileid });
+ } else {
+ //Send function on child
+ navigation.navigate('NewPost', { toProfile: route.params?.profileid, sendNow: true });
+ }
+ },
+ })}
+ />
+ (
+
+ ),
+ header: () => { <> },
+ }}
+ />
+ (
+
+ ),
+ header: () => { <> },
+ }}
+ listeners={({ navigation, route }) => ({
+ tabPress: e => {
+ navigation.navigate('MyProfile', { profileid: viewer._id });
+ },
+ })}
+ />
+ {/*
{
header: () => { <> },
}}
/>*/}
-
-
+
+
)
}
@@ -284,66 +255,66 @@ export default function App() {
,
}} theme={theme}>
-
-
-
- {
- return (
-
- {props.navigation.canGoBack() ? {
- props.navigation.goBack();
- }} /> : {props.navigation.navigate('Menu');}} />}
-
- {alert("Chats are comming soon.")}} />
- {props.navigation.navigate("Search")}} />
- {props.navigation.navigate("Notifications")}} />
-
- )
- },
- }}>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ {
+ return (
+
+ {props.navigation.canGoBack() ? {
+ props.navigation.goBack();
+ }} /> : { props.navigation.navigate('Menu'); }} />}
+
+ { alert("Chats are comming soon.") }} />
+ { props.navigation.navigate("Search") }} />
+ { props.navigation.navigate("Notifications") }} />
+
+ )
+ },
+ }}>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
);
diff --git a/Views/Feed.js b/Views/Feed.js
index 35ec2b6..f950f8b 100644
--- a/Views/Feed.js
+++ b/Views/Feed.js
@@ -3,6 +3,7 @@ import { StyleSheet, SafeAreaView, FlatList } from 'react-native';
import API from './../API.js';
import Post from './../components/Post.js';
import GlobalState from '../contexts/GlobalState.js';
+import * as Linking from 'expo-linking';
import AsyncStorage from '@react-native-async-storage/async-storage';
@@ -26,10 +27,34 @@ const getFeed = async () => {
}
}
+let prevLink = '';
+const handleURL = (url, navigation) => {
+ const { hostname, path, queryParams } = Linking.parse(url);
+ if(path.includes("feed/post/")){
+ const postid = path.substring(10);
+ return navigation.navigate('SinglePost', { postid });
+ }
+ if(path.includes("feed/")){
+ const profileid = path.substring(5);
+ return navigation.navigate('Profile', { profileid });
+ }
+ if (path === 'alert') {
+ alert(queryParams.str);
+ } else {
+ alert(path + " ::: " + queryParams);
+ }
+}
+
let Feed = ({ navigation, route }) => {
let [Posts, setPosts] = useState([]);
const flatListRef = React.useRef()
console.log("Render Feed");
+ const url = Linking.useURL();
+ useEffect(() => {
+ if (prevLink === url || !url) return;
+ prevLink = url;
+ handleURL(url, navigation);
+ }, [url]);
useEffect(() => {
let subscribed = true;
const getData = async () => {
@@ -43,7 +68,7 @@ let Feed = ({ navigation, route }) => {
routes: [{ name: 'Login' }],
});
if (route.params && route.params.profileid) {
- return navigation.navigate('Profile', { profileid: route.params.profileid })
+ return navigation.navigate('Profile', { profileid: route.params.profileid });
}
}
if(!route.params?.reRender){