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

Commit

Permalink
Merge branch 'release/0.6.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
@malcommac
malcommac committed Oct 13, 2018
2 parents 325afef + e18e7ec commit 36dd579
Show file tree
Hide file tree
Showing 21 changed files with 167 additions and 116 deletions.
8 changes: 4 additions & 4 deletions ExampleApp/AppDelegate.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
var window: UIWindow?


func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
// Override point for customization after application launch.
return true
}
func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
// Override point for customization after application launch.
return true
}

func applicationWillResignActive(_ application: UIApplication) {
// Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state.
Expand Down
17 changes: 12 additions & 5 deletions ExampleApp/Base.lproj/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13122.16" systemVersion="17A277" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13104.12"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<deployment identifier="iOS"/>
<development version="8000" identifier="xcode"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="EHf-IW-A2E">
<objects>
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="5AG-4Z-N8N"/>
<viewControllerLayoutGuide type="bottom" id="GvZ-aQ-yQ9"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
Expand Down
31 changes: 18 additions & 13 deletions ExampleApp/Base.lproj/Main.storyboard
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="49e-Tb-3d3">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--First-->
<scene sceneID="hNz-n2-bh7">
<objects>
<viewController id="9pv-A4-QxB" customClass="TableViewController" customModule="ExampleApp" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="kbR-mD-icz"/>
<viewControllerLayoutGuide type="bottom" id="mO9-jy-qOO"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="tsR-hK-woN">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -62,12 +65,11 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="PQr-Ze-W5v" firstAttribute="bottom" secondItem="jcz-1b-EUS" secondAttribute="bottom" id="J02-b3-Cp1"/>
<constraint firstItem="jcz-1b-EUS" firstAttribute="leading" secondItem="PQr-Ze-W5v" secondAttribute="leading" id="KIO-nN-yaH"/>
<constraint firstItem="PQr-Ze-W5v" firstAttribute="trailing" secondItem="jcz-1b-EUS" secondAttribute="trailing" id="ZSx-3q-vCc"/>
<constraint firstItem="jcz-1b-EUS" firstAttribute="top" secondItem="PQr-Ze-W5v" secondAttribute="top" constant="15" id="uNe-uC-ecT"/>
<constraint firstItem="mO9-jy-qOO" firstAttribute="top" secondItem="jcz-1b-EUS" secondAttribute="bottom" id="J02-b3-Cp1"/>
<constraint firstItem="jcz-1b-EUS" firstAttribute="leading" secondItem="tsR-hK-woN" secondAttribute="leading" id="KIO-nN-yaH"/>
<constraint firstAttribute="trailing" secondItem="jcz-1b-EUS" secondAttribute="trailing" id="ZSx-3q-vCc"/>
<constraint firstItem="jcz-1b-EUS" firstAttribute="top" secondItem="kbR-mD-icz" secondAttribute="bottom" constant="15" id="uNe-uC-ecT"/>
</constraints>
<viewLayoutGuide key="safeArea" id="PQr-Ze-W5v"/>
</view>
<tabBarItem key="tabBarItem" title="First" image="first" id="acW-dT-cKf"/>
<connections>
Expand All @@ -82,6 +84,10 @@
<scene sceneID="wg7-f3-ORb">
<objects>
<viewController storyboardIdentifier="CollectionExampleController" id="8rJ-Kc-sve" customClass="CollectionExampleController" customModule="ExampleApp" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="Fbb-M9-AaG"/>
<viewControllerLayoutGuide type="bottom" id="BXn-AZ-XR2"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="QS5-Rx-YEW">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
Expand Down Expand Up @@ -162,12 +168,11 @@
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="sds-rC-oKn" firstAttribute="leading" secondItem="O1u-W8-tvY" secondAttribute="leading" id="1q2-z3-fBq"/>
<constraint firstItem="O1u-W8-tvY" firstAttribute="trailing" secondItem="sds-rC-oKn" secondAttribute="trailing" id="3CF-Xc-E7a"/>
<constraint firstItem="sds-rC-oKn" firstAttribute="top" secondItem="O1u-W8-tvY" secondAttribute="top" id="J7O-ar-xyS"/>
<constraint firstItem="O1u-W8-tvY" firstAttribute="bottom" secondItem="sds-rC-oKn" secondAttribute="bottom" id="qcp-vc-4u2"/>
<constraint firstItem="sds-rC-oKn" firstAttribute="leading" secondItem="QS5-Rx-YEW" secondAttribute="leading" id="1q2-z3-fBq"/>
<constraint firstAttribute="trailing" secondItem="sds-rC-oKn" secondAttribute="trailing" id="3CF-Xc-E7a"/>
<constraint firstItem="sds-rC-oKn" firstAttribute="top" secondItem="Fbb-M9-AaG" secondAttribute="bottom" id="J7O-ar-xyS"/>
<constraint firstItem="BXn-AZ-XR2" firstAttribute="top" secondItem="sds-rC-oKn" secondAttribute="bottom" id="qcp-vc-4u2"/>
</constraints>
<viewLayoutGuide key="safeArea" id="O1u-W8-tvY"/>
</view>
<tabBarItem key="tabBarItem" title="Second" image="second" id="cPa-gy-q4n"/>
<connections>
Expand Down
8 changes: 3 additions & 5 deletions ExampleApp/Collection Example/CollectionHeader.xib
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -17,7 +16,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ND8-PW-VcR">
<rect key="frame" x="166" y="23" width="42" height="21"/>
<rect key="frame" x="166.5" y="23" width="42" height="21"/>
<color key="backgroundColor" red="0.93753222479999998" green="1" blue="0.1451660632" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
Expand All @@ -30,7 +29,6 @@
<constraint firstItem="ND8-PW-VcR" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="zuB-2F-PZn"/>
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="label" destination="ND8-PW-VcR" id="dW5-PF-FOk"/>
</connections>
Expand Down
13 changes: 6 additions & 7 deletions ExampleApp/Table Example/Custom Footer/TableFooterExample.xib
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand All @@ -16,7 +16,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="3 WINNERS FOOTER" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EcM-2G-Fff">
<rect key="frame" x="15" y="14" width="345" height="21"/>
<rect key="frame" x="15" y="13.5" width="345" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
<nil key="highlightedColor"/>
Expand All @@ -25,12 +25,11 @@
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="EcM-2G-Fff" firstAttribute="centerY" secondItem="vEs-cy-DNe" secondAttribute="centerY" id="CeK-mW-AEa"/>
<constraint firstItem="BTY-Ub-l0q" firstAttribute="trailing" secondItem="EcM-2G-Fff" secondAttribute="trailing" constant="15" id="bfb-4j-NuL"/>
<constraint firstItem="EcM-2G-Fff" firstAttribute="leading" secondItem="BTY-Ub-l0q" secondAttribute="leading" constant="15" id="ji2-jC-ALH"/>
<constraint firstAttribute="trailing" secondItem="EcM-2G-Fff" secondAttribute="trailing" constant="15" id="bfb-4j-NuL"/>
<constraint firstItem="EcM-2G-Fff" firstAttribute="leading" secondItem="vEs-cy-DNe" secondAttribute="leading" constant="15" id="ji2-jC-ALH"/>
</constraints>
<nil key="simulatedTopBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="BTY-Ub-l0q"/>
<connections>
<outlet property="titleLabel" destination="EcM-2G-Fff" id="b52-bJ-ec2"/>
</connections>
Expand Down
14 changes: 6 additions & 8 deletions ExampleApp/Table Example/Custom Header/TableExampleHeaderView.xib
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14313.18" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14283.14"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
Expand Down Expand Up @@ -35,14 +34,13 @@
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="twB-F4-x3j" firstAttribute="bottom" secondItem="M0h-nF-WiP" secondAttribute="bottom" id="Yhz-LA-eoE"/>
<constraint firstItem="M0h-nF-WiP" firstAttribute="leading" secondItem="twB-F4-x3j" secondAttribute="leading" id="fgs-Sp-l5O"/>
<constraint firstItem="M0h-nF-WiP" firstAttribute="top" secondItem="twB-F4-x3j" secondAttribute="top" id="huM-3J-7Jj"/>
<constraint firstItem="twB-F4-x3j" firstAttribute="trailing" secondItem="M0h-nF-WiP" secondAttribute="trailing" id="t12-zW-yPx"/>
<constraint firstAttribute="bottom" secondItem="M0h-nF-WiP" secondAttribute="bottom" id="Yhz-LA-eoE"/>
<constraint firstItem="M0h-nF-WiP" firstAttribute="leading" secondItem="FNk-8Q-zsp" secondAttribute="leading" id="fgs-Sp-l5O"/>
<constraint firstItem="M0h-nF-WiP" firstAttribute="top" secondItem="FNk-8Q-zsp" secondAttribute="top" id="huM-3J-7Jj"/>
<constraint firstAttribute="trailing" secondItem="M0h-nF-WiP" secondAttribute="trailing" id="t12-zW-yPx"/>
</constraints>
<nil key="simulatedTopBarMetrics"/>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="twB-F4-x3j"/>
<connections>
<outlet property="titleLabel" destination="7pv-cE-ETM" id="Csf-wV-woQ"/>
</connections>
Expand Down
12 changes: 6 additions & 6 deletions FlowKit.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Configs/FlowKit.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = "com.FlowKit.FlowKit-iOS";
Expand All @@ -693,7 +693,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INFOPLIST_FILE = Configs/FlowKit.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = "com.FlowKit.FlowKit-iOS";
PRODUCT_NAME = FlowKit;
Expand Down Expand Up @@ -748,12 +748,12 @@
DEVELOPMENT_TEAM = E5DU3FA699;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ExampleApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flowkit.demoapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Debug;
Expand All @@ -775,12 +775,12 @@
DEVELOPMENT_TEAM = E5DU3FA699;
GCC_C_LANGUAGE_STANDARD = gnu11;
INFOPLIST_FILE = ExampleApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 11.3;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.flowkit.demoapp;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
SWIFT_VERSION = 4.0;
SWIFT_VERSION = 4.2;
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
Loading

0 comments on commit 36dd579

Please sign in to comment.