fix(useinternalbarcoderead.ts): fix platform selection

nartc · Jan 27, 2020 · c9e9b8e · c9e9b8e
1 parent f2b6350
commit c9e9b8e
Show file tree

Hide file tree

Showing 11 changed files with 394 additions and 312 deletions.
diff --git a/example/App.js b/example/App.js
@@ -21,44 +21,59 @@ import {
 import {RNCamera} from 'react-native-camera';
 import {
   BarcodeMaskWithOuterLayout,
-  useCustomBarcodeRead,
+  useBarcodeRead,
 } from './@nartc/react-native-barcode-mask/react-native-barcode-mask.esm';
 
 const App = () => {
   const rnCamera = useRef(null);
   const [barcodeReadCount, setBarcodeReadCount] = useState(0);
   const [barcodeReadAware, setBarcodeReadAware] = useState(false);
-  const [barcodeRead, setBarcodeRead] = useState(false);
-  const {onBarcodeFinderLayoutChange, onBarcodeRead} = useCustomBarcodeRead(
+  // const [barcodeRead, setBarcodeRead] = useState(false);
+  // const {onBarcodeFinderLayoutChange, onBarcodeRead} = useCustomBarcodeRead(
+  //   true,
+  //   data => data,
+  //   processed => {
+  //     console.log(processed, {barcodeReadCount});
+  //     setBarcodeReadCount(prev => prev + 1);
+  //   },
+  //   {
+  //     beforeScan: () => {
+  //       setBarcodeRead(true);
+  //     },
+  //     afterScan: () => {},
+  //   },
+  //   (a, b, c) => {
+  //     return event => {
+  //       c(event.data);
+  //     };
+  //   },
+  // );
+  const {
+    barcodeRead,
+    onBarcodeRead,
+    onBarcodeFinderLayoutChange,
+  } = useBarcodeRead(
     true,
     data => data,
     processed => {
-      console.log(processed, {barcodeReadCount});
-      setBarcodeReadCount(prev => prev + 1);
-    },
-    {
-      beforeScan: () => {
-        setBarcodeRead(true);
-      },
-      afterScan: () => {},
-    },
-    (a, b, c) => {
-      return event => {
-        c(event.data);
-      };
+      console.log(processed);
     },
   );
 
   return (
     <>
       <StatusBar barStyle="dark-content" />
-      <SafeAreaView style={{flex: 1}}>
+      <SafeAreaView
+        style={{
+          flex: 1,
+          flexDirection: 'column',
+        }}>
         <View style={{flexDirection: 'row'}}>
           <Button
             title={'Toggle Barcode Read Aware'}
             onPress={() => {
               setBarcodeReadAware(prev => !prev);
-              setBarcodeRead(false);
+              // setBarcodeRead(false);
               setBarcodeReadCount(0);
             }}
           />
@@ -67,7 +82,9 @@ const App = () => {
         <View style={{flexDirection: 'row'}}>
           <Button
             title={'Reset Barcode Read'}
-            onPress={() => setBarcodeRead(false)}
+            onPress={() => {
+              // setBarcodeRead(false);
+            }}
           />
           <Text>{barcodeRead.toString()}</Text>
         </View>
@@ -93,7 +110,8 @@ const App = () => {
           captureAudio={false}>
           <BarcodeMaskWithOuterLayout
             maskOpacity={0.5}
-            height={'90%'}
+            height={'80%'}
+            width={'80%'}
             onLayoutChange={onBarcodeFinderLayoutChange}
           />
         </RNCamera>
@@ -105,8 +123,8 @@ const App = () => {
 const styles = StyleSheet.create({
   scanner: {
     flex: 1,
-    width: '100%',
-    overflow: 'hidden',
+    justifyContent: 'flex-end',
+    alignItems: 'center',
   },
 });
 

diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -182,6 +182,14 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
   - React-jsinspector (0.61.5)
+  - react-native-camera (3.15.0):
+    - React
+    - react-native-camera/RCT (= 3.15.0)
+    - react-native-camera/RN (= 3.15.0)
+  - react-native-camera/RCT (3.15.0):
+    - React
+  - react-native-camera/RN (3.15.0):
+    - React
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
   - React-RCTAnimation (0.61.5):
@@ -217,6 +225,8 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
     - ReactCommon/jscallinvoker (= 0.61.5)
+  - RNReanimated (1.4.0):
+    - React
   - Yoga (1.14.0)
 
 DEPENDENCIES:
@@ -236,6 +246,7 @@ DEPENDENCIES:
   - 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-native-camera (from `../node_modules/react-native-camera`)
   - 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`)
@@ -247,6 +258,7 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - RNReanimated (from `../node_modules/react-native-reanimated`)
   - Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
 
 SPEC REPOS:
@@ -282,6 +294,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/jsiexecutor"
   React-jsinspector:
     :path: "../node_modules/react-native/ReactCommon/jsinspector"
+  react-native-camera:
+    :path: "../node_modules/react-native-camera"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -302,6 +316,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Vibration"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  RNReanimated:
+    :path: "../node_modules/react-native-reanimated"
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
@@ -321,6 +337,7 @@ SPEC CHECKSUMS:
   React-jsi: cb2cd74d7ccf4cffb071a46833613edc79cdf8f7
   React-jsiexecutor: d5525f9ed5f782fdbacb64b9b01a43a9323d2386
   React-jsinspector: fa0ecc501688c3c4c34f28834a76302233e29dc0
+  react-native-camera: 52114c432860b89986c9ee4919d00a48a6ba7abb
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -331,6 +348,7 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
+  RNReanimated: b2ab0b693dddd2339bd2f300e770f6302d2e960c
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
 PODFILE CHECKSUM: 79310af6b976c356911a8a833e9b99c3399fdda3

diff --git a/example/ios/example.xcodeproj/project.pbxproj b/example/ios/example.xcodeproj/project.pbxproj
@@ -161,7 +161,6 @@
 				5ECA95E1E4CA88CC5D879CA2 /* Pods-exampleTests.debug.xcconfig */,
 				3956FEBAB5319E39F6611B2F /* Pods-exampleTests.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -290,8 +289,12 @@
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
+						DevelopmentTeam = FF6FP9322P;
 						TestTargetID = 13B07F861A680F5B00A75B9A;
 					};
+					13B07F861A680F5B00A75B9A = {
+						DevelopmentTeam = FF6FP9322P;
+					};
 					2D02E47A1E0B4A5D006451C7 = {
 						CreatedOnToolsVersion = 8.2.1;
 						ProvisioningStyle = Automatic;
@@ -308,6 +311,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -583,6 +587,7 @@
 			baseConfigurationReference = 5ECA95E1E4CA88CC5D879CA2 /* Pods-exampleTests.debug.xcconfig */;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
+				DEVELOPMENT_TEAM = FF6FP9322P;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -607,6 +612,7 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
+				DEVELOPMENT_TEAM = FF6FP9322P;
 				INFOPLIST_FILE = exampleTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
@@ -628,14 +634,15 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
 				DEAD_CODE_STRIPPING = NO;
+				DEVELOPMENT_TEAM = FF6FP9322P;
 				INFOPLIST_FILE = example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.nartc.barcodemask;
 				PRODUCT_NAME = example;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
@@ -647,14 +654,15 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CURRENT_PROJECT_VERSION = 1;
+				DEVELOPMENT_TEAM = FF6FP9322P;
 				INFOPLIST_FILE = example/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
 					"-lc++",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = "org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier)";
+				PRODUCT_BUNDLE_IDENTIFIER = com.nartc.barcodemask;
 				PRODUCT_NAME = example;
 				VERSIONING_SYSTEM = "apple-generic";
 			};

diff --git a/example/ios/example.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/ios/example.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/example/ios/example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/example.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/ios/example.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/example/ios/example/Info.plist b/example/ios/example/Info.plist
@@ -53,5 +53,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+  <key>NSCameraUsageDescription</key>
+  <string>Your own description of the purpose</string>
 </dict>
 </plist>