Merge branch 'release/1.1_37'

PowZone · Nov 10, 2014 · a776aa8 · a776aa8
2 parents b3e51b3 + 0801386
commit a776aa8
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/BeMyEyes/Base.lproj/Main.storyboard b/BeMyEyes/Base.lproj/Main.storyboard
@@ -577,7 +577,7 @@
  <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
  <subviews>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hkz-vv-OkC" userLabel="Content View">
- <rect key="frame" x="0.0" y="0.0" width="320" height="455"/>
+ <rect key="frame" x="0.0" y="0.0" width="320" height="460"/>
  <subviews>
  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8pA-sN-peL">
  <rect key="frame" x="0.0" y="20" width="85" height="61"/>
@@ -613,7 +613,7 @@
  </connections>
  </view>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fM4-jC-xC3" userLabel="Email View">
- <rect key="frame" x="15" y="171" width="290" height="60"/>
+ <rect key="frame" x="15" y="176" width="290" height="60"/>
  <subviews>
  <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SignUpEmail" translatesAutoresizingMaskIntoConstraints="NO" id="9zP-E0-8Lk">
  <rect key="frame" x="10" y="21" width="28" height="18"/>
@@ -649,7 +649,7 @@
  </constraints>
  </view>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yuq-Gm-fi6" userLabel="Password View">
- <rect key="frame" x="15" y="246" width="290" height="60"/>
+ <rect key="frame" x="15" y="251" width="290" height="60"/>
  <subviews>
  <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SignUpPassword" translatesAutoresizingMaskIntoConstraints="NO" id="qWh-0h-mTP">
  <rect key="frame" x="10" y="16" width="28" height="28"/>
@@ -685,7 +685,7 @@
  </constraints>
  </view>
  <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eav-yG-qgk" userLabel="E-mail" customClass="Button" customModule="BeMyEyes" customModuleProvider="target">
- <rect key="frame" x="0.0" y="313" width="320" height="75"/>
+ <rect key="frame" x="0.0" y="318" width="320" height="75"/>
  <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
  <accessibility key="accessibilityConfiguration">
  <accessibilityTraits key="traits" none="YES" button="YES"/>
@@ -702,7 +702,7 @@
  </connections>
  </view>
  <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="oL9-6V-10R">
- <rect key="frame" x="0.0" y="395" width="320" height="60"/>
+ <rect key="frame" x="0.0" y="400" width="320" height="60"/>
  <constraints>
  <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="60" id="9FX-oX-1U9"/>
  </constraints>
@@ -731,7 +731,7 @@
  <constraint firstAttribute="trailing" secondItem="oL9-6V-10R" secondAttribute="trailing" id="aD5-re-ZVm"/>
  <constraint firstAttribute="trailing" secondItem="0Ff-9t-PDp" secondAttribute="trailing" id="hYo-cb-jry"/>
  <constraint firstItem="oL9-6V-10R" firstAttribute="top" secondItem="eav-yG-qgk" secondAttribute="bottom" constant="7" id="kpR-ky-chh"/>
- <constraint firstItem="fM4-jC-xC3" firstAttribute="top" secondItem="0Ff-9t-PDp" secondAttribute="bottom" constant="15" id="lwb-BG-vPo"/>
+ <constraint firstItem="fM4-jC-xC3" firstAttribute="top" secondItem="0Ff-9t-PDp" secondAttribute="bottom" constant="20" id="lwb-BG-vPo"/>
  <constraint firstAttribute="trailing" secondItem="eav-yG-qgk" secondAttribute="trailing" id="nEx-DE-GJk"/>
  <constraint firstAttribute="bottom" secondItem="oL9-6V-10R" secondAttribute="bottom" id="ngx-cr-atI"/>
  <constraint firstItem="eav-yG-qgk" firstAttribute="top" secondItem="yuq-Gm-fi6" secondAttribute="bottom" constant="7" id="qGO-Md-sNk"/>

diff --git a/BeMyEyes/BeMyEyes-Info.plist b/BeMyEyes/BeMyEyes-Info.plist
@@ -30,7 +30,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>36</string>
+ <string>37</string>
  <key>FacebookAppID</key>
  <string>771890076161460</string>
  <key>FacebookDisplayName</key>

diff --git a/BeMyEyes/Source/Controllers/BMEHelperMainViewController.m b/BeMyEyes/Source/Controllers/BMEHelperMainViewController.m
@@ -152,9 +152,9 @@ - (void)viewDidLayoutSubviews {
  CGFloat contentHeight = self.tableView.contentSize.height;
  CGFloat viewHeight = self.view.frame.size.height;
  CGFloat bottomInset = 0;
- CGFloat hiddenHeight = contentHeight - (viewHeight - communityHeight);
- if (0 < hiddenHeight) {
- bottomInset = viewHeight - contentHeight + hiddenHeight/2;
+ if (contentHeight > viewHeight - communityHeight &&
+  contentHeight < viewHeight + communityHeight) {
+ bottomInset = (viewHeight - contentHeight + communityHeight)/2;
  }
 
  UIEdgeInsets contentInsets = self.tableView.contentInset;

diff --git a/README.md b/README.md
@@ -1,11 +1,7 @@
 # Getting started
-## install CocoaPod
-sudo gem install cocoapods 
-# install dependencies
-pod install
+## Install Dependencies
+Install pods by running `pod install` in the terminal
+If you don't have CocoaPods already, install by `sudo gem install cocoapods`
 
-## configuration
-rename BMEGlobal.temp.h to BMEGlobal.h and configure to your own needs
-
-# Localization
-Update localization keys by running `Scripts/./miaw -g -o BeMyEyes/Source/` from the top level folder.
+## Configuration
+Rename BMEGlobal.temp.h to BMEGlobal.h and configure to your own needs