diff --git a/Classes/FileSourceController.m b/Classes/FileSourceController.m index c7361f1..e539ad8 100644 --- a/Classes/FileSourceController.m +++ b/Classes/FileSourceController.m @@ -59,8 +59,12 @@ - (void)addUIElements self.navigationItem.leftBarButtonItem =[[UIBarButtonItem alloc]initWithTitle:@"Back" style:UIBarButtonItemStylePlain target:self action:@selector(backButtonAction)]; - self.previewViewController = (FilePreviewViewController *)[[self.splitViewController.viewControllers lastObject] topViewController]; - + if (DEVICE_IS_IPAD) { + self.previewViewController = (FilePreviewViewController *)[[self.splitViewController.viewControllers lastObject] topViewController]; + } else { + UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"MainStoryboard_iPhone" bundle:nil]; + self.previewViewController = [mainStoryboard instantiateViewControllerWithIdentifier:@"FilePreviewViewController_iPhone"]; + } UIRefreshControl *refreshControl = [[UIRefreshControl alloc] init]; [refreshControl addTarget:self action:@selector(handleRefresh:) forControlEvents:UIControlEventValueChanged]; self.refreshControl = refreshControl; @@ -607,6 +611,9 @@ - (void) objectSelectedAtIndex:(NSInteger) index withThumbnail:(UIImage *) thumb , nil]]; }); + if (!DEVICE_IS_IPAD) { + [FPMBProgressHUD showHUDAddedTo:self.view animated:YES]; + } [[self previewViewController] showSpinner]; [self downloadAndUpdatePreview:obj]; @@ -645,6 +652,10 @@ - (void) downloadAndUpdatePreview: (NSDictionary*) obj { [selectedFile writeData:data]; + if (!DEVICE_IS_IPAD) { + [FPMBProgressHUD hideHUDForView:self.view animated:NO]; + [self.navigationController pushViewController:self.previewViewController animated:YES]; + } [[self previewViewController] previewFile:selectedFile]; } failure:^(FPAFHTTPRequestOperation *operation, NSError *error) { diff --git a/Classes/FileSourceListController.m b/Classes/FileSourceListController.m index ebe8045..0fe60c9 100644 --- a/Classes/FileSourceListController.m +++ b/Classes/FileSourceListController.m @@ -38,7 +38,13 @@ - (id)initWithStyle:(UITableViewStyle)style - (void)viewDidLoad { [super viewDidLoad]; - self.previewViewController = (FilePreviewViewController *)[[self.splitViewController.viewControllers lastObject] topViewController]; + //self.previewViewController = (FilePreviewViewController *)[[self.splitViewController.viewControllers lastObject] topViewController]; + if (DEVICE_IS_IPAD) { + self.previewViewController = (FilePreviewViewController *)[[self.splitViewController.viewControllers lastObject] topViewController]; + } else { + UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"MainStoryboard_iPhone" bundle:nil]; + self.previewViewController = [mainStoryboard instantiateViewControllerWithIdentifier:@"FilePreviewViewController_iPhone"]; + } self.previewViewController.master = (id)self; [UIBarButtonItem configureFlatButtonsWithColor:[UIColor peterRiverColor] highlightedColor:[UIColor belizeHoleColor] diff --git a/Classes/MainStoryboard_iPhone.storyboard b/Classes/MainStoryboard_iPhone.storyboard new file mode 100644 index 0000000..f4482af --- /dev/null +++ b/Classes/MainStoryboard_iPhone.storyboard @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Classes/PairingReceiveViewController.m b/Classes/PairingReceiveViewController.m index b3e279b..2bf21d6 100644 --- a/Classes/PairingReceiveViewController.m +++ b/Classes/PairingReceiveViewController.m @@ -33,6 +33,10 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil return self; } +#define labelFrame (DEVICE_IS_IPAD ? CGRectMake(0, 30, 540, 30) : CGRectMake(0, 30, 320, 30)) +#define filenameFrame (DEVICE_IS_IPAD ? CGRectMake((540-400)/2, 130, 400, 30) : CGRectMake(0, 130, 320, 30)) +#define mimetypeFrame (DEVICE_IS_IPAD ? CGRectMake((540-400)/2, 150, 400, 30) : CGRectMake(0, 150, 320, 30)) +#define txFrame (DEVICE_IS_IPAD ? CGRectMake((540-350)/2, 80, 350, 30) : CGRectMake(0, 80, 320, 30)) - (void)viewDidLoad { [super viewDidLoad]; @@ -45,14 +49,14 @@ - (void)viewDidLoad [self.view setBackgroundColor:[UIColor whiteColor]]; - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 30, 540, 30)]; + UILabel *label = [[UILabel alloc] initWithFrame:labelFrame]; label.text = [NSString stringWithFormat:@"Enter the Pairing Code:"]; label.font = [UIFont fontWithName:LIGHTFONT size:16]; label.textAlignment = NSTextAlignmentCenter; [self.view addSubview:label]; - UILabel *filename = [[UILabel alloc] initWithFrame:CGRectMake((540-400)/2, 130, 400, 30)]; + UILabel *filename = [[UILabel alloc] initWithFrame:filenameFrame]; filename.text = @""; filename.textAlignment = NSTextAlignmentCenter; filename.lineBreakMode = NSLineBreakByTruncatingMiddle; @@ -60,7 +64,7 @@ - (void)viewDidLoad [self.view addSubview:filename]; self.filename = filename; - UILabel *mimetype = [[UILabel alloc] initWithFrame:CGRectMake((540-400)/2, 150, 400, 30)]; + UILabel *mimetype = [[UILabel alloc] initWithFrame:mimetypeFrame]; mimetype.textAlignment = NSTextAlignmentCenter; mimetype.text = @""; mimetype.font = [UIFont fontWithName:LIGHTFONT size:14]; @@ -74,7 +78,7 @@ - (void)viewDidLoad label.textAlignment = NSTextAlignmentCenter; [self.view addSubview:label]; - UITextField *tx = [[UITextField alloc] initWithFrame:CGRectMake((540-350)/2, 80, 350, 30)]; + UITextField *tx = [[UITextField alloc] initWithFrame:txFrame]; [tx setBorderStyle:UITextBorderStyleRoundedRect]; [tx setFont:[UIFont fontWithName:@"Courier" size:16]]; tx.autocapitalizationType = UITextAutocapitalizationTypeNone; diff --git a/Classes/PairingViewController.m b/Classes/PairingViewController.m index 6af4f07..9ebcb72 100644 --- a/Classes/PairingViewController.m +++ b/Classes/PairingViewController.m @@ -35,6 +35,11 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil return self; } +#define imageVFrame (DEVICE_IS_IPAD ? (CGRectMake((540-imageV.frame.size.width)/2, 50, imageV.frame.size.width, imageV.frame.size.height)) : (CGRectMake(10, 5, imageV.frame.size.width, imageV.frame.size.height))) +#define subheaderFrame (DEVICE_IS_IPAD ? CGRectMake(0, 200, 540, 90) : CGRectMake(0, 170, 320, 90)) +#define labelFrame (DEVICE_IS_IPAD ? CGRectMake(0, 350, 540, 30) : CGRectMake(0, 280, 320, 30)) +#define pairingTextfieldFrame (DEVICE_IS_IPAD ? CGRectMake((540-250)/2, 385, 250, 30) : CGRectMake(40, 335, 250, 30)) +#define copylabelFrame (DEVICE_IS_IPAD ? CGRectMake(0, 410, 540, 30) : CGRectMake(0, 350, 320, 30)) - (void)viewDidLoad { [super viewDidLoad]; @@ -45,10 +50,10 @@ - (void)viewDidLoad [self.view setBackgroundColor:[UIColor whiteColor]]; UIImageView *imageV = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"pair.png"]]; - imageV.frame = CGRectMake((540-imageV.frame.size.width)/2, 50, imageV.frame.size.width, imageV.frame.size.height); + imageV.frame = imageVFrame; [self.view addSubview:imageV]; - UILabel *subheader = [[UILabel alloc] initWithFrame:CGRectMake(0, 200, 540, 90)]; + UILabel *subheader = [[UILabel alloc] initWithFrame:subheaderFrame]; subheader.textAlignment = NSTextAlignmentCenter; subheader.text = @"You can easily share files with other ThatCloud users.\n A secure pairing code has been generated below \nand can be retrieved on another device with ThatCloud."; subheader.lineBreakMode = NSLineBreakByWordWrapping; @@ -57,14 +62,14 @@ - (void)viewDidLoad [self.view addSubview:subheader]; - UILabel *label = [[UILabel alloc] initWithFrame:CGRectMake(0, 350, 540, 30)]; + UILabel *label = [[UILabel alloc] initWithFrame:labelFrame]; label.textAlignment = NSTextAlignmentCenter; label.text = @"Pairing Code"; label.font = [UIFont fontWithName:FONT size:22]; [self.view addSubview:label]; - UITextField *pairing = [[UITextField alloc] initWithFrame:CGRectMake((540-250)/2, 385, 250, 30)]; + UITextField *pairing = [[UITextField alloc] initWithFrame:pairingTextfieldFrame]; [pairing setText:self.fphandle]; pairing.delegate = self; pairing.textAlignment = NSTextAlignmentCenter; @@ -72,7 +77,7 @@ - (void)viewDidLoad pairing.font = [UIFont fontWithName:@"Courier" size:18]; [self.view addSubview:pairing]; - UILabel *copylabel = [[UILabel alloc] initWithFrame:CGRectMake(0, 410, 540, 30)]; + UILabel *copylabel = [[UILabel alloc] initWithFrame:copylabelFrame]; copylabel.textAlignment = NSTextAlignmentCenter; copylabel.text = @"(Copied to your clipboard)"; copylabel.font = [UIFont fontWithName:FONT size:14]; diff --git a/Classes/ThatCloudAppDelegate.m b/Classes/ThatCloudAppDelegate.m index c5b5511..a86805f 100755 --- a/Classes/ThatCloudAppDelegate.m +++ b/Classes/ThatCloudAppDelegate.m @@ -50,7 +50,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( if ([INKWelcomeViewController shouldRunWelcomeFlow]) { INKWelcomeViewController * welcomeViewController; - welcomeViewController = [[INKWelcomeViewController alloc] initWithNibName:@"INKWelcomeViewController" bundle:nil]; + welcomeViewController = [[INKWelcomeViewController alloc] initWithNibName:DEVICE_SPECIFIC_NIB2( INKWelcomeViewController) bundle:nil]; welcomeViewController.nextViewController = self.window.rootViewController; [self.window setRootViewController:welcomeViewController]; diff --git a/Classes/en.lproj/MainStoryboard_iPad.storyboard b/Classes/en.lproj/MainStoryboard_iPad.storyboard index 395d71c..1078410 100755 --- a/Classes/en.lproj/MainStoryboard_iPad.storyboard +++ b/Classes/en.lproj/MainStoryboard_iPad.storyboard @@ -1,44 +1,42 @@ - + - - - + + - - + + - + - + - - + @@ -68,11 +66,11 @@ - + - + @@ -121,15 +119,6 @@ - - - - - - - - - diff --git a/Classes/thatcloud-Info.plist b/Classes/thatcloud-Info.plist index d890d1b..d6c4d3d 100755 --- a/Classes/thatcloud-Info.plist +++ b/Classes/thatcloud-Info.plist @@ -67,7 +67,7 @@ LSRequiresIPhoneOS UIMainStoryboardFile - MainStoryboard_iPad + MainStoryboard_iPhone UIMainStoryboardFile~ipad MainStoryboard_iPad UIPrerenderedIcon diff --git a/Classes/thatcloud-Prefix.pch b/Classes/thatcloud-Prefix.pch index 4f6cb94..731a8e0 100755 --- a/Classes/thatcloud-Prefix.pch +++ b/Classes/thatcloud-Prefix.pch @@ -13,4 +13,7 @@ #import #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/IconsAndBackgrounds/Default-568h.png b/IconsAndBackgrounds/Default-568h.png new file mode 100644 index 0000000..39aa353 Binary files /dev/null and b/IconsAndBackgrounds/Default-568h.png differ diff --git a/IconsAndBackgrounds/Default-568h@2x.png b/IconsAndBackgrounds/Default-568h@2x.png new file mode 100644 index 0000000..dc8a229 Binary files /dev/null and b/IconsAndBackgrounds/Default-568h@2x.png differ diff --git a/WelcomeFlow/INKWelcomeViewController.m b/WelcomeFlow/INKWelcomeViewController.m index 13b2ac2..97b6af0 100644 --- a/WelcomeFlow/INKWelcomeViewController.m +++ b/WelcomeFlow/INKWelcomeViewController.m @@ -12,7 +12,7 @@ @interface INKWelcomeViewController () @end -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 +40,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 +60,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/PagedScrollView.m b/WelcomeFlow/PagedScrollView.m index 08dc41d..53e114b 100755 --- a/WelcomeFlow/PagedScrollView.m +++ b/WelcomeFlow/PagedScrollView.m @@ -117,6 +117,8 @@ - (void)changePage:(UIPageControl *)sender self.pageControlIsChangingPage = YES; } +#pragma scrollviewdelegate + - (void)scrollViewDidScroll:(UIScrollView *)scrollView { if (self.pageControlIsChangingPage) { @@ -124,7 +126,7 @@ - (void)scrollViewDidScroll:(UIScrollView *)scrollView } CGFloat pageWidth = scrollView.frame.size.width; //switch page at 50% across - int page = (int)floor((scrollView.contentOffset.x - pageWidth / 2) / pageWidth) + 1; + int page = floor((scrollView.contentOffset.x - pageWidth / 2) / pageWidth) + 1; self.pageControl.currentPage = page; } 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 diff --git a/thatcloud.xcodeproj/project.pbxproj b/thatcloud.xcodeproj/project.pbxproj index a2ec5ea..419ee18 100755 --- a/thatcloud.xcodeproj/project.pbxproj +++ b/thatcloud.xcodeproj/project.pbxproj @@ -153,6 +153,22 @@ 99DDE378168B7B780071241C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99DDE350168B7B780071241C /* Foundation.framework */; }; 99DDE3B2168B83D70071241C /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 99DDE3B1168B83D70071241C /* AssetsLibrary.framework */; }; 99DDE3B5168B8E340071241C /* MBProgressHUD.m in Sources */ = {isa = PBXBuildFile; fileRef = 99DDE3B4168B8E340071241C /* MBProgressHUD.m */; }; + 9AB803E81809DDDA008FCFB9 /* INKWelcomeViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803E71809DDDA008FCFB9 /* INKWelcomeViewController_iPhone.xib */; }; + 9AB803F51809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803E91809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone.png */; }; + 9AB803F61809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803EA1809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone@2x.png */; }; + 9AB803F71809DDF0008FCFB9 /* WelcomeThatPDF_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803EB1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone.png */; }; + 9AB803F81809DDF0008FCFB9 /* WelcomeThatPDF_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803EC1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone@2x.png */; }; + 9AB803F91809DDF0008FCFB9 /* WelcomeThatCloud_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803ED1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone.png */; }; + 9AB803FA1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803EE1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone@2x.png */; }; + 9AB803FB1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803EF1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone.png */; }; + 9AB803FC1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803F01809DDF0008FCFB9 /* WelcomeThatInbox_iPhone@2x.png */; }; + 9AB803FD1809DDF0008FCFB9 /* OnboardStep2_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803F11809DDF0008FCFB9 /* OnboardStep2_iPhone.png */; }; + 9AB803FE1809DDF0008FCFB9 /* OnboardStep2_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803F21809DDF0008FCFB9 /* OnboardStep2_iPhone@2x.png */; }; + 9AB803FF1809DDF0008FCFB9 /* OnboardStep3_iPhone.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803F31809DDF0008FCFB9 /* OnboardStep3_iPhone.png */; }; + 9AB804001809DDF0008FCFB9 /* OnboardStep3_iPhone@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB803F41809DDF0008FCFB9 /* OnboardStep3_iPhone@2x.png */; }; + 9AB8044B1809EB9E008FCFB9 /* MainStoryboard_iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 9AB8044A1809EB9E008FCFB9 /* MainStoryboard_iPhone.storyboard */; }; + 9AB8044E1809ED27008FCFB9 /* Default-568h.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB8044C1809ED27008FCFB9 /* Default-568h.png */; }; + 9AB8044F1809ED27008FCFB9 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 9AB8044D1809ED27008FCFB9 /* Default-568h@2x.png */; }; EA24660217D803CA009A4619 /* StandaloneStatsEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = EA24660117D803CA009A4619 /* StandaloneStatsEmitter.m */; }; EA4DE4B317C585EE001D7859 /* FPAFHTTPClient.m in Sources */ = {isa = PBXBuildFile; fileRef = EA4DE49F17C585EE001D7859 /* FPAFHTTPClient.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; EA4DE4B417C585EE001D7859 /* FPAFHTTPRequestOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = EA4DE4A117C585EE001D7859 /* FPAFHTTPRequestOperation.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -449,6 +465,22 @@ 99DDE3B1168B83D70071241C /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; }; 99DDE3B3168B8E340071241C /* MBProgressHUD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MBProgressHUD.h; sourceTree = ""; }; 99DDE3B4168B8E340071241C /* MBProgressHUD.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MBProgressHUD.m; sourceTree = ""; }; + 9AB803E71809DDDA008FCFB9 /* INKWelcomeViewController_iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = INKWelcomeViewController_iPhone.xib; sourceTree = ""; }; + 9AB803E91809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatPhoto_iPhone.png; sourceTree = ""; }; + 9AB803EA1809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatPhoto_iPhone@2x.png"; sourceTree = ""; }; + 9AB803EB1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatPDF_iPhone.png; sourceTree = ""; }; + 9AB803EC1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatPDF_iPhone@2x.png"; sourceTree = ""; }; + 9AB803ED1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatCloud_iPhone.png; sourceTree = ""; }; + 9AB803EE1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatCloud_iPhone@2x.png"; sourceTree = ""; }; + 9AB803EF1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = WelcomeThatInbox_iPhone.png; sourceTree = ""; }; + 9AB803F01809DDF0008FCFB9 /* WelcomeThatInbox_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "WelcomeThatInbox_iPhone@2x.png"; sourceTree = ""; }; + 9AB803F11809DDF0008FCFB9 /* OnboardStep2_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = OnboardStep2_iPhone.png; sourceTree = ""; }; + 9AB803F21809DDF0008FCFB9 /* OnboardStep2_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "OnboardStep2_iPhone@2x.png"; sourceTree = ""; }; + 9AB803F31809DDF0008FCFB9 /* OnboardStep3_iPhone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = OnboardStep3_iPhone.png; sourceTree = ""; }; + 9AB803F41809DDF0008FCFB9 /* OnboardStep3_iPhone@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "OnboardStep3_iPhone@2x.png"; sourceTree = ""; }; + 9AB8044A1809EB9E008FCFB9 /* MainStoryboard_iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = MainStoryboard_iPhone.storyboard; sourceTree = ""; }; + 9AB8044C1809ED27008FCFB9 /* Default-568h.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h.png"; sourceTree = ""; }; + 9AB8044D1809ED27008FCFB9 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; EA24660017D803C9009A4619 /* StandaloneStatsEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StandaloneStatsEmitter.h; sourceTree = ""; }; EA24660117D803CA009A4619 /* StandaloneStatsEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StandaloneStatsEmitter.m; sourceTree = ""; }; EA4DE49E17C585EE001D7859 /* FPAFHTTPClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FPAFHTTPClient.h; sourceTree = ""; }; @@ -628,6 +660,7 @@ 027AB1FF17B9D8D5007171B1 /* INKWelcomeViewController.h */, 027AB20017B9D8D5007171B1 /* INKWelcomeViewController.m */, 027AB20117B9D8D5007171B1 /* INKWelcomeViewController.xib */, + 9AB803E71809DDDA008FCFB9 /* INKWelcomeViewController_iPhone.xib */, 027AB20217B9D8D5007171B1 /* PagedScrollView.h */, 027AB20317B9D8D5007171B1 /* PagedScrollView.m */, 027AB20417B9D8D5007171B1 /* Resources */, @@ -638,6 +671,18 @@ 027AB20417B9D8D5007171B1 /* Resources */ = { isa = PBXGroup; children = ( + 9AB803E91809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone.png */, + 9AB803EA1809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone@2x.png */, + 9AB803EB1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone.png */, + 9AB803EC1809DDF0008FCFB9 /* WelcomeThatPDF_iPhone@2x.png */, + 9AB803ED1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone.png */, + 9AB803EE1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone@2x.png */, + 9AB803EF1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone.png */, + 9AB803F01809DDF0008FCFB9 /* WelcomeThatInbox_iPhone@2x.png */, + 9AB803F11809DDF0008FCFB9 /* OnboardStep2_iPhone.png */, + 9AB803F21809DDF0008FCFB9 /* OnboardStep2_iPhone@2x.png */, + 9AB803F31809DDF0008FCFB9 /* OnboardStep3_iPhone.png */, + 9AB803F41809DDF0008FCFB9 /* OnboardStep3_iPhone@2x.png */, 027AB20517B9D8D5007171B1 /* OnboardStep2.png */, 027AB20617B9D8D5007171B1 /* OnboardStep2@2x.png */, 027AB20717B9D8D5007171B1 /* OnboardStep3.png */, @@ -785,6 +830,8 @@ 9934FCC7170F7FEE00890A53 /* IconsAndBackgrounds */ = { isa = PBXGroup; children = ( + 9AB8044C1809ED27008FCFB9 /* Default-568h.png */, + 9AB8044D1809ED27008FCFB9 /* Default-568h@2x.png */, 8374922717A7847C0084FEAC /* Icon-72@2x.png */, 8374922517A784760084FEAC /* Icon-72.png */, 8310823617A50172008713FC /* Default-Portrait~ipad.png */, @@ -942,6 +989,7 @@ 99DDE35D168B7B780071241C /* ThatCloudAppDelegate.h */, 99DDE35E168B7B780071241C /* ThatCloudAppDelegate.m */, 99DDE369168B7B780071241C /* MainStoryboard_iPad.storyboard */, + 9AB8044A1809EB9E008FCFB9 /* MainStoryboard_iPhone.storyboard */, 83FB0825178F639100754626 /* FilePreviewViewController.h */, EA8B739017A0817C003EF80D /* SourceListSaveController.h */, EA8B739117A0817C003EF80D /* SourceListSaveController.m */, @@ -1163,11 +1211,13 @@ 99A9FA5E174479DF00205C32 /* package@2x.png in Resources */, 99A9FA5F174479DF00205C32 /* page_white.png in Resources */, 99A9FA60174479DF00205C32 /* page_white@2x.png in Resources */, + 9AB803E81809DDDA008FCFB9 /* INKWelcomeViewController_iPhone.xib in Resources */, 99A9FA62174479DF00205C32 /* page_white_acrobat@2x.png in Resources */, 99A9FA64174479DF00205C32 /* page_white_acrobat_import@2x.png in Resources */, 99A9FA65174479DF00205C32 /* page_white_actionscript.png in Resources */, 99A9FA66174479DF00205C32 /* page_white_actionscript@2x.png in Resources */, 99A9FA67174479DF00205C32 /* page_white_c.png in Resources */, + 9AB804001809DDF0008FCFB9 /* OnboardStep3_iPhone@2x.png in Resources */, 99A9FA68174479DF00205C32 /* page_white_c@2x.png in Resources */, 99A9FA69174479DF00205C32 /* page_white_code.png in Resources */, 99A9FA6A174479DF00205C32 /* page_white_code@2x.png in Resources */, @@ -1185,6 +1235,7 @@ 99A9FA78174479DF00205C32 /* page_white_excel@2x.png in Resources */, 99A9FA7B174479DF00205C32 /* page_white_film.png in Resources */, 99A9FA7C174479DF00205C32 /* page_white_film@2x.png in Resources */, + 9AB803F81809DDF0008FCFB9 /* WelcomeThatPDF_iPhone@2x.png in Resources */, 99A9FA7D174479DF00205C32 /* page_white_flash.png in Resources */, 99A9FA7E174479DF00205C32 /* page_white_flash@2x.png in Resources */, 99A9FA7F174479DF00205C32 /* page_white_gear.png in Resources */, @@ -1197,11 +1248,14 @@ 99A9FA86174479DF00205C32 /* page_white_jef@2x.png in Resources */, 99A9FA87174479DF00205C32 /* page_white_js.png in Resources */, 99A9FA88174479DF00205C32 /* page_white_js@2x.png in Resources */, + 9AB8044E1809ED27008FCFB9 /* Default-568h.png in Resources */, + 9AB8044B1809EB9E008FCFB9 /* MainStoryboard_iPhone.storyboard in Resources */, 99A9FA89174479DF00205C32 /* page_white_paint.png in Resources */, 99A9FA8A174479DF00205C32 /* page_white_paint@2x.png in Resources */, 99A9FA8D174479DF00205C32 /* page_white_php.png in Resources */, 99A9FA8E174479DF00205C32 /* page_white_php@2x.png in Resources */, 99A9FA8F174479DF00205C32 /* page_white_picture.png in Resources */, + 9AB803F51809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone.png in Resources */, 99A9FA90174479DF00205C32 /* page_white_picture@2x.png in Resources */, 99A9FA93174479DF00205C32 /* page_white_powerpoint.png in Resources */, 99A9FA94174479DF00205C32 /* page_white_powerpoint@2x.png in Resources */, @@ -1219,9 +1273,11 @@ 99A9FAA6174479DF00205C32 /* page_white_visualstudio@2x.png in Resources */, 99A9FAA7174479DF00205C32 /* page_white_word.png in Resources */, 99A9FAA8174479DF00205C32 /* page_white_word@2x.png in Resources */, + 9AB803FE1809DDF0008FCFB9 /* OnboardStep2_iPhone@2x.png in Resources */, 99A9FAAB174479DF00205C32 /* pages.png in Resources */, 99A9FAAC174479DF00205C32 /* pages@2x.png in Resources */, EA8B73CD17A0817C003EF80D /* allowedUrlPrefix.plist in Resources */, + 9AB803FA1809DDF0008FCFB9 /* WelcomeThatCloud_iPhone@2x.png in Resources */, EA8B73CF17A0817C003EF80D /* disallowedUrlPrefix.plist in Resources */, EA8B73D017A0817C003EF80D /* FilepickerSettings.plist in Resources */, EA8B73EA17A0817C003EF80D /* glyphicons_008_film.png in Resources */, @@ -1249,6 +1305,7 @@ EA8B740017A0817C003EF80D /* glyphicons_390_facebook.png in Resources */, EA8B740117A0817C003EF80D /* glyphicons_390_facebook@2x.png in Resources */, EA8B740217A0817C003EF80D /* glyphicons_395_flickr.png in Resources */, + 9AB803F91809DDF0008FCFB9 /* WelcomeThatCloud_iPhone.png in Resources */, EA8B740317A0817C003EF80D /* glyphicons_395_flickr@2x.png in Resources */, EA8B740417A0817C003EF80D /* glyphicons_399_e-mail.png in Resources */, EA8B740517A0817C003EF80D /* glyphicons_399_e-mail@2x.png in Resources */, @@ -1260,12 +1317,16 @@ EA8B740B17A0817C003EF80D /* glyphicons_sb3_skydrive@2x.png in Resources */, EA8B740C17A0817C003EF80D /* GoogleDrive.png in Resources */, EA8B740D17A0817C003EF80D /* GoogleDrive@2x.png in Resources */, + 9AB803FD1809DDF0008FCFB9 /* OnboardStep2_iPhone.png in Resources */, + 9AB803F71809DDF0008FCFB9 /* WelcomeThatPDF_iPhone.png in Resources */, EA8B740E17A0817C003EF80D /* Instagram.png in Resources */, + 9AB803FF1809DDF0008FCFB9 /* OnboardStep3_iPhone.png in Resources */, EA8B740F17A0817C003EF80D /* Instagram@2x.png in Resources */, EA8B741C17A339FC003EF80D /* page_white_acrobat_import.png in Resources */, EA8B741E17A339FC003EF80D /* page_white_acrobat.png in Resources */, 8310823117A500D9008713FC /* Default-Landscape~ipad.png in Resources */, 8310823317A500DD008713FC /* Default-Landscape@2x~ipad.png in Resources */, + 9AB803F61809DDF0008FCFB9 /* WelcomeThatPhoto_iPhone@2x.png in Resources */, 8310823517A5016D008713FC /* Default-Portrait@2x~ipad.png in Resources */, 8310823717A50172008713FC /* Default-Portrait~ipad.png in Resources */, 8310823F17A50532008713FC /* folder.png in Resources */, @@ -1283,12 +1344,15 @@ 027AB21217B9D8D5007171B1 /* INKWelcomeViewController.xib in Resources */, 027AB21417B9D8D5007171B1 /* OnboardStep2.png in Resources */, 027AB21517B9D8D5007171B1 /* OnboardStep2@2x.png in Resources */, + 9AB803FC1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone@2x.png in Resources */, 027AB21617B9D8D5007171B1 /* OnboardStep3.png in Resources */, + 9AB803FB1809DDF0008FCFB9 /* WelcomeThatInbox_iPhone.png in Resources */, 027AB21717B9D8D5007171B1 /* OnboardStep3@2x.png in Resources */, 027AB21817B9D8D5007171B1 /* WelcomeThatCloud.png in Resources */, 027AB21917B9D8D5007171B1 /* WelcomeThatCloud@2x.png in Resources */, 027AB21A17B9D8D5007171B1 /* WelcomeThatInbox.png in Resources */, 027AB21B17B9D8D5007171B1 /* WelcomeThatInbox@2x.png in Resources */, + 9AB8044F1809ED27008FCFB9 /* Default-568h@2x.png in Resources */, 027AB21C17B9D8D5007171B1 /* WelcomeThatPDF.png in Resources */, 027AB21D17B9D8D5007171B1 /* WelcomeThatPDF@2x.png in Resources */, 027AB21E17B9D8D5007171B1 /* WelcomeThatPhoto.png in Resources */, @@ -1537,7 +1601,7 @@ ); PRODUCT_NAME = thatcloud; PROVISIONING_PROFILE = ""; - TARGETED_DEVICE_FAMILY = 2; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -1554,8 +1618,8 @@ CLANG_WARN_OBJC_MISSING_PROPERTY_SYNTHESIS = NO; CLANG_WARN_OBJC_RECEIVER_WEAK = NO; CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO; - CODE_SIGN_IDENTITY = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; + CODE_SIGN_IDENTITY = "iPhone Developer"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COMPRESS_PNG_FILES = YES; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -1589,7 +1653,7 @@ PRODUCT_NAME = thatcloud; PROVISIONING_PROFILE = ""; "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; - TARGETED_DEVICE_FAMILY = 2; + TARGETED_DEVICE_FAMILY = "1,2"; WRAPPER_EXTENSION = app; }; name = Release;