Skip to content

Commit

Permalink
adding iphone 6 and 6+ launch images, converting demo app to use stor…
Browse files Browse the repository at this point in the history
…yboard as entry point
  • Loading branch information
Tom Thorpe committed Sep 20, 2014
1 parent 12202a5 commit 76b892b
Show file tree
Hide file tree
Showing 15 changed files with 297 additions and 35 deletions.
26 changes: 26 additions & 0 deletions MainStoryboard.storyboard
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6245" systemVersion="13E28" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="C0e-6Q-Dhr">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6238"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="pw4-AJ-VzE">
<objects>
<viewController id="C0e-6Q-Dhr" customClass="TTViewController" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="6e2-Lz-v4Q"/>
<viewControllerLayoutGuide type="bottom" id="i5t-TG-rnY"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="fix-v3-jCg">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="s0g-3h-zxN" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="355" y="258"/>
</scene>
</scenes>
</document>
26 changes: 14 additions & 12 deletions UIScrollSlidingPages.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,15 @@
9F70249416DBF6650003B5FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9F70249216DBF6650003B5FA /* InfoPlist.strings */; };
9F70249616DBF6650003B5FA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F70249516DBF6650003B5FA /* main.m */; };
9F70249A16DBF6650003B5FA /* TTAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F70249916DBF6650003B5FA /* TTAppDelegate.m */; };
9F70249C16DBF6650003B5FA /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F70249B16DBF6650003B5FA /* Default.png */; };
9F70249E16DBF6650003B5FA /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F70249D16DBF6650003B5FA /* Default@2x.png */; };
9F7024A016DBF6650003B5FA /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9F70249F16DBF6650003B5FA /* Default-568h@2x.png */; };
9F7024C316DBF7080003B5FA /* TTUITableViewZoomController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F7024C216DBF7080003B5FA /* TTUITableViewZoomController.m */; };
9F7024C916DBF7E20003B5FA /* TabOneViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F7024C716DBF7E20003B5FA /* TabOneViewController.m */; };
9F7024CA16DBF7E20003B5FA /* TabOneViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F7024C816DBF7E20003B5FA /* TabOneViewController.xib */; };
9F7024CE16DBF7F80003B5FA /* TabTwoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F7024CC16DBF7F80003B5FA /* TabTwoViewController.m */; };
9F7024CF16DBF7F80003B5FA /* TabTwoViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F7024CD16DBF7F80003B5FA /* TabTwoViewController.xib */; };
9F7024D116DBFBE20003B5FA /* FancyCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F7024D016DBFBE20003B5FA /* FancyCellView.xib */; };
9F936B55170650EF001622D8 /* TTSlidingPageTitle.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F936B54170650EF001622D8 /* TTSlidingPageTitle.m */; };
9F98735719CDCF2E0067A379 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9F98735619CDCF2E0067A379 /* Images.xcassets */; };
9F98735919CDD4DA0067A379 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9F98735819CDD4DA0067A379 /* MainStoryboard.storyboard */; };
9F9B9B9B1703758A00CD45B4 /* TTViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9B9B991703758A00CD45B4 /* TTViewController.m */; };
9F9B9B9C1703758A00CD45B4 /* TTViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9F9B9B9A1703758A00CD45B4 /* TTViewController.xib */; };
9F9B9BA117037C0B00CD45B4 /* TTScrollSlidingPagesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9F9B9BA017037C0B00CD45B4 /* TTScrollSlidingPagesController.m */; };
Expand All @@ -53,9 +52,6 @@
9F70249716DBF6650003B5FA /* UIScrollSlidingPages-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIScrollSlidingPages-Prefix.pch"; sourceTree = "<group>"; };
9F70249816DBF6650003B5FA /* TTAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TTAppDelegate.h; sourceTree = "<group>"; };
9F70249916DBF6650003B5FA /* TTAppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TTAppDelegate.m; sourceTree = "<group>"; };
9F70249B16DBF6650003B5FA /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Demo/Default.png; sourceTree = "<group>"; };
9F70249D16DBF6650003B5FA /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Demo/Default@2x.png"; sourceTree = "<group>"; };
9F70249F16DBF6650003B5FA /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "Demo/Default-568h@2x.png"; sourceTree = "<group>"; };
9F7024C116DBF7080003B5FA /* TTUITableViewZoomController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTUITableViewZoomController.h; sourceTree = "<group>"; };
9F7024C216DBF7080003B5FA /* TTUITableViewZoomController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTUITableViewZoomController.m; sourceTree = "<group>"; };
9F7024C616DBF7E20003B5FA /* TabOneViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TabOneViewController.h; sourceTree = "<group>"; };
Expand All @@ -67,6 +63,8 @@
9F7024D016DBFBE20003B5FA /* FancyCellView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FancyCellView.xib; sourceTree = "<group>"; };
9F936B53170650EF001622D8 /* TTSlidingPageTitle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTSlidingPageTitle.h; sourceTree = "<group>"; };
9F936B54170650EF001622D8 /* TTSlidingPageTitle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTSlidingPageTitle.m; sourceTree = "<group>"; };
9F98735619CDCF2E0067A379 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = ../UIScrollSlidingPages/Images.xcassets; sourceTree = "<group>"; };
9F98735819CDD4DA0067A379 /* MainStoryboard.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = MainStoryboard.storyboard; path = ../../MainStoryboard.storyboard; sourceTree = "<group>"; };
9F9B9B981703758A00CD45B4 /* TTViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TTViewController.h; sourceTree = "<group>"; };
9F9B9B991703758A00CD45B4 /* TTViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TTViewController.m; sourceTree = "<group>"; };
9F9B9B9A1703758A00CD45B4 /* TTViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TTViewController.xib; sourceTree = "<group>"; };
Expand Down Expand Up @@ -159,13 +157,11 @@
9F70249016DBF6650003B5FA /* Supporting Files */ = {
isa = PBXGroup;
children = (
9F98735619CDCF2E0067A379 /* Images.xcassets */,
9F70249116DBF6650003B5FA /* UIScrollSlidingPages-Info.plist */,
9F70249216DBF6650003B5FA /* InfoPlist.strings */,
9F70249516DBF6650003B5FA /* main.m */,
9F70249716DBF6650003B5FA /* UIScrollSlidingPages-Prefix.pch */,
9F70249B16DBF6650003B5FA /* Default.png */,
9F70249D16DBF6650003B5FA /* Default@2x.png */,
9F70249F16DBF6650003B5FA /* Default-568h@2x.png */,
);
name = "Supporting Files";
path = ..;
Expand Down Expand Up @@ -200,6 +196,7 @@
9F9B9B9A1703758A00CD45B4 /* TTViewController.xib */,
9F7024C516DBF7AA0003B5FA /* TableViews */,
9F70249016DBF6650003B5FA /* Supporting Files */,
9F98735819CDD4DA0067A379 /* MainStoryboard.storyboard */,
9F70249816DBF6650003B5FA /* TTAppDelegate.h */,
9F70249916DBF6650003B5FA /* TTAppDelegate.m */,
);
Expand Down Expand Up @@ -282,9 +279,8 @@
buildActionMask = 2147483647;
files = (
9F70249416DBF6650003B5FA /* InfoPlist.strings in Resources */,
9F70249C16DBF6650003B5FA /* Default.png in Resources */,
9F70249E16DBF6650003B5FA /* Default@2x.png in Resources */,
9F7024A016DBF6650003B5FA /* Default-568h@2x.png in Resources */,
9F98735919CDD4DA0067A379 /* MainStoryboard.storyboard in Resources */,
9F98735719CDCF2E0067A379 /* Images.xcassets in Resources */,
9F7024CA16DBF7E20003B5FA /* TabOneViewController.xib in Resources */,
9F7024CF16DBF7F80003B5FA /* TabTwoViewController.xib in Resources */,
9F7024D116DBFBE20003B5FA /* FancyCellView.xib in Resources */,
Expand Down Expand Up @@ -393,21 +389,27 @@
9F7024BE16DBF6650003B5FA /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "UIScrollViewSlidingPages/UIScrollSlidingPages-Prefix.pch";
INFOPLIST_FILE = "UIScrollViewSlidingPages/UIScrollSlidingPages-Info.plist";
PRODUCT_NAME = UIScrollSlidingPages;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Debug;
};
9F7024BF16DBF6650003B5FA /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "UIScrollViewSlidingPages/UIScrollSlidingPages-Prefix.pch";
INFOPLIST_FILE = "UIScrollViewSlidingPages/UIScrollSlidingPages-Info.plist";
PRODUCT_NAME = UIScrollSlidingPages;
TARGETED_DEVICE_FAMILY = "1,2";
WRAPPER_EXTENSION = app;
};
name = Release;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
{
"images" : [
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "57x57",
"scale" : "1x"
},
{
"idiom" : "iphone",
"size" : "57x57",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "2x"
},
{
"idiom" : "iphone",
"size" : "60x60",
"scale" : "3x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "29x29",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "40x40",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "50x50",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "72x72",
"scale" : "2x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "1x"
},
{
"idiom" : "ipad",
"size" : "76x76",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
{
"images" : [
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "736h",
"filename" : "Default55.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "3x"
},
{
"orientation" : "landscape",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "8.0",
"subtype" : "736h",
"scale" : "3x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "667h",
"filename" : "Default47.png",
"minimum-system-version" : "8.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"filename" : "Default@2x-1.png",
"scale" : "2x"
},
{
"extent" : "full-screen",
"idiom" : "iphone",
"subtype" : "retina4",
"filename" : "Default-568h@2x-1.png",
"minimum-system-version" : "7.0",
"orientation" : "portrait",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"minimum-system-version" : "7.0",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"filename" : "Default.png",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"filename" : "Default@2x.png",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "iphone",
"extent" : "full-screen",
"filename" : "Default-568h@2x.png",
"subtype" : "retina4",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "1x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "1x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "portrait",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "to-status-bar",
"scale" : "2x"
},
{
"orientation" : "landscape",
"idiom" : "ipad",
"extent" : "full-screen",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
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.
8 changes: 0 additions & 8 deletions UIScrollViewSlidingPages/Demo/TTAppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ @implementation TTAppDelegate

- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
{
self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
// Override point for customization after application launch.
UIViewController *mainViewController;

mainViewController = [[TTViewController alloc] init];

self.window.rootViewController = mainViewController;
[self.window makeKeyAndVisible];
return YES;
}

Expand Down
Loading

0 comments on commit 76b892b

Please sign in to comment.