UI refactor

This commit is contained in:
Max Hunt 2019-06-15 14:54:49 +01:00
parent 2b6b0989b4
commit 8bb59994cf

View File

@ -249,7 +249,6 @@
<!--7ady View Controller--> <!--7ady View Controller-->
<scene sceneID="alI-ln-agi"> <scene sceneID="alI-ln-agi">
<objects> <objects>
<placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/>
<viewController storyboardIdentifier="screen7" useStoryboardIdentifierAsRestorationIdentifier="YES" id="lTn-Ln-RFg" customClass="R7adyViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController"> <viewController storyboardIdentifier="screen7" useStoryboardIdentifierAsRestorationIdentifier="YES" id="lTn-Ln-RFg" customClass="R7adyViewController" customModule="Guibe" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="6A0-Zn-hBC"> <view key="view" contentMode="scaleToFill" id="6A0-Zn-hBC">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/> <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
@ -268,6 +267,7 @@
<viewLayoutGuide key="safeArea" id="AzM-Y7-if5"/> <viewLayoutGuide key="safeArea" id="AzM-Y7-if5"/>
</view> </view>
</viewController> </viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="sFx-6a-7bc" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects> </objects>
<point key="canvasLocation" x="4442" y="21"/> <point key="canvasLocation" x="4442" y="21"/>
</scene> </scene>
@ -349,7 +349,7 @@
</connections> </connections>
</button> </button>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc"> <view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J48-J9-3Mc">
<rect key="frame" x="-34" y="-24" width="347" height="399"/> <rect key="frame" x="-34" y="-24" width="347" height="489"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews> <subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="fds-28-e5l"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="appLogo" translatesAutoresizingMaskIntoConstraints="NO" id="fds-28-e5l">
@ -357,7 +357,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hHS-Ml-slu"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hHS-Ml-slu">
<rect key="frame" x="53" y="163" width="277" height="56"/> <rect key="frame" x="53" y="327" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/> <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title=" Settings"> <state key="normal" title=" Settings">
@ -370,28 +370,15 @@
</segue> </segue>
</connections> </connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sG4-j5-Aqw">
<rect key="frame" x="53" y="243" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title=" Instructions">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<segue destination="Obs-kC-EBO" kind="popoverPresentation" popoverAnchorView="sG4-j5-Aqw" id="nyG-Nf-0ng">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xjP-IE-WTI"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xjP-IE-WTI">
<rect key="frame" x="53" y="326" width="277" height="56"/> <rect key="frame" x="53" y="170" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/> <fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title=" Product Specifications"> <state key="normal" title=" Turn By Turn">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state> </state>
<connections> <connections>
<segue destination="fQI-eI-vgI" kind="popoverPresentation" popoverAnchorView="xjP-IE-WTI" id="Xzq-Av-xhq"> <segue destination="EcN-9C-GZO" kind="popoverPresentation" popoverAnchorView="xjP-IE-WTI" id="JDr-1M-cK4">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/> <popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue> </segue>
</connections> </connections>
@ -404,6 +391,32 @@
<rect key="frame" x="53" y="142" width="277" height="10"/> <rect key="frame" x="53" y="142" width="277" height="10"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView> </imageView>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oDG-KT-Vhu">
<rect key="frame" x="53" y="409" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title=" How to use Guibe">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<segue destination="JpF-eY-5Vc" kind="popoverPresentation" popoverAnchorView="oDG-KT-Vhu" id="0yC-8J-abJ">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sG4-j5-Aqw">
<rect key="frame" x="53" y="251" width="277" height="56"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" name="Helvetica" family="Helvetica" pointSize="25"/>
<state key="normal" title=" Relearn Language">
<color key="titleColor" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</state>
<connections>
<segue destination="ppL-gd-4JI" kind="popoverPresentation" popoverAnchorView="sG4-j5-Aqw" id="RFS-M6-gMo">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
@ -501,14 +514,6 @@
</subviews> </subviews>
<color key="backgroundColor" white="0.0" alpha="0.50644798801369861" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="0.0" alpha="0.50644798801369861" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view> </view>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zGG-vE-h8F">
<rect key="frame" x="372" y="618" width="30" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<state key="normal" title="xart"/>
<connections>
<action selector="xDebug:" destination="Ovf-sw-BKp" eventType="touchUpInside" id="Eoq-Hg-JAY"/>
</connections>
</button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/> <viewLayoutGuide key="safeArea" id="Ut7-03-t0b"/>
@ -825,9 +830,6 @@
</state> </state>
<connections> <connections>
<action selector="writtenInstructionsBtnPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="sKr-xE-dr8"/> <action selector="writtenInstructionsBtnPressed:" destination="Obs-kC-EBO" eventType="touchUpInside" id="sKr-xE-dr8"/>
<segue destination="EcN-9C-GZO" kind="popoverPresentation" popoverAnchorView="fov-Ic-2dL" id="K7g-fR-33s">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jE8-yt-tWJ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Instructions" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jE8-yt-tWJ">
@ -844,11 +846,6 @@
<state key="normal" title="Setup Instructions"> <state key="normal" title="Setup Instructions">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state> </state>
<connections>
<segue destination="JpF-eY-5Vc" kind="popoverPresentation" popoverAnchorView="BB5-mU-ez6" id="feN-Dq-AdY">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button> </button>
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xgn-og-o9u"> <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xgn-og-o9u">
<rect key="frame" x="29" y="368" width="272" height="51"/> <rect key="frame" x="29" y="368" width="272" height="51"/>
@ -857,11 +854,6 @@
<state key="normal" title="Relearn Instructions"> <state key="normal" title="Relearn Instructions">
<color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/> <color key="titleColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
</state> </state>
<connections>
<segue destination="ppL-gd-4JI" kind="popoverPresentation" popoverAnchorView="xgn-og-o9u" id="gsg-p4-GcU">
<popoverArrowDirection key="popoverArrowDirection" up="YES" down="YES" left="YES" right="YES"/>
</segue>
</connections>
</button> </button>
</subviews> </subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@ -919,8 +911,8 @@
<action selector="backBtnPressed:" destination="EcN-9C-GZO" eventType="touchUpInside" id="OkU-jv-83F"/> <action selector="backBtnPressed:" destination="EcN-9C-GZO" eventType="touchUpInside" id="OkU-jv-83F"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Step By Step" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIi-bs-d6P"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Turn By Turn" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIi-bs-d6P">
<rect key="frame" x="214" y="48" width="180" height="36"/> <rect key="frame" x="217" y="48" width="175" height="36"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="30"/> <fontDescription key="fontDescription" type="boldSystem" pointSize="30"/>
<nil key="textColor"/> <nil key="textColor"/>