Skip to content

Commit

Permalink
project: iOS 9.0 compatibilty + logo replacement
Browse files Browse the repository at this point in the history
This commit:
- sets the deployement target to iOS 9.0
- modify the texts and logo of the "About" page
- embed RxFlow framework into RxFlowDemo
  • Loading branch information
twittemb committed Jan 4, 2018
1 parent 30bf78e commit 334c916
Show file tree
Hide file tree
Showing 29 changed files with 50 additions and 27 deletions.
4 changes: 2 additions & 2 deletions RxFlow/RxFlow.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@
);
INFOPLIST_FILE = RxFlow/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down Expand Up @@ -522,7 +522,7 @@
);
INFOPLIST_FILE = RxFlow/Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlow;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
Expand Down
24 changes: 22 additions & 2 deletions RxFlowDemo/RxFlowDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
1A7217901FFDAB4600163FA1 /* RxFlow.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A72178F1FFDAB4600163FA1 /* RxFlow.framework */; };
1A7217911FFDAB4600163FA1 /* RxFlow.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1A72178F1FFDAB4600163FA1 /* RxFlow.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
1A8FBE101FF845EE00389464 /* Reusable.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0D1FF845EE00389464 /* Reusable.framework */; };
1A8FBE111FF845EE00389464 /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0E1FF845EE00389464 /* RxSwift.framework */; };
1A8FBE121FF845EE00389464 /* RxCocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */; };
Expand Down Expand Up @@ -50,7 +52,22 @@
1AF854BD1FF832AE00271B52 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 1AF854BB1FF832AE00271B52 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXCopyFilesBuildPhase section */
1A7217921FFDAB4600163FA1 /* Embed Frameworks */ = {
isa = PBXCopyFilesBuildPhase;
buildActionMask = 2147483647;
dstPath = "";
dstSubfolderSpec = 10;
files = (
1A7217911FFDAB4600163FA1 /* RxFlow.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
1A72178F1FFDAB4600163FA1 /* RxFlow.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = RxFlow.framework; sourceTree = BUILT_PRODUCTS_DIR; };
1A8FBE0D1FF845EE00389464 /* Reusable.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Reusable.framework; path = Carthage/Build/iOS/Reusable.framework; sourceTree = "<group>"; };
1A8FBE0E1FF845EE00389464 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxSwift.framework; path = Carthage/Build/iOS/RxSwift.framework; sourceTree = "<group>"; };
1A8FBE0F1FF845EE00389464 /* RxCocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = RxCocoa.framework; path = Carthage/Build/iOS/RxCocoa.framework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -103,6 +120,7 @@
files = (
1A8FBE101FF845EE00389464 /* Reusable.framework in Frameworks */,
1A8FBE111FF845EE00389464 /* RxSwift.framework in Frameworks */,
1A7217901FFDAB4600163FA1 /* RxFlow.framework in Frameworks */,
1A8FBE121FF845EE00389464 /* RxCocoa.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -241,6 +259,7 @@
1AF854A61FF832AE00271B52 = {
isa = PBXGroup;
children = (
1A72178F1FFDAB4600163FA1 /* RxFlow.framework */,
1AF854B11FF832AE00271B52 /* RxFlowDemo */,
1AF854B01FF832AE00271B52 /* Products */,
1A8FBE0C1FF845EE00389464 /* Frameworks */,
Expand Down Expand Up @@ -283,6 +302,7 @@
1AF854AB1FF832AE00271B52 /* Sources */,
1AF854AC1FF832AE00271B52 /* Frameworks */,
1AF854AD1FF832AE00271B52 /* Resources */,
1A7217921FFDAB4600163FA1 /* Embed Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -552,7 +572,7 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = RxFlowDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -572,7 +592,7 @@
"$(PROJECT_DIR)/Carthage/Build/iOS",
);
INFOPLIST_FILE = RxFlowDemo/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.warpfactor.RxFlowDemo;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "NO">
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
Expand Down
Empty file.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"images" : [
{
"idiom" : "universal",
"filename" : "weavy_logo.png",
"filename" : "RxFlow_logo_small.png",
"scale" : "1x"
},
{
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,51 +1,54 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ZpY-pk-hEw">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="ZpY-pk-hEw">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--Settings About View Controller-->
<scene sceneID="35H-hz-Gvf">
<objects>
<viewController id="ZpY-pk-hEw" customClass="SettingsAboutViewController" customModule="WeavyDemo" customModuleProvider="target" sceneMemberID="viewController">
<viewController id="ZpY-pk-hEw" customClass="SettingsAboutViewController" customModule="RxFlowDemo" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="ed2-hv-zBh">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="weavy_logo" translatesAutoresizingMaskIntoConstraints="NO" id="Jz3-1y-fjv">
<rect key="frame" x="0.0" y="0.0" width="375" height="200"/>
<constraints>
<constraint firstAttribute="height" constant="200" id="p5G-4i-5hc"/>
</constraints>
</imageView>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="Q8Z-zM-AHU">
<rect key="frame" x="8" y="208" width="359" height="459"/>
<rect key="frame" x="16" y="269" width="343" height="150"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<string key="text">This is an example application to show the possibilities of Weavy.
<constraints>
<constraint firstAttribute="height" constant="150" id="7mD-uN-5hf"/>
</constraints>
<string key="text">This is an example application to show the possibilities of RxFlow.

Weavy is a navigation framework based on a weaving concept. Feel free to contribute:
RxFlow is a navigation framework based on a Reactive Flow Coordinator concept. Feel free to contribute:

https://github.com/twittemb/Weavy</string>
https://github.com/RxSwiftCommunity/RxFlow</string>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
<dataDetectorType key="dataDetectorTypes" link="YES"/>
</textView>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="RxFlow_logo_small" translatesAutoresizingMaskIntoConstraints="NO" id="Jz3-1y-fjv">
<rect key="frame" x="0.0" y="161" width="375" height="100"/>
<constraints>
<constraint firstAttribute="height" constant="100" id="M9o-I8-9Au"/>
</constraints>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="top" secondItem="Jz3-1y-fjv" secondAttribute="bottom" constant="8" symbolic="YES" id="0Sc-cb-bdd"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="leading" secondItem="Jz3-1y-fjv" secondAttribute="leading" constant="8" id="1C1-ai-RgN"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="bottom" secondItem="PsQ-6u-iLj" secondAttribute="bottom" id="K6i-xe-bpV"/>
<constraint firstAttribute="trailing" secondItem="Jz3-1y-fjv" secondAttribute="trailing" id="WT2-9L-Khg"/>
<constraint firstItem="Jz3-1y-fjv" firstAttribute="leading" secondItem="ed2-hv-zBh" secondAttribute="leading" id="Zgq-uU-7ON"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="trailing" secondItem="Jz3-1y-fjv" secondAttribute="trailing" constant="-8" id="b7n-LF-GAc"/>
<constraint firstItem="PsQ-6u-iLj" firstAttribute="top" secondItem="Jz3-1y-fjv" secondAttribute="top" constant="20" id="mMs-R9-4pf"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="leading" secondItem="PsQ-6u-iLj" secondAttribute="leading" constant="16" id="Q6E-gy-tP5"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="centerX" secondItem="PsQ-6u-iLj" secondAttribute="centerX" id="SOh-Tx-HCv"/>
<constraint firstItem="Jz3-1y-fjv" firstAttribute="leading" secondItem="ed2-hv-zBh" secondAttribute="leading" id="mVa-Dt-q38"/>
<constraint firstItem="PsQ-6u-iLj" firstAttribute="trailing" secondItem="Q8Z-zM-AHU" secondAttribute="trailing" constant="16" id="nQO-Of-03f"/>
<constraint firstItem="Jz3-1y-fjv" firstAttribute="centerX" secondItem="Q8Z-zM-AHU" secondAttribute="centerX" id="oil-du-Ami"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="centerY" secondItem="PsQ-6u-iLj" secondAttribute="centerY" id="x03-3a-rkj"/>
<constraint firstItem="Q8Z-zM-AHU" firstAttribute="top" secondItem="Jz3-1y-fjv" secondAttribute="bottom" constant="8" symbolic="YES" id="yTG-Om-KzE"/>
</constraints>
<viewLayoutGuide key="safeArea" id="PsQ-6u-iLj"/>
</view>
Expand All @@ -56,6 +59,6 @@ https://github.com/twittemb/Weavy</string>
</scene>
</scenes>
<resources>
<image name="weavy_logo" width="180" height="180"/>
<image name="RxFlow_logo_small" width="512" height="226"/>
</resources>
</document>

0 comments on commit 334c916

Please sign in to comment.