diff --git a/Project/MoreFreeTime/MoreFreeTime.xcodeproj/project.xcworkspace/xcuserdata/diesel.xcuserdatad/UserInterfaceState.xcuserstate b/Project/MoreFreeTime/MoreFreeTime.xcodeproj/project.xcworkspace/xcuserdata/diesel.xcuserdatad/UserInterfaceState.xcuserstate index d8d27d53b3e6349cd17453289740f3e0532e8853..59efb51b457c6b747d7c4520b3e582d721b87ee6 100644 Binary files a/Project/MoreFreeTime/MoreFreeTime.xcodeproj/project.xcworkspace/xcuserdata/diesel.xcuserdatad/UserInterfaceState.xcuserstate and b/Project/MoreFreeTime/MoreFreeTime.xcodeproj/project.xcworkspace/xcuserdata/diesel.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Project/MoreFreeTime/MoreFreeTime/Base.lproj/Main.storyboard b/Project/MoreFreeTime/MoreFreeTime/Base.lproj/Main.storyboard index 34d60cee2936fa60e9ac851d31c88165cde2f590..7fdbc987880224e73caabd87e4bfb77cb92fdffb 100644 --- a/Project/MoreFreeTime/MoreFreeTime/Base.lproj/Main.storyboard +++ b/Project/MoreFreeTime/MoreFreeTime/Base.lproj/Main.storyboard @@ -30,8 +30,8 @@ <constraint firstAttribute="width" secondItem="KJk-Rm-yfA" secondAttribute="height" multiplier="268:489" id="CSt-Zv-Yxk"/> </constraints> </imageView> - <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eSU-9y-L3a" userLabel="ContinueButton"> - <rect key="frame" x="115" y="419" width="30" height="30"/> + <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" hasAttributedTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eSU-9y-L3a" userLabel="ContinueButton"> + <rect key="frame" x="115" y="419" width="150" height="30"/> <state key="normal"> <attributedString key="attributedTitle"/> </state> @@ -39,30 +39,37 @@ <segue destination="GBq-lu-OIv" kind="show" id="Mbd-gt-juR"/> </connections> </button> - <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="Screen Shot 2018-12-06 at 4.41.19 PM" translatesAutoresizingMaskIntoConstraints="NO" id="MPy-IA-gqK"> + <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Screen Shot 2018-12-06 at 4.41.19 PM" translatesAutoresizingMaskIntoConstraints="NO" id="MPy-IA-gqK"> <rect key="frame" x="90" y="235" width="195" height="176"/> - <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> + <constraints> + <constraint firstAttribute="height" constant="176" id="djc-kY-aLb"/> + </constraints> </imageView> </subviews> <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> + <constraint firstItem="eSU-9y-L3a" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="115" id="7Wx-rN-ymW"/> <constraint firstItem="G7e-bO-7dF" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="DMj-cg-P8h"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="EHe-zD-6ra"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="HZz-Ta-wmu"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="Q82-l6-26X"/> <constraint firstItem="G7e-bO-7dF" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="TJe-TF-geJ"/> - <constraint firstItem="eSU-9y-L3a" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="115" id="Tj5-8R-7XG"/> + <constraint firstItem="MPy-IA-gqK" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" constant="90" id="Tss-G3-d2f"/> <constraint firstItem="G7e-bO-7dF" firstAttribute="top" secondItem="oJa-zg-vsj" secondAttribute="top" id="WIH-vJ-dzi"/> + <constraint firstItem="6Tk-OE-BBY" firstAttribute="trailing" secondItem="eSU-9y-L3a" secondAttribute="trailing" constant="110" id="agR-86-bWG"/> <constraint firstAttribute="bottom" secondItem="G7e-bO-7dF" secondAttribute="bottom" id="c6g-zq-htS"/> + <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="eSU-9y-L3a" secondAttribute="bottom" constant="218" id="feG-DV-WOF"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="g9N-2A-3Ne"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="leading" secondItem="6Tk-OE-BBY" secondAttribute="leading" id="i1E-y0-LzD"/> <constraint firstItem="G7e-bO-7dF" firstAttribute="trailing" secondItem="6Tk-OE-BBY" secondAttribute="trailing" id="i4W-tU-hxN"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="centerY" secondItem="6Tk-OE-BBY" secondAttribute="centerY" id="jha-iN-4U5"/> <constraint firstItem="oJa-zg-vsj" firstAttribute="width" secondItem="G7e-bO-7dF" secondAttribute="width" id="kJs-gI-alj"/> + <constraint firstItem="MPy-IA-gqK" firstAttribute="centerX" secondItem="KJk-Rm-yfA" secondAttribute="centerX" id="lal-4h-5dA"/> <constraint firstAttribute="bottom" secondItem="KJk-Rm-yfA" secondAttribute="bottom" constant="20" symbolic="YES" id="qxl-jW-vOq"/> <constraint firstItem="KJk-Rm-yfA" firstAttribute="centerX" secondItem="oJa-zg-vsj" secondAttribute="centerX" id="sTE-p3-ACT"/> <constraint firstItem="G7e-bO-7dF" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="xdk-GY-gJh"/> <constraint firstItem="KJk-Rm-yfA" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="138" id="yeu-N3-f8Y"/> + <constraint firstItem="eSU-9y-L3a" firstAttribute="top" secondItem="MPy-IA-gqK" secondAttribute="bottom" constant="8" symbolic="YES" id="zmm-s9-4LK"/> </constraints> <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/> </view>