Merges

RefugeRestrooms · Feb 22, 2015 · 62b791a · 62b791a
2 parents a9ef273 + e69da47
commit 62b791a
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 16 deletions.
diff --git a/...e-ios/refuge-ios.xcworkspace/xcuserdata/harlan.xcuserdatad/UserInterfaceState.xcuserstate b/...e-ios/refuge-ios.xcworkspace/xcuserdata/harlan.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...refuge-ios.xcworkspace/xcuserdata/harlan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...refuge-ios.xcworkspace/xcuserdata/harlan.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -109,5 +109,53 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "refuge-ios/RefugeAppDelegate.m"
+            timestampString = "446336888.470407"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "30"
+            endingLineNumber = "30"
+            landmarkName = "-application:didFinishLaunchingWithOptions:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "refuge-ios/RefugeAppDelegate.m"
+            timestampString = "446338027.599318"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "40"
+            endingLineNumber = "40"
+            landmarkName = "-application:didFinishLaunchingWithOptions:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "refuge-ios/RefugeAppDelegate.m"
+            timestampString = "446338030.643928"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "41"
+            endingLineNumber = "41"
+            landmarkName = "-application:didFinishLaunchingWithOptions:"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage1.xib b/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage1.xib
@@ -13,14 +13,14 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refuge-onboard1.png" translatesAutoresizingMaskIntoConstraints="NO" id="JOV-cT-Cy0" userLabel="Image">
-                    <rect key="frame" x="100" y="150" width="400" height="600"/>
+                    <rect key="frame" x="100" y="200" width="400" height="600"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="400" id="edu-Th-BXf"/>
                         <constraint firstAttribute="width" secondItem="JOV-cT-Cy0" secondAttribute="height" multiplier="1:1.5" id="j3p-Dm-noX"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="REFUGE maps safe restrooms for transgender, intersex, and gender nonconforming individuals" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDu-Z3-M6k" userLabel="Description Label">
-                    <rect key="frame" x="8" y="20" width="584" height="122"/>
+                    <rect key="frame" x="8" y="20" width="584" height="148"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
@@ -40,8 +40,8 @@
                 <constraint firstItem="nFA-Tx-TLY" firstAttribute="bottom" secondItem="iN0-l3-epB" secondAttribute="bottomMargin" id="6ED-P5-zwV"/>
                 <constraint firstItem="JOV-cT-Cy0" firstAttribute="centerX" secondItem="nFA-Tx-TLY" secondAttribute="centerX" id="6p5-NJ-7YC"/>
                 <constraint firstAttribute="bottom" secondItem="JOV-cT-Cy0" secondAttribute="bottom" id="CQp-SW-1Px"/>
-                <constraint firstAttribute="centerY" secondItem="JOV-cT-Cy0" secondAttribute="centerY" constant="-150" id="E4b-YA-ecW"/>
-                <constraint firstItem="JOV-cT-Cy0" firstAttribute="top" secondItem="MDu-Z3-M6k" secondAttribute="bottom" constant="8" symbolic="YES" id="K4j-Iu-YG0"/>
+                <constraint firstAttribute="centerY" secondItem="JOV-cT-Cy0" secondAttribute="centerY" constant="-200" id="E4b-YA-ecW"/>
+                <constraint firstItem="JOV-cT-Cy0" firstAttribute="top" secondItem="MDu-Z3-M6k" secondAttribute="bottom" constant="32" id="K4j-Iu-YG0"/>
                 <constraint firstItem="MDu-Z3-M6k" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" symbolic="YES" id="Na4-Ia-ALd"/>
                 <constraint firstItem="nFA-Tx-TLY" firstAttribute="centerX" secondItem="JOV-cT-Cy0" secondAttribute="centerX" id="RhO-SJ-fkf"/>
                 <constraint firstItem="nFA-Tx-TLY" firstAttribute="leading" secondItem="JOV-cT-Cy0" secondAttribute="trailing" constant="-32" id="Two-Ha-0b7"/>

diff --git a/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage2.xib b/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage2.xib
@@ -13,14 +13,14 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refuge-onboard2.png" translatesAutoresizingMaskIntoConstraints="NO" id="tgl-sF-ERj" userLabel="Image">
-                    <rect key="frame" x="100" y="150" width="400" height="600"/>
+                    <rect key="frame" x="100" y="200" width="400" height="600"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="400" id="5Vt-5i-jkh"/>
                         <constraint firstAttribute="width" secondItem="tgl-sF-ERj" secondAttribute="height" multiplier="1:1.5" id="8Yv-bK-QOz"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tap a map pin to see more information, including whether the restroom is unisex and/or accessible" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oeV-do-Fff" userLabel="Description Label">
-                    <rect key="frame" x="8" y="20" width="584" height="122"/>
+                    <rect key="frame" x="8" y="20" width="584" height="148"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
@@ -31,9 +31,9 @@
             <constraints>
                 <constraint firstItem="oeV-do-Fff" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" symbolic="YES" id="1Qz-r8-yJP"/>
                 <constraint firstAttribute="centerX" secondItem="tgl-sF-ERj" secondAttribute="centerX" id="4pc-nM-ZPi"/>
-                <constraint firstItem="tgl-sF-ERj" firstAttribute="top" secondItem="oeV-do-Fff" secondAttribute="bottom" constant="8" symbolic="YES" id="IXi-RU-hfS"/>
+                <constraint firstItem="tgl-sF-ERj" firstAttribute="top" secondItem="oeV-do-Fff" secondAttribute="bottom" constant="32" id="IXi-RU-hfS"/>
                 <constraint firstItem="oeV-do-Fff" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="h2P-fi-42a"/>
-                <constraint firstAttribute="centerY" secondItem="tgl-sF-ERj" secondAttribute="centerY" constant="-150" id="lrS-ua-Y4G"/>
+                <constraint firstAttribute="centerY" secondItem="tgl-sF-ERj" secondAttribute="centerY" constant="-200" id="lrS-ua-Y4G"/>
                 <constraint firstItem="oeV-do-Fff" firstAttribute="centerX" secondItem="tgl-sF-ERj" secondAttribute="centerX" id="sTL-u3-TSF"/>
             </constraints>
         </view>

diff --git a/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage3.xib b/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage3.xib
@@ -13,14 +13,14 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refuge-onboard3.png" translatesAutoresizingMaskIntoConstraints="NO" id="NKI-Lx-LJO" userLabel="Image">
-                    <rect key="frame" x="100" y="150" width="400" height="600"/>
+                    <rect key="frame" x="100" y="200" width="400" height="600"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="NKI-Lx-LJO" secondAttribute="height" multiplier="1:1.5" id="QKn-2E-RBW"/>
                         <constraint firstAttribute="width" constant="400" id="z9S-by-1E7"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Search allows you to look for restrooms around specific locations, great for everyday use or travel" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="086-bu-bVy" userLabel="Description Label">
-                    <rect key="frame" x="8" y="20" width="584" height="122"/>
+                    <rect key="frame" x="8" y="20" width="584" height="148"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
@@ -33,8 +33,8 @@
                 <constraint firstItem="086-bu-bVy" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="MHs-Rx-rYe"/>
                 <constraint firstAttribute="centerX" secondItem="NKI-Lx-LJO" secondAttribute="centerX" id="cvp-bl-MOF"/>
                 <constraint firstItem="086-bu-bVy" firstAttribute="centerX" secondItem="NKI-Lx-LJO" secondAttribute="centerX" id="l2g-gk-kwH"/>
-                <constraint firstItem="NKI-Lx-LJO" firstAttribute="top" secondItem="086-bu-bVy" secondAttribute="bottom" constant="8" symbolic="YES" id="tvD-ek-jPg"/>
-                <constraint firstAttribute="centerY" secondItem="NKI-Lx-LJO" secondAttribute="centerY" constant="-150" id="wA9-hC-rs5"/>
+                <constraint firstItem="NKI-Lx-LJO" firstAttribute="top" secondItem="086-bu-bVy" secondAttribute="bottom" constant="32" id="tvD-ek-jPg"/>
+                <constraint firstAttribute="centerY" secondItem="NKI-Lx-LJO" secondAttribute="centerY" constant="-200" id="wA9-hC-rs5"/>
             </constraints>
         </view>
     </objects>

diff --git a/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage4.xib b/refuge-ios/refuge-ios/View/UI Elements/RefugeOnboardPage4.xib
@@ -13,14 +13,14 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="refuge-onboard4.png" translatesAutoresizingMaskIntoConstraints="NO" id="nEy-Wx-HB8" userLabel="Image">
-                    <rect key="frame" x="100" y="150" width="400" height="600"/>
+                    <rect key="frame" x="100" y="200" width="400" height="600"/>
                     <constraints>
                         <constraint firstAttribute="width" secondItem="nEy-Wx-HB8" secondAttribute="height" multiplier="1:1.5" id="WuK-RL-cl9"/>
                         <constraint firstAttribute="width" constant="400" id="pBZ-Xw-LRL"/>
                     </constraints>
                 </imageView>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Don't see a location in your area? Tap the '+' button or visit refugerestrooms.org" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SXE-RZ-KPB" userLabel="Description Label">
-                    <rect key="frame" x="8" y="20" width="584" height="122"/>
+                    <rect key="frame" x="8" y="20" width="584" height="148"/>
                     <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="20"/>
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
@@ -31,9 +31,9 @@
             <constraints>
                 <constraint firstItem="SXE-RZ-KPB" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="20" symbolic="YES" id="Eoz-jC-Wds"/>
                 <constraint firstItem="SXE-RZ-KPB" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leadingMargin" id="TAA-We-FxK"/>
-                <constraint firstItem="nEy-Wx-HB8" firstAttribute="top" secondItem="SXE-RZ-KPB" secondAttribute="bottom" constant="8" symbolic="YES" id="Wzq-Pw-zj9"/>
+                <constraint firstItem="nEy-Wx-HB8" firstAttribute="top" secondItem="SXE-RZ-KPB" secondAttribute="bottom" constant="32" id="Wzq-Pw-zj9"/>
                 <constraint firstItem="SXE-RZ-KPB" firstAttribute="centerX" secondItem="nEy-Wx-HB8" secondAttribute="centerX" id="a1Z-AE-fyP"/>
-                <constraint firstAttribute="centerY" secondItem="nEy-Wx-HB8" secondAttribute="centerY" constant="-150" id="tZn-ch-vnJ"/>
+                <constraint firstAttribute="centerY" secondItem="nEy-Wx-HB8" secondAttribute="centerY" constant="-200" id="tZn-ch-vnJ"/>
                 <constraint firstAttribute="centerX" secondItem="nEy-Wx-HB8" secondAttribute="centerX" id="y9I-mz-QDd"/>
             </constraints>
         </view>