Переглянути джерело

Granite expo esign 更新 2020 合同,iOS13 兼容性适配,部分框架修改

Ray Zhang 6 роки тому
батько
коміт
618042aca2

+ 0 - 32
Ants Contract/AntsContract/AntsContract/Base.lproj/LaunchScreen.storyboard

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="15G1212" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
-    <device id="ipad9_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
-    <dependencies>
-        <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
-        <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">
-                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
-                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
-                        <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="67.840000000000003" y="640"/>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>

+ 46 - 61
Ants Contract/AntsContract/AntsContract/Base.lproj/Main.storyboard

@@ -18,7 +18,7 @@
                                 <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
                             </imageView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="VWG-vZ-UuE">
-                                <rect key="frame" x="0.0" y="401" width="768" height="223"/>
+                                <rect key="frame" x="0.0" y="400.5" width="768" height="223"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VoO-EQ-M9h">
                                         <rect key="frame" x="50" y="30" width="200" height="150"/>
@@ -103,7 +103,7 @@
                                 <rect key="frame" x="0.0" y="20" width="768" height="1004"/>
                                 <subviews>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_bg_p" translatesAutoresizingMaskIntoConstraints="NO" id="74h-ia-SzF">
-                                        <rect key="frame" x="1" y="0.0" width="768" height="1025"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="768" height="1004"/>
                                     </imageView>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -146,6 +146,14 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="knI-LF-shp">
+                                <rect key="frame" x="605" y="914" width="103" height="30"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
+                                <state key="normal" title="Privacy Policy"/>
+                                <connections>
+                                    <action selector="onPrivacyClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="t3o-2C-AJh"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
@@ -164,6 +172,7 @@
                             <constraint firstItem="QNm-bw-hPi" firstAttribute="top" secondItem="lzJ-IH-Kef" secondAttribute="top" constant="50" id="Qq7-sQ-gca"/>
                             <constraint firstItem="VWG-vZ-UuE" firstAttribute="leading" secondItem="lzJ-IH-Kef" secondAttribute="leading" id="UG9-fA-F94"/>
                             <constraint firstAttribute="bottom" secondItem="WlE-9f-0pQ" secondAttribute="bottom" id="WAx-P7-pKe"/>
+                            <constraint firstItem="lzJ-IH-Kef" firstAttribute="trailing" secondItem="knI-LF-shp" secondAttribute="trailing" constant="60" id="WOy-Wc-39E"/>
                             <constraint firstItem="V7m-G1-ogb" firstAttribute="trailing" secondItem="lzJ-IH-Kef" secondAttribute="trailing" id="beY-EE-X4H"/>
                             <constraint firstItem="V7m-G1-ogb" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" constant="20" id="byv-Q7-OEw"/>
                             <constraint firstItem="lzJ-IH-Kef" firstAttribute="trailing" secondItem="QNm-bw-hPi" secondAttribute="trailing" constant="30" id="c7c-f5-Rv7"/>
@@ -172,6 +181,7 @@
                             <constraint firstItem="VWG-vZ-UuE" firstAttribute="centerY" secondItem="8bC-Xf-vdC" secondAttribute="centerY" id="oxN-Q1-Peo"/>
                             <constraint firstItem="WPb-xH-q9X" firstAttribute="top" secondItem="V9T-Cq-Gk2" secondAttribute="bottom" constant="15" id="qCz-g2-EUJ"/>
                             <constraint firstItem="lzJ-IH-Kef" firstAttribute="bottom" secondItem="bur-yb-Jpu" secondAttribute="bottom" constant="40" id="zID-w7-tLj"/>
+                            <constraint firstItem="lzJ-IH-Kef" firstAttribute="bottom" secondItem="knI-LF-shp" secondAttribute="bottom" constant="30" id="zNr-FV-D03"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="lzJ-IH-Kef"/>
                     </view>
@@ -227,18 +237,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="UZY-AP-7MO" customClass="PDFScrollView">
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" maximumZoomScale="3" id="UZY-AP-7MO" customClass="PDFScrollView">
                                 <rect key="frame" x="0.0" y="64" width="768" height="960"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <view tag="1024" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Iyx-2L-Lrz">
+                                    <view tag="1024" contentMode="scaleToFill" id="Iyx-2L-Lrz">
                                         <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <subviews>
-                                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8Hw-OZ-rsH" customClass="RAPDFPageView">
+                                            <view contentMode="scaleToFill" id="8Hw-OZ-rsH" customClass="RAPDFPageView">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                             </view>
-                                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wPo-qh-F4Q">
+                                            <view contentMode="scaleToFill" id="wPo-qh-F4Q">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             </view>
@@ -246,27 +258,13 @@
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     </view>
                                 </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstAttribute="bottom" secondItem="Iyx-2L-Lrz" secondAttribute="bottom" id="131-qm-Hvu"/>
-                                    <constraint firstAttribute="trailing" secondItem="Iyx-2L-Lrz" secondAttribute="trailing" id="KIi-Gu-gXq"/>
-                                    <constraint firstItem="Iyx-2L-Lrz" firstAttribute="top" secondItem="UZY-AP-7MO" secondAttribute="top" id="MvJ-3R-2ny"/>
-                                    <constraint firstItem="Iyx-2L-Lrz" firstAttribute="centerX" secondItem="UZY-AP-7MO" secondAttribute="centerX" id="f1x-F8-2Ai"/>
-                                    <constraint firstItem="Iyx-2L-Lrz" firstAttribute="leading" secondItem="UZY-AP-7MO" secondAttribute="leading" id="gt1-6p-kRn"/>
-                                    <constraint firstItem="Iyx-2L-Lrz" firstAttribute="centerY" secondItem="UZY-AP-7MO" secondAttribute="centerY" id="oEv-pr-psC"/>
-                                </constraints>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <connections>
                                     <outlet property="delegate" destination="e1o-QP-z2F" id="CgE-j3-5MJ"/>
                                 </connections>
                             </scrollView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstAttribute="trailing" secondItem="UZY-AP-7MO" secondAttribute="trailing" id="5h4-AB-T5c"/>
-                            <constraint firstItem="UZY-AP-7MO" firstAttribute="leading" secondItem="BEc-Ba-Mzk" secondAttribute="leading" id="XUg-Br-QPp"/>
-                            <constraint firstItem="UZY-AP-7MO" firstAttribute="bottom" secondItem="0n3-oJ-oam" secondAttribute="bottom" id="n7i-xy-xla"/>
-                            <constraint firstItem="UZY-AP-7MO" firstAttribute="top" secondItem="0n3-oJ-oam" secondAttribute="top" constant="64" id="w5m-po-IWq"/>
-                        </constraints>
                         <viewLayoutGuide key="safeArea" id="0n3-oJ-oam"/>
                     </view>
                     <toolbarItems/>
@@ -288,18 +286,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" maximumZoomScale="3" translatesAutoresizingMaskIntoConstraints="NO" id="pzg-Ru-RVP" customClass="PDFScrollView">
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" maximumZoomScale="3" id="pzg-Ru-RVP" customClass="PDFScrollView">
                                 <rect key="frame" x="0.0" y="64" width="768" height="960"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
-                                    <view tag="1024" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZDg-DZ-YJ5">
+                                    <view tag="1024" contentMode="scaleToFill" id="ZDg-DZ-YJ5">
                                         <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <subviews>
-                                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vhq-zu-ya0" customClass="RAPDFPageView">
+                                            <view contentMode="scaleToFill" id="vhq-zu-ya0" customClass="RAPDFPageView">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                             </view>
-                                            <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wQP-TO-G9n">
+                                            <view contentMode="scaleToFill" id="wQP-TO-G9n">
                                                 <rect key="frame" x="0.0" y="0.0" width="768" height="960"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             </view>
@@ -308,26 +308,12 @@
                                     </view>
                                 </subviews>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="ZDg-DZ-YJ5" firstAttribute="leading" secondItem="pzg-Ru-RVP" secondAttribute="leading" id="AFI-9c-YMU"/>
-                                    <constraint firstAttribute="bottom" secondItem="ZDg-DZ-YJ5" secondAttribute="bottom" id="Htn-4Z-lWI"/>
-                                    <constraint firstItem="ZDg-DZ-YJ5" firstAttribute="centerX" secondItem="pzg-Ru-RVP" secondAttribute="centerX" id="UBl-Ou-bOv"/>
-                                    <constraint firstAttribute="trailing" secondItem="ZDg-DZ-YJ5" secondAttribute="trailing" id="Zjh-NA-h3L"/>
-                                    <constraint firstItem="ZDg-DZ-YJ5" firstAttribute="centerY" secondItem="pzg-Ru-RVP" secondAttribute="centerY" id="aZf-1m-vbi"/>
-                                    <constraint firstItem="ZDg-DZ-YJ5" firstAttribute="top" secondItem="pzg-Ru-RVP" secondAttribute="top" id="eKQ-qR-IQr"/>
-                                </constraints>
                                 <connections>
                                     <outlet property="delegate" destination="VeE-j2-f2V" id="Aoy-Rt-VM1"/>
                                 </connections>
                             </scrollView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                        <constraints>
-                            <constraint firstItem="pzg-Ru-RVP" firstAttribute="leading" secondItem="DPe-e8-0nn" secondAttribute="leading" id="5C7-Qf-RPz"/>
-                            <constraint firstItem="pzg-Ru-RVP" firstAttribute="bottom" secondItem="Hq3-UL-fYw" secondAttribute="bottom" id="A8H-L3-fko"/>
-                            <constraint firstItem="pzg-Ru-RVP" firstAttribute="top" secondItem="Hq3-UL-fYw" secondAttribute="top" constant="64" id="Z46-B4-1WC"/>
-                            <constraint firstAttribute="trailing" secondItem="pzg-Ru-RVP" secondAttribute="trailing" id="gsw-Pj-dJx"/>
-                        </constraints>
                         <viewLayoutGuide key="safeArea" id="Hq3-UL-fYw"/>
                     </view>
                     <toolbarItems/>
@@ -455,7 +441,7 @@ textAlignment</string>
                                 <textInputTraits key="textInputTraits" secureTextEntry="YES"/>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="faF-MK-9Oe">
-                                <rect key="frame" x="60" y="193.5" width="158" height="22"/>
+                                <rect key="frame" x="60" y="193.5" width="142" height="22"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="22" id="AlR-lk-KIA"/>
                                 </constraints>
@@ -665,7 +651,7 @@ textAlignment</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ewl-Ty-p9Y">
-                                                    <rect key="frame" x="346" y="9" width="100" height="21"/>
+                                                    <rect key="frame" x="359" y="9" width="100" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="100" id="4no-4E-Tpv"/>
                                                         <constraint firstAttribute="height" constant="21" id="FxS-Ty-jrq"/>
@@ -675,8 +661,9 @@ textAlignment</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CUSTOMER NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GV5-wm-LUp">
-                                                    <rect key="frame" x="154" y="9" width="177" height="21"/>
+                                                    <rect key="frame" x="154" y="9" width="190" height="21"/>
                                                     <constraints>
+                                                        <constraint firstAttribute="width" constant="190" id="ID8-7x-LDh"/>
                                                         <constraint firstAttribute="height" constant="21" id="wjp-h8-gxg"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -753,8 +740,9 @@ textAlignment</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AGENT NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tHu-Ic-2Wf">
-                                                    <rect key="frame" x="461" y="9" width="177" height="21"/>
+                                                    <rect key="frame" x="474" y="9" width="164" height="21"/>
                                                     <constraints>
+                                                        <constraint firstAttribute="width" constant="190" id="LuQ-3U-ZxK"/>
                                                         <constraint firstAttribute="height" constant="21" id="YyC-fl-m7J"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -766,17 +754,14 @@ textAlignment</string>
                                                 <constraint firstItem="GV5-wm-LUp" firstAttribute="leading" secondItem="eH3-OQ-M6Q" secondAttribute="trailing" constant="15" id="3aM-Jn-RBh"/>
                                                 <constraint firstItem="eq9-ea-SjV" firstAttribute="centerY" secondItem="eH3-OQ-M6Q" secondAttribute="centerY" id="460-lK-2yb"/>
                                                 <constraint firstItem="GV5-wm-LUp" firstAttribute="centerY" secondItem="eH3-OQ-M6Q" secondAttribute="centerY" id="BPN-uF-mPf"/>
-                                                <constraint firstItem="srU-k9-4zC" firstAttribute="trailing" secondItem="81n-fk-zWB" secondAttribute="trailing" id="CTr-N1-VJT"/>
                                                 <constraint firstItem="Ewl-Ty-p9Y" firstAttribute="leading" secondItem="GV5-wm-LUp" secondAttribute="trailing" constant="15" id="Dfj-AY-mGn"/>
                                                 <constraint firstItem="5pm-I2-dZ8" firstAttribute="bottom" secondItem="t8P-5p-BAG" secondAttribute="bottom" id="Do4-Qa-Ahq"/>
                                                 <constraint firstItem="eH3-OQ-M6Q" firstAttribute="leading" secondItem="twt-7p-gUd" secondAttribute="leading" constant="15" id="Fi7-Hn-FoJ"/>
                                                 <constraint firstItem="tHu-Ic-2Wf" firstAttribute="trailing" secondItem="t8P-5p-BAG" secondAttribute="trailing" id="IbR-WA-DHZ"/>
-                                                <constraint firstItem="Xb0-aM-Zkx" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="81n-fk-zWB" secondAttribute="trailing" constant="6" id="J2z-xM-999"/>
                                                 <constraint firstItem="Xb0-aM-Zkx" firstAttribute="top" secondItem="t8P-5p-BAG" secondAttribute="top" id="K69-Mc-05f"/>
-                                                <constraint firstItem="5pm-I2-dZ8" firstAttribute="leading" secondItem="srU-k9-4zC" secondAttribute="trailing" constant="6" id="MU7-hR-hVW"/>
+                                                <constraint firstItem="81n-fk-zWB" firstAttribute="leading" secondItem="eq9-ea-SjV" secondAttribute="leading" id="Lkk-wO-HVM"/>
                                                 <constraint firstItem="srU-k9-4zC" firstAttribute="leading" secondItem="eq9-ea-SjV" secondAttribute="leading" id="NQB-5f-J85"/>
                                                 <constraint firstItem="tHu-Ic-2Wf" firstAttribute="centerY" secondItem="eH3-OQ-M6Q" secondAttribute="centerY" id="Nnm-PN-gO3"/>
-                                                <constraint firstItem="kGK-fH-w0V" firstAttribute="width" secondItem="5pm-I2-dZ8" secondAttribute="width" id="O9W-cR-7wM"/>
                                                 <constraint firstItem="Xb0-aM-Zkx" firstAttribute="centerY" secondItem="81n-fk-zWB" secondAttribute="centerY" id="SD2-aO-2OJ"/>
                                                 <constraint firstItem="5pm-I2-dZ8" firstAttribute="centerY" secondItem="srU-k9-4zC" secondAttribute="centerY" id="Vh8-of-T9O"/>
                                                 <constraint firstItem="5pm-I2-dZ8" firstAttribute="top" secondItem="kGK-fH-w0V" secondAttribute="bottom" constant="7" id="Yoh-Wn-jwR"/>
@@ -787,14 +772,15 @@ textAlignment</string>
                                                 <constraint firstItem="eq9-ea-SjV" firstAttribute="leading" secondItem="tHu-Ic-2Wf" secondAttribute="trailing" constant="15" id="ewi-hw-aum"/>
                                                 <constraint firstAttribute="bottom" secondItem="5pm-I2-dZ8" secondAttribute="bottom" constant="14" id="fNw-xh-O5a"/>
                                                 <constraint firstItem="kGK-fH-w0V" firstAttribute="trailing" secondItem="eq9-ea-SjV" secondAttribute="trailing" id="hmS-oo-dtu"/>
-                                                <constraint firstItem="Xb0-aM-Zkx" firstAttribute="width" secondItem="5pm-I2-dZ8" secondAttribute="width" id="iQH-5c-pDX"/>
-                                                <constraint firstItem="tHu-Ic-2Wf" firstAttribute="width" secondItem="GV5-wm-LUp" secondAttribute="width" id="idi-aH-pGV"/>
-                                                <constraint firstItem="kGK-fH-w0V" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="9ba-hT-bka" secondAttribute="trailing" constant="6" id="kQU-sz-kmb"/>
-                                                <constraint firstItem="tHu-Ic-2Wf" firstAttribute="leading" secondItem="Ewl-Ty-p9Y" secondAttribute="trailing" constant="15" id="pAF-8j-I0x"/>
+                                                <constraint firstItem="5pm-I2-dZ8" firstAttribute="leading" secondItem="srU-k9-4zC" secondAttribute="trailing" constant="6" id="jp0-U4-y5g"/>
+                                                <constraint firstItem="tHu-Ic-2Wf" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ewl-Ty-p9Y" secondAttribute="trailing" constant="15" id="pAF-8j-I0x"/>
+                                                <constraint firstItem="kGK-fH-w0V" firstAttribute="leading" secondItem="9ba-hT-bka" secondAttribute="trailing" constant="6" id="pc6-q6-NdR"/>
                                                 <constraint firstItem="kGK-fH-w0V" firstAttribute="centerY" secondItem="9ba-hT-bka" secondAttribute="centerY" id="q0H-K2-qcf"/>
+                                                <constraint firstItem="9ba-hT-bka" firstAttribute="leading" secondItem="eq9-ea-SjV" secondAttribute="leading" id="sNi-sk-bhI"/>
                                                 <constraint firstItem="t8P-5p-BAG" firstAttribute="leading" secondItem="eH3-OQ-M6Q" secondAttribute="leading" id="txp-y1-zKf"/>
-                                                <constraint firstItem="9ba-hT-bka" firstAttribute="trailing" secondItem="81n-fk-zWB" secondAttribute="trailing" id="wXQ-h6-Qa2"/>
                                                 <constraint firstItem="Xb0-aM-Zkx" firstAttribute="trailing" secondItem="eq9-ea-SjV" secondAttribute="trailing" id="who-ny-afA"/>
+                                                <constraint firstItem="Xb0-aM-Zkx" firstAttribute="leading" secondItem="81n-fk-zWB" secondAttribute="trailing" constant="6" id="xLp-Jq-VbP"/>
+                                                <constraint firstItem="srU-k9-4zC" firstAttribute="leading" secondItem="eq9-ea-SjV" secondAttribute="leading" id="xc0-UW-80z"/>
                                                 <constraint firstItem="Xb0-aM-Zkx" firstAttribute="top" secondItem="eq9-ea-SjV" secondAttribute="bottom" constant="7" id="zqv-SM-Rdp"/>
                                             </constraints>
                                         </tableViewCellContentView>
@@ -824,7 +810,7 @@ textAlignment</string>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cannot get data from server.
Tap to try again." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S0J-Y4-ysB">
-                                <rect key="frame" x="262" y="489" width="244" height="46"/>
+                                <rect key="frame" x="262" y="489.5" width="244" height="45.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <color key="textColor" red="0.33333333329999998" green="0.33333333329999998" blue="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -918,7 +904,7 @@ textAlignment</string>
                                 </connections>
                             </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Bp7-lh-LCu">
-                                <rect key="frame" x="0.0" y="72" width="540" height="565"/>
+                                <rect key="frame" x="0.0" y="71.5" width="540" height="565.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <connections>
                                     <outlet property="dataSource" destination="pYZ-6S-3OA" id="7QE-2C-FZO"/>
@@ -1069,7 +1055,7 @@ textAlignment</string>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="pEf-xk-Nic">
-                                <rect key="frame" x="0.0" y="68" width="540" height="612"/>
+                                <rect key="frame" x="0.0" y="68.5" width="540" height="611.5"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="ADTableViewCell" textLabel="93T-5h-JKV" detailTextLabel="mtf-OD-AFL" style="IBUITableViewCellStyleSubtitle" id="K5M-kB-Cox">
@@ -1481,17 +1467,17 @@ textAlignment</string>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="CUSTOMER NAME" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RMA-Os-3p1">
-                                                    <rect key="frame" x="141" y="8" width="183" height="21"/>
+                                                    <rect key="frame" x="141" y="8" width="190" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="HQ3-9U-nq3"/>
-                                                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="190" id="jdd-Lh-GaS"/>
+                                                        <constraint firstAttribute="width" constant="190" id="jdd-Lh-GaS"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016-12-12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5C-3D-UJW">
-                                                    <rect key="frame" x="336" y="8" width="100" height="21"/>
+                                                    <rect key="frame" x="343" y="8" width="100" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="21" id="ubg-1d-aoR"/>
                                                         <constraint firstAttribute="width" constant="100" id="yWT-4d-Gz0"/>
@@ -1526,7 +1512,6 @@ textAlignment</string>
                                                 <constraint firstItem="5Tt-7m-QFz" firstAttribute="leading" secondItem="rna-0d-wd1" secondAttribute="leading" constant="8" id="0w4-cQ-37u"/>
                                                 <constraint firstAttribute="trailing" secondItem="CxZ-jk-8rp" secondAttribute="trailing" constant="8" id="5mV-5k-4CI"/>
                                                 <constraint firstItem="RMA-Os-3p1" firstAttribute="leading" secondItem="5Tt-7m-QFz" secondAttribute="trailing" constant="12" id="85i-HY-CWr"/>
-                                                <constraint firstItem="4SK-nY-T58" firstAttribute="leading" secondItem="e5C-3D-UJW" secondAttribute="trailing" constant="12" id="ObS-sh-5xB"/>
                                                 <constraint firstItem="e5C-3D-UJW" firstAttribute="leading" secondItem="RMA-Os-3p1" secondAttribute="trailing" constant="12" id="S2j-7k-jgF"/>
                                                 <constraint firstItem="4SK-nY-T58" firstAttribute="top" secondItem="rna-0d-wd1" secondAttribute="top" constant="8" id="Tob-4j-zXz"/>
                                                 <constraint firstItem="CxZ-jk-8rp" firstAttribute="leading" secondItem="4SK-nY-T58" secondAttribute="trailing" constant="12" id="fkw-FB-Grp"/>
@@ -1597,8 +1582,9 @@ textAlignment</string>
                                     <action selector="onRightButtonClick:" destination="IrJ-nO-Jqx" eventType="touchUpInside" id="dEM-hq-dkP"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w7G-eF-IRC">
+                            <view contentMode="scaleToFill" id="w7G-eF-IRC">
                                 <rect key="frame" x="26" y="667" width="717" height="337"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="w4q-z3-jFI">
                                         <rect key="frame" x="328.5" y="45" width="60" height="30"/>
@@ -1996,7 +1982,6 @@ textAlignment</string>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
                             <constraint firstItem="SPx-WF-an0" firstAttribute="trailing" secondItem="tuM-sI-7IN" secondAttribute="trailing" constant="20" id="3My-Fz-uJ0"/>
-                            <constraint firstItem="SPx-WF-an0" firstAttribute="bottom" secondItem="w7G-eF-IRC" secondAttribute="bottom" constant="20" id="Aun-JM-mIP"/>
                             <constraint firstItem="SPx-WF-an0" firstAttribute="trailing" secondItem="w7G-eF-IRC" secondAttribute="trailing" constant="25" id="HmJ-N4-psE"/>
                             <constraint firstItem="YRy-cf-b04" firstAttribute="leading" secondItem="SPx-WF-an0" secondAttribute="leading" constant="20" id="JTO-w6-Lem"/>
                             <constraint firstItem="YRy-cf-b04" firstAttribute="centerY" secondItem="YvY-Uw-Cr6" secondAttribute="centerY" id="aQ1-r1-UPq"/>

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
Ants Contract/Granite Expo eSign/2020 GECI - Home Improvement Contract.json


BIN
Ants Contract/Granite Expo eSign/2020 GECI - Home Improvement Contract.pdf


+ 18 - 20
Ants Contract/Granite Expo eSign/Granite Expo eSign.xcodeproj/project.pbxproj

@@ -7,10 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		3C69617C23C70ECF0075172A /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C69617B23C70ECF0075172A /* WebViewController.m */; };
+		3C69618E23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */; };
+		3C69619023C81A500075172A /* 2020 GECI - Home Improvement Contract.json in Resources */ = {isa = PBXBuildFile; fileRef = 3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */; };
 		3CC7E73423BEDE9700BE5561 /* RAPDFViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E73323BEDE9700BE5561 /* RAPDFViewController.m */; };
 		3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E73523BEDEA000BE5561 /* wkweb.storyboard */; };
 		3CC7E73C23BEE07900BE5561 /* ACNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E73B23BEE07900BE5561 /* ACNetwork.m */; };
 		3CC7E73F23BEE13200BE5561 /* NetworkUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CC7E73E23BEE13200BE5561 /* NetworkUtils.m */; };
+		3CC7E7B723C5CB7800BE5561 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3CC7E7B623C5CB7800BE5561 /* Launch Screen.storyboard */; };
 		425A00F41F8F196900286D6F /* attribute_template.json in Resources */ = {isa = PBXBuildFile; fileRef = 425A00F31F8F0EC200286D6F /* attribute_template.json */; };
 		42D49E561F8DF13A00AE39D5 /* AttributeTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D49E551F8DF13A00AE39D5 /* AttributeTextFieldCell.m */; };
 		42D49E591F8DF15800AE39D5 /* AttributeLabelCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D49E581F8DF15800AE39D5 /* AttributeLabelCell.m */; };
@@ -34,7 +38,6 @@
 		7128C2401E124F4500FF635B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C23F1E124F4500FF635B /* main.m */; };
 		7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7128C24A1E124F4500FF635B /* Assets.xcassets */; };
 		7128C26F1E124FF200FF635B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2671E124FF200FF635B /* Main.storyboard */; };
-		7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2691E124FF200FF635B /* LaunchScreen.storyboard */; };
 		7128C27B1E12500B00FF635B /* SignatureView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2731E12500B00FF635B /* SignatureView.m */; };
 		7128C27C1E12500B00FF635B /* SignatureViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7128C2751E12500B00FF635B /* SignatureViewController.m */; };
 		7128C27D1E12500B00FF635B /* signature.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7128C2761E12500B00FF635B /* signature.storyboard */; };
@@ -87,14 +90,16 @@
 		71B152EF1E66C87F00D2E5EC /* AddExtDocumentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71B152EE1E66C87F00D2E5EC /* AddExtDocumentViewController.m */; };
 		71BBFC371E6419D4008668A7 /* ExtDocumentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */; };
 		71BBFC3A1E651CC4008668A7 /* DocnotesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71BBFC391E651CC4008668A7 /* DocnotesViewController.m */; };
-		71C19D22212523F1002F859F /* GECI - Home Improvement Contract 2018.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */; };
-		71C19D2421252423002F859F /* GECI - Home Improvement Contract 2018.json in Resources */ = {isa = PBXBuildFile; fileRef = 71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */; };
 		71CDA0901F75EE400079F8E6 /* DocumentTemplateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CDA08F1F75EE400079F8E6 /* DocumentTemplateViewController.m */; };
 		71CDA0931F75EEBF0079F8E6 /* TemplateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 71CDA0921F75EEBF0079F8E6 /* TemplateViewController.m */; };
 		71F8D0341EC057A2002003DB /* RANetworkTaskDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		3C69617A23C70ECF0075172A /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewController.h; path = "../../../common/WK PDF+Web/WebViewController.h"; sourceTree = "<group>"; };
+		3C69617B23C70ECF0075172A /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewController.m; path = "../../../common/WK PDF+Web/WebViewController.m"; sourceTree = "<group>"; };
+		3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "2020 GECI - Home Improvement Contract.pdf"; sourceTree = "<group>"; };
+		3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "2020 GECI - Home Improvement Contract.json"; sourceTree = "<group>"; };
 		3CC7E73223BEDE9700BE5561 /* RAPDFViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RAPDFViewController.h; path = "../../../common/WK PDF+Web/RAPDFViewController.h"; sourceTree = "<group>"; };
 		3CC7E73323BEDE9700BE5561 /* RAPDFViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = RAPDFViewController.m; path = "../../../common/WK PDF+Web/RAPDFViewController.m"; sourceTree = "<group>"; };
 		3CC7E73523BEDEA000BE5561 /* wkweb.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = wkweb.storyboard; path = "../../../common/WK PDF+Web/wkweb.storyboard"; sourceTree = "<group>"; };
@@ -102,6 +107,7 @@
 		3CC7E73B23BEE07900BE5561 /* ACNetwork.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ACNetwork.m; sourceTree = "<group>"; };
 		3CC7E73D23BEE13200BE5561 /* NetworkUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkUtils.h; path = ../../../common/NetworkUtils.h; sourceTree = "<group>"; };
 		3CC7E73E23BEE13200BE5561 /* NetworkUtils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NetworkUtils.m; path = ../../../common/NetworkUtils.m; sourceTree = "<group>"; };
+		3CC7E7B623C5CB7800BE5561 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		425A00F31F8F0EC200286D6F /* attribute_template.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = attribute_template.json; sourceTree = "<group>"; };
 		42D49E541F8DF13A00AE39D5 /* AttributeTextFieldCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AttributeTextFieldCell.h; sourceTree = "<group>"; };
 		42D49E551F8DF13A00AE39D5 /* AttributeTextFieldCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AttributeTextFieldCell.m; sourceTree = "<group>"; };
@@ -141,7 +147,6 @@
 		7128C24A1E124F4500FF635B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		7128C24F1E124F4500FF635B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		7128C2681E124FF200FF635B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = ../../AntsContract/AntsContract/Base.lproj/Main.storyboard; sourceTree = "<group>"; };
-		7128C26A1E124FF200FF635B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = ../../AntsContract/AntsContract/Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		7128C2721E12500B00FF635B /* SignatureView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureView.h; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureView.h"; sourceTree = "<group>"; };
 		7128C2731E12500B00FF635B /* SignatureView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SignatureView.m; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureView.m"; sourceTree = "<group>"; };
 		7128C2741E12500B00FF635B /* SignatureViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SignatureViewController.h; path = "../../../RedAnt ERP Mobile/common/Functions/signature/SignatureViewController.h"; sourceTree = "<group>"; };
@@ -244,8 +249,6 @@
 		71BBFC361E6419D4008668A7 /* ExtDocumentsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtDocumentsViewController.m; path = ../../common/ExtDocumentsViewController.m; sourceTree = "<group>"; };
 		71BBFC381E651CC4008668A7 /* DocnotesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DocnotesViewController.h; path = ../../common/DocnotesViewController.h; sourceTree = "<group>"; };
 		71BBFC391E651CC4008668A7 /* DocnotesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DocnotesViewController.m; path = ../../common/DocnotesViewController.m; sourceTree = "<group>"; };
-		71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = "GECI - Home Improvement Contract 2018.pdf"; sourceTree = "<group>"; };
-		71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "GECI - Home Improvement Contract 2018.json"; sourceTree = "<group>"; };
 		71CDA08E1F75EE400079F8E6 /* DocumentTemplateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentTemplateViewController.h; sourceTree = "<group>"; };
 		71CDA08F1F75EE400079F8E6 /* DocumentTemplateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocumentTemplateViewController.m; sourceTree = "<group>"; };
 		71CDA0911F75EEBF0079F8E6 /* TemplateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TemplateViewController.h; sourceTree = "<group>"; };
@@ -358,9 +361,9 @@
 				7128C29A1E12506200FF635B /* pdfedit */,
 				7128C2711E124FFE00FF635B /* signature */,
 				7128C2671E124FF200FF635B /* Main.storyboard */,
+				3CC7E7B623C5CB7800BE5561 /* Launch Screen.storyboard */,
 				713B97AF1F79E0CA002B86BF /* dbgPageVC.h */,
 				713B97B01F79E0CA002B86BF /* dbgPageVC.m */,
-				7128C2691E124FF200FF635B /* LaunchScreen.storyboard */,
 				7128C24F1E124F4500FF635B /* Info.plist */,
 				71F8D0321EC057A2002003DB /* RANetworkTaskDelegate.h */,
 				71F8D0331EC057A2002003DB /* RANetworkTaskDelegate.m */,
@@ -423,6 +426,8 @@
 			children = (
 				3CC7E73223BEDE9700BE5561 /* RAPDFViewController.h */,
 				3CC7E73323BEDE9700BE5561 /* RAPDFViewController.m */,
+				3C69617A23C70ECF0075172A /* WebViewController.h */,
+				3C69617B23C70ECF0075172A /* WebViewController.m */,
 				3CC7E73523BEDEA000BE5561 /* wkweb.storyboard */,
 			);
 			name = preview;
@@ -541,8 +546,8 @@
 		7128C3261E1251DE00FF635B /* pdf resource */ = {
 			isa = PBXGroup;
 			children = (
-				71C19D21212523F0002F859F /* GECI - Home Improvement Contract 2018.pdf */,
-				71C19D2321252423002F859F /* GECI - Home Improvement Contract 2018.json */,
+				3C69618F23C81A500075172A /* 2020 GECI - Home Improvement Contract.json */,
+				3C69618D23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf */,
 				714B870A1E24CAE200A40D18 /* debug.json */,
 				425A00F31F8F0EC200286D6F /* attribute_template.json */,
 				42DDB87B1F91E351002CCE22 /* template_type.json */,
@@ -633,19 +638,19 @@
 			buildActionMask = 2147483647;
 			files = (
 				42DDB87E1F91E949002CCE22 /* template_example.json in Resources */,
-				71C19D2421252423002F859F /* GECI - Home Improvement Contract 2018.json in Resources */,
+				3CC7E7B723C5CB7800BE5561 /* Launch Screen.storyboard in Resources */,
 				42DDB87C1F91E367002CCE22 /* template_type.json in Resources */,
 				425A00F41F8F196900286D6F /* attribute_template.json in Resources */,
 				7128C24B1E124F4500FF635B /* Assets.xcassets in Resources */,
 				7128C26F1E124FF200FF635B /* Main.storyboard in Resources */,
-				7128C2701E124FF200FF635B /* LaunchScreen.storyboard in Resources */,
 				3CC7E73623BEDEA000BE5561 /* wkweb.storyboard in Resources */,
+				3C69618E23C819F70075172A /* 2020 GECI - Home Improvement Contract.pdf in Resources */,
 				42DDB87A1F91DCE8002CCE22 /* ControlTemplateCell.xib in Resources */,
 				7115D45F1E16326C00EF4E4C /* CommonEditor.storyboard in Resources */,
 				7128C27D1E12500B00FF635B /* signature.storyboard in Resources */,
+				3C69619023C81A500075172A /* 2020 GECI - Home Improvement Contract.json in Resources */,
 				7128C2E81E12511B00FF635B /* LICENSE in Resources */,
 				42DDB8751F91C081002CCE22 /* ControlTemplateVC.xib in Resources */,
-				71C19D22212523F1002F859F /* GECI - Home Improvement Contract 2018.pdf in Resources */,
 				714B870B1E24CAE300A40D18 /* debug.json in Resources */,
 				714B37081E70FCFE00E99B90 /* cam_scan.storyboard in Resources */,
 			);
@@ -677,6 +682,7 @@
 				7128C2C71E1250FC00FF635B /* PDFUtils.m in Sources */,
 				717243441E1CCCEC00800678 /* CustomIOSAlertView.m in Sources */,
 				42D49E6C1F8DFF2D00AE39D5 /* ItemTableDataSourceAndDelegate.m in Sources */,
+				3C69617C23C70ECF0075172A /* WebViewController.m in Sources */,
 				7128C3541E12548C00FF635B /* RAPDFScrollView.m in Sources */,
 				7128C3411E12542000FF635B /* LoginViewController.m in Sources */,
 				713B97B11F79E0CB002B86BF /* dbgPageVC.m in Sources */,
@@ -740,14 +746,6 @@
 			name = Main.storyboard;
 			sourceTree = "<group>";
 		};
-		7128C2691E124FF200FF635B /* LaunchScreen.storyboard */ = {
-			isa = PBXVariantGroup;
-			children = (
-				7128C26A1E124FF200FF635B /* Base */,
-			);
-			name = LaunchScreen.storyboard;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */

+ 1 - 1
Ants Contract/Granite Expo eSign/Granite Expo eSign/Info.plist

@@ -53,7 +53,7 @@
 	<key>UIFileSharingEnabled</key>
 	<false/>
 	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
 	<key>UIRequiredDeviceCapabilities</key>

+ 61 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/Launch Screen.storyboard

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+    <device id="ipad9_7" orientation="portrait" layout="fullscreen" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <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">
+                    <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Copyright © 2020 United Software Applications, Inc. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="obG-Y5-kRd">
+                                <rect key="frame" x="0.0" y="983.5" width="768" height="20.5"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Granite Expo eSign" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines" minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="GJd-Yh-RWb">
+                                <rect key="frame" x="0.0" y="321" width="768" height="43"/>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="36"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="home_bg_icon" translatesAutoresizingMaskIntoConstraints="NO" id="fWu-w9-qPL">
+                                <rect key="frame" x="70" y="163" width="240" height="128"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="128" id="bY9-Dn-2HF"/>
+                                    <constraint firstAttribute="width" constant="240" id="cZf-2a-Joi"/>
+                                </constraints>
+                            </imageView>
+                        </subviews>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="obG-Y5-kRd" secondAttribute="centerX" id="5cz-MP-9tL"/>
+                            <constraint firstItem="fWu-w9-qPL" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" constant="70" id="OBT-w5-DPp"/>
+                            <constraint firstItem="Bcu-3y-fUS" firstAttribute="centerX" secondItem="GJd-Yh-RWb" secondAttribute="centerX" id="Q3B-4B-g5h"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="top" secondItem="fWu-w9-qPL" secondAttribute="bottom" constant="30" id="Q8U-Tv-nUi"/>
+                            <constraint firstItem="obG-Y5-kRd" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="SfN-ll-jLj"/>
+                            <constraint firstAttribute="bottom" secondItem="obG-Y5-kRd" secondAttribute="bottom" constant="20" id="Y44-ml-fuU"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="bottom" multiplier="1/3" constant="1" id="moa-c2-u7t"/>
+                            <constraint firstItem="GJd-Yh-RWb" firstAttribute="leading" secondItem="Bcu-3y-fUS" secondAttribute="leading" symbolic="YES" id="x7j-FC-K8j"/>
+                        </constraints>
+                        <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
+                    </view>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="53" y="375"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="home_bg_icon" width="188" height="77"/>
+    </resources>
+</document>

+ 41 - 17
Ants Contract/Granite Expo eSign/Granite Expo eSign/TemplateViewController.m

@@ -740,7 +740,7 @@ typedef enum {
     }
     [destView addSubview:btn];
 }
--(UIView*) createMarker:(int)size x:(int)x y:(int)y destView:(UIView*)destView
+-(UIView*) createMarker:(double)size x:(double)x y:(double)y destView:(UIView*)destView
 {
     
     
@@ -818,13 +818,17 @@ typedef enum {
         UIView* marker= (UIView *)[destView viewWithTag:CHECK_BASE+index*1000+i];
         
         if (marker) {
-            int x = [item[1][0] intValue];
-            int y = [item[1][1] intValue];
-            int size = [template[@"marker_size"] intValue];
+//            int x = [item[1][0] intValue];
+//            int y = [item[1][1] intValue];
+//            int size = [template[@"marker_size"] intValue];
+            
+            double x = [item[1][0] floatValue];
+            double y = [item[1][1] floatValue];
+            double size = [template[@"marker_size"] floatValue];
             CGRect srect = [self scaleControl:CGRectMake(x,y,size,size) from:CGSizeMake(768, 960) to:destView.frame.size];
             marker.frame = srect;
         } else {
-            marker = [self createMarker:[template[@"marker_size"] intValue] x:[item[1][0] intValue] y:[item[1][1] intValue] destView:destView];
+            marker = [self createMarker:[template[@"marker_size"] floatValue] x:[item[1][0] floatValue] y:[item[1][1] floatValue] destView:destView];
         }
         
         
@@ -2247,10 +2251,15 @@ typedef enum {
     else
     {
         CGRect frame = [self scaleControl:control.frame from:self.editControlView.bounds.size to:CGSizeMake(768, 960)];
-        int x = frame.origin.x+0.5;
-        int y = frame.origin.y+0.5;
-        int w = frame.size.width+0.5;
-        int h = frame.size.height+0.5;
+//        int x = frame.origin.x+0.5;
+//        int y = frame.origin.y+0.5;
+//        int w = frame.size.width+0.5;
+//        int h = frame.size.height+0.5;
+        
+        double x = frame.origin.x;
+        double y = frame.origin.y;
+        double w = frame.size.width;
+        double h = frame.size.height;
         [json setValue:@(x) forKey:@"pos_x"];
         [json setValue:@(y) forKey:@"pos_y"];
         [json setValue:@(w) forKey:@"width"];
@@ -2284,8 +2293,11 @@ typedef enum {
                 {
                     CGRect marker_frame = [self scaleControl:marker.frame from:self.editControlView.bounds.size to:CGSizeMake(768, 960)];
                     
-                    int marker_x = marker_frame.origin.x;
-                    int marker_y = marker_frame.origin.y;
+//                    int marker_x = marker_frame.origin.x;
+//                    int marker_y = marker_frame.origin.y;
+                    
+                    double marker_x = marker_frame.origin.x;
+                    double marker_y = marker_frame.origin.y;
                     //                int marker_w = marker_frame.size.width;
                     //                int marker_h = marker_frame.size.height;
                     
@@ -2468,15 +2480,27 @@ typedef enum {
     NSString *key = [NSString stringWithFormat:@"control_%ld",index];
 //    [self.page_controlTemplate removeObjectForKey:key];
     // 重新排序
+    
+    int newcount=0;
     for (int i = 0; i < count; i++) {
-        if (i > index) {
-            key = [NSString stringWithFormat:@"control_%d",i];
-            id value = [self.page_controlTemplate objectForKey:key];
-            key = [NSString stringWithFormat:@"control_%d",i - 1];
-            [self.page_controlTemplate setObject:value forKey:key];
+
+        key = [NSString stringWithFormat:@"control_%d",i];
+        id value = [self.page_controlTemplate objectForKey:key];
+        
+        if(value!=nil && i!=index)
+        {
+            NSString* newkey = [NSString stringWithFormat:@"control_%d",newcount];
+        [self.page_controlTemplate setObject:value forKey:newkey];
+        newcount++;
         }
+//        if (i > index) {
+//            key = [NSString stringWithFormat:@"control_%d",i];
+//            id value = [self.page_controlTemplate objectForKey:key];
+//            key = [NSString stringWithFormat:@"control_%d",i - 1];
+//            
+//        }
     }
-    [self.page_controlTemplate setObject:@(--count) forKey:@"count"];
+    [self.page_controlTemplate setObject:@(newcount) forKey:@"count"];
     
     // 更新视图
     [self viewWillLayoutSubviews];

+ 3 - 2
Ants Contract/Granite Expo eSign/Granite Expo eSign/config.h

@@ -18,8 +18,8 @@
 //#define ENCRYPT_OFF
 # ifdef DEBUG
     #define NO_SAVE_VERIFY false
-    #define test_server
-    #define DEBUG_PDFSIG false
+//    #define test_server
+    #define DEBUG_PDFSIG true
 # else
     #define NO_SAVE_VERIFY false
     #define DEBUG_PDFSIG false
@@ -57,6 +57,7 @@
     #define  URL_NEW_DOCUMENT  @"https://www.thegraniteexpo.com/admin_v2.php"
     #define  URL_UPDATE_NOTES  @"https://www.thegraniteexpo.com/admin_v2.php"
     #define URL_HEART_BEAT @"https://www.thegraniteexpo.com/admin_v2.php"
+#define URL_PRIVACY @"https://www.thegraniteexpo.com/privacyPolicy.htm"
 #endif
 
 #endif /* config_h */

+ 8 - 0
Ants Contract/common/AppDelegate.m

@@ -82,6 +82,14 @@
     
     
     [self function_test];
+    
+    
+//    self.window = [[UIWindow alloc]initWithFrame:[UIScreen mainScreen].bounds];
+    self.window.backgroundColor = [UIColor whiteColor];
+    
+
+    
+    [self.window makeKeyAndVisible];
     return YES;
 }
 -(NSString*) filetype:(NSString*)filePath

+ 2 - 2
Ants Contract/common/DocumentListViewController.m

@@ -505,7 +505,7 @@
     [solabel sizeToFit];
     [myView addSubview:solabel];
     
-    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(143, 2, 135, 22)];
+    UILabel *userlabel = [[UILabel alloc] initWithFrame:CGRectMake(153, 2, 135, 22)];
     userlabel.textColor=UIColorFromRGB(color);
     userlabel.backgroundColor = [UIColor clearColor];
     userlabel.text=NSLocalizedString(@"Customer", nil);
@@ -519,7 +519,7 @@
 //    [creatorlabel sizeToFit];
 //    [myView addSubview:creatorlabel];
     
-    UILabel *contactlabel = [[UILabel alloc] initWithFrame:CGRectMake(345, 2, 150, 22)];
+    UILabel *contactlabel = [[UILabel alloc] initWithFrame:CGRectMake(355, 2, 150, 22)];
     
     contactlabel.textColor=UIColorFromRGB(color);
     contactlabel.backgroundColor = [UIColor clearColor];

+ 2 - 2
Ants Contract/common/PageViewController.m

@@ -681,7 +681,7 @@ typedef enum {
     }
     [destView addSubview:btn];
 }
--(UIView*) createMarker:(int)size x:(int)x y:(int)y destView:(UIView*)destView
+-(UIView*) createMarker:(double)size x:(double)x y:(double)y destView:(UIView*)destView
 {
     
     
@@ -743,7 +743,7 @@ typedef enum {
         {
             [btn setTitle:@"" forState:UIControlStateNormal];
         }
-        UIView* marker=[self createMarker:[template[@"marker_size"] intValue] x:[item[1][0] intValue] y:[item[1][1] intValue] destView:destView];
+        UIView* marker=[self createMarker:[template[@"marker_size"] floatValue] x:[item[1][0] floatValue] y:[item[1][1] floatValue] destView:destView];
         
         marker.backgroundColor = marker_bg;
         marker.tag = CHECK_BASE+index*1000+i;

+ 21 - 8
Ants Contract/common/RootViewController.m

@@ -21,6 +21,7 @@
 #import "AddExtDocumentViewController.h"
 #import "config.h"
 #import "DocumentTemplateViewController.h"
+#import "WebViewController.h"
 
 @interface RootViewController ()
 
@@ -281,8 +282,8 @@
         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
         
         //                dvc.templateName = @"debug.json";
-        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
-        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
+        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
+        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
 
         dvc.docment_id =  offline_docnumber;
         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -316,8 +317,8 @@
                     DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                     
                     //                dvc.templateName = @"debug.json";
-                    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
-                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
+                    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
+                    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
                     dvc.docment_id = json[@"doc_number"];
                     dvc.OnSave=^(NSString* file, NSString* subject)
                     {
@@ -345,8 +346,8 @@
                         DocumentPageViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentPageViewController" ];
                         
                         //                dvc.templateName = @"debug.json";
-                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
-                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
+                        dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
+                        dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
 
                         dvc.docment_id =  offline_docnumber;
                         dvc.OnSave=^(NSString* file, NSString* subject)
@@ -551,6 +552,18 @@
     self.buttonSRL.enabled = false;
     self.coverView.hidden = false;
 }
+- (IBAction)onPrivacyClick:(id)sender {
+    
+    NSString* url = URL_PRIVACY;
+    
+    NSString* title = @"Privacy Policy";
+    
+    WebViewController *ViewController = [[UIStoryboard storyboardWithName:@"wkweb" bundle:nil] instantiateViewControllerWithIdentifier:@"WebViewController"];
+    ViewController.url = url;
+    ViewController.title = title;
+
+    [self.navigationController pushViewController:ViewController animated:YES];
+}
 
 - (IBAction)OnSigninClick:(id)sender {
     
@@ -711,8 +724,8 @@
     
     DocumentTemplateViewController* dvc = [self.storyboard instantiateViewControllerWithIdentifier:@"DocumentTemplateViewController" ];
     
-    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.json" ofType:nil];
-    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"GECI - Home Improvement Contract 2018.pdf" ofType:nil];
+    dvc.templatePath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.json" ofType:nil];
+    dvc.pdfPath = [[NSBundle mainBundle] pathForResource:@"2020 GECI - Home Improvement Contract.pdf" ofType:nil];
     
     dvc.docment_id =  @"debug_template";
     dvc.OnSave=^(NSString* file, NSString* subject)

Деякі файли не було показано, через те що забагато файлів було змінено