Move login button up on front page

BeMyEyes Tests/BeMyEyes Tests-Bridging-Header.h

@@ -17,3 +17,4 @@
 
 #import "BMEHelperMainViewController.h"
 #import "BMEBlindMainViewController.h"
+#import "BMEFrontPageViewController.h"

BeMyEyes Tests/FrontPageViewController_Tests.swift

@@ -0,0 +1,32 @@
+//
+// FrontPageViewController_Tests.swift
+// BeMyEyes
+//
+// Created by Tobias Due Munk on 02/01/15.
+// Copyright (c) 2015 Be My Eyes. All rights reserved.
+//
+
+import UIKit
+import XCTest
+
+class FrontPageViewController_Tests: FBSnapshotTestCase {
+
+ var frontPageVC: BMEFrontPageViewController?
+
+ override func setUp() {
+ super.setUp()
+ recordMode = true
+ renderAsLayer = true
+
+ frontPageVC = UIApplication.sharedApplication().keyWindow?.rootViewController?.storyboard?.instantiateViewControllerWithIdentifier(BMEFrontPageControllerIdentifier) as? BMEFrontPageViewController
+ frontPageVC?.viewDidLoad()
+ }
+
+ override func tearDown() {
+ super.tearDown()
+ }
+
+ func testOnAllDevices() {
+ verifyViewOnAllDevicesAndLanguages(frontPageVC!)
+ }
+}

BeMyEyes.xcodeproj/project.pbxproj

@@ -55,6 +55,7 @@
  4EE671C21A2DB4260037865B /* ProfileSarah.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EE671BF1A2DB3240037865B /* ProfileSarah.png */; };
  4EE671C41A2DF9C10037865B /* BlindMainViewController_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EE671C31A2DF9C10037865B /* BlindMainViewController_Tests.swift */; };
  4EE91D1419E5977C00CF4F23 /* RadioButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EE91D1319E5977C00CF4F23 /* RadioButton.swift */; };
+ 4EECE0E01A56957E0073AFDF /* FrontPageViewController_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EECE0DF1A56957E0073AFDF /* FrontPageViewController_Tests.swift */; };
  4EFA28081A2B7A4F0050450C /* MaskedLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E1916CE19E5800300B85E61 /* MaskedLabel.swift */; };
  556D82D33DA8A505A137BD4A /* libPods-BeMyEyes Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 03381774851623C2C6BE0645 /* libPods-BeMyEyes Tests.a */; };
  7206A76118FA9BF000251824 /* BMEPointLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = 7206A76018FA9BF000251824 /* BMEPointLabel.m */; };
@@ -448,6 +449,7 @@
  4EE671BF1A2DB3240037865B /* ProfileSarah.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ProfileSarah.png; sourceTree = "<group>"; };
  4EE671C31A2DF9C10037865B /* BlindMainViewController_Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlindMainViewController_Tests.swift; sourceTree = "<group>"; };
  4EE91D1319E5977C00CF4F23 /* RadioButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadioButton.swift; sourceTree = "<group>"; };
+ 4EECE0DF1A56957E0073AFDF /* FrontPageViewController_Tests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FrontPageViewController_Tests.swift; sourceTree = "<group>"; };
  4EFCE56F1A55C57500FAE663 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
  4EFCE5701A55C57500FAE663 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/BMEAccessLocalization.strings; sourceTree = "<group>"; };
  4EFCE5711A55C57500FAE663 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/BMEAppDelegateLocalizationTable.strings; sourceTree = "<group>"; };
@@ -720,6 +722,7 @@
  4E7BA9B51A1CE2DC00F9744A /* MaskedLabel_Tests.swift */,
  4E7BA9C21A1DEE4500F9744A /* HelperMainViewController_Tests.swift */,
  4EE671C31A2DF9C10037865B /* BlindMainViewController_Tests.swift */,
+ 4EECE0DF1A56957E0073AFDF /* FrontPageViewController_Tests.swift */,
  4E7BA9BB1A1CF50C00F9744A /* SnapshotHelper.swift */,
  4E7BA9BD1A1CF5DA00F9744A /* DataHelper.swift */,
  4E7BA9A81A1B5E9900F9744A /* BeMyEyes Tests-Bridging-Header.h */,
@@ -1367,6 +1370,7 @@
  isa = PBXSourcesBuildPhase;
  buildActionMask = 2147483647;
  files = (
+ 4EECE0E01A56957E0073AFDF /* FrontPageViewController_Tests.swift in Sources */,
  4E7BA9B61A1CE2DC00F9744A /* MaskedLabel_Tests.swift in Sources */,
  4E7BA9B81A1CE64300F9744A /* GVUserDefaults+Settings.m in Sources */,
  4EFA28081A2B7A4F0050450C /* MaskedLabel.swift in Sources */,

BeMyEyes/Base.lproj/Main.storyboard

@@ -11,7 +11,7 @@
  <!--Front Page View Controller-->
  <scene sceneID="ufC-wZ-h7g">
  <objects>
- <viewController id="vXZ-lx-hvc" customClass="BMEFrontPageViewController" sceneMemberID="viewController">
+ <viewController storyboardIdentifier="FrontPage" id="vXZ-lx-hvc" customClass="BMEFrontPageViewController" sceneMemberID="viewController">
  <layoutGuides>
  <viewControllerLayoutGuide type="top" id="LUz-nx-Suh"/>
  <viewControllerLayoutGuide type="bottom" id="Uzk-Yk-OlI"/>
@@ -24,12 +24,6 @@
  <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
  <color key="backgroundColor" red="0.18039215689999999" green="0.45098039220000002" blue="0.60784313729999995" alpha="1" colorSpace="calibratedRGB"/>
  </view>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What is your role?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mHE-NR-WpR">
- <rect key="frame" x="15" y="247" width="290" height="19.5"/>
- <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
- <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
- <nil key="highlightedColor"/>
- </label>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mmg-sQ-kOY" userLabel="Community Stats View">
  <rect key="frame" x="15" y="0.0" width="290" height="71.5"/>
  <subviews>
@@ -202,10 +196,10 @@
  </constraints>
  </view>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6ag-KE-c4b" userLabel="Logo Wrapper">
- <rect key="frame" x="0.0" y="71.5" width="320" height="176"/>
+ <rect key="frame" x="0.0" y="71" width="320" height="161.5"/>
  <subviews>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aNI-8U-fEM" userLabel="Logo Container">
- <rect key="frame" x="0.0" y="24" width="320" height="127"/>
+ <rect key="frame" x="0.0" y="17.5" width="320" height="127"/>
  <subviews>
  <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="LogoNoTextWhite" translatesAutoresizingMaskIntoConstraints="NO" id="m2L-ka-v6O">
  <rect key="frame" x="110" y="0.0" width="100" height="69"/>
@@ -245,7 +239,7 @@
  </constraints>
  </view>
  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="headTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M9q-Oe-kOY">
- <rect key="frame" x="0.0" y="415" width="320" height="65"/>
+ <rect key="frame" x="0.0" y="232" width="320" height="65"/>
  <constraints>
  <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="65" id="ns0-dZ-2wX"/>
  </constraints>
@@ -259,8 +253,14 @@
  <segue destination="ihY-sp-kva" kind="push" identifier="Login" id="Y8W-tr-yNw"/>
  </connections>
  </button>
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What is your role?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mHE-NR-WpR">
+ <rect key="frame" x="15" y="297" width="290" height="19.5"/>
+ <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
+ <color key="textColor" cocoaTouchSystemColor="lightTextColor"/>
+ <nil key="highlightedColor"/>
+ </label>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kV5-ME-fhW" userLabel="I am sighted" customClass="Button" customModule="BeMyEyes" customModuleProvider="target">
- <rect key="frame" x="0.0" y="272" width="320" height="75"/>
+ <rect key="frame" x="0.0" y="322" width="320" height="75"/>
  <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  <accessibility key="accessibilityConfiguration">
  <accessibilityTraits key="traits" none="YES" button="YES"/>
@@ -277,7 +277,7 @@
  </connections>
  </view>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ESf-r7-DMS" userLabel="I am blind" customClass="Button" customModule="BeMyEyes" customModuleProvider="target">
- <rect key="frame" x="0.0" y="347" width="320" height="75"/>
+ <rect key="frame" x="0.0" y="397" width="320" height="75"/>
  <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  <accessibility key="accessibilityConfiguration">
  <accessibilityTraits key="traits" none="YES" button="YES"/>
@@ -299,26 +299,26 @@
  <constraint firstAttribute="trailing" secondItem="kV5-ME-fhW" secondAttribute="trailing" id="4GI-qh-xx9"/>
  <constraint firstAttribute="trailing" secondItem="mHE-NR-WpR" secondAttribute="trailing" constant="15" id="4r7-UX-yDw"/>
  <constraint firstItem="ESf-r7-DMS" firstAttribute="top" secondItem="kV5-ME-fhW" secondAttribute="bottom" id="BPw-Ne-xSn"/>
- <constraint firstItem="Uzk-Yk-OlI" firstAttribute="top" secondItem="M9q-Oe-kOY" secondAttribute="bottom" id="C1T-cs-CA1"/>
  <constraint firstItem="mHE-NR-WpR" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" constant="15" id="CNB-s2-WAd"/>
  <constraint firstAttribute="trailing" secondItem="6ag-KE-c4b" secondAttribute="trailing" id="CYf-kI-iv1"/>
  <constraint firstItem="mmg-sQ-kOY" firstAttribute="top" secondItem="kh9-bI-dsS" secondAttribute="top" id="CnK-Nu-Sfr"/>
  <constraint firstAttribute="trailing" secondItem="M9q-Oe-kOY" secondAttribute="trailing" id="DEr-5q-DMA"/>
- <constraint firstItem="M9q-Oe-kOY" firstAttribute="top" secondItem="ESf-r7-DMS" secondAttribute="bottom" constant="-7" id="I18-UV-Mxy"/>
  <constraint firstAttribute="trailing" secondItem="ESf-r7-DMS" secondAttribute="trailing" id="QIW-F1-PJG"/>
  <constraint firstItem="mmg-sQ-kOY" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" constant="15" id="SFZ-ff-SnQ"/>
  <constraint firstItem="M9q-Oe-kOY" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="Udx-JV-XuY"/>
  <constraint firstItem="usY-iz-Xp5" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="bHx-2Z-4KR"/>
  <constraint firstAttribute="trailing" secondItem="mmg-sQ-kOY" secondAttribute="trailing" constant="15" id="c5T-uu-FU4"/>
+ <constraint firstItem="mHE-NR-WpR" firstAttribute="top" secondItem="M9q-Oe-kOY" secondAttribute="bottom" id="eJd-Lb-qq8"/>
  <constraint firstItem="ESf-r7-DMS" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="em8-Xj-A20"/>
  <constraint firstItem="usY-iz-Xp5" firstAttribute="top" secondItem="LUz-nx-Suh" secondAttribute="bottom" id="fKH-Hl-9FG"/>
  <constraint firstAttribute="trailing" secondItem="usY-iz-Xp5" secondAttribute="trailing" id="gWb-M3-1lj"/>
  <constraint firstItem="6ag-KE-c4b" firstAttribute="top" secondItem="mmg-sQ-kOY" secondAttribute="bottom" id="mG7-B3-WCo"/>
+ <constraint firstItem="M9q-Oe-kOY" firstAttribute="top" secondItem="6ag-KE-c4b" secondAttribute="bottom" id="nGA-8B-uja"/>
  <constraint firstItem="kV5-ME-fhW" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="q8t-Tb-po2"/>
  <constraint firstItem="6ag-KE-c4b" firstAttribute="leading" secondItem="kh9-bI-dsS" secondAttribute="leading" id="rai-Xv-zdX"/>
  <constraint firstItem="Uzk-Yk-OlI" firstAttribute="top" secondItem="usY-iz-Xp5" secondAttribute="bottom" id="rsU-3r-MUP"/>
- <constraint firstItem="mHE-NR-WpR" firstAttribute="top" secondItem="6ag-KE-c4b" secondAttribute="bottom" id="wk8-BG-RAd"/>
  <constraint firstItem="kV5-ME-fhW" firstAttribute="top" secondItem="mHE-NR-WpR" secondAttribute="bottom" constant="5" id="xaY-aS-3iL"/>
+ <constraint firstAttribute="bottom" secondItem="ESf-r7-DMS" secondAttribute="bottom" constant="8" id="yoc-VA-vVu"/>
  </constraints>
  </view>
  <navigationItem key="navigationItem" id="Gva-8w-2WT"/>