Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sample app fixes #527

Merged
merged 2 commits into from
Oct 6, 2023
Merged

Sample app fixes #527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b9861c
Updating objc-c sample app
May 21, 2021
486c7d4
Fixing applyRectOfInterest method to work with different screen sizes
May 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions examples/BarcodeScanner/AppDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
@implementation AppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
self.window.rootViewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil];
[self.window makeKeyAndVisible];
return YES;
}

Expand Down
4 changes: 4 additions & 0 deletions examples/BarcodeScanner/BarcodeScanner-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>UIMainStoryboardFile</key>
<string>Main</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleDisplayName</key>
Expand Down
24 changes: 8 additions & 16 deletions examples/BarcodeScanner/BarcodeScanner.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
02C6AFD7156FCB330052B145 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 02C6AFD6156FCB330052B145 /* main.m */; };
02C6AFDA156FCB4F0052B145 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 02C6AFD9156FCB4F0052B145 /* ViewController.m */; };
02C6AFDD156FCB660052B145 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 02C6AFDC156FCB660052B145 /* AppDelegate.m */; };
02C6AFE0156FCBA00052B145 /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 02C6AFDE156FCBA00052B145 /* ViewController.xib */; };
02C6AFE3156FCBA80052B145 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 02C6AFE1156FCBA80052B145 /* InfoPlist.strings */; };
25404718166AC1D200E13304 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 25404717166AC1D200E13304 /* [email protected] */; };
25404737166AC2EA00E13304 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 25404736166AC2EA00E13304 /* AVFoundation.framework */; };
25FFF6A61839839400C2E985 /* libZXingObjC-iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 25FFF69B1839837F00C2E985 /* libZXingObjC-iOS.a */; };
52D7D9D52657C33700EBEE2A /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52D7D9D42657C33700EBEE2A /* Main.storyboard */; };
52D7D9D72657C4A200EBEE2A /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 52D7D9D62657C4A200EBEE2A /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -94,11 +94,11 @@
02C6AFD9156FCB4F0052B145 /* ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = SOURCE_ROOT; };
02C6AFDB156FCB660052B145 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; };
02C6AFDC156FCB660052B145 /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; };
02C6AFDF156FCBA00052B145 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = SOURCE_ROOT; };
02C6AFE2156FCBA80052B145 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; };
25404717166AC1D200E13304 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = SOURCE_ROOT; };
25404736166AC2EA00E13304 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
25FFF6921839837E00C2E985 /* ZXingObjC.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZXingObjC.xcodeproj; path = ../../ZXingObjC.xcodeproj; sourceTree = "<group>"; };
52D7D9D42657C33700EBEE2A /* Main.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = SOURCE_ROOT; };
52D7D9D62657C4A200EBEE2A /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -163,8 +163,8 @@
02C6AFDC156FCB660052B145 /* AppDelegate.m */,
02C6AFD8156FCB4F0052B145 /* ViewController.h */,
02C6AFD9156FCB4F0052B145 /* ViewController.m */,
02C6AFDE156FCBA00052B145 /* ViewController.xib */,
25404717166AC1D200E13304 /* [email protected] */,
52D7D9D42657C33700EBEE2A /* Main.storyboard */,
52D7D9D62657C4A200EBEE2A /* LaunchScreen.storyboard */,
024D10E6156EAB6F00FE6872 /* Supporting Files */,
);
path = BarcodeScanner;
Expand Down Expand Up @@ -297,9 +297,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
02C6AFE0156FCBA00052B145 /* ViewController.xib in Resources */,
02C6AFE3156FCBA80052B145 /* InfoPlist.strings in Resources */,
25404718166AC1D200E13304 /* [email protected] in Resources */,
52D7D9D72657C4A200EBEE2A /* LaunchScreen.storyboard in Resources */,
52D7D9D52657C33700EBEE2A /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -327,14 +327,6 @@
/* End PBXTargetDependency section */

/* Begin PBXVariantGroup section */
02C6AFDE156FCBA00052B145 /* ViewController.xib */ = {
isa = PBXVariantGroup;
children = (
02C6AFDF156FCBA00052B145 /* en */,
);
name = ViewController.xib;
sourceTree = "<group>";
};
02C6AFE1156FCBA80052B145 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
Expand Down
Binary file removed examples/BarcodeScanner/[email protected]
View file
Open in desktop
Binary file not shown.
31 changes: 31 additions & 0 deletions examples/BarcodeScanner/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="FwT-D8-sd2"/>
<viewControllerLayoutGuide type="bottom" id="17b-cA-aqh"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="53" y="375"/>
</scene>
</scenes>
</document>
56 changes: 56 additions & 0 deletions examples/BarcodeScanner/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="t6u-rZ-9xd">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="DQp-Wl-wOu">
<objects>
<viewController id="t6u-rZ-9xd" customClass="ViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="EU2-Kd-Lf1"/>
<viewControllerLayoutGuide type="bottom" id="vsd-LP-wUm"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="cej-i4-12n">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qgo-yu-mXB">
<rect key="frame" x="62.5" y="208.5" width="250" height="250"/>
<color key="backgroundColor" white="1" alpha="0.29999999999999999" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="height" constant="250" id="EKu-ik-U53"/>
<constraint firstAttribute="width" constant="250" id="YeP-YC-EB9"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hold up to a barcode to scan" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MvI-ai-FZ9">
<rect key="frame" x="62.5" y="111" width="250" height="445"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" red="1" green="0.018318351409999999" blue="0.15975175750000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="Qgo-yu-mXB" firstAttribute="centerY" secondItem="cej-i4-12n" secondAttribute="centerY" id="3eH-2F-RId"/>
<constraint firstItem="MvI-ai-FZ9" firstAttribute="centerX" secondItem="cej-i4-12n" secondAttribute="centerX" id="7WN-VY-O0R"/>
<constraint firstItem="Qgo-yu-mXB" firstAttribute="centerX" secondItem="cej-i4-12n" secondAttribute="centerX" id="WKt-dq-H78"/>
<constraint firstItem="MvI-ai-FZ9" firstAttribute="height" secondItem="cej-i4-12n" secondAttribute="height" multiplier="2/3" id="kUl-tY-Izx"/>
<constraint firstItem="MvI-ai-FZ9" firstAttribute="centerY" secondItem="cej-i4-12n" secondAttribute="centerY" id="mg4-5f-SUZ"/>
<constraint firstItem="MvI-ai-FZ9" firstAttribute="width" secondItem="Qgo-yu-mXB" secondAttribute="width" id="nlf-sl-j7e"/>
</constraints>
</view>
<connections>
<outlet property="resultLabel" destination="MvI-ai-FZ9" id="eGd-3k-Eo2"/>
<outlet property="scanView" destination="Qgo-yu-mXB" id="RU5-a7-dq6"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="5Ik-HT-pJT" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="268" y="-235"/>
</scene>
</scenes>
</document>
Loading