Skip to content
This repository has been archived by the owner on Oct 15, 2018. It is now read-only.

Commit

Permalink
Manually merge #25
Browse files Browse the repository at this point in the history
  • Loading branch information
andreamazz committed Jan 26, 2018
1 parent 1b29fe2 commit 336c9cc
Show file tree
Hide file tree
Showing 88 changed files with 7,694 additions and 5,086 deletions.
12 changes: 6 additions & 6 deletions Gulps.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
"${BUILT_PRODUCTS_DIR}/AMWaveTransition/AMWaveTransition.framework",
"${BUILT_PRODUCTS_DIR}/BAFluidView/BAFluidView.framework",
"${BUILT_PRODUCTS_DIR}/BubbleTransition/BubbleTransition.framework",
"${BUILT_PRODUCTS_DIR}/JTCalendar/JTCalendar.framework",
"${BUILT_PRODUCTS_DIR}/CVCalendar/CVCalendar.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
"${BUILT_PRODUCTS_DIR}/UICountingLabel/UICountingLabel.framework",
Expand All @@ -846,7 +846,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AMWaveTransition.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BAFluidView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BubbleTransition.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JTCalendar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CVCalendar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/UICountingLabel.framework",
Expand Down Expand Up @@ -888,7 +888,7 @@
"${BUILT_PRODUCTS_DIR}/AMWaveTransition/AMWaveTransition.framework",
"${BUILT_PRODUCTS_DIR}/BAFluidView/BAFluidView.framework",
"${BUILT_PRODUCTS_DIR}/BubbleTransition/BubbleTransition.framework",
"${BUILT_PRODUCTS_DIR}/JTCalendar/JTCalendar.framework",
"${BUILT_PRODUCTS_DIR}/CVCalendar/CVCalendar.framework",
"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
"${BUILT_PRODUCTS_DIR}/RealmSwift/RealmSwift.framework",
"${PODS_ROOT}/Reveal-SDK/RevealServer-13/iOS/RevealServer.framework",
Expand All @@ -902,7 +902,7 @@
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AMWaveTransition.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BAFluidView.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/BubbleTransition.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JTCalendar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CVCalendar.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RealmSwift.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
Expand Down Expand Up @@ -1392,7 +1392,7 @@
65F44C791AF24B8A0093A3E9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer";
Expand All @@ -1419,7 +1419,7 @@
65F44C7A1AF24B8A0093A3E9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
Expand Down
97 changes: 58 additions & 39 deletions Gulps/Base.lproj/LaunchScreen.xib
Original file line number Diff line number Diff line change
@@ -1,46 +1,65 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14F6a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB">
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tabBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YqG-fM-mZ4">
<rect key="frame" x="0.0" y="431" width="480" height="49"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
<constraints>
<constraint firstAttribute="height" constant="49" id="ef5-7c-KC6"/>
</constraints>
<items/>
</tabBar>
<navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U4e-1e-BSW">
<rect key="frame" x="0.0" y="0.0" width="480" height="64"/>
<constraints>
<constraint firstAttribute="height" constant="64" id="TJ1-2U-4hG"/>
</constraints>
<color key="barTintColor" red="0.21960784310000001" green="0.49019607840000001" blue="0.81176470590000005" alpha="1" colorSpace="calibratedRGB"/>
<items>
<navigationItem id="xsM-90-qGn"/>
</items>
</navigationBar>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<constraints>
<constraint firstItem="U4e-1e-BSW" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="0UW-vN-Bvo"/>
<constraint firstAttribute="trailing" secondItem="U4e-1e-BSW" secondAttribute="trailing" id="Ftu-96-c0M"/>
<constraint firstItem="YqG-fM-mZ4" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="V05-tV-wLM"/>
<constraint firstAttribute="bottom" secondItem="YqG-fM-mZ4" secondAttribute="bottom" id="Xk8-Td-58y"/>
<constraint firstAttribute="trailing" secondItem="YqG-fM-mZ4" secondAttribute="trailing" id="q5s-j0-gbN"/>
<constraint firstItem="U4e-1e-BSW" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="w1h-0C-b1p"/>
</constraints>
<nil key="simulatedStatusBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<point key="canvasLocation" x="296" y="437"/>
</view>
<viewController id="Dtt-3q-aUs">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="P9a-Xn-0df"/>
<viewControllerLayoutGuide type="bottom" id="qH0-cH-eW1"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="DxT-0x-OGN">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tabBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HhL-U5-H4y">
<rect key="frame" x="0.0" y="618" width="375" height="49"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<items/>
</tabBar>
<navigationBar contentMode="scaleToFill" translucent="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dZq-x5-fHY">
<rect key="frame" x="0.0" y="20" width="375" height="44"/>
<color key="barTintColor" red="0.17367905378341675" green="0.40215393900871277" blue="0.76835298538208008" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<items>
<navigationItem id="S1i-UO-YaU"/>
</items>
</navigationBar>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7pv-Fn-yst">
<rect key="frame" x="0.0" y="0.0" width="375" height="20"/>
<color key="backgroundColor" red="0.17367905380000001" green="0.40215393900000002" blue="0.76835298539999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5sj-U5-sqp">
<rect key="frame" x="0.0" y="64" width="375" height="554"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="qH0-cH-eW1" firstAttribute="top" secondItem="HhL-U5-H4y" secondAttribute="bottom" id="0GR-MT-DKh"/>
<constraint firstItem="HhL-U5-H4y" firstAttribute="top" secondItem="5sj-U5-sqp" secondAttribute="bottom" id="621-Cy-cu1"/>
<constraint firstItem="dZq-x5-fHY" firstAttribute="leading" secondItem="DxT-0x-OGN" secondAttribute="leading" id="6hQ-l1-TZ8"/>
<constraint firstItem="5sj-U5-sqp" firstAttribute="top" secondItem="dZq-x5-fHY" secondAttribute="bottom" id="Ak7-sB-LSI"/>
<constraint firstItem="dZq-x5-fHY" firstAttribute="top" secondItem="P9a-Xn-0df" secondAttribute="bottom" id="BFX-P0-FaL"/>
<constraint firstItem="5sj-U5-sqp" firstAttribute="leading" secondItem="DxT-0x-OGN" secondAttribute="leading" id="Omr-nA-zJU"/>
<constraint firstItem="HhL-U5-H4y" firstAttribute="leading" secondItem="DxT-0x-OGN" secondAttribute="leading" id="OzM-hx-90I"/>
<constraint firstItem="7pv-Fn-yst" firstAttribute="leading" secondItem="DxT-0x-OGN" secondAttribute="leading" id="T0W-jx-3db"/>
<constraint firstItem="7pv-Fn-yst" firstAttribute="top" secondItem="DxT-0x-OGN" secondAttribute="top" id="UfI-XQ-zi2"/>
<constraint firstAttribute="trailing" secondItem="5sj-U5-sqp" secondAttribute="trailing" id="aDX-nV-zhj"/>
<constraint firstAttribute="trailing" secondItem="HhL-U5-H4y" secondAttribute="trailing" id="cc3-bT-lwC"/>
<constraint firstAttribute="trailing" secondItem="7pv-Fn-yst" secondAttribute="trailing" id="hB1-Il-lro"/>
<constraint firstAttribute="trailing" secondItem="dZq-x5-fHY" secondAttribute="trailing" id="pd6-gY-Mce"/>
<constraint firstItem="dZq-x5-fHY" firstAttribute="top" secondItem="7pv-Fn-yst" secondAttribute="bottom" id="wfn-8O-eFz"/>
</constraints>
</view>
<point key="canvasLocation" x="52" y="374.66266866566718"/>
</viewController>
</objects>
</document>
Loading

0 comments on commit 336c9cc

Please sign in to comment.