merged

Pods/Onboard/Source/OnboardingContentViewController.m

@@ -73,6 +73,7 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
 
 + (instancetype)contentWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock {
     return [[self alloc] initWithTitle:title body:body image:nil videoURL:videoURL inputView:inputView buttonText:buttonText actionBlock:actionBlock];
+
 }
 
 - (instancetype)initWithTitle:(NSString *)title body:(NSString *)body videoURL:(NSURL *)videoURL  buttonText:(NSString *)buttonText action:(dispatch_block_t)action {
@@ -153,6 +154,7 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
     return self;
 }
 
+
 - (instancetype)initWithTitle:(NSString *)title body:(NSString *)body image:(UIImage *)image videoURL:(NSURL *)videoURL inputView:(UIView *)inputView buttonText:(NSString *)buttonText actionBlock:(action_callback)actionBlock {
     self = [super init];
     
@@ -359,6 +361,7 @@ NSString * const kOnboardInputViewAccessibilityIdentifier = @"OnboardInputViewAc
     self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, 0);
     [self.bodyLabel sizeToFit];
     self.bodyLabel.frame = CGRectMake(xPadding, bodyYOrigin, contentWidth, CGRectGetHeight(self.bodyLabel.frame));
+
     
     self.actionButton.frame = CGRectMake((CGRectGetMaxX(self.view.frame) / 2) - (contentWidth / 2), CGRectGetMaxY(self.view.frame) - self.underPageControlPadding - kMainPageControlHeight - kActionButtonHeight - self.bottomPadding, contentWidth, kActionButtonHeight);
     

Pods/Pods.xcodeproj/xcuserdata/jakobsbode.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -52,16 +52,41 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>4BBD10B16564F31F9E6CB3A46C82B375</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>738FFB5A0A7C642A6657EA5241C1FB7E</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>82BBBA182FED17649112AE9374B4898E</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>83321BF5BD0E06C7F212CF8969A25A33</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>838A2C6DA366DE138E5FDF1AF19D94C0</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>8905DB6521F8FDC34752B69DEE3FDEB7</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>8F5682E0AC126B1910FC04BA8A16F382</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>9ED6B0DBB547C5A9B34F2DDC36242048</key>
 		<dict>
 			<key>primary</key>
@@ -72,6 +97,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>BF1258B878BFA89993BC8FEA5ACA97E4</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>D7FF48F3092783E4E42B336F0DEF2D1A</key>
 		<dict>
 			<key>primary</key>
@@ -87,6 +117,16 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>E8B699458103CA9ABE04ABB6069ACD9D</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>FC17CCC069BF20C1FDFA841B915A467B</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>

Pods/Target Support Files/BZipCompression/BZipCompression-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 #import "BZipCompression.h"
 

Pods/Target Support Files/FrameAccessor/FrameAccessor-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 #import "FrameAccessor.h"
 #import "ScrollViewFrameAccessor.h"

Pods/Target Support Files/KeychainAccess/KeychainAccess-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 
 FOUNDATION_EXPORT double KeychainAccessVersionNumber;

Pods/Target Support Files/Onboard/Onboard-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 #import "OnboardingViewController.h"
 #import "OnboardingContentViewController.h"

Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-acknowledgements.plist

@@ -206,6 +206,8 @@ third-party archives.
    See the License for the specific language governing permissions and
    limitations under the License.
 </string>
+			<key>License</key>
+			<string>Apache2</string>
 			<key>Title</key>
 			<string>BZipCompression</string>
 			<key>Type</key>
@@ -233,6 +235,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>FrameAccessor</string>
 			<key>Type</key>
@@ -263,6 +267,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 </string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>KeychainAccess</string>
 			<key>Type</key>
@@ -292,6 +298,8 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 </string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>Onboard</string>
 			<key>Type</key>
@@ -427,6 +435,8 @@ THE SOFTWARE.
  */
 
 </string>
+			<key>License</key>
+			<string>OpenSSL (OpenSSL/SSLeay)</string>
 			<key>Title</key>
 			<string>OpenSSL-Universal</string>
 			<key>Type</key>
@@ -455,6 +465,8 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.</string>
+			<key>License</key>
+			<string>MIT</string>
 			<key>Title</key>
 			<string>VENTokenField</string>
 			<key>Type</key>
@@ -463,6 +475,8 @@ SOFTWARE.</string>
 		<dict>
 			<key>FooterText</key>
 			<string>&lt;html&gt;&lt;body&gt;You are being &lt;a href="https://raw.githubusercontent.com/MailCore/mailcore2/master/LICENSE"&gt;redirected&lt;/a&gt;.&lt;/body&gt;&lt;/html&gt;</string>
+			<key>License</key>
+			<string>BSD</string>
 			<key>Title</key>
 			<string>mailcore2-ios</string>
 			<key>Type</key>

Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-resources.sh

@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
     ;;
 esac
 
-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
   if [[ "$1" = /* ]] ; then
@@ -70,7 +64,7 @@ EOM
       xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
       XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
       ;;
     *)
@@ -93,7 +87,7 @@ then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
   while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
       XCASSET_FILES+=("$line")
     fi
   done <<<"$OTHER_XCASSETS"

Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 
 FOUNDATION_EXPORT double Pods_enzevalos_iphoneVersionNumber;

Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.debug.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1

Pods/Target Support Files/Pods-enzevalos_iphone/Pods-enzevalos_iphone.release.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
 EMBEDDED_CONTENT_CONTAINS_SWIFT = YES
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1

Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-resources.sh

@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
     ;;
 esac
 
-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
   if [[ "$1" = /* ]] ; then
@@ -70,7 +64,7 @@ EOM
       xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
       XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
       ;;
     *)
@@ -93,7 +87,7 @@ then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
   while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
       XCASSET_FILES+=("$line")
     fi
   done <<<"$OTHER_XCASSETS"

Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 
 FOUNDATION_EXPORT double Pods_enzevalos_iphoneTestsVersionNumber;

Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.debug.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"

Pods/Target Support Files/Pods-enzevalos_iphoneTests/Pods-enzevalos_iphoneTests.release.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"

Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests-resources.sh

@@ -23,12 +23,6 @@ case "${TARGETED_DEVICE_FAMILY}" in
     ;;
 esac
 
-realpath() {
-  DIRECTORY="$(cd "${1%/*}" && pwd)"
-  FILENAME="${1##*/}"
-  echo "$DIRECTORY/$FILENAME"
-}
-
 install_resource()
 {
   if [[ "$1" = /* ]] ; then
@@ -70,7 +64,7 @@ EOM
       xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm"
       ;;
     *.xcassets)
-      ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH")
+      ABSOLUTE_XCASSET_FILE="$RESOURCE_PATH"
       XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE")
       ;;
     *)
@@ -93,7 +87,7 @@ then
   # Find all other xcassets (this unfortunately includes those of path pods and other targets).
   OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
   while read line; do
-    if [[ $line != "`realpath $PODS_ROOT`*" ]]; then
+    if [[ $line != "${PODS_ROOT}*" ]]; then
       XCASSET_FILES+=("$line")
     fi
   done <<<"$OTHER_XCASSETS"

Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests-umbrella.h

+#ifdef __OBJC__
 #import <UIKit/UIKit.h>
+#endif
 
 
 FOUNDATION_EXPORT double Pods_enzevalos_iphoneUITestsVersionNumber;

Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.debug.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"

Pods/Target Support Files/Pods-enzevalos_iphoneUITests/Pods-enzevalos_iphoneUITests.release.xcconfig

+ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/BZipCompression" "$PODS_CONFIGURATION_BUILD_DIR/FrameAccessor" "$PODS_CONFIGURATION_BUILD_DIR/KeychainAccess" "$PODS_CONFIGURATION_BUILD_DIR/Onboard" "$PODS_CONFIGURATION_BUILD_DIR/VENTokenField"
 GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/OpenSSL-Universal" "${PODS_ROOT}/Headers/Public/mailcore2-ios"