From 6925abbd8b7474832885efc45153276cf312b2ec Mon Sep 17 00:00:00 2001 From: David Sheldrick Date: Tue, 26 Jan 2021 15:05:03 +0000 Subject: [PATCH] wip --- package.json | 3 +- src/__generated__/AndroidAppQuery.graphql.ts | 97 ------------------- src/lib/AndroidApp.tsx | 1 + .../NativeModules/ARScreenPresenterModule.tsx | 6 +- .../Scenes/BottomTabs/BottomTabsNavigator.tsx | 29 +++--- src/lib/navigation/ModalStack.tsx | 18 ++++ src/lib/navigation/NavStack.tsx | 2 +- yarn.lock | 16 ++- 8 files changed, 56 insertions(+), 116 deletions(-) delete mode 100644 src/__generated__/AndroidAppQuery.graphql.ts create mode 100644 src/lib/navigation/ModalStack.tsx diff --git a/package.json b/package.json index 80a48451b82..3b178e82575 100644 --- a/package.json +++ b/package.json @@ -85,6 +85,7 @@ "@react-native-community/netinfo": "4.6.1", "@react-native-community/picker": "1.3.0", "@react-native-mapbox-gl/maps": "8.1.0-rc.9", + "@react-navigation/bottom-tabs": "^5.11.7", "@react-navigation/native": "^5.8.6", "@react-navigation/stack": "^5.12.3", "@sentry/react-native": "1.3.2", @@ -108,7 +109,7 @@ "react-native-localize": "^2.0.1", "react-native-reanimated": "^1.13.1", "react-native-safe-area-context": "^3.1.8", - "react-native-screens": "^2.13.0", + "react-native-screens": "^2.17.1", "react-native-scrollable-tab-view": "1.0.0", "react-native-share": "5.1.0", "react-native-svg": "9.13.3", diff --git a/src/__generated__/AndroidAppQuery.graphql.ts b/src/__generated__/AndroidAppQuery.graphql.ts deleted file mode 100644 index 2acf483b032..00000000000 --- a/src/__generated__/AndroidAppQuery.graphql.ts +++ /dev/null @@ -1,97 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -// @ts-nocheck -/* @relayHash 714ac6ded0ecac33354c6bb6fbe322dd */ - -import { ConcreteRequest } from "relay-runtime"; -export type AndroidAppQueryVariables = {}; -export type AndroidAppQueryResponse = { - readonly me: { - readonly name: string | null; - } | null; -}; -export type AndroidAppQuery = { - readonly response: AndroidAppQueryResponse; - readonly variables: AndroidAppQueryVariables; -}; - - - -/* -query AndroidAppQuery { - me { - name - id - } -} -*/ - -const node: ConcreteRequest = (function(){ -var v0 = { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "name", - "storageKey": null -}; -return { - "fragment": { - "argumentDefinitions": [], - "kind": "Fragment", - "metadata": null, - "name": "AndroidAppQuery", - "selections": [ - { - "alias": null, - "args": null, - "concreteType": "Me", - "kind": "LinkedField", - "name": "me", - "plural": false, - "selections": [ - (v0/*: any*/) - ], - "storageKey": null - } - ], - "type": "Query", - "abstractKey": null - }, - "kind": "Request", - "operation": { - "argumentDefinitions": [], - "kind": "Operation", - "name": "AndroidAppQuery", - "selections": [ - { - "alias": null, - "args": null, - "concreteType": "Me", - "kind": "LinkedField", - "name": "me", - "plural": false, - "selections": [ - (v0/*: any*/), - { - "alias": null, - "args": null, - "kind": "ScalarField", - "name": "id", - "storageKey": null - } - ], - "storageKey": null - } - ] - }, - "params": { - "id": "714ac6ded0ecac33354c6bb6fbe322dd", - "metadata": {}, - "name": "AndroidAppQuery", - "operationKind": "query", - "text": null - } -}; -})(); -(node as any).hash = '6306cd64f6035bc0b736347f094c6561'; -export default node; diff --git a/src/lib/AndroidApp.tsx b/src/lib/AndroidApp.tsx index e8fef3d7665..1c6c4c4893e 100644 --- a/src/lib/AndroidApp.tsx +++ b/src/lib/AndroidApp.tsx @@ -6,6 +6,7 @@ import { View } from "react-native" import { TouchableOpacity } from "react-native-gesture-handler" import track from "react-tracking" import { LogIn } from "./LogIn/LogIn" +import { HolisticNav } from "./navigation/HolisticNav" import { BottomTabsNavigator } from "./Scenes/BottomTabs/BottomTabsNavigator" import { ProvideScreenDimensions } from "./utils/useScreenDimensions" diff --git a/src/lib/NativeModules/ARScreenPresenterModule.tsx b/src/lib/NativeModules/ARScreenPresenterModule.tsx index d9a39b0719d..96c52e0523f 100644 --- a/src/lib/NativeModules/ARScreenPresenterModule.tsx +++ b/src/lib/NativeModules/ARScreenPresenterModule.tsx @@ -12,8 +12,12 @@ export const __unsafe_tabStackNavRefs: Record { const { bottom } = useScreenDimensions().safeAreaInsets return ( - , - , - , - , - , - ]} - activeIndex={["home", "search", "inbox", "sell", "profile"].indexOf(selectedTab)} - /> - + + , + , + , + , + , + ]} + activeIndex={["home", "search", "inbox", "sell", "profile"].indexOf(selectedTab)} + /> + + ) } diff --git a/src/lib/navigation/ModalStack.tsx b/src/lib/navigation/ModalStack.tsx new file mode 100644 index 00000000000..333f40bf97f --- /dev/null +++ b/src/lib/navigation/ModalStack.tsx @@ -0,0 +1,18 @@ +import { NavigationContainer } from "@react-navigation/native" +import { __unsafe_modalStackRef } from "lib/NativeModules/ARScreenPresenterModule" +import { HomeQueryRenderer } from "lib/Scenes/Home/Home" +import React from "react" +import { createNativeStackNavigator } from "react-native-screens/native-stack" + +const Stack = createNativeStackNavigator() + +export const ModalStack: React.FC = ({ children }) => { + return ( + + + {() => children} + + + + ) +} diff --git a/src/lib/navigation/NavStack.tsx b/src/lib/navigation/NavStack.tsx index d5a122d960b..9a037287cbc 100644 --- a/src/lib/navigation/NavStack.tsx +++ b/src/lib/navigation/NavStack.tsx @@ -10,7 +10,7 @@ const StackNavigator = createStackNavigator() export const NavStack = React.forwardRef( ({ rootModuleName }, ref) => { return ( - +