diff --git a/ios/Podfile.lock b/ios/Podfile.lock index afe54778..6451abdb 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -346,6 +346,11 @@ PODS: - React-perflogger (= 0.66.0) - RNGestureHandler (1.10.3): - React-Core + - RNSound (0.11.1): + - React-Core + - RNSound/Core (= 0.11.1) + - RNSound/Core (0.11.1): + - React-Core - RNSVG (12.1.1): - React - Yoga (1.14.0) @@ -408,6 +413,7 @@ DEPENDENCIES: - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) + - RNSound (from `../node_modules/react-native-sound`) - RNSVG (from `../node_modules/react-native-svg`) - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) @@ -493,6 +499,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon" RNGestureHandler: :path: "../node_modules/react-native-gesture-handler" + RNSound: + :path: "../node_modules/react-native-sound" RNSVG: :path: "../node_modules/react-native-svg" Yoga: @@ -544,10 +552,11 @@ SPEC CHECKSUMS: React-runtimeexecutor: 4bb657a97aa74568d9ed634c8bd478299bb8a3a6 ReactCommon: eb059748e842a1a86025ebbd4ac9d99e74492f88 RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211 + RNSound: 27e8268bdb0a1f191f219a33267f7e0445e8d62f RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f Yoga: c11abbf5809216c91fcd62f5571078b83d9b6720 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a PODFILE CHECKSUM: 45168e505fb57597cdd9ed21e3521928d9833790 -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.2 diff --git a/ios/matchimals.xcodeproj/project.pbxproj b/ios/matchimals.xcodeproj/project.pbxproj index aeaf62e1..041c82c0 100644 --- a/ios/matchimals.xcodeproj/project.pbxproj +++ b/ios/matchimals.xcodeproj/project.pbxproj @@ -251,8 +251,8 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-matchimals/Pods-matchimals-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/double-conversion/double-conversion.framework/double-conversion", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL/OpenSSL.framework/OpenSSL", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( diff --git a/package.json b/package.json index de3b1e1a..dc59b2bf 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,7 @@ "react-native-gesture-handler": "1.10.3", "react-native-modal": "13.0.0", "react-native-safe-area-context": "3.3.2", + "react-native-sound": "0.11.1", "react-native-svg": "12.1.1", "react-native-video": "5.1.1", "react-native-web": "0.17.5", diff --git a/src/App.js b/src/App.js index ec89d471..50169658 100644 --- a/src/App.js +++ b/src/App.js @@ -9,9 +9,11 @@ import game from "./Matchimals/game"; import MainMenu from "./MainMenu"; import { MusicProvider } from "./Music"; import { PlayerProvider } from "./hooks/players"; +import Dragimals from "./Dragimals"; class App extends Component { state = { + playDragimals: false, isMainMenuVisible: true, numPlayers: 1, }; @@ -29,8 +31,15 @@ class App extends Component { }); }; + playDragimals = () => { + this.setState((state) => ({ + ...state, + playDragimals: true, + })); + }; + render() { - const { isMainMenuVisible, numPlayers } = this.state; + const { isMainMenuVisible, numPlayers, playDragimals } = this.state; const MatchimalsClient = Client({ board: Matchimals, game, @@ -44,8 +53,13 @@ class App extends Component { + + + {Platform.OS !== "web" && music && (