diff --git a/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj b/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj index f6a7d83e..afccc265 100644 --- a/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj +++ b/HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj @@ -564,7 +564,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -598,6 +598,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -635,7 +636,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -661,6 +662,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/HelloWorld/ios/Podfile.lock b/HelloWorld/ios/Podfile.lock new file mode 100644 index 00000000..a94ef7a9 --- /dev/null +++ b/HelloWorld/ios/Podfile.lock @@ -0,0 +1,629 @@ +PODS: + - boost (1.76.0) + - CocoaAsyncSocket (7.6.5) + - DoubleConversion (1.1.6) + - FBLazyVector (0.70.6) + - FBReactNativeSpec (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.2.0.1) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.10): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin + - fmt (6.2.1) + - glog (0.3.5) + - libevent (2.1.12) + - OpenSSL-Universal (1.1.1100) + - RCT-Folly (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - RCT-Folly/Default (= 2021.07.22.00) + - RCT-Folly/Default (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - RCTRequired (0.70.6) + - RCTTypeSafety (0.70.6): + - FBLazyVector (= 0.70.6) + - RCTRequired (= 0.70.6) + - React-Core (= 0.70.6) + - React (0.70.6): + - React-Core (= 0.70.6) + - React-Core/DevSupport (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-RCTActionSheet (= 0.70.6) + - React-RCTAnimation (= 0.70.6) + - React-RCTBlob (= 0.70.6) + - React-RCTImage (= 0.70.6) + - React-RCTLinking (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - React-RCTSettings (= 0.70.6) + - React-RCTText (= 0.70.6) + - React-RCTVibration (= 0.70.6) + - React-bridging (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-jsi (= 0.70.6) + - React-callinvoker (0.70.6) + - React-Codegen (0.70.6): + - FBReactNativeSpec (= 0.70.6) + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-Core (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/CoreModulesHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/Default (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/DevSupport (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTActionSheetHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTAnimationHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTBlobHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTImageHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTLinkingHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTNetworkHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTSettingsHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTTextHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTVibrationHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTWebSocket (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-CoreModules (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/CoreModulesHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTImage (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-cxxreact (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-runtimeexecutor (= 0.70.6) + - React-jsi (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-jsi/Default (= 0.70.6) + - React-jsi/Default (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-jsiexecutor (0.70.6): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsinspector (0.70.6) + - React-logger (0.70.6): + - glog + - react-native-safe-area-context (4.3.4): + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - ReactCommon/turbomodule/core + - React-perflogger (0.70.6) + - React-RCTActionSheet (0.70.6): + - React-Core/RCTActionSheetHeaders (= 0.70.6) + - React-RCTAnimation (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTAnimationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTBlob (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTBlobHeaders (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTImage (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTImageHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTLinking (0.70.6): + - React-Codegen (= 0.70.6) + - React-Core/RCTLinkingHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTNetwork (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTNetworkHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTSettings (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTSettingsHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTText (0.70.6): + - React-Core/RCTTextHeaders (= 0.70.6) + - React-RCTVibration (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTVibrationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-runtimeexecutor (0.70.6): + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (0.70.6): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-bridging (= 0.70.6) + - React-callinvoker (= 0.70.6) + - React-Core (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - RNCAsyncStorage (1.17.12): + - React-Core + - RNCMaskedView (0.1.11): + - React + - RNDeviceInfo (10.0.2): + - React-Core + - RNGestureHandler (2.5.0): + - React-Core + - RNReanimated (2.9.1): + - DoubleConversion + - FBLazyVector + - FBReactNativeSpec + - glog + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-callinvoker + - React-Core + - React-Core/DevSupport + - React-Core/RCTWebSocket + - React-CoreModules + - React-cxxreact + - React-jsi + - React-jsiexecutor + - React-jsinspector + - React-RCTActionSheet + - React-RCTAnimation + - React-RCTBlob + - React-RCTImage + - React-RCTLinking + - React-RCTNetwork + - React-RCTSettings + - React-RCTText + - ReactCommon/turbomodule/core + - Yoga + - RNScreens (3.15.0): + - React-Core + - React-RCTImage + - RNSVG (13.9.0): + - React-Core + - SocketRocket (0.6.0) + - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) + +DEPENDENCIES: + - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) + - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) + - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.2.0.1) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) + - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - OpenSSL-Universal (= 1.1.1100) + - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) + - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) + - React (from `../node_modules/react-native/`) + - React-bridging (from `../node_modules/react-native/ReactCommon`) + - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) + - React-Codegen (from `build/generated/ios`) + - React-Core (from `../node_modules/react-native/`) + - React-Core/DevSupport (from `../node_modules/react-native/`) + - React-Core/RCTWebSocket (from `../node_modules/react-native/`) + - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) + - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) + - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) + - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) + - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) + - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) + - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) + - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) + - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) + - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) + - React-RCTText (from `../node_modules/react-native/Libraries/Text`) + - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) + - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" + - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" + - RNDeviceInfo (from `../node_modules/react-native-device-info`) + - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) + - RNReanimated (from `../node_modules/react-native-reanimated`) + - RNScreens (from `../node_modules/react-native-screens`) + - RNSVG (from `../node_modules/react-native-svg`) + - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) + +SPEC REPOS: + trunk: + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit + - fmt + - libevent + - OpenSSL-Universal + - SocketRocket + - YogaKit + +EXTERNAL SOURCES: + boost: + :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" + DoubleConversion: + :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + FBLazyVector: + :path: "../node_modules/react-native/Libraries/FBLazyVector" + FBReactNativeSpec: + :path: "../node_modules/react-native/React/FBReactNativeSpec" + glog: + :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + RCT-Folly: + :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" + RCTRequired: + :path: "../node_modules/react-native/Libraries/RCTRequired" + RCTTypeSafety: + :path: "../node_modules/react-native/Libraries/TypeSafety" + React: + :path: "../node_modules/react-native/" + React-bridging: + :path: "../node_modules/react-native/ReactCommon" + React-callinvoker: + :path: "../node_modules/react-native/ReactCommon/callinvoker" + React-Codegen: + :path: build/generated/ios + React-Core: + :path: "../node_modules/react-native/" + React-CoreModules: + :path: "../node_modules/react-native/React/CoreModules" + React-cxxreact: + :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-jsi: + :path: "../node_modules/react-native/ReactCommon/jsi" + React-jsiexecutor: + :path: "../node_modules/react-native/ReactCommon/jsiexecutor" + React-jsinspector: + :path: "../node_modules/react-native/ReactCommon/jsinspector" + React-logger: + :path: "../node_modules/react-native/ReactCommon/logger" + react-native-safe-area-context: + :path: "../node_modules/react-native-safe-area-context" + React-perflogger: + :path: "../node_modules/react-native/ReactCommon/reactperflogger" + React-RCTActionSheet: + :path: "../node_modules/react-native/Libraries/ActionSheetIOS" + React-RCTAnimation: + :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTBlob: + :path: "../node_modules/react-native/Libraries/Blob" + React-RCTImage: + :path: "../node_modules/react-native/Libraries/Image" + React-RCTLinking: + :path: "../node_modules/react-native/Libraries/LinkingIOS" + React-RCTNetwork: + :path: "../node_modules/react-native/Libraries/Network" + React-RCTSettings: + :path: "../node_modules/react-native/Libraries/Settings" + React-RCTText: + :path: "../node_modules/react-native/Libraries/Text" + React-RCTVibration: + :path: "../node_modules/react-native/Libraries/Vibration" + React-runtimeexecutor: + :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" + ReactCommon: + :path: "../node_modules/react-native/ReactCommon" + RNCAsyncStorage: + :path: "../node_modules/@react-native-async-storage/async-storage" + RNCMaskedView: + :path: "../node_modules/@react-native-community/masked-view" + RNDeviceInfo: + :path: "../node_modules/react-native-device-info" + RNGestureHandler: + :path: "../node_modules/react-native-gesture-handler" + RNReanimated: + :path: "../node_modules/react-native-reanimated" + RNScreens: + :path: "../node_modules/react-native-screens" + RNSVG: + :path: "../node_modules/react-native-svg" + Yoga: + :path: "../node_modules/react-native/ReactCommon/yoga" + +SPEC CHECKSUMS: + boost: a7c83b31436843459a1961bfd74b96033dc77234 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4 + FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c + RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda + RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a + RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e + React: bb3e06418d2cc48a84f9666a576c7b38e89cd7db + React-bridging: 572502ec59c9de30309afdc4932e278214288913 + React-callinvoker: 6b708b79c69f3359d42f1abb4663f620dbd4dadf + React-Codegen: 74e1cd7cee692a8b983c18df3274b5e749de07c8 + React-Core: b587d0a624f9611b0e032505f3d6f25e8daa2bee + React-CoreModules: c6ff48b985e7aa622e82ca51c2c353c7803eb04e + React-cxxreact: ade3d9e63c599afdead3c35f8a8bd12b3da6730b + React-jsi: 5a3952e0c6d57460ad9ee2c905025b4c28f71087 + React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f + React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b + React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0 + react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9 + React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595 + React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466 + React-RCTAnimation: 5341e288375451297057391227f691d9b2326c3d + React-RCTBlob: b0615fc2daf2b5684ade8fadcab659f16f6f0efa + React-RCTImage: 6487b9600f268ecedcaa86114d97954d31ad4750 + React-RCTLinking: c8018ae9ebfefcec3839d690d4725f8d15e4e4b3 + React-RCTNetwork: 8aa63578741e0fe1205c28d7d4b40dbfdabce8a8 + React-RCTSettings: d00c15ad369cd62242a4dfcc6f277912b4a84ed3 + React-RCTText: f532e5ca52681ecaecea452b3ad7a5b630f50d75 + React-RCTVibration: c75ceef7aa60a33b2d5731ebe5800ddde40cefc4 + React-runtimeexecutor: 15437b576139df27635400de0599d9844f1ab817 + ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c + RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b + RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 + RNDeviceInfo: 0a7c1d2532aa7691f9b9925a27e43af006db4dae + RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNReanimated: 24508aef58348323f891abd6616debf39173f1b9 + RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 + RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + +PODFILE CHECKSUM: 33d7a51a8f4559dfbd8f66e2a02d13bc02f7faa3 + +COCOAPODS: 1.11.3 diff --git a/HelloWorld/package.json b/HelloWorld/package.json index 7c58303c..be1f9eb4 100644 --- a/HelloWorld/package.json +++ b/HelloWorld/package.json @@ -14,7 +14,7 @@ "precommit": "npm run lint", "lint-staged": "lint-staged", "prepare": "husky install", - "doc":"kktd @uiw/react-native-doc/doc/build" + "doc": "kktd @uiw/react-native-doc/doc/build" }, "dependencies": { "@react-native-async-storage/async-storage": "~1.17.11", @@ -25,7 +25,7 @@ "@rematch/core": "2.2.0", "@rematch/loading": "2.1.2", "@uiw/formatter": "~1.3.3", - "@uiw/react-native": "^3.0.4", + "@uiw/react-native": "^4.0.1", "react": "18.1.0", "react-native": "0.70.6", "react-native-device-info": "~10.0.2", @@ -33,12 +33,13 @@ "react-native-reanimated": "~2.9.1", "react-native-safe-area-context": "~4.3.1", "react-native-screens": "~3.15.0", - "react-native-svg": "12.1.1", + "react-native-svg": "13.9.0", "react-redux": "7.2.6", "redux": "4.1.2", - "react-query":"~3.39.2", - "@kkt/doc":"^1.0.0", - "@uiw/react-native-doc":"^3.0.7" + "react-query": "~3.39.2", + "@kkt/doc": "^1.0.0", + "@uiw/react-native-doc": "^3.0.7", + "@shopify/restyle": "2.4.2" }, "devDependencies": { "@babel/core": "~7.18.9", @@ -49,7 +50,7 @@ "eslint-plugin-prettier": "~4.2.1", "jest": "27.2.0", "metro-react-native-babel-preset": "^0.72.3", - "babel-plugin-module-resolver":"^4.1.0", + "babel-plugin-module-resolver": "^4.1.0", "mocker-api": "~2.9.5", "prettier": "^2.8.0", "lint-staged": "~12.5.0", @@ -68,4 +69,4 @@ "jest": { "preset": "react-native" } -} +} \ No newline at end of file diff --git a/HelloWorld/src/App.js b/HelloWorld/src/App.js index 4a072916..716aad1f 100644 --- a/HelloWorld/src/App.js +++ b/HelloWorld/src/App.js @@ -1,43 +1,48 @@ import 'react-native-gesture-handler'; import React from 'react'; -import { StatusBar } from 'react-native'; -import { NavigationContainer } from '@react-navigation/native'; -import { createStackNavigator } from '@react-navigation/stack'; -import { Provider } from 'react-redux'; -import { store } from './models'; +import {StatusBar, useColorScheme} from 'react-native'; +import {NavigationContainer, useNavigationContainerRef, DefaultTheme, DarkTheme} from '@react-navigation/native'; +import {createStackNavigator} from '@react-navigation/stack'; +import {Provider} from 'react-redux'; +import {store} from './models'; import AuthLoadingScreen from './pages/AuthLoading'; -import { stackPageData } from './routes'; -import { QueryClient, QueryClientProvider } from 'react-query' +import {stackPageData} from './routes'; +import {QueryClient, QueryClientProvider} from 'react-query'; +import {ThemeProvider, theme} from '@uiw/react-native'; const Stack = createStackNavigator(); -const queryClient = new QueryClient() +const queryClient = new QueryClient(); export default () => { + const navigationRef = useNavigationContainerRef(); + const colorScheme = useColorScheme(); return ( - - {token => ( - - - {stackPageData.map((props, index) => { - return ( - null - // }} - // component={Home} - /> - ); - })} - - - )} - + + + + {token => ( + + {stackPageData.map((props, index) => { + return ( + null + // }} + // component={Home} + /> + ); + })} + + )} + + + ); diff --git a/HelloWorld/src/pages/Home/index.js b/HelloWorld/src/pages/Home/index.js index 333a5c95..c46605d8 100644 --- a/HelloWorld/src/pages/Home/index.js +++ b/HelloWorld/src/pages/Home/index.js @@ -1,23 +1,27 @@ import React from 'react'; -import {StatusBar} from 'react-native'; +import {StatusBar, useColorScheme} from 'react-native'; import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'; import homeTabData from '../../routes/homeTab'; const BottomTabs = createBottomTabNavigator(); -class DashboardScreen extends React.Component { - render() { - return ( - - - - {homeTabData.map((props, idx) => { - return ; - })} - - - ); - } -} +const DashboardScreen = props => { + const colorScheme = useColorScheme(); + const iconColor = (colorScheme && colorScheme) === 'light' ? '#000' : '#fff'; + return ( + + + + {homeTabData({iconColor}).map((props, idx) => { + return ; + })} + + + ); +}; export default DashboardScreen; diff --git a/HelloWorld/src/pages/MyHome/Setting/index.js b/HelloWorld/src/pages/MyHome/Setting/index.js index 28ee04a1..b632d69f 100644 --- a/HelloWorld/src/pages/MyHome/Setting/index.js +++ b/HelloWorld/src/pages/MyHome/Setting/index.js @@ -1,14 +1,10 @@ import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; +import {View, SafeAreaView} from 'react-native'; export default class MyScreen extends Component { render() { return ( - - - 设置 - - + ); } } diff --git a/HelloWorld/src/pages/MyHome/index.js b/HelloWorld/src/pages/MyHome/index.js index a5887bf1..ff7e30fd 100644 --- a/HelloWorld/src/pages/MyHome/index.js +++ b/HelloWorld/src/pages/MyHome/index.js @@ -1,6 +1,6 @@ import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; -import {Button, List, Icon} from '@uiw/react-native'; +import {View, SafeAreaView} from 'react-native'; +import {Button, List, Icon, Text} from '@uiw/react-native'; export default class MyScreen extends Component { render() { diff --git a/HelloWorld/src/pages/OrderHome/index.js b/HelloWorld/src/pages/OrderHome/index.js index 6aa445c5..6aa0a4d1 100644 --- a/HelloWorld/src/pages/OrderHome/index.js +++ b/HelloWorld/src/pages/OrderHome/index.js @@ -1,14 +1,8 @@ import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; +import {SafeAreaView} from 'react-native'; export default class MyScreen extends Component { render() { - return ( - - - 订单首页 - - - ); + return ; } } diff --git a/HelloWorld/src/pages/TransportHome/index.js b/HelloWorld/src/pages/TransportHome/index.js index c7c6ca3a..58296d61 100644 --- a/HelloWorld/src/pages/TransportHome/index.js +++ b/HelloWorld/src/pages/TransportHome/index.js @@ -1,20 +1,10 @@ import React, { Component } from 'react'; -import { View, Text, SafeAreaView } from 'react-native'; -import { SegmentedControl } from '@uiw/react-native' +import { SafeAreaView } from 'react-native'; export default class MyScreen extends Component { render() { return ( - - - - - + ); } } diff --git a/HelloWorld/src/routes/homeTab.js b/HelloWorld/src/routes/homeTab.js index 58b69a3c..8987d36b 100644 --- a/HelloWorld/src/routes/homeTab.js +++ b/HelloWorld/src/routes/homeTab.js @@ -3,36 +3,39 @@ import {Icon} from '@uiw/react-native'; import MyHome from '../pages/MyHome'; import OrderHome from '../pages/OrderHome'; import TransportHome from '../pages/TransportHome'; - -export default [ - { - name: 'TransportHome', - component: TransportHome, - options: { - title: '发货', - tabBarIcon: () => { - return ; +const demo = ({iconColor}) => { + return [ + { + name: 'TransportHome', + component: TransportHome, + options: { + title: '发货', + tabBarIcon: () => { + return ; + }, }, }, - }, - { - name: 'OrderHome', - component: OrderHome, - options: { - title: '订单', - tabBarIcon: () => { - return ; + { + name: 'OrderHome', + component: OrderHome, + options: { + title: '订单', + tabBarIcon: () => { + return ; + }, }, }, - }, - { - name: 'MyHome', - component: MyHome, - options: { - title: '我的', - tabBarIcon: () => { - return ; + { + name: 'MyHome', + component: MyHome, + options: { + title: '我的', + tabBarIcon: () => { + return ; + }, }, }, - }, -]; + ]; +}; + +export default demo; diff --git a/HelloWorld/src/routes/index.js b/HelloWorld/src/routes/index.js index f9372cc6..65251e9e 100644 --- a/HelloWorld/src/routes/index.js +++ b/HelloWorld/src/routes/index.js @@ -8,8 +8,8 @@ export const stackPageData = [ name: 'Home', component: Home, options: { - // headerShown: false, - // header: () => null + headerShown: false, + header: () => null, }, }, { diff --git a/template/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/template/ios/HelloWorld.xcodeproj/project.pbxproj index f6a7d83e..afccc265 100644 --- a/template/template/ios/HelloWorld.xcodeproj/project.pbxproj +++ b/template/template/ios/HelloWorld.xcodeproj/project.pbxproj @@ -564,7 +564,7 @@ COPY_PHASE_STRIP = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -598,6 +598,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; }; name = Debug; @@ -635,7 +636,7 @@ COPY_PHASE_STRIP = YES; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = i386; + "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -661,6 +662,7 @@ "-DFOLLY_MOBILE=1", "-DFOLLY_USE_LIBCPP=1", ); + REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native"; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; }; diff --git a/template/template/ios/Podfile.lock b/template/template/ios/Podfile.lock new file mode 100644 index 00000000..a94ef7a9 --- /dev/null +++ b/template/template/ios/Podfile.lock @@ -0,0 +1,629 @@ +PODS: + - boost (1.76.0) + - CocoaAsyncSocket (7.6.5) + - DoubleConversion (1.1.6) + - FBLazyVector (0.70.6) + - FBReactNativeSpec (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - Flipper (0.125.0): + - Flipper-Folly (~> 2.6) + - Flipper-RSocket (~> 1.4) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (3.2.0.1) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.10): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.1100) + - Flipper-Glog (0.5.0.5) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.125.0): + - FlipperKit/Core (= 0.125.0) + - FlipperKit/Core (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - SocketRocket (~> 0.6.0) + - FlipperKit/CppBridge (0.125.0): + - Flipper (~> 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (0.125.0): + - Flipper-Folly (~> 2.6) + - FlipperKit/FBDefines (0.125.0) + - FlipperKit/FKPortForwarding (0.125.0): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.125.0) + - FlipperKit/FlipperKitLayoutHelpers (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutHelpers + - FlipperKit/FlipperKitLayoutIOSDescriptors + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.125.0): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin + - fmt (6.2.1) + - glog (0.3.5) + - libevent (2.1.12) + - OpenSSL-Universal (1.1.1100) + - RCT-Folly (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - RCT-Folly/Default (= 2021.07.22.00) + - RCT-Folly/Default (2021.07.22.00): + - boost + - DoubleConversion + - fmt (~> 6.2.1) + - glog + - RCTRequired (0.70.6) + - RCTTypeSafety (0.70.6): + - FBLazyVector (= 0.70.6) + - RCTRequired (= 0.70.6) + - React-Core (= 0.70.6) + - React (0.70.6): + - React-Core (= 0.70.6) + - React-Core/DevSupport (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-RCTActionSheet (= 0.70.6) + - React-RCTAnimation (= 0.70.6) + - React-RCTBlob (= 0.70.6) + - React-RCTImage (= 0.70.6) + - React-RCTLinking (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - React-RCTSettings (= 0.70.6) + - React-RCTText (= 0.70.6) + - React-RCTVibration (= 0.70.6) + - React-bridging (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-jsi (= 0.70.6) + - React-callinvoker (0.70.6) + - React-Codegen (0.70.6): + - FBReactNativeSpec (= 0.70.6) + - RCT-Folly (= 2021.07.22.00) + - RCTRequired (= 0.70.6) + - RCTTypeSafety (= 0.70.6) + - React-Core (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-Core (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/CoreModulesHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/Default (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/DevSupport (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTActionSheetHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTAnimationHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTBlobHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTImageHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTLinkingHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTNetworkHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTSettingsHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTTextHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTVibrationHeaders (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-Core/RCTWebSocket (0.70.6): + - glog + - RCT-Folly (= 2021.07.22.00) + - React-Core/Default (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsiexecutor (= 0.70.6) + - React-perflogger (= 0.70.6) + - Yoga + - React-CoreModules (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/CoreModulesHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTImage (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-cxxreact (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-callinvoker (= 0.70.6) + - React-jsi (= 0.70.6) + - React-jsinspector (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-runtimeexecutor (= 0.70.6) + - React-jsi (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-jsi/Default (= 0.70.6) + - React-jsi/Default (0.70.6): + - boost (= 1.76.0) + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-jsiexecutor (0.70.6): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-perflogger (= 0.70.6) + - React-jsinspector (0.70.6) + - React-logger (0.70.6): + - glog + - react-native-safe-area-context (4.3.4): + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-Core + - ReactCommon/turbomodule/core + - React-perflogger (0.70.6) + - React-RCTActionSheet (0.70.6): + - React-Core/RCTActionSheetHeaders (= 0.70.6) + - React-RCTAnimation (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTAnimationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTBlob (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTBlobHeaders (= 0.70.6) + - React-Core/RCTWebSocket (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTImage (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTImageHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - React-RCTNetwork (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTLinking (0.70.6): + - React-Codegen (= 0.70.6) + - React-Core/RCTLinkingHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTNetwork (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTNetworkHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTSettings (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - RCTTypeSafety (= 0.70.6) + - React-Codegen (= 0.70.6) + - React-Core/RCTSettingsHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-RCTText (0.70.6): + - React-Core/RCTTextHeaders (= 0.70.6) + - React-RCTVibration (0.70.6): + - RCT-Folly (= 2021.07.22.00) + - React-Codegen (= 0.70.6) + - React-Core/RCTVibrationHeaders (= 0.70.6) + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (= 0.70.6) + - React-runtimeexecutor (0.70.6): + - React-jsi (= 0.70.6) + - ReactCommon/turbomodule/core (0.70.6): + - DoubleConversion + - glog + - RCT-Folly (= 2021.07.22.00) + - React-bridging (= 0.70.6) + - React-callinvoker (= 0.70.6) + - React-Core (= 0.70.6) + - React-cxxreact (= 0.70.6) + - React-jsi (= 0.70.6) + - React-logger (= 0.70.6) + - React-perflogger (= 0.70.6) + - RNCAsyncStorage (1.17.12): + - React-Core + - RNCMaskedView (0.1.11): + - React + - RNDeviceInfo (10.0.2): + - React-Core + - RNGestureHandler (2.5.0): + - React-Core + - RNReanimated (2.9.1): + - DoubleConversion + - FBLazyVector + - FBReactNativeSpec + - glog + - RCT-Folly + - RCTRequired + - RCTTypeSafety + - React-callinvoker + - React-Core + - React-Core/DevSupport + - React-Core/RCTWebSocket + - React-CoreModules + - React-cxxreact + - React-jsi + - React-jsiexecutor + - React-jsinspector + - React-RCTActionSheet + - React-RCTAnimation + - React-RCTBlob + - React-RCTImage + - React-RCTLinking + - React-RCTNetwork + - React-RCTSettings + - React-RCTText + - ReactCommon/turbomodule/core + - Yoga + - RNScreens (3.15.0): + - React-Core + - React-RCTImage + - RNSVG (13.9.0): + - React-Core + - SocketRocket (0.6.0) + - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) + +DEPENDENCIES: + - boost (from `../node_modules/react-native/third-party-podspecs/boost.podspec`) + - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`) + - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`) + - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`) + - Flipper (= 0.125.0) + - Flipper-Boost-iOSX (= 1.76.0.1.11) + - Flipper-DoubleConversion (= 3.2.0.1) + - Flipper-Fmt (= 7.1.7) + - Flipper-Folly (= 2.6.10) + - Flipper-Glog (= 0.5.0.5) + - Flipper-PeerTalk (= 0.0.4) + - Flipper-RSocket (= 1.4.3) + - FlipperKit (= 0.125.0) + - FlipperKit/Core (= 0.125.0) + - FlipperKit/CppBridge (= 0.125.0) + - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0) + - FlipperKit/FBDefines (= 0.125.0) + - FlipperKit/FKPortForwarding (= 0.125.0) + - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0) + - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0) + - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0) + - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0) + - FlipperKit/FlipperKitReactPlugin (= 0.125.0) + - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0) + - FlipperKit/SKIOSNetworkPlugin (= 0.125.0) + - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - OpenSSL-Universal (= 1.1.1100) + - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) + - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) + - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`) + - React (from `../node_modules/react-native/`) + - React-bridging (from `../node_modules/react-native/ReactCommon`) + - React-callinvoker (from `../node_modules/react-native/ReactCommon/callinvoker`) + - React-Codegen (from `build/generated/ios`) + - React-Core (from `../node_modules/react-native/`) + - React-Core/DevSupport (from `../node_modules/react-native/`) + - React-Core/RCTWebSocket (from `../node_modules/react-native/`) + - React-CoreModules (from `../node_modules/react-native/React/CoreModules`) + - React-cxxreact (from `../node_modules/react-native/ReactCommon/cxxreact`) + - React-jsi (from `../node_modules/react-native/ReactCommon/jsi`) + - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) + - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) + - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - React-perflogger (from `../node_modules/react-native/ReactCommon/reactperflogger`) + - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`) + - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`) + - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`) + - React-RCTImage (from `../node_modules/react-native/Libraries/Image`) + - React-RCTLinking (from `../node_modules/react-native/Libraries/LinkingIOS`) + - React-RCTNetwork (from `../node_modules/react-native/Libraries/Network`) + - React-RCTSettings (from `../node_modules/react-native/Libraries/Settings`) + - React-RCTText (from `../node_modules/react-native/Libraries/Text`) + - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`) + - React-runtimeexecutor (from `../node_modules/react-native/ReactCommon/runtimeexecutor`) + - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`) + - "RNCAsyncStorage (from `../node_modules/@react-native-async-storage/async-storage`)" + - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)" + - RNDeviceInfo (from `../node_modules/react-native-device-info`) + - RNGestureHandler (from `../node_modules/react-native-gesture-handler`) + - RNReanimated (from `../node_modules/react-native-reanimated`) + - RNScreens (from `../node_modules/react-native-screens`) + - RNSVG (from `../node_modules/react-native-svg`) + - Yoga (from `../node_modules/react-native/ReactCommon/yoga`) + +SPEC REPOS: + trunk: + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit + - fmt + - libevent + - OpenSSL-Universal + - SocketRocket + - YogaKit + +EXTERNAL SOURCES: + boost: + :podspec: "../node_modules/react-native/third-party-podspecs/boost.podspec" + DoubleConversion: + :podspec: "../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec" + FBLazyVector: + :path: "../node_modules/react-native/Libraries/FBLazyVector" + FBReactNativeSpec: + :path: "../node_modules/react-native/React/FBReactNativeSpec" + glog: + :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + RCT-Folly: + :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" + RCTRequired: + :path: "../node_modules/react-native/Libraries/RCTRequired" + RCTTypeSafety: + :path: "../node_modules/react-native/Libraries/TypeSafety" + React: + :path: "../node_modules/react-native/" + React-bridging: + :path: "../node_modules/react-native/ReactCommon" + React-callinvoker: + :path: "../node_modules/react-native/ReactCommon/callinvoker" + React-Codegen: + :path: build/generated/ios + React-Core: + :path: "../node_modules/react-native/" + React-CoreModules: + :path: "../node_modules/react-native/React/CoreModules" + React-cxxreact: + :path: "../node_modules/react-native/ReactCommon/cxxreact" + React-jsi: + :path: "../node_modules/react-native/ReactCommon/jsi" + React-jsiexecutor: + :path: "../node_modules/react-native/ReactCommon/jsiexecutor" + React-jsinspector: + :path: "../node_modules/react-native/ReactCommon/jsinspector" + React-logger: + :path: "../node_modules/react-native/ReactCommon/logger" + react-native-safe-area-context: + :path: "../node_modules/react-native-safe-area-context" + React-perflogger: + :path: "../node_modules/react-native/ReactCommon/reactperflogger" + React-RCTActionSheet: + :path: "../node_modules/react-native/Libraries/ActionSheetIOS" + React-RCTAnimation: + :path: "../node_modules/react-native/Libraries/NativeAnimation" + React-RCTBlob: + :path: "../node_modules/react-native/Libraries/Blob" + React-RCTImage: + :path: "../node_modules/react-native/Libraries/Image" + React-RCTLinking: + :path: "../node_modules/react-native/Libraries/LinkingIOS" + React-RCTNetwork: + :path: "../node_modules/react-native/Libraries/Network" + React-RCTSettings: + :path: "../node_modules/react-native/Libraries/Settings" + React-RCTText: + :path: "../node_modules/react-native/Libraries/Text" + React-RCTVibration: + :path: "../node_modules/react-native/Libraries/Vibration" + React-runtimeexecutor: + :path: "../node_modules/react-native/ReactCommon/runtimeexecutor" + ReactCommon: + :path: "../node_modules/react-native/ReactCommon" + RNCAsyncStorage: + :path: "../node_modules/@react-native-async-storage/async-storage" + RNCMaskedView: + :path: "../node_modules/@react-native-community/masked-view" + RNDeviceInfo: + :path: "../node_modules/react-native-device-info" + RNGestureHandler: + :path: "../node_modules/react-native-gesture-handler" + RNReanimated: + :path: "../node_modules/react-native-reanimated" + RNScreens: + :path: "../node_modules/react-native-screens" + RNSVG: + :path: "../node_modules/react-native-svg" + Yoga: + :path: "../node_modules/react-native/ReactCommon/yoga" + +SPEC CHECKSUMS: + boost: a7c83b31436843459a1961bfd74b96033dc77234 + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 + DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + FBLazyVector: 48289402952f4f7a4e235de70a9a590aa0b79ef4 + FBReactNativeSpec: dd1186fd05255e3457baa2f4ca65e94c2cd1e3ac + Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3 + Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 + fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 + glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c + RCT-Folly: 0080d0a6ebf2577475bda044aa59e2ca1f909cda + RCTRequired: e1866f61af7049eb3d8e08e8b133abd38bc1ca7a + RCTTypeSafety: 27c2ac1b00609a432ced1ae701247593f07f901e + React: bb3e06418d2cc48a84f9666a576c7b38e89cd7db + React-bridging: 572502ec59c9de30309afdc4932e278214288913 + React-callinvoker: 6b708b79c69f3359d42f1abb4663f620dbd4dadf + React-Codegen: 74e1cd7cee692a8b983c18df3274b5e749de07c8 + React-Core: b587d0a624f9611b0e032505f3d6f25e8daa2bee + React-CoreModules: c6ff48b985e7aa622e82ca51c2c353c7803eb04e + React-cxxreact: ade3d9e63c599afdead3c35f8a8bd12b3da6730b + React-jsi: 5a3952e0c6d57460ad9ee2c905025b4c28f71087 + React-jsiexecutor: b4a65947391c658450151275aa406f2b8263178f + React-jsinspector: 60769e5a0a6d4b32294a2456077f59d0266f9a8b + React-logger: 1623c216abaa88974afce404dc8f479406bbc3a0 + react-native-safe-area-context: dfe5aa13bee37a0c7e8059d14f72ffc076d120e9 + React-perflogger: 8c79399b0500a30ee8152d0f9f11beae7fc36595 + React-RCTActionSheet: 7316773acabb374642b926c19aef1c115df5c466 + React-RCTAnimation: 5341e288375451297057391227f691d9b2326c3d + React-RCTBlob: b0615fc2daf2b5684ade8fadcab659f16f6f0efa + React-RCTImage: 6487b9600f268ecedcaa86114d97954d31ad4750 + React-RCTLinking: c8018ae9ebfefcec3839d690d4725f8d15e4e4b3 + React-RCTNetwork: 8aa63578741e0fe1205c28d7d4b40dbfdabce8a8 + React-RCTSettings: d00c15ad369cd62242a4dfcc6f277912b4a84ed3 + React-RCTText: f532e5ca52681ecaecea452b3ad7a5b630f50d75 + React-RCTVibration: c75ceef7aa60a33b2d5731ebe5800ddde40cefc4 + React-runtimeexecutor: 15437b576139df27635400de0599d9844f1ab817 + ReactCommon: 349be31adeecffc7986a0de875d7fb0dcf4e251c + RNCAsyncStorage: 09fc8595e6d6f6d5abf16b23a56b257d9c6b7c5b + RNCMaskedView: 0e1bc4bfa8365eba5fbbb71e07fbdc0555249489 + RNDeviceInfo: 0a7c1d2532aa7691f9b9925a27e43af006db4dae + RNGestureHandler: bad495418bcbd3ab47017a38d93d290ebd406f50 + RNReanimated: 24508aef58348323f891abd6616debf39173f1b9 + RNScreens: 4a1af06327774490d97342c00aee0c2bafb497b7 + RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315 + SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 + Yoga: 99caf8d5ab45e9d637ee6e0174ec16fbbb01bcfc + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a + +PODFILE CHECKSUM: 33d7a51a8f4559dfbd8f66e2a02d13bc02f7faa3 + +COCOAPODS: 1.11.3 diff --git a/template/template/package.json b/template/template/package.json index 77143a61..fed413bc 100644 --- a/template/template/package.json +++ b/template/template/package.json @@ -14,7 +14,7 @@ "precommit": "npm run lint", "lint-staged": "lint-staged", "prepare": "husky install", - "doc":"kktd @uiw/react-native-doc/doc/build" + "doc": "kktd @uiw/react-native-doc/doc/build" }, "dependencies": { "@react-native-async-storage/async-storage": "~1.17.11", @@ -25,7 +25,7 @@ "@rematch/core": "2.2.0", "@rematch/loading": "2.1.2", "@uiw/formatter": "~1.3.3", - "@uiw/react-native": "^3.0.4", + "@uiw/react-native": "^4.0.1", "react": "18.1.0", "react-native": "0.70.6", "react-native-device-info": "~10.0.2", @@ -33,12 +33,13 @@ "react-native-reanimated": "~2.9.1", "react-native-safe-area-context": "~4.3.1", "react-native-screens": "~3.15.0", - "react-native-svg": "12.1.1", + "react-native-svg": "13.9.0", "react-redux": "7.2.6", "redux": "4.1.2", - "react-query":"~3.39.2", - "@kkt/doc":"^1.0.0", - "@uiw/react-native-doc":"^3.0.7" + "react-query": "~3.39.2", + "@kkt/doc": "^1.0.0", + "@uiw/react-native-doc": "^3.0.7", + "@shopify/restyle":"2.4.2" }, "devDependencies": { "@babel/core": "~7.18.9", @@ -49,7 +50,7 @@ "eslint-plugin-prettier": "~4.2.1", "jest": "27.2.0", "metro-react-native-babel-preset": "^0.72.3", - "babel-plugin-module-resolver":"^4.1.0", + "babel-plugin-module-resolver": "^4.1.0", "mocker-api": "~2.9.5", "prettier": "^2.8.0", "lint-staged": "~12.5.0", @@ -68,4 +69,4 @@ "jest": { "preset": "react-native" } -} +} \ No newline at end of file diff --git a/template/template/src/App.js b/template/template/src/App.js index 4a072916..8229cc3f 100644 --- a/template/template/src/App.js +++ b/template/template/src/App.js @@ -1,43 +1,62 @@ -import 'react-native-gesture-handler'; -import React from 'react'; -import { StatusBar } from 'react-native'; -import { NavigationContainer } from '@react-navigation/native'; -import { createStackNavigator } from '@react-navigation/stack'; -import { Provider } from 'react-redux'; -import { store } from './models'; -import AuthLoadingScreen from './pages/AuthLoading'; -import { stackPageData } from './routes'; -import { QueryClient, QueryClientProvider } from 'react-query' +import "react-native-gesture-handler"; +import React from "react"; +import { StatusBar, useColorScheme } from "react-native"; +import { + NavigationContainer, + useNavigationContainerRef, + DefaultTheme, + DarkTheme, +} from "@react-navigation/native"; +import { createStackNavigator } from "@react-navigation/stack"; +import { Provider } from "react-redux"; +import { store } from "./models"; +import AuthLoadingScreen from "./pages/AuthLoading"; +import { stackPageData } from "./routes"; +import { QueryClient, QueryClientProvider } from "react-query"; +import { ThemeProvider, theme } from "@uiw/react-native"; const Stack = createStackNavigator(); -const queryClient = new QueryClient() +const queryClient = new QueryClient(); export default () => { + const navigationRef = useNavigationContainerRef(); + const colorScheme = useColorScheme(); return ( - - {token => ( - - - {stackPageData.map((props, index) => { - return ( - null - // }} - // component={Home} - /> - ); - })} - - - )} - + + + + {(token) => ( + + {stackPageData.map((props, index) => { + return ( + null + // }} + // component={Home} + /> + ); + })} + + )} + + + ); diff --git a/template/template/src/pages/Home/index.js b/template/template/src/pages/Home/index.js index 333a5c95..c46605d8 100644 --- a/template/template/src/pages/Home/index.js +++ b/template/template/src/pages/Home/index.js @@ -1,23 +1,27 @@ import React from 'react'; -import {StatusBar} from 'react-native'; +import {StatusBar, useColorScheme} from 'react-native'; import {createBottomTabNavigator} from '@react-navigation/bottom-tabs'; import homeTabData from '../../routes/homeTab'; const BottomTabs = createBottomTabNavigator(); -class DashboardScreen extends React.Component { - render() { - return ( - - - - {homeTabData.map((props, idx) => { - return ; - })} - - - ); - } -} +const DashboardScreen = props => { + const colorScheme = useColorScheme(); + const iconColor = (colorScheme && colorScheme) === 'light' ? '#000' : '#fff'; + return ( + + + + {homeTabData({iconColor}).map((props, idx) => { + return ; + })} + + + ); +}; export default DashboardScreen; diff --git a/template/template/src/pages/MyHome/Setting/index.js b/template/template/src/pages/MyHome/Setting/index.js index 28ee04a1..ba758404 100644 --- a/template/template/src/pages/MyHome/Setting/index.js +++ b/template/template/src/pages/MyHome/Setting/index.js @@ -1,14 +1,7 @@ -import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; - +import React, { Component } from "react"; +import { View, SafeAreaView } from "react-native"; export default class MyScreen extends Component { render() { - return ( - - - 设置 - - - ); + return ; } } diff --git a/template/template/src/pages/MyHome/index.js b/template/template/src/pages/MyHome/index.js index a5887bf1..9f2190ed 100644 --- a/template/template/src/pages/MyHome/index.js +++ b/template/template/src/pages/MyHome/index.js @@ -1,30 +1,37 @@ -import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; -import {Button, List, Icon} from '@uiw/react-native'; +import React, { Component } from "react"; +import { View, SafeAreaView } from "react-native"; +import { Button, List, Icon, Text } from "@uiw/react-native"; export default class MyScreen extends Component { render() { - const {navigation} = this.props; + const { navigation } = this.props; return ( - - + + navigation.navigate('MyHomeSetting')}, - {title: '退出登录', onPress: () => navigation.replace('SignIn')}, + { title: "企业开票" }, + { title: "我的熟车" }, + { + title: "设置", + onPress: () => navigation.navigate("MyHomeSetting"), + }, + { + title: "退出登录", + onPress: () => navigation.replace("SignIn"), + }, ]} - renderItem={({item, index}) => { + renderItem={({ item, index }) => { return ( } size="large" paddingLeft={15} - style={{borderBottomWidth: 0}} - onPress={item.onPress || null}> + style={{ borderBottomWidth: 0 }} + onPress={item.onPress || null} + > {item.title} diff --git a/template/template/src/pages/OrderHome/index.js b/template/template/src/pages/OrderHome/index.js index 6aa445c5..bfb94a0b 100644 --- a/template/template/src/pages/OrderHome/index.js +++ b/template/template/src/pages/OrderHome/index.js @@ -1,14 +1,8 @@ -import React, {Component} from 'react'; -import {View, Text, SafeAreaView} from 'react-native'; +import React, { Component } from "react"; +import { View, SafeAreaView } from "react-native"; export default class MyScreen extends Component { render() { - return ( - - - 订单首页 - - - ); + return ; } } diff --git a/template/template/src/pages/TransportHome/index.js b/template/template/src/pages/TransportHome/index.js index c7c6ca3a..e3b47d90 100644 --- a/template/template/src/pages/TransportHome/index.js +++ b/template/template/src/pages/TransportHome/index.js @@ -1,20 +1,10 @@ import React, { Component } from 'react'; -import { View, Text, SafeAreaView } from 'react-native'; -import { SegmentedControl } from '@uiw/react-native' +import { View, SafeAreaView } from 'react-native'; export default class MyScreen extends Component { render() { return ( - - - - - + ); } } diff --git a/template/template/src/routes/homeTab.js b/template/template/src/routes/homeTab.js index 58b69a3c..6637912b 100644 --- a/template/template/src/routes/homeTab.js +++ b/template/template/src/routes/homeTab.js @@ -3,36 +3,39 @@ import {Icon} from '@uiw/react-native'; import MyHome from '../pages/MyHome'; import OrderHome from '../pages/OrderHome'; import TransportHome from '../pages/TransportHome'; - -export default [ - { - name: 'TransportHome', - component: TransportHome, - options: { - title: '发货', - tabBarIcon: () => { - return ; +const demo = ({iconColor}) => { + return [ + { + name: 'TransportHome', + component: TransportHome, + options: { + title: '发货', + tabBarIcon: () => { + return ; + }, }, }, - }, - { - name: 'OrderHome', - component: OrderHome, - options: { - title: '订单', - tabBarIcon: () => { - return ; + { + name: 'OrderHome', + component: OrderHome, + options: { + title: '订单', + tabBarIcon: () => { + return ; + }, }, }, - }, - { - name: 'MyHome', - component: MyHome, - options: { - title: '我的', - tabBarIcon: () => { - return ; + { + name: 'MyHome', + component: MyHome, + options: { + title: '我的', + tabBarIcon: () => { + return ; + }, }, }, - }, -]; + ]; +}; + +export default demo; \ No newline at end of file diff --git a/template/template/src/routes/index.js b/template/template/src/routes/index.js index f9372cc6..84a8b4b4 100644 --- a/template/template/src/routes/index.js +++ b/template/template/src/routes/index.js @@ -1,19 +1,19 @@ -import Home from '../pages/Home'; -import SignIn from '../pages/SignIn'; -import DevOptions from '../pages/DevOptions'; -import MyHomeSetting from '../pages/MyHome/Setting'; +import Home from "../pages/Home"; +import SignIn from "../pages/SignIn"; +import DevOptions from "../pages/DevOptions"; +import MyHomeSetting from "../pages/MyHome/Setting"; export const stackPageData = [ { - name: 'Home', + name: "Home", component: Home, options: { - // headerShown: false, - // header: () => null + headerShown: false, + header: () => null, }, }, { - name: 'SignIn', + name: "SignIn", component: SignIn, options: { headerShown: false, @@ -21,7 +21,7 @@ export const stackPageData = [ }, }, { - name: 'DevOptions', + name: "DevOptions", component: DevOptions, options: { headerShown: false, @@ -29,10 +29,10 @@ export const stackPageData = [ }, }, { - name: 'MyHomeSetting', + name: "MyHomeSetting", component: MyHomeSetting, options: { - title: '设置', + title: "设置", }, }, ];