diff --git a/ThatPhoto.xcodeproj/project.pbxproj b/ThatPhoto.xcodeproj/project.pbxproj index ac88ed4..af15286 100644 --- a/ThatPhoto.xcodeproj/project.pbxproj +++ b/ThatPhoto.xcodeproj/project.pbxproj @@ -81,6 +81,22 @@ 06CD773B16B093260040A783 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06CD773A16B093250040A783 /* CoreText.framework */; }; 06CD773D16B0932D0040A783 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06CD773C16B0932D0040A783 /* OpenGLES.framework */; }; 06CD78D316B30A150040A783 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 06CD78D216B30A150040A783 /* SystemConfiguration.framework */; }; + 9ACF2C351809C3D2009F9AE9 /* INKWelcomeViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C341809C3D2009F9AE9 /* INKWelcomeViewController_iPhone.xib */; }; + 9ACF2C421809CD71009F9AE9 /* WelcomeThatPhoto_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C361809CD71009F9AE9 /* WelcomeThatPhoto_iPhone@2x.png */; }; + 9ACF2C431809CD71009F9AE9 /* WelcomeThatPhoto_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C371809CD71009F9AE9 /* WelcomeThatPhoto_iPhone.png */; }; + 9ACF2C441809CD71009F9AE9 /* WelcomeThatPDF_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C381809CD71009F9AE9 /* WelcomeThatPDF_iPhone@2x.png */; }; + 9ACF2C451809CD71009F9AE9 /* WelcomeThatPDF_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C391809CD71009F9AE9 /* WelcomeThatPDF_iPhone.png */; }; + 9ACF2C461809CD71009F9AE9 /* WelcomeThatInbox_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3A1809CD71009F9AE9 /* WelcomeThatInbox_iPhone@2x.png */; }; + 9ACF2C471809CD71009F9AE9 /* WelcomeThatInbox_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3B1809CD71009F9AE9 /* WelcomeThatInbox_iPhone.png */; }; + 9ACF2C481809CD71009F9AE9 /* WelcomeThatCloud_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3C1809CD71009F9AE9 /* WelcomeThatCloud_iPhone@2x.png */; }; + 9ACF2C491809CD71009F9AE9 /* WelcomeThatCloud_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3D1809CD71009F9AE9 /* WelcomeThatCloud_iPhone.png */; }; + 9ACF2C4A1809CD71009F9AE9 /* OnboardStep3_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3E1809CD71009F9AE9 /* OnboardStep3_iPhone@2x.png */; }; + 9ACF2C4B1809CD71009F9AE9 /* OnboardStep3_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C3F1809CD71009F9AE9 /* OnboardStep3_iPhone.png */; }; + 9ACF2C4C1809CD71009F9AE9 /* OnboardStep2_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C401809CD71009F9AE9 /* OnboardStep2_iPhone@2x.png */; }; + 9ACF2C4D1809CD71009F9AE9 /* OnboardStep2_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C411809CD71009F9AE9 /* OnboardStep2_iPhone.png */; }; + 9ACF2C501809CF38009F9AE9 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C4E1809CF38009F9AE9 /* Default-568h@2x.png */; }; + 9ACF2C511809CF38009F9AE9 /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C4F1809CF38009F9AE9 /* Default-568h.png */; }; + 9ACF2C531809D0D4009F9AE9 /* TPMainViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9ACF2C521809D0D4009F9AE9 /* TPMainViewController_iPhone.xib */; }; EA24661317D9A8D8009A4619 /* StandaloneStatsEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = EA24661217D9A8D8009A4619 /* StandaloneStatsEmitter.m */; }; EAE28E7817B4D4FF00B7F505 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAE28E7717B4D4FF00B7F505 /* CoreTelephony.framework */; }; /* End PBXBuildFile section */ @@ -198,6 +214,22 @@ 06CD773A16B093250040A783 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; }; 06CD773C16B0932D0040A783 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; 06CD78D216B30A150040A783 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + 9ACF2C341809C3D2009F9AE9 /* INKWelcomeViewController_iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = INKWelcomeViewController_iPhone.xib; sourceTree = ""; }; + 9ACF2C361809CD71009F9AE9 /* WelcomeThatPhoto_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatPhoto_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C371809CD71009F9AE9 /* WelcomeThatPhoto_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatPhoto_iPhone.png; sourceTree = ""; }; + 9ACF2C381809CD71009F9AE9 /* WelcomeThatPDF_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatPDF_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C391809CD71009F9AE9 /* WelcomeThatPDF_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatPDF_iPhone.png; sourceTree = ""; }; + 9ACF2C3A1809CD71009F9AE9 /* WelcomeThatInbox_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatInbox_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C3B1809CD71009F9AE9 /* WelcomeThatInbox_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatInbox_iPhone.png; sourceTree = ""; }; + 9ACF2C3C1809CD71009F9AE9 /* WelcomeThatCloud_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatCloud_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C3D1809CD71009F9AE9 /* WelcomeThatCloud_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatCloud_iPhone.png; sourceTree = ""; }; + 9ACF2C3E1809CD71009F9AE9 /* OnboardStep3_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "OnboardStep3_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C3F1809CD71009F9AE9 /* OnboardStep3_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = OnboardStep3_iPhone.png; sourceTree = ""; }; + 9ACF2C401809CD71009F9AE9 /* OnboardStep2_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "OnboardStep2_iPhone@2x.png"; sourceTree = ""; }; + 9ACF2C411809CD71009F9AE9 /* OnboardStep2_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = OnboardStep2_iPhone.png; sourceTree = ""; }; + 9ACF2C4E1809CF38009F9AE9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 9ACF2C4F1809CF38009F9AE9 /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = ""; }; + 9ACF2C521809D0D4009F9AE9 /* TPMainViewController_iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TPMainViewController_iPhone.xib; sourceTree = ""; }; EA2465D717D7E4DF009A4619 /* StandaloneStatsEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandaloneStatsEmitter.h; sourceTree = ""; }; EA24661217D9A8D8009A4619 /* StandaloneStatsEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StandaloneStatsEmitter.m; sourceTree = ""; }; EAE28E7717B4D4FF00B7F505 /* CoreTelephony.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreTelephony.framework; path = System/Library/Frameworks/CoreTelephony.framework; sourceTree = SDKROOT; }; @@ -259,6 +291,7 @@ 027AB24817B9DF3E007171B1 /* TPMainViewController.h */, 027AB24917B9DF3E007171B1 /* TPMainViewController.m */, 027AB24A17B9DF3E007171B1 /* TPMainViewController_iPad.xib */, + 9ACF2C521809D0D4009F9AE9 /* TPMainViewController_iPhone.xib */, 027AB24C17B9DF3E007171B1 /* Resources */, 027AB26E17B9DF3E007171B1 /* ThatPhoto-Info.plist */, 027AB26F17B9DF3E007171B1 /* ThatPhoto-Prefix.pch */, @@ -335,6 +368,7 @@ 027AB29517B9DF60007171B1 /* INKWelcomeViewController.h */, 027AB29617B9DF60007171B1 /* INKWelcomeViewController.m */, 027AB29717B9DF60007171B1 /* INKWelcomeViewController.xib */, + 9ACF2C341809C3D2009F9AE9 /* INKWelcomeViewController_iPhone.xib */, 027AB29817B9DF60007171B1 /* PagedScrollView.h */, 027AB29917B9DF60007171B1 /* PagedScrollView.m */, 027AB29A17B9DF60007171B1 /* Resources */, @@ -345,6 +379,18 @@ 027AB29A17B9DF60007171B1 /* Resources */ = { isa = PBXGroup; children = ( + 9ACF2C361809CD71009F9AE9 /* WelcomeThatPhoto_iPhone@2x.png */, + 9ACF2C371809CD71009F9AE9 /* WelcomeThatPhoto_iPhone.png */, + 9ACF2C381809CD71009F9AE9 /* WelcomeThatPDF_iPhone@2x.png */, + 9ACF2C391809CD71009F9AE9 /* WelcomeThatPDF_iPhone.png */, + 9ACF2C3A1809CD71009F9AE9 /* WelcomeThatInbox_iPhone@2x.png */, + 9ACF2C3B1809CD71009F9AE9 /* WelcomeThatInbox_iPhone.png */, + 9ACF2C3C1809CD71009F9AE9 /* WelcomeThatCloud_iPhone@2x.png */, + 9ACF2C3D1809CD71009F9AE9 /* WelcomeThatCloud_iPhone.png */, + 9ACF2C3E1809CD71009F9AE9 /* OnboardStep3_iPhone@2x.png */, + 9ACF2C3F1809CD71009F9AE9 /* OnboardStep3_iPhone.png */, + 9ACF2C401809CD71009F9AE9 /* OnboardStep2_iPhone@2x.png */, + 9ACF2C411809CD71009F9AE9 /* OnboardStep2_iPhone.png */, 027AB29B17B9DF60007171B1 /* OnboardStep2.png */, 027AB29C17B9DF60007171B1 /* OnboardStep2@2x.png */, 027AB29D17B9DF60007171B1 /* OnboardStep3.png */, @@ -364,6 +410,8 @@ 02E96E3517C56C5400969697 /* AppLaunchScreens */ = { isa = PBXGroup; children = ( + 9ACF2C4E1809CF38009F9AE9 /* Default-568h@2x.png */, + 9ACF2C4F1809CF38009F9AE9 /* Default-568h.png */, 02E96E3617C56C5400969697 /* Default-Landscape@2x~ipad.png */, 02E96E3717C56C5400969697 /* Default-Landscape~ipad.png */, 02E96E3817C56C5400969697 /* Default.png */, @@ -553,19 +601,28 @@ 027AB23D17B9DEEA007171B1 /* ATConnect.h in Resources */, 027AB24017B9DF12007171B1 /* INK.bundle in Resources */, 027AB27017B9DF3E007171B1 /* InfoPlist.strings in Resources */, + 9ACF2C421809CD71009F9AE9 /* WelcomeThatPhoto_iPhone@2x.png in Resources */, + 9ACF2C4A1809CD71009F9AE9 /* OnboardStep3_iPhone@2x.png in Resources */, 027AB27417B9DF3E007171B1 /* TPMainViewController_iPad.xib in Resources */, 027AB27617B9DF3E007171B1 /* background.png in Resources */, + 9ACF2C4D1809CD71009F9AE9 /* OnboardStep2_iPhone.png in Resources */, 027AB27717B9DF3E007171B1 /* background@2X.png in Resources */, 027AB27917B9DF3E007171B1 /* blue_button.png in Resources */, 027AB27A17B9DF3E007171B1 /* blue_button@2x.png in Resources */, 027AB27B17B9DF3E007171B1 /* blue_button_pressed.png in Resources */, 027AB27C17B9DF3E007171B1 /* blue_button_pressed@2x.png in Resources */, 027AB27D17B9DF3E007171B1 /* dark_button.png in Resources */, + 9ACF2C351809C3D2009F9AE9 /* INKWelcomeViewController_iPhone.xib in Resources */, 027AB27E17B9DF3E007171B1 /* dark_button@2x.png in Resources */, + 9ACF2C4C1809CD71009F9AE9 /* OnboardStep2_iPhone@2x.png in Resources */, 027AB27F17B9DF3E007171B1 /* dark_button_pressed.png in Resources */, + 9ACF2C431809CD71009F9AE9 /* WelcomeThatPhoto_iPhone.png in Resources */, 027AB28017B9DF3E007171B1 /* dark_button_pressed@2x.png in Resources */, 027AB28617B9DF3E007171B1 /* Dot.png in Resources */, + 9ACF2C491809CD71009F9AE9 /* WelcomeThatCloud_iPhone.png in Resources */, + 9ACF2C4B1809CD71009F9AE9 /* OnboardStep3_iPhone.png in Resources */, 027AB28717B9DF3E007171B1 /* EditIcon.png in Resources */, + 9ACF2C451809CD71009F9AE9 /* WelcomeThatPDF_iPhone.png in Resources */, 027AB28817B9DF3E007171B1 /* icon.ai in Resources */, 027AB28917B9DF3E007171B1 /* icon1024.png in Resources */, 027AB28A17B9DF3E007171B1 /* icon114.png in Resources */, @@ -573,8 +630,12 @@ 027AB28C17B9DF3E007171B1 /* icon512.png in Resources */, 027AB28D17B9DF3E007171B1 /* icon57.png in Resources */, 027AB28E17B9DF3E007171B1 /* icon72.png in Resources */, + 9ACF2C511809CF38009F9AE9 /* Default-568h.png in Resources */, 027AB28F17B9DF3E007171B1 /* splash.png in Resources */, 027AB29017B9DF3E007171B1 /* splash@2x.png in Resources */, + 9ACF2C531809D0D4009F9AE9 /* TPMainViewController_iPhone.xib in Resources */, + 9ACF2C461809CD71009F9AE9 /* WelcomeThatInbox_iPhone@2x.png in Resources */, + 9ACF2C471809CD71009F9AE9 /* WelcomeThatInbox_iPhone.png in Resources */, 027AB29117B9DF3E007171B1 /* splash~ipad.png in Resources */, 027AB29217B9DF3E007171B1 /* splash~ipad@2x.png in Resources */, 027AB2A817B9DF60007171B1 /* INKWelcomeViewController.xib in Resources */, @@ -586,9 +647,12 @@ 027AB2AF17B9DF60007171B1 /* WelcomeThatCloud@2x.png in Resources */, 027AB2B017B9DF60007171B1 /* WelcomeThatInbox.png in Resources */, 027AB2B117B9DF60007171B1 /* WelcomeThatInbox@2x.png in Resources */, + 9ACF2C481809CD71009F9AE9 /* WelcomeThatCloud_iPhone@2x.png in Resources */, 027AB2B217B9DF60007171B1 /* WelcomeThatPDF.png in Resources */, 027AB2B317B9DF60007171B1 /* WelcomeThatPDF@2x.png in Resources */, + 9ACF2C441809CD71009F9AE9 /* WelcomeThatPDF_iPhone@2x.png in Resources */, 027AB2B417B9DF60007171B1 /* WelcomeThatPhoto.png in Resources */, + 9ACF2C501809CF38009F9AE9 /* Default-568h@2x.png in Resources */, 027AB2B517B9DF60007171B1 /* WelcomeThatPhoto@2x.png in Resources */, 027DE59317B9DFD100BCA4FE /* ApptentiveResources.bundle in Resources */, 02E96E3A17C56C5400969697 /* Default-Landscape@2x~ipad.png in Resources */, @@ -701,6 +765,8 @@ 06CD769D16B047030040A783 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Vendor\"", @@ -718,7 +784,8 @@ "-Objc", ); PRODUCT_NAME = ThatPhoto; - TARGETED_DEVICE_FAMILY = 2; + PROVISIONING_PROFILE = ""; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -726,8 +793,8 @@ 06CD769E16B047030040A783 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/Vendor\"", @@ -747,7 +814,7 @@ PRODUCT_NAME = ThatPhoto; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - TARGETED_DEVICE_FAMILY = 2; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/ThatPhoto/Resources/AppLaunchScreens/Default-568h.png b/ThatPhoto/Resources/AppLaunchScreens/Default-568h.png new file mode 100644 index 0000000..16e05be Binary files /dev/null and b/ThatPhoto/Resources/AppLaunchScreens/Default-568h.png differ diff --git a/ThatPhoto/Resources/AppLaunchScreens/Default-568h@2x.png b/ThatPhoto/Resources/AppLaunchScreens/Default-568h@2x.png new file mode 100644 index 0000000..89385de Binary files /dev/null and b/ThatPhoto/Resources/AppLaunchScreens/Default-568h@2x.png differ diff --git a/ThatPhoto/TPMainViewController.h b/ThatPhoto/TPMainViewController.h index c7f008b..5fbea50 100644 --- a/ThatPhoto/TPMainViewController.h +++ b/ThatPhoto/TPMainViewController.h @@ -17,7 +17,7 @@ @property (strong, nonatomic) IBOutlet UIButton *inkButton; @property (nonatomic, retain) IBOutlet iCarousel *carousel; @property (strong, nonatomic) IBOutlet UILabel *albumName; -@property (strong, nonatomic) UISlider *albumSlider; +@property (strong, nonatomic) IBOutlet UISlider *albumSlider; @property (atomic, strong) NSArray *albums; diff --git a/ThatPhoto/TPMainViewController.m b/ThatPhoto/TPMainViewController.m index 2071957..92249e6 100644 --- a/ThatPhoto/TPMainViewController.m +++ b/ThatPhoto/TPMainViewController.m @@ -88,7 +88,7 @@ - (void) viewDidAppear:(BOOL)animated { //Once the app is all ready to go, run the welcome flow if ([INKWelcomeViewController shouldRunWelcomeFlow]) { - INKWelcomeViewController *welcomeViewController = [[INKWelcomeViewController alloc] initWithNibName:@"INKWelcomeViewController" bundle:nil]; + INKWelcomeViewController *welcomeViewController = [[INKWelcomeViewController alloc] initWithNibName:DEVICE_SPECIFIC_NIB2(INKWelcomeViewController) bundle:nil]; [self presentViewController:welcomeViewController animated:NO completion:^{}]; } [[StandaloneStatsEmitter sharedEmitter] setAppKey:@"AjTXjeBephotoqTdTUPz"]; diff --git a/ThatPhoto/TPMainViewController_iPad.xib b/ThatPhoto/TPMainViewController_iPad.xib index 13537a6..dc7b279 100644 --- a/ThatPhoto/TPMainViewController_iPad.xib +++ b/ThatPhoto/TPMainViewController_iPad.xib @@ -1,507 +1,104 @@ - - - - 1280 - 12E55 - 3084 - 1187.39 - 626.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 - - - IBProxyObject - IBUIButton - IBUILabel - IBUISlider - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBIPadFramework - - - IBFirstResponder - IBIPadFramework - - - - 274 - - - - 292 - {{100, 100}, {120, 120}} - - - - _NS:9 - NO - IBIPadFramework - 0 - 0 - YES - - 3 - MQA - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 3 - MC41AA - - - NSImage - EditIcon.png - - - 2 - 15 - - - Helvetica-Bold - 15 - 16 - - - - - 289 - {{548, 100}, {120, 120}} - - - - _NS:9 - IBIPadFramework - 0 - 0 - YES - YES - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - 1 - MCAwLjM0ODM3MzgwNDkgMC45OTQ5MjcwNDg3AA - - - - NSImage - Dot.png - - - - - - - 269 - {{284, 858}, {200, 38}} - - - - _NS:9 - NO - YES - 7 - NO - IBIPadFramework - Camera Roll - - 2 - MC45OTYwNzg0OTEyIDAuOTkyMTU2OTIyOCAwLjk5MjE1NjkyMjgAA - - - 0 - 1 - - HelveticaNeue-Light - Helvetica Neue - 0 - 30 - - - HelveticaNeue-Medium - 30 - 16 - - NO - - - - 269 - {{304, 904}, {161, 23}} - - - _NS:9 - NO - IBIPadFramework - 0 - 0 - - 3 - MC4zMzMzMzMzMzMzAA - - - - 1 - MCAwLjQ5MTUyNTIxMTcgMC45OTQ5MjcwNDg3AA - - - - - 282 - - {{0, 395}, {768, 489}} - - - - _NS:9 - - 3 - MCAwAA - - IBIPadFramework - - - - 265 - {{637, 924}, {111, 61}} - - - _NS:9 - NO - IBIPadFramework - 0 - 0 - Feedback - - - - - 1 - 20 - - - Helvetica - 20 - 16 - - - - {{0, 20}, {768, 1004}} - - - - - - 2 - - IBIPadFramework - - - - - - - view - - - - 41 - - - - carousel - - - - 47 - - - - inkButton - - - - 50 - - - - editButton - - - - 51 - - - - albumName - - - - 57 - - - - albumSlider - - - - 62 - - - - delegate - - - - 52 - - - - dataSource - - - - 53 - - - - launchEditorForCurrentPhoto: - - - 7 - - 64 - - - - launchInkForCurrentPhoto: - - - 7 - - 63 - - - - scrollAlbums: - - - 13 - - 61 - - - - feedbackButtonPressed: - - - 7 - - 67 - - - - - - 0 - - - - - - 1 - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 46 - - - - iCarousel - - - 48 - - - Edit Button - - - 49 - - - Ink Button - - - 55 - - - AlbumName - - - 60 - - - Album Slider - - - 65 - - - - - - - TPMainViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - iCarousel - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 67 - - - - - TPMainViewController - UIViewController - - id - id - id - id - - - - feedbackButtonPressed: - id - - - launchEditorForCurrentPhoto: - id - - - launchInkForCurrentPhoto: - id - - - scrollAlbums: - id - - - - UILabel - iCarousel - UIButton - UIButton - - - - albumName - UILabel - - - carousel - iCarousel - - - editButton - UIButton - - - inkButton - UIButton - - - - IBProjectSource - ./Classes/TPMainViewController.h - - - - iCarousel - UIView - - id - id - - - - dataSource - id - - - delegate - id - - - - IBProjectSource - ./Classes/iCarousel.h - - - - - 0 - IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - YES - 3 - - {648, 648} - {512, 512} - - 2083 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ThatPhoto/TPMainViewController_iPhone.xib b/ThatPhoto/TPMainViewController_iPhone.xib new file mode 100644 index 0000000..20baedc --- /dev/null +++ b/ThatPhoto/TPMainViewController_iPhone.xib @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ThatPhoto/ThatPhoto-Prefix.pch b/ThatPhoto/ThatPhoto-Prefix.pch index 8a9aada..e11b4e3 100644 --- a/ThatPhoto/ThatPhoto-Prefix.pch +++ b/ThatPhoto/ThatPhoto-Prefix.pch @@ -11,4 +11,7 @@ #ifdef __OBJC__ #import #import + #define DEVICE_IS_IPAD (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) + #define DEVICE_SPECIFIC_NIB(nibname) (DEVICE_IS_IPAD ? @#nibname @"_iPad" : @#nibname @"_iPhone") + #define DEVICE_SPECIFIC_NIB2(nibname) (DEVICE_IS_IPAD ? @#nibname @"" : @#nibname @"_iPhone") #endif diff --git a/ThatPhoto/ThatPhotoAppDelegate.m b/ThatPhoto/ThatPhotoAppDelegate.m index 7b1a938..f4020b3 100644 --- a/ThatPhoto/ThatPhotoAppDelegate.m +++ b/ThatPhoto/ThatPhotoAppDelegate.m @@ -26,7 +26,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( connection.apiKey = kApptentiveAPIKey; TPMainViewController * viewController; - viewController = [[TPMainViewController alloc] initWithNibName:@"TPMainViewController_iPad" bundle:nil]; + viewController = [[TPMainViewController alloc] initWithNibName:DEVICE_SPECIFIC_NIB( TPMainViewController) bundle:nil]; //Setting up Ink with the ThatPhoto app key [Ink setupWithAppKey:@"AjTXjeBephotoqTdTUPz"]; diff --git a/WelcomeFlow/INKWelcomeViewController.m b/WelcomeFlow/INKWelcomeViewController.m index e2ca9b5..6fc5846 100644 --- a/WelcomeFlow/INKWelcomeViewController.m +++ b/WelcomeFlow/INKWelcomeViewController.m @@ -12,7 +12,8 @@ @interface INKWelcomeViewController () @end -CGFloat const scrollViewHeight = 578.f; +//CGFloat const scrollViewHeight = 578.f; +#define scrollViewHeight (DEVICE_IS_IPAD ? 578.f : 345.f) CGFloat const scrollViewMargin = 0.f; NSString *nsuserdefaultsHasRunFlowKeyName = @"com.inkmobility.hasRunWelcomeFlow"; @@ -40,6 +41,14 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil return self; } +- (BOOL)shouldAutorotate +{ + if (DEVICE_IS_IPAD) { + return YES; + } + return NO; +} + - (void)viewDidLoad { [super viewDidLoad]; @@ -52,16 +61,16 @@ - (void)viewDidLoad NSString* appID = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIdentifier"]; NSMutableArray *views = [NSMutableArray arrayWithCapacity:4]; - NSMutableArray *images = [NSMutableArray arrayWithObjects:@"OnboardStep2", @"OnboardStep3", nil]; + NSMutableArray *images = [NSMutableArray arrayWithObjects:DEVICE_SPECIFIC_NIB2(OnboardStep2), DEVICE_SPECIFIC_NIB2(OnboardStep3), nil]; if ([appID isEqualToString:@"com.inkmobility.ThatPhoto"]) { - [images insertObject:@"WelcomeThatPhoto" atIndex:0]; + [images insertObject:DEVICE_SPECIFIC_NIB2(WelcomeThatPhoto) atIndex:0]; } else if ([appID isEqualToString:@"com.inkmobility.thatinbox"]) { - [images insertObject:@"WelcomeThatInbox" atIndex:0]; + [images insertObject:DEVICE_SPECIFIC_NIB2(WelcomeThatInbox) atIndex:0]; } else if ([appID isEqualToString:@"com.inkmobility.ThatPDF"]) { - [images insertObject:@"WelcomeThatPDF" atIndex:0]; + [images insertObject:DEVICE_SPECIFIC_NIB2(WelcomeThatPDF) atIndex:0]; } else if ([appID isEqualToString:@"com.inkmobility.thatcloud"]) { - [images insertObject:@"WelcomeThatCloud" atIndex:0]; + [images insertObject:DEVICE_SPECIFIC_NIB2(WelcomeThatCloud) atIndex:0]; } for (NSString *imageName in images) { UIView *welcomeScreen = [[UIView alloc] init]; diff --git a/WelcomeFlow/INKWelcomeViewController.xib b/WelcomeFlow/INKWelcomeViewController.xib index 4c46512..6503ce7 100644 --- a/WelcomeFlow/INKWelcomeViewController.xib +++ b/WelcomeFlow/INKWelcomeViewController.xib @@ -1,14 +1,14 @@ - 1552 - 12E55 - 3084 + 1536 + 12F37 + 4510 1187.39 626.00 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 2083 + 3742 IBNSLayoutConstraint @@ -33,7 +33,7 @@ IBIPadFramework - + 292 @@ -41,7 +41,6 @@ 274 {{0, 50}, {768, 568}} - _NS:9 {36, 250} @@ -59,8 +58,6 @@ 292 {{284, 668}, {201, 54}} - - _NS:9 1 @@ -70,12 +67,12 @@ IBIPadFramework 0 0 - Get Started - + 3 MQA - + + Get Started 3 MC41AA @@ -87,15 +84,13 @@ 28 - HelveticaNeue-Medium + HelveticaNeue 28 16 {{0, 20}, {768, 1004}} - - 3 @@ -175,6 +170,7 @@ 9 40 3 + NO @@ -191,6 +187,7 @@ 9 40 2 + NO @@ -207,6 +204,7 @@ 9 40 3 + NO @@ -223,6 +221,7 @@ 9 40 3 + NO @@ -239,6 +238,7 @@ 9 40 3 + NO @@ -264,6 +264,7 @@ 9 40 1 + NO @@ -287,6 +288,7 @@ 9 40 1 + NO @@ -303,6 +305,7 @@ 3 9 1 + NO @@ -389,61 +392,21 @@ 264 - - - - INKWelcomeViewController - UIViewController - - skipWelcomeFlow: - id - - - skipWelcomeFlow: - - skipWelcomeFlow: - id - - - - pageScrollView - PagedScrollView - - - pageScrollView - - pageScrollView - PagedScrollView - - - - IBProjectSource - ./Classes/INKWelcomeViewController.h - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - PagedScrollView - UIView - - IBProjectSource - ./Classes/PagedScrollView.h - - - - + 0 IBIPadFramework + YES + + com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS + + + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + YES 3 YES - 2083 + 3742 diff --git a/WelcomeFlow/INKWelcomeViewController_iPhone.xib b/WelcomeFlow/INKWelcomeViewController_iPhone.xib new file mode 100644 index 0000000..0cf7800 --- /dev/null +++ b/WelcomeFlow/INKWelcomeViewController_iPhone.xib @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/WelcomeFlow/Resources/OnboardStep2_iPhone.png b/WelcomeFlow/Resources/OnboardStep2_iPhone.png new file mode 100644 index 0000000..421d861 Binary files /dev/null and b/WelcomeFlow/Resources/OnboardStep2_iPhone.png differ diff --git a/WelcomeFlow/Resources/OnboardStep2_iPhone@2x.png b/WelcomeFlow/Resources/OnboardStep2_iPhone@2x.png new file mode 100644 index 0000000..01c79f3 Binary files /dev/null and b/WelcomeFlow/Resources/OnboardStep2_iPhone@2x.png differ diff --git a/WelcomeFlow/Resources/OnboardStep3_iPhone.png b/WelcomeFlow/Resources/OnboardStep3_iPhone.png new file mode 100644 index 0000000..a3f2003 Binary files /dev/null and b/WelcomeFlow/Resources/OnboardStep3_iPhone.png differ diff --git a/WelcomeFlow/Resources/OnboardStep3_iPhone@2x.png b/WelcomeFlow/Resources/OnboardStep3_iPhone@2x.png new file mode 100644 index 0000000..444fbf5 Binary files /dev/null and b/WelcomeFlow/Resources/OnboardStep3_iPhone@2x.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatCloud_iPhone.png b/WelcomeFlow/Resources/WelcomeThatCloud_iPhone.png new file mode 100644 index 0000000..54c2556 Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatCloud_iPhone.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatCloud_iPhone@2x.png b/WelcomeFlow/Resources/WelcomeThatCloud_iPhone@2x.png new file mode 100644 index 0000000..b1dc8a0 Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatCloud_iPhone@2x.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatInbox_iPhone.png b/WelcomeFlow/Resources/WelcomeThatInbox_iPhone.png new file mode 100644 index 0000000..760132c Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatInbox_iPhone.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatInbox_iPhone@2x.png b/WelcomeFlow/Resources/WelcomeThatInbox_iPhone@2x.png new file mode 100644 index 0000000..7d772fd Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatInbox_iPhone@2x.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatPDF_iPhone.png b/WelcomeFlow/Resources/WelcomeThatPDF_iPhone.png new file mode 100644 index 0000000..9b4840d Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatPDF_iPhone.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatPDF_iPhone@2x.png b/WelcomeFlow/Resources/WelcomeThatPDF_iPhone@2x.png new file mode 100644 index 0000000..d2a43da Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatPDF_iPhone@2x.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone.png b/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone.png new file mode 100644 index 0000000..5f93b92 Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone.png differ diff --git a/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone@2x.png b/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone@2x.png new file mode 100644 index 0000000..fe0e6bb Binary files /dev/null and b/WelcomeFlow/Resources/WelcomeThatPhoto_iPhone@2x.png differ