From 717023a7c31d06aed5331c5e3c75b00b4ce2889b Mon Sep 17 00:00:00 2001 From: Reza_ashrafi Date: Tue, 24 May 2022 15:56:05 +0430 Subject: [PATCH] update 23 files --- package.json | 1 + src/components/Navbar.js | 502 ++++++++++++---------- src/screens/AR/index.js | 1 + src/screens/Activation/index.js | 4 +- src/screens/Address/index.js | 4 +- src/screens/Blog/index.js | 45 +- src/screens/Blogs/index.js | 5 +- src/screens/Contact/index.js | 13 +- src/screens/DeliveryForm/index.js | 4 +- src/screens/Faq/index.js | 82 ++-- src/screens/Home/index.js | 3 +- src/screens/OrderDetails/index.js | 3 +- src/screens/OrdersFollowUp/index.js | 3 +- src/screens/Product/components/Rates.js | 8 +- src/screens/Product/index.js | 3 +- src/screens/Products/components/Header.js | 2 +- src/screens/Profile/index.js | 3 +- src/screens/QRContent/index.js | 2 + src/screens/ShoppingCart/index.js | 3 +- src/screens/Video/index.js | 3 +- src/screens/VideoDisplay/index.js | 3 +- src/screens/Videos/index.js | 3 +- yarn.lock | 15 +- 23 files changed, 390 insertions(+), 325 deletions(-) diff --git a/package.json b/package.json index 1394d75..f44374e 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "react-i18next": "^11.15.1", "react-native": "0.64.3", "react-native-awesome-alerts": "^1.5.2", + "react-native-copilot": "^2.5.1", "react-native-htmlview": "^0.16.0", "react-native-openanything": "^0.0.6", "react-native-qrcode-scanner": "^1.5.4", diff --git a/src/components/Navbar.js b/src/components/Navbar.js index 92f6431..0a3812f 100644 --- a/src/components/Navbar.js +++ b/src/components/Navbar.js @@ -7,6 +7,7 @@ import { TouchableOpacity, ActivityIndicator, } from "react-native"; +import { copilot, walkthroughable, CopilotStep } from "react-native-copilot"; import Svg, { G, @@ -33,6 +34,8 @@ import Colors from "../constants/Colors"; import tw from "tailwind-rn"; import fontSize from "../constants/fontSize"; +const CopilotView = walkthroughable(View); + const Navbar = ({ notification, setBoxPosition, @@ -42,9 +45,16 @@ const Navbar = ({ userFavoriteList, theme, bookmarkLoading, + ...props }) => { const navigation = useNavigation(); + React.useEffect(() => { + setTimeout(() => { + props.start(); + }, 800); + }, []); + const isActiveBookmark = React.useMemo(() => { return userFavoriteList.filter((object) => headerOptions.bookmarkItem?.productId @@ -64,7 +74,6 @@ const Navbar = ({ borderColor: theme === "light" ? Colors.theme1.green79 : Colors.theme1.white, borderWidth: 1, - marginLeft: route === "AR" ? 10 : 0, }, ]} onPress={() => navigation.navigate(route, { page: state })} @@ -86,6 +95,7 @@ const Navbar = ({ ? Colors.theme1.white : Colors.theme1.dark, height: 64, + zIndex: 100, }, ]} > @@ -414,236 +424,257 @@ const Navbar = ({ ) : null} {headerOptions?.qr ? ( <> -