Browse Source

Remonde Ads and cleanup

David Walter 3 years ago
parent
commit
c9aa06ffd8

+ 8
- 9
CodeReader.xcodeproj/project.pbxproj View File

@@ -17,12 +17,10 @@
17 17
 		630819DB1A7A9CA90077456C /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 630819DA1A7A9CA90077456C /* Images.xcassets */; };
18 18
 		630819DE1A7A9CA90077456C /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 630819DC1A7A9CA90077456C /* LaunchScreen.xib */; };
19 19
 		630819EA1A7A9CAA0077456C /* CodeReaderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630819E91A7A9CAA0077456C /* CodeReaderTests.swift */; };
20
-		630819F41A7A9CEA0077456C /* iAd.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630819F31A7A9CEA0077456C /* iAd.framework */; };
21 20
 		630819F61A7A9CF00077456C /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 630819F51A7A9CF00077456C /* AVFoundation.framework */; };
22 21
 		630819F81A7A9D460077456C /* CodeReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630819F71A7A9D460077456C /* CodeReader.swift */; };
23 22
 		630819FA1A7AA8970077456C /* DetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 630819F91A7AA8970077456C /* DetailViewController.swift */; };
24 23
 		636D4D181A840FB100EC103A /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 636D4D171A840FB100EC103A /* StoreKit.framework */; };
25
-		636D4D1C1A84116A00EC103A /* RemoveAds.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636D4D1B1A84116A00EC103A /* RemoveAds.swift */; };
26 24
 		636D4D1E1A841FDE00EC103A /* Overlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 636D4D1D1A841FDE00EC103A /* Overlay.swift */; };
27 25
 		63E272E31A83A1FF00293C83 /* Validation.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E272E21A83A1FF00293C83 /* Validation.swift */; };
28 26
 		63E272E51A83AB0D00293C83 /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 63E272E41A83AB0D00293C83 /* Settings.swift */; };
@@ -54,12 +52,10 @@
54 52
 		630819E31A7A9CAA0077456C /* CodeReaderTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CodeReaderTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
55 53
 		630819E81A7A9CAA0077456C /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
56 54
 		630819E91A7A9CAA0077456C /* CodeReaderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeReaderTests.swift; sourceTree = "<group>"; };
57
-		630819F31A7A9CEA0077456C /* iAd.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = iAd.framework; path = System/Library/Frameworks/iAd.framework; sourceTree = SDKROOT; };
58 55
 		630819F51A7A9CF00077456C /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
59 56
 		630819F71A7A9D460077456C /* CodeReader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CodeReader.swift; sourceTree = "<group>"; };
60 57
 		630819F91A7AA8970077456C /* DetailViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DetailViewController.swift; sourceTree = "<group>"; };
61 58
 		636D4D171A840FB100EC103A /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; };
62
-		636D4D1B1A84116A00EC103A /* RemoveAds.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RemoveAds.swift; sourceTree = "<group>"; };
63 59
 		636D4D1D1A841FDE00EC103A /* Overlay.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Overlay.swift; sourceTree = "<group>"; };
64 60
 		63E272E21A83A1FF00293C83 /* Validation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Validation.swift; sourceTree = "<group>"; };
65 61
 		63E272E41A83AB0D00293C83 /* Settings.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Settings.swift; sourceTree = "<group>"; };
@@ -73,7 +69,6 @@
73 69
 				636D4D181A840FB100EC103A /* StoreKit.framework in Frameworks */,
74 70
 				630819B71A83C94000EAD1BC /* QuartzCore.framework in Frameworks */,
75 71
 				630819F61A7A9CF00077456C /* AVFoundation.framework in Frameworks */,
76
-				630819F41A7A9CEA0077456C /* iAd.framework in Frameworks */,
77 72
 			);
78 73
 			runOnlyForDeploymentPostprocessing = 0;
79 74
 		};
@@ -93,7 +88,6 @@
93 88
 				636D4D171A840FB100EC103A /* StoreKit.framework */,
94 89
 				630819B61A83C94000EAD1BC /* QuartzCore.framework */,
95 90
 				630819F51A7A9CF00077456C /* AVFoundation.framework */,
96
-				630819F31A7A9CEA0077456C /* iAd.framework */,
97 91
 				630819D01A7A9CA90077456C /* CodeReader */,
98 92
 				630819E61A7A9CAA0077456C /* CodeReaderTests */,
99 93
 				630819CF1A7A9CA90077456C /* Products */,
@@ -117,7 +111,6 @@
117 111
 				630819F91A7AA8970077456C /* DetailViewController.swift */,
118 112
 				6307550D1A7BBFA200EA3D60 /* SettingsViewController.swift */,
119 113
 				630819F71A7A9D460077456C /* CodeReader.swift */,
120
-				636D4D1B1A84116A00EC103A /* RemoveAds.swift */,
121 114
 				63E272E21A83A1FF00293C83 /* Validation.swift */,
122 115
 				6307550F1A7BCBF600EA3D60 /* Outpan.swift */,
123 116
 				630819D71A7A9CA90077456C /* Main.storyboard */,
@@ -203,7 +196,7 @@
203 196
 			attributes = {
204 197
 				LastSwiftMigration = 0700;
205 198
 				LastSwiftUpdateCheck = 0700;
206
-				LastUpgradeCheck = 0700;
199
+				LastUpgradeCheck = 0830;
207 200
 				ORGANIZATIONNAME = "David Walter";
208 201
 				TargetAttributes = {
209 202
 					630819CD1A7A9CA90077456C = {
@@ -262,7 +255,6 @@
262 255
 			isa = PBXSourcesBuildPhase;
263 256
 			buildActionMask = 2147483647;
264 257
 			files = (
265
-				636D4D1C1A84116A00EC103A /* RemoveAds.swift in Sources */,
266 258
 				630755101A7BCBF600EA3D60 /* Outpan.swift in Sources */,
267 259
 				630819D61A7A9CA90077456C /* ViewController.swift in Sources */,
268 260
 				63E272E51A83AB0D00293C83 /* Settings.swift in Sources */,
@@ -327,8 +319,10 @@
327 319
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
328 320
 				CLANG_WARN_EMPTY_BODY = YES;
329 321
 				CLANG_WARN_ENUM_CONVERSION = YES;
322
+				CLANG_WARN_INFINITE_RECURSION = YES;
330 323
 				CLANG_WARN_INT_CONVERSION = YES;
331 324
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
325
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
332 326
 				CLANG_WARN_UNREACHABLE_CODE = YES;
333 327
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
334 328
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -337,6 +331,7 @@
337 331
 				ENABLE_TESTABILITY = YES;
338 332
 				GCC_C_LANGUAGE_STANDARD = gnu99;
339 333
 				GCC_DYNAMIC_NO_PIC = NO;
334
+				GCC_NO_COMMON_BLOCKS = YES;
340 335
 				GCC_OPTIMIZATION_LEVEL = 0;
341 336
 				GCC_PREPROCESSOR_DEFINITIONS = (
342 337
 					"DEBUG=1",
@@ -370,8 +365,10 @@
370 365
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
371 366
 				CLANG_WARN_EMPTY_BODY = YES;
372 367
 				CLANG_WARN_ENUM_CONVERSION = YES;
368
+				CLANG_WARN_INFINITE_RECURSION = YES;
373 369
 				CLANG_WARN_INT_CONVERSION = YES;
374 370
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
371
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
375 372
 				CLANG_WARN_UNREACHABLE_CODE = YES;
376 373
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
377 374
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -379,6 +376,7 @@
379 376
 				ENABLE_NS_ASSERTIONS = NO;
380 377
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
381 378
 				GCC_C_LANGUAGE_STANDARD = gnu99;
379
+				GCC_NO_COMMON_BLOCKS = YES;
382 380
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
383 381
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
384 382
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
@@ -388,6 +386,7 @@
388 386
 				IPHONEOS_DEPLOYMENT_TARGET = 8.1;
389 387
 				MTL_ENABLE_DEBUG_INFO = NO;
390 388
 				SDKROOT = iphoneos;
389
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
391 390
 				VALIDATE_PRODUCT = YES;
392 391
 			};
393 392
 			name = Release;

BIN
CodeReader.xcodeproj/project.xcworkspace/xcuserdata/david.xcuserdatad/UserInterfaceState.xcuserstate View File


+ 1
- 1
CodeReader.xcodeproj/xcuserdata/david.xcuserdatad/xcschemes/CodeReader.xcscheme View File

@@ -1,6 +1,6 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <Scheme
3
-   LastUpgradeVersion = "0700"
3
+   LastUpgradeVersion = "0830"
4 4
    version = "1.3">
5 5
    <BuildAction
6 6
       parallelizeBuildables = "YES"

+ 33
- 86
CodeReader/Base.lproj/Main.storyboard View File

@@ -1,9 +1,13 @@
1
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8187.4" systemVersion="15A279b" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="g24-NZ-lCn">
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12118" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="g24-NZ-lCn">
3
+    <device id="retina4_7" orientation="portrait">
4
+        <adaptation id="fullscreen"/>
5
+    </device>
3 6
     <dependencies>
4 7
         <deployment identifier="iOS"/>
5
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8151.3"/>
8
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12086"/>
6 9
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
10
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
7 11
     </dependencies>
8 12
     <scenes>
9 13
         <!--View Controller-->
@@ -20,37 +24,16 @@
20 24
                         <subviews>
21 25
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gv3-eU-Lfi">
22 26
                                 <rect key="frame" x="0.0" y="0.0" width="320" height="600"/>
23
-                                <animations/>
24
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
27
+                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
25 28
                             </view>
26
-                            <adBannerView hidden="YES" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EKM-kw-x2m">
27
-                                <rect key="frame" x="0.0" y="550" width="320" height="50"/>
28
-                                <animations/>
29
-                                <constraints>
30
-                                    <constraint firstAttribute="height" constant="50" id="dvy-G3-Zbf"/>
31
-                                </constraints>
32
-                                <connections>
33
-                                    <outlet property="delegate" destination="vXZ-lx-hvc" id="hxs-LW-uwi"/>
34
-                                </connections>
35
-                            </adBannerView>
36 29
                         </subviews>
37
-                        <animations/>
38
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
30
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
39 31
                         <constraints>
40 32
                             <constraint firstItem="gv3-eU-Lfi" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="-16" id="0jB-tD-H5R"/>
41 33
                             <constraint firstAttribute="trailingMargin" secondItem="gv3-eU-Lfi" secondAttribute="trailing" constant="-16" id="GO1-Xx-qkR"/>
42 34
                             <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="gv3-eU-Lfi" secondAttribute="bottom" id="JGV-vu-4pc"/>
43
-                            <constraint firstItem="EKM-kw-x2m" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leadingMargin" constant="-20" id="Oph-Vb-bts"/>
44
-                            <constraint firstAttribute="trailingMargin" secondItem="EKM-kw-x2m" secondAttribute="trailing" constant="-20" id="bTw-ng-msg"/>
45
-                            <constraint firstItem="EKM-kw-x2m" firstAttribute="bottom" secondItem="kh9-bI-dsS" secondAttribute="bottomMargin" id="dGM-TD-4Lz"/>
46
-                            <constraint firstItem="2fi-mo-0CV" firstAttribute="top" secondItem="EKM-kw-x2m" secondAttribute="bottom" id="ebV-7L-SEW"/>
47 35
                             <constraint firstItem="gv3-eU-Lfi" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="topMargin" id="nK7-50-dRD"/>
48 36
                         </constraints>
49
-                        <variation key="default">
50
-                            <mask key="constraints">
51
-                                <exclude reference="ebV-7L-SEW"/>
52
-                            </mask>
53
-                        </variation>
54 37
                     </view>
55 38
                     <navigationItem key="navigationItem" id="n1w-Zw-otG">
56 39
                         <barButtonItem key="leftBarButtonItem" image="Gear" id="gWI-s8-4wp">
@@ -59,7 +42,7 @@
59 42
                             </connections>
60 43
                         </barButtonItem>
61 44
                         <barButtonItem key="rightBarButtonItem" image="Flash" id="pcN-Lv-9CO">
62
-                            <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
45
+                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
63 46
                             <connections>
64 47
                                 <action selector="toggleFlash:" destination="vXZ-lx-hvc" id="RvB-Jv-cZl"/>
65 48
                             </connections>
@@ -68,7 +51,6 @@
68 51
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
69 52
                     <size key="freeformSize" width="320" height="600"/>
70 53
                     <connections>
71
-                        <outlet property="banner" destination="EKM-kw-x2m" id="4k5-19-3JS"/>
72 54
                         <outlet property="cameraView" destination="gv3-eU-Lfi" id="ouX-UK-LCl"/>
73 55
                         <outlet property="flashButton" destination="pcN-Lv-9CO" id="NMY-tf-y3N"/>
74 56
                         <segue destination="7ns-37-3i1" kind="show" identifier="CodeDetail" id="LcQ-Cf-4fe"/>
@@ -85,72 +67,55 @@
85 67
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="GUN-BG-B7N">
86 68
                         <rect key="frame" x="0.0" y="0.0" width="320" height="600"/>
87 69
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
88
-                        <animations/>
89
-                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
90
-                        <adBannerView key="tableHeaderView" hidden="YES" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="jej-HZ-rEX">
91
-                            <rect key="frame" x="0.0" y="64" width="320" height="44"/>
92
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
93
-                            <animations/>
94
-                            <connections>
95
-                                <outlet property="delegate" destination="7ns-37-3i1" id="QPY-cH-QgL"/>
96
-                            </connections>
97
-                        </adBannerView>
70
+                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
98 71
                         <prototypes>
99 72
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="DetailCell" id="ZTO-zO-xx0">
100
-                                <rect key="frame" x="0.0" y="179.5" width="320" height="44"/>
73
+                                <rect key="frame" x="0.0" y="56" width="320" height="44"/>
101 74
                                 <autoresizingMask key="autoresizingMask"/>
102 75
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZTO-zO-xx0" id="XqK-DN-gmo">
103
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
76
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
104 77
                                     <autoresizingMask key="autoresizingMask"/>
105
-                                    <animations/>
106 78
                                 </tableViewCellContentView>
107
-                                <animations/>
108 79
                             </tableViewCell>
109 80
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AttributeCell" textLabel="l7i-GU-Rix" detailTextLabel="cPw-2i-8Qf" style="IBUITableViewCellStyleValue1" id="C0S-vN-MeR" customClass="AttributeCell" customModule="CodeReader" customModuleProvider="target">
110
-                                <rect key="frame" x="0.0" y="223.5" width="320" height="44"/>
81
+                                <rect key="frame" x="0.0" y="100" width="320" height="44"/>
111 82
                                 <autoresizingMask key="autoresizingMask"/>
112 83
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C0S-vN-MeR" id="C3d-sx-wLI">
113
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
84
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
114 85
                                     <autoresizingMask key="autoresizingMask"/>
115 86
                                     <subviews>
116 87
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="l7i-GU-Rix">
117
-                                            <rect key="frame" x="15" y="12" width="31.5" height="19.5"/>
88
+                                            <rect key="frame" x="15" y="12" width="32" height="20"/>
118 89
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
119
-                                            <animations/>
120 90
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
121
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
91
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
122 92
                                             <nil key="highlightedColor"/>
123 93
                                         </label>
124 94
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Detail" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cPw-2i-8Qf">
125
-                                            <rect key="frame" x="263.5" y="12" width="41.5" height="19.5"/>
95
+                                            <rect key="frame" x="263" y="12" width="42" height="20"/>
126 96
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
127
-                                            <animations/>
128 97
                                             <fontDescription key="fontDescription" type="system" pointSize="16"/>
129
-                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="calibratedRGB"/>
98
+                                            <color key="textColor" red="0.55686274509803924" green="0.55686274509803924" blue="0.57647058823529407" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
130 99
                                             <nil key="highlightedColor"/>
131 100
                                         </label>
132 101
                                     </subviews>
133
-                                    <animations/>
134 102
                                 </tableViewCellContentView>
135
-                                <animations/>
136 103
                                 <connections>
137 104
                                     <outlet property="detail" destination="cPw-2i-8Qf" id="t8w-Bp-3jk"/>
138 105
                                     <outlet property="name" destination="l7i-GU-Rix" id="JqH-93-KQD"/>
139 106
                                 </connections>
140 107
                             </tableViewCell>
141 108
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ImageCell" rowHeight="150" id="Htw-m3-fgz" customClass="ImageCell" customModule="CodeReader" customModuleProvider="target">
142
-                                <rect key="frame" x="0.0" y="267.5" width="320" height="150"/>
109
+                                <rect key="frame" x="0.0" y="144" width="320" height="150"/>
143 110
                                 <autoresizingMask key="autoresizingMask"/>
144 111
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Htw-m3-fgz" id="ixZ-ny-O1I">
145
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="149.5"/>
112
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="150"/>
146 113
                                     <autoresizingMask key="autoresizingMask"/>
147 114
                                     <subviews>
148 115
                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sfB-8a-sKq">
149
-                                            <rect key="frame" x="0.0" y="8" width="320" height="134"/>
150
-                                            <animations/>
116
+                                            <rect key="frame" x="0.0" y="8" width="320" height="133"/>
151 117
                                         </imageView>
152 118
                                     </subviews>
153
-                                    <animations/>
154 119
                                     <constraints>
155 120
                                         <constraint firstItem="sfB-8a-sKq" firstAttribute="top" secondItem="ixZ-ny-O1I" secondAttribute="topMargin" id="DuI-V0-TRB"/>
156 121
                                         <constraint firstAttribute="trailingMargin" secondItem="sfB-8a-sKq" secondAttribute="trailing" constant="-8" id="JuO-y1-w2e"/>
@@ -158,7 +123,6 @@
158 123
                                         <constraint firstItem="sfB-8a-sKq" firstAttribute="leading" secondItem="ixZ-ny-O1I" secondAttribute="leadingMargin" constant="-8" id="QoV-Jz-GVg"/>
159 124
                                     </constraints>
160 125
                                 </tableViewCellContentView>
161
-                                <animations/>
162 126
                                 <connections>
163 127
                                     <outlet property="product" destination="sfB-8a-sKq" id="LLF-bG-3F1"/>
164 128
                                 </connections>
@@ -192,41 +156,36 @@
192 156
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="cTt-Pf-ZR6">
193 157
                         <rect key="frame" x="0.0" y="0.0" width="320" height="600"/>
194 158
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
195
-                        <animations/>
196
-                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
159
+                        <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
197 160
                         <prototypes>
198 161
                             <tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SettingsCell" id="tPf-UV-yUd" customClass="SettingsCell" customModule="CodeReader" customModuleProvider="target">
199
-                                <rect key="frame" x="0.0" y="113.5" width="320" height="44"/>
162
+                                <rect key="frame" x="0.0" y="56" width="320" height="44"/>
200 163
                                 <autoresizingMask key="autoresizingMask"/>
201 164
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="tPf-UV-yUd" id="8vB-ca-M4q">
202
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
165
+                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
203 166
                                     <autoresizingMask key="autoresizingMask"/>
204 167
                                     <subviews>
205 168
                                         <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="vjk-We-wAJ">
206 169
                                             <rect key="frame" x="263" y="6" width="51" height="31"/>
207
-                                            <animations/>
208 170
                                             <constraints>
209 171
                                                 <constraint firstAttribute="width" constant="49" id="Xn2-QG-iLj"/>
210 172
                                                 <constraint firstAttribute="height" constant="31" id="ytj-O1-lfP"/>
211 173
                                             </constraints>
212
-                                            <color key="onTintColor" red="0.99607849120000003" green="0.79607850309999995" blue="0.180392161" alpha="1" colorSpace="deviceRGB"/>
174
+                                            <color key="onTintColor" red="0.99019813537597656" green="0.75903403759002686" blue="0.14210078120231628" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
213 175
                                         </switch>
214 176
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0cJ-Fa-X75">
215
-                                            <rect key="frame" x="56" y="0.0" width="199" height="44"/>
216
-                                            <animations/>
177
+                                            <rect key="frame" x="56" y="0.0" width="199" height="43"/>
217 178
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
218
-                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
179
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
219 180
                                             <nil key="highlightedColor"/>
220 181
                                         </label>
221 182
                                         <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="8M5-Hn-mGa">
222 183
                                             <rect key="frame" x="8" y="2" width="40" height="40"/>
223
-                                            <animations/>
224 184
                                             <constraints>
225 185
                                                 <constraint firstAttribute="width" constant="40" id="77d-it-dVA"/>
226 186
                                             </constraints>
227 187
                                         </imageView>
228 188
                                     </subviews>
229
-                                    <animations/>
230 189
                                     <constraints>
231 190
                                         <constraint firstItem="vjk-We-wAJ" firstAttribute="leading" secondItem="0cJ-Fa-X75" secondAttribute="trailing" constant="8" id="Ce7-yl-wN9"/>
232 191
                                         <constraint firstItem="vjk-We-wAJ" firstAttribute="trailing" secondItem="8vB-ca-M4q" secondAttribute="trailingMargin" id="FLg-gp-9xQ"/>
@@ -261,23 +220,12 @@
261 220
                                         </mask>
262 221
                                     </variation>
263 222
                                 </tableViewCellContentView>
264
-                                <animations/>
265 223
                                 <connections>
266 224
                                     <outlet property="label" destination="0cJ-Fa-X75" id="eHJ-QZ-Rbi"/>
267 225
                                     <outlet property="logo" destination="8M5-Hn-mGa" id="fVk-XL-l77"/>
268 226
                                     <outlet property="onoff" destination="vjk-We-wAJ" id="hpy-ak-3VX"/>
269 227
                                 </connections>
270 228
                             </tableViewCell>
271
-                            <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="RemoveAdsCell" id="Nxi-Pg-GvM">
272
-                                <rect key="frame" x="0.0" y="157.5" width="320" height="44"/>
273
-                                <autoresizingMask key="autoresizingMask"/>
274
-                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Nxi-Pg-GvM" id="kfj-fx-mzD">
275
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
276
-                                    <autoresizingMask key="autoresizingMask"/>
277
-                                    <animations/>
278
-                                </tableViewCellContentView>
279
-                                <animations/>
280
-                            </tableViewCell>
281 229
                         </prototypes>
282 230
                         <connections>
283 231
                             <outlet property="dataSource" destination="ghB-8c-FC9" id="vtz-gZ-cCi"/>
@@ -297,13 +245,12 @@
297 245
                     <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" id="h5M-U2-u01">
298 246
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
299 247
                         <autoresizingMask key="autoresizingMask"/>
300
-                        <animations/>
301
-                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
302
-                        <color key="tintColor" red="0.99607849120000003" green="0.79607850309999995" blue="0.180392161" alpha="1" colorSpace="deviceRGB"/>
303
-                        <color key="barTintColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
248
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
249
+                        <color key="tintColor" red="0.99019813537597656" green="0.75903403759002686" blue="0.14210078120231628" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
250
+                        <color key="barTintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
304 251
                         <textAttributes key="titleTextAttributes">
305
-                            <color key="textColor" red="0.99607849120000003" green="0.79607850309999995" blue="0.180392161" alpha="1" colorSpace="deviceRGB"/>
306
-                            <color key="textShadowColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
252
+                            <color key="textColor" red="0.99019813537597656" green="0.75903403759002686" blue="0.14210078120231628" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
253
+                            <color key="textShadowColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
307 254
                         </textAttributes>
308 255
                     </navigationBar>
309 256
                     <connections>

+ 2
- 0
CodeReader/Info.plist View File

@@ -2,6 +2,8 @@
2 2
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 3
 <plist version="1.0">
4 4
 <dict>
5
+	<key>NSCameraUsageDescription</key>
6
+	<string>Camera will be used to scan Barcodes and QR Codes</string>
5 7
 	<key>CFBundleDevelopmentRegion</key>
6 8
 	<string>en</string>
7 9
 	<key>CFBundleExecutable</key>

+ 4
- 0
CodeReader/Outpan.swift View File

@@ -6,6 +6,10 @@
6 6
 //  Copyright (c) 2015 David Walter. All rights reserved.
7 7
 //
8 8
 
9
+//
10
+// Outdated there is a new API coming soon - https://www.outpan.com/developers
11
+//
12
+
9 13
 import Foundation
10 14
 
11 15
 class Outpan : NSObject {

+ 1
- 27
CodeReader/SettingsViewController.swift View File

@@ -17,8 +17,6 @@ class SettingsCell: UITableViewCell {
17 17
 
18 18
 class SettingsViewController: UITableViewController {
19 19
     
20
-    let removeAds = RemoveAds()
21
-    
22 20
     override func viewDidLoad() {
23 21
         super.viewDidLoad()
24 22
         self.navigationItem.title = "Settings"
@@ -49,27 +47,11 @@ class SettingsViewController: UITableViewController {
49 47
     }
50 48
     
51 49
     override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
52
-        if (section == 1) {
53
-            return "Remove Ads"
54
-        }
55
-        
56 50
         return "Open automatically"
57 51
     }
58 52
     
59 53
     override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
60 54
         
61
-        if indexPath.section == 1 {  //Remove Ads
62
-            let cell = self.tableView.dequeueReusableCell(withIdentifier: "RemoveAdsCell", for: indexPath) 
63
-            
64
-            cell.textLabel?.textAlignment = NSTextAlignment.center
65
-            if (indexPath.row == 0) {
66
-                cell.textLabel?.text = "Remove Ads"
67
-            } else {
68
-                cell.textLabel?.text = "Restore"
69
-            }
70
-            
71
-            return cell
72
-        } else {
73 55
             let scell = self.tableView.dequeueReusableCell(withIdentifier: "SettingsCell", for: indexPath) as! SettingsCell
74 56
             
75 57
             if (indexPath.row == 0) {
@@ -98,7 +80,7 @@ class SettingsViewController: UITableViewController {
98 80
             scell.onoff?.addTarget(self, action: #selector(SettingsViewController.flip(_:)), for: UIControlEvents.valueChanged)
99 81
             
100 82
             return scell
101
-        }
83
+        
102 84
     }
103 85
     
104 86
     @IBAction func flip(_ id: UISwitch) {
@@ -121,13 +103,5 @@ class SettingsViewController: UITableViewController {
121 103
     override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
122 104
         
123 105
         self.tableView.deselectRow(at: indexPath, animated: true)
124
-        
125
-        if (indexPath.section == 1) { //Remove Ads
126
-            if (indexPath.row == 0) {
127
-                removeAds.RemoveAds()
128
-            } else {
129
-                removeAds.restoreRemoveAds()
130
-            }
131
-        }
132 106
     }
133 107
 }