diff --git a/ios/NoLoSay.xcodeproj/project.pbxproj b/ios/NoLoSay.xcodeproj/project.pbxproj index 88c7ebbcc..f055e2ebf 100644 --- a/ios/NoLoSay.xcodeproj/project.pbxproj +++ b/ios/NoLoSay.xcodeproj/project.pbxproj @@ -9,14 +9,14 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* NoLoSayTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* NoLoSayTests.m */; }; 044386082ADC6FBE00F8779D /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 044386072ADC6FBE00F8779D /* main.jsbundle */; }; - 0C80B921A6F3F58F76C31292 /* libPods-NoLoSay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-NoLoSay.a */; }; + 07C2C4975CFD682EFD9FFA66 /* libPods-NoLoSay.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DCFB5CBA3528774868DB80D6 /* libPods-NoLoSay.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 2D34643C17DD41EFA801C6DB /* Poppins-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 8C0D8D855F5F4EA7AA63A5AF /* Poppins-Regular.ttf */; }; 433BE1A5C7024800BC139B48 /* Poppins-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B89AEEC1B7E4F8A9B798614 /* Poppins-Light.ttf */; }; - 7699B88040F8A987B510C191 /* libPods-NoLoSay-NoLoSayTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-NoLoSay-NoLoSayTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; + CA1AD6490875B95457E54FCB /* libPods-NoLoSay-NoLoSayTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B0A4CDFC0288351EE2EDE3F5 /* libPods-NoLoSay-NoLoSayTests.a */; }; CD36571C61324AFEADA55A27 /* Poppins-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 342A41CFAF754B14ABF1B7B2 /* Poppins-Medium.ttf */; }; E5682CE1F54A4240B89C4933 /* Poppins-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D47B74B107894504B9BDBBCE /* Poppins-SemiBold.ttf */; }; EB197BC773E341F7AC467867 /* Poppins-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2CE73495D9554B2881F25076 /* Poppins-Bold.ttf */; }; @@ -43,18 +43,18 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = NoLoSay/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = NoLoSay/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = NoLoSay/main.m; sourceTree = ""; }; - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-NoLoSay-NoLoSayTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NoLoSay-NoLoSayTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 2CE73495D9554B2881F25076 /* Poppins-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Bold.ttf"; path = "../assets/fonts/Poppins-Bold.ttf"; sourceTree = ""; }; 342A41CFAF754B14ABF1B7B2 /* Poppins-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Medium.ttf"; path = "../assets/fonts/Poppins-Medium.ttf"; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-NoLoSay.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoLoSay.debug.xcconfig"; path = "Target Support Files/Pods-NoLoSay/Pods-NoLoSay.debug.xcconfig"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-NoLoSay.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoLoSay.release.xcconfig"; path = "Target Support Files/Pods-NoLoSay/Pods-NoLoSay.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-NoLoSay-NoLoSayTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoLoSay-NoLoSayTests.debug.xcconfig"; path = "Target Support Files/Pods-NoLoSay-NoLoSayTests/Pods-NoLoSay-NoLoSayTests.debug.xcconfig"; sourceTree = ""; }; 5B89AEEC1B7E4F8A9B798614 /* Poppins-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Light.ttf"; path = "../assets/fonts/Poppins-Light.ttf"; sourceTree = ""; }; - 5DCACB8F33CDC322A6C60F78 /* libPods-NoLoSay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NoLoSay.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = NoLoSay/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-NoLoSay-NoLoSayTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-NoLoSay-NoLoSayTests.release.xcconfig"; path = "Target Support Files/Pods-NoLoSay-NoLoSayTests/Pods-NoLoSay-NoLoSayTests.release.xcconfig"; sourceTree = ""; }; 8C0D8D855F5F4EA7AA63A5AF /* Poppins-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-Regular.ttf"; path = "../assets/fonts/Poppins-Regular.ttf"; sourceTree = ""; }; + B0A4CDFC0288351EE2EDE3F5 /* libPods-NoLoSay-NoLoSayTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NoLoSay-NoLoSayTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; D47B74B107894504B9BDBBCE /* Poppins-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Poppins-SemiBold.ttf"; path = "../assets/fonts/Poppins-SemiBold.ttf"; sourceTree = ""; }; + DCFB5CBA3528774868DB80D6 /* libPods-NoLoSay.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-NoLoSay.a"; sourceTree = BUILT_PRODUCTS_DIR; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -63,7 +63,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7699B88040F8A987B510C191 /* libPods-NoLoSay-NoLoSayTests.a in Frameworks */, + CA1AD6490875B95457E54FCB /* libPods-NoLoSay-NoLoSayTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -71,7 +71,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 0C80B921A6F3F58F76C31292 /* libPods-NoLoSay.a in Frameworks */, + 07C2C4975CFD682EFD9FFA66 /* libPods-NoLoSay.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -112,8 +112,8 @@ isa = PBXGroup; children = ( ED297162215061F000B7C4FE /* JavaScriptCore.framework */, - 5DCACB8F33CDC322A6C60F78 /* libPods-NoLoSay.a */, - 19F6CBCC0A4E27FBF8BF4A61 /* libPods-NoLoSay-NoLoSayTests.a */, + DCFB5CBA3528774868DB80D6 /* libPods-NoLoSay.a */, + B0A4CDFC0288351EE2EDE3F5 /* libPods-NoLoSay-NoLoSayTests.a */, ); name = Frameworks; sourceTree = ""; @@ -537,7 +537,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.nolosayapp.com; + PRODUCT_BUNDLE_IDENTIFIER = com.nolosay.noloapp; PRODUCT_NAME = NoLoSay; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; @@ -567,7 +567,7 @@ "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = org.nolosayapp.com; + PRODUCT_BUNDLE_IDENTIFIER = com.nolosay.noloapp; PRODUCT_NAME = NoLoSay; SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; @@ -624,6 +624,17 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + ); IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, @@ -697,6 +708,17 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios", + "${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/components/view/platform/cxx", + "${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers", + "${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios", + ); IPHONEOS_DEPLOYMENT_TARGET = 12.4; LD_RUNPATH_SEARCH_PATHS = ( /usr/lib/swift, diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b5d188b66..4885888d0 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -962,7 +962,7 @@ PODS: - React-Core - react-native-geolocation (3.1.0): - React-Core - - react-native-maps (1.8.4): + - react-native-maps (1.9.1): - React-Core - react-native-safe-area-context (4.8.2): - React-Core @@ -970,7 +970,9 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core - - react-native-webview (13.6.3): + - react-native-webview (13.6.4): + - glog + - RCT-Folly (= 2022.05.16.00) - React-Core - React-nativeconfig (0.73.2) - React-NativeModulesApple (0.73.2): @@ -1162,7 +1164,7 @@ PODS: - libwebp (~> 1.0) - SDWebImage/Core (~> 5.10) - SocketRocket (0.6.1) - - VisionCamera (3.6.17): + - VisionCamera (3.7.0): - React - React-callinvoker - React-Core @@ -1443,10 +1445,10 @@ SPEC CHECKSUMS: React-Mapbuffer: 9ee041e1d7be96da6d76a251f92e72b711c651d6 react-native-cameraroll: 3301d62d45616ee9da55ceed04be8d788c3de3ef react-native-geolocation: ef66fb798d96284c6043f0b16c15d9d1d4955db4 - react-native-maps: e2b78affd8e90c807a87bd042dc6b1af2decbcf1 + react-native-maps: 4f45622710094c3603b262279c40026750579b1f react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89 react-native-slider: 7d387c7e8dd0b4c12bf49c975c8666435f082a33 - react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0 + react-native-webview: f95eb7d4d6a7ca45d04d861d99f628241b2aff83 React-nativeconfig: d753fbbc8cecc8ae413d615599ac378bbf6999bb React-NativeModulesApple: 964f4eeab1b4325e8b6a799cf4444c3fd4eb0a9c React-perflogger: 29efe63b7ef5fbaaa50ef6eaa92482f98a24b97e @@ -1476,7 +1478,7 @@ SPEC CHECKSUMS: SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 - VisionCamera: 3cb14dbbf94962e123f56b3f6afe6c6fe5dac955 + VisionCamera: 459701e86be125db2583392d2d06acb15b04ec03 Yoga: 13c8ef87792450193e117976337b8527b49e8c03 PODFILE CHECKSUM: b64d753f83e1a7ba2eba67e86fc669a429862b8e diff --git a/package.json b/package.json index 25bbce7c9..90cc356e8 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@react-navigation/bottom-tabs": "^6.5.8", "@react-navigation/native": "^6.1.7", "@react-navigation/native-stack": "^6.9.13", - "@tanstack/react-query": "^5.17.19", + "@tanstack/react-query": "^5.20.1", "geolib": "^3.3.4", "react-native-device-info": "^10.11.0", "react-native-dotenv": "^3.4.9", @@ -49,7 +49,8 @@ "react-native-maps": "^1.7.1", "react-native-screens": "^3.22.1", "react-native-vision-camera": "^3.6.3", - "react-native-webview": "^13.6.0" + "react-native-webview": "^13.6.0", + "react-native-youtube-iframe": "^2.3.0" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/src/AuthRouter.tsx b/src/AuthRouter.tsx index e055782cf..6e853d2b9 100644 --- a/src/AuthRouter.tsx +++ b/src/AuthRouter.tsx @@ -19,6 +19,7 @@ import SubscriptionScreen from '@screens/authentificationSection/subscription/Su import SettingsScreen from '@screens/settings/SettingsScreen' import WebViewScreen from '@screens/webView/WebView' import PlaceDescription from '@screens/PlaceDescription/PlaceDescription' +import VideoConsumptionView from '@screens/VideoConsumptionView/VideoConsumptionView' import AppRouter from './AppRouter' export default function App(): React.JSX.Element { @@ -71,6 +72,12 @@ export default function App(): React.JSX.Element { // @ts-ignore: Unreachable code error component={WebViewScreen} /> + textStyle?: StyleProp + containerStyle?: StyleProp } /** @@ -25,9 +26,9 @@ interface Props { * @param {StyleProp} props.style - Style of the button * @returns */ -export default function Button({ onPress, text, style, textStyle }: Props) { +export default function Button({ onPress, text, style, textStyle, containerStyle }: Props) { return ( - + + +/** + * @typedef {Object} VideoConsumptionModalProps + */ +export type VideoConsumptionModalProps = NativeStackScreenProps diff --git a/src/screens/PlaceDescription/PlaceDescription.tsx b/src/screens/PlaceDescription/PlaceDescription.tsx index 75f00daa9..6d5d19ed0 100644 --- a/src/screens/PlaceDescription/PlaceDescription.tsx +++ b/src/screens/PlaceDescription/PlaceDescription.tsx @@ -95,6 +95,7 @@ export default function PlaceDescription({ route }: PlaceDescriptionProps): Reac {place?.longDescription}