Skip to content

Commit c406b68

Browse files
ghazi256HJafri256
authored andcommitted
Merge branch 'master' into limit-maximum-number-of-scans
2 parents cbf756b + 8a7d633 commit c406b68

File tree

6 files changed

+79
-194
lines changed

6 files changed

+79
-194
lines changed
Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3-
<device id="ipad9_7" orientation="portrait">
4-
<adaptation id="fullscreen"/>
5-
</device>
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
3+
<device id="retina6_72" orientation="portrait" appearance="light"/>
64
<dependencies>
75
<deployment identifier="iOS"/>
8-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
97
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
108
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
119
</dependencies>
@@ -19,16 +17,16 @@
1917
</placeholder>
2018
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
2119
<view contentMode="scaleToFill" id="iN0-l3-epB">
22-
<rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
20+
<rect key="frame" x="0.0" y="0.0" width="430" height="932"/>
2321
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
2422
<subviews>
2523
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IGI-av-nLY">
26-
<rect key="frame" x="0.0" y="20" width="768" height="960"/>
24+
<rect key="frame" x="0.0" y="59" width="430" height="795"/>
2725
</imageView>
2826
<toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6o0-xD-q4y">
29-
<rect key="frame" x="0.0" y="980" width="768" height="44"/>
27+
<rect key="frame" x="0.0" y="854" width="430" height="44"/>
3028
<constraints>
31-
<constraint firstAttribute="height" constant="44" id="pDQ-Y3-XI7"/>
29+
<constraint firstAttribute="height" constant="44" id="qsw-Qy-41S"/>
3230
</constraints>
3331
<items>
3432
<barButtonItem title="Retake" id="tC1-07-Z7Y">
@@ -45,18 +43,18 @@
4543
</items>
4644
</toolbar>
4745
</subviews>
46+
<viewLayoutGuide key="safeArea" id="DMX-4Q-5IJ"/>
4847
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
4948
<constraints>
50-
<constraint firstItem="6o0-xD-q4y" firstAttribute="leading" secondItem="DMX-4Q-5IJ" secondAttribute="leading" id="4y7-nX-4ik"/>
51-
<constraint firstItem="6o0-xD-q4y" firstAttribute="bottom" secondItem="DMX-4Q-5IJ" secondAttribute="bottom" id="JfA-0X-cJ1"/>
52-
<constraint firstItem="DMX-4Q-5IJ" firstAttribute="trailing" secondItem="IGI-av-nLY" secondAttribute="trailing" id="dIo-ae-sI8"/>
53-
<constraint firstItem="IGI-av-nLY" firstAttribute="leading" secondItem="DMX-4Q-5IJ" secondAttribute="leading" id="jyC-VG-7Ix"/>
54-
<constraint firstItem="6o0-xD-q4y" firstAttribute="trailing" secondItem="DMX-4Q-5IJ" secondAttribute="trailing" id="to3-hq-9Cr"/>
55-
<constraint firstItem="DMX-4Q-5IJ" firstAttribute="top" secondItem="IGI-av-nLY" secondAttribute="top" id="u0v-JI-nFQ"/>
56-
<constraint firstItem="6o0-xD-q4y" firstAttribute="top" secondItem="IGI-av-nLY" secondAttribute="bottom" id="yHU-Fj-MGb"/>
49+
<constraint firstItem="IGI-av-nLY" firstAttribute="top" secondItem="DMX-4Q-5IJ" secondAttribute="top" id="4iE-zt-2HD"/>
50+
<constraint firstItem="6o0-xD-q4y" firstAttribute="leading" secondItem="DMX-4Q-5IJ" secondAttribute="leading" id="AlC-hz-czz"/>
51+
<constraint firstItem="DMX-4Q-5IJ" firstAttribute="bottom" secondItem="6o0-xD-q4y" secondAttribute="bottom" id="Hkq-Ep-uIf"/>
52+
<constraint firstItem="IGI-av-nLY" firstAttribute="trailing" secondItem="DMX-4Q-5IJ" secondAttribute="trailing" id="cXz-HU-ibu"/>
53+
<constraint firstItem="6o0-xD-q4y" firstAttribute="top" secondItem="IGI-av-nLY" secondAttribute="bottom" id="qG0-UV-rxb"/>
54+
<constraint firstItem="IGI-av-nLY" firstAttribute="leading" secondItem="DMX-4Q-5IJ" secondAttribute="leading" id="rS6-Rf-cOY"/>
55+
<constraint firstItem="6o0-xD-q4y" firstAttribute="trailing" secondItem="DMX-4Q-5IJ" secondAttribute="trailing" id="y4o-Mu-hab"/>
5756
</constraints>
58-
<viewLayoutGuide key="safeArea" id="DMX-4Q-5IJ"/>
59-
<point key="canvasLocation" x="-288.5" y="9"/>
57+
<point key="canvasLocation" x="-288.83720930232556" y="8.3690987124463518"/>
6058
</view>
6159
</objects>
6260
</document>

0 commit comments

Comments
 (0)