cleanup

casvanluijtelaar
Commit b79187393dfb50990ad51d2a300adc56e863fc07 b7918739 1 parent e31a4756
Showing 3 changed files with 22 additions and 21 deletions
android/src/main/kotlin/dev/steenbakker/mobile_scanner/MobileScanner.kt
example/ios/Runner.xcodeproj/project.pbxproj
example/ios/Runner/Info.plist
--- a/android/src/main/kotlin/dev/steenbakker/mobile_scanner/MobileScanner.kt
View file @b791873
+++ b/android/src/main/kotlin/dev/steenbakker/mobile_scanner/MobileScanner.kt
View file @b791873
@@ -143,20 +143,12 @@ class MobileScanner(private val activity: Activity, private val textureRegistry:
         val imageWidth = inputImage.getWidth();
         val imageHeight = inputImage.getHeight();
-        println(inputImage.getWidth())
-        println(inputImage.getHeight())
-
-        println(barcodeBoundingBox)
-
         val left = (scanWindow[0] * imageWidth).roundToInt()
         val top = (scanWindow[1] * imageHeight).roundToInt()
         val right = (scanWindow[2] * imageWidth).roundToInt()
         val bottom = (scanWindow[3] * imageHeight).roundToInt()
         val scaledScanWindow = Rect(left, top, right, bottom)                
-                println(scaledScanWindow)
-                
-        println("-------------------------")
         return scaledScanWindow.contains(barcodeBoundingBox)
     }
@@ -223,7 +215,7 @@ class MobileScanner(private val activity: Activity, private val textureRegistry:
                 // Build the analyzer to be passed on to MLKit
                 val analysisBuilder = ImageAnalysis.Builder()
                         .setBackpressureStrategy(ImageAnalysis.STRATEGY_KEEP_ONLY_LATEST)
-                        .setTargetResolution(preview!!.resolutionInfo?.resolution ?: Size(0, 0))
+                        .setTargetResolution(preview!!.resolutionInfo?.resolution ?: Size(640, 480))
                 if (ratio != null) { analysisBuilder.setTargetAspectRatio(ratio) }
                 val analysis = analysisBuilder.build().apply { setAnalyzer(executor, analyzer) }
--- a/example/ios/Runner.xcodeproj/project.pbxproj
View file @b791873
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
View file @b791873
@@ -354,16 +354,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
+				DEVELOPMENT_TEAM = QAJQ4586J2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.steenbakker.mobileScannerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.casvanluijtelaar.mobileScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
@@ -483,16 +486,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
+				DEVELOPMENT_TEAM = QAJQ4586J2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.steenbakker.mobileScannerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.casvanluijtelaar.mobileScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -506,16 +512,19 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 75Y2P2WSQQ;
+				DEVELOPMENT_TEAM = QAJQ4586J2;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = dev.steenbakker.mobileScannerExample;
+				PRODUCT_BUNDLE_IDENTIFIER = dev.casvanluijtelaar.mobileScannerExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				VERSIONING_SYSTEM = "apple-generic";
--- a/example/ios/Runner/Info.plist
View file @b791873
+++ b/example/ios/Runner/Info.plist
View file @b791873
@@ -2,10 +2,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>NSPhotoLibraryUsageDescription</key>
-	<string>We need access in order to open photos of barcodes</string>
-	<key>NSCameraUsageDescription</key>
-	<string>We use the camera to scan barcodes</string>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleDisplayName</key>
@@ -28,6 +26,10 @@
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>NSCameraUsageDescription</key>
+	<string>We use the camera to scan barcodes</string>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>We need access in order to open photos of barcodes</string>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
@@ -47,7 +49,5 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 </dict>
 </plist>