From 90f5ce81b93394b4408bf64309d196ebb24cd2de Mon Sep 17 00:00:00 2001 From: Matt Ronge Date: Wed, 8 Jan 2014 20:40:22 -0600 Subject: iOS 7ify the example project --- .../iOS UI Test/iOS UI Test/MasterViewController.m | 3 +- .../iOS UI Test/SettingsViewController.m | 9 +- .../iOS UI Test/SettingsViewController.xib | 1207 ++------------------ .../iOS UI Test/en.lproj/MainStoryboard.storyboard | 36 +- 4 files changed, 119 insertions(+), 1136 deletions(-) (limited to 'example') diff --git a/example/ios/iOS UI Test/iOS UI Test/MasterViewController.m b/example/ios/iOS UI Test/iOS UI Test/MasterViewController.m index 0ed66e70..e30aabe3 100644 --- a/example/ios/iOS UI Test/iOS UI Test/MasterViewController.m +++ b/example/ios/iOS UI Test/iOS UI Test/MasterViewController.m @@ -352,7 +352,8 @@ finishedRefreshWithFetcher:(GTMHTTPFetcher *)fetcher SettingsViewController *settingsViewController = [[SettingsViewController alloc] initWithNibName:nil bundle:nil]; settingsViewController.delegate = self; - [self presentViewController:settingsViewController animated:YES completion:nil]; + UINavigationController *nav = [[UINavigationController alloc] initWithRootViewController:settingsViewController]; + [self presentViewController:nav animated:YES completion:nil]; } - (void)settingsViewControllerFinished:(SettingsViewController *)viewController { diff --git a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.m b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.m index d17b479a..c1766796 100644 --- a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.m +++ b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.m @@ -30,7 +30,14 @@ NSString * const OAuthEnabledKey = @"OAuth2Enabled"; - (void)viewDidLoad { [super viewDidLoad]; - self.view.backgroundColor = [UIColor underPageBackgroundColor]; + self.title = @"Settings"; + + UIBarButtonItem *doneButton = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone + target:self + action:@selector(done:)]; + self.navigationItem.rightBarButtonItem = doneButton; + + self.view.backgroundColor = [UIColor lightGrayColor]; self.emailTextField.text = [[NSUserDefaults standardUserDefaults] stringForKey:UsernameKey]; self.passwordTextField.text = [[FXKeychain defaultKeychain] objectForKey:PasswordKey]; self.hostnameTextField.text = [[NSUserDefaults standardUserDefaults] stringForKey:HostnameKey]; diff --git a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.xib b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.xib index c3f4f089..6aa55216 100644 --- a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.xib +++ b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.xib @@ -1,1110 +1,97 @@ - - - - 1552 - 12E55 - 4457.6 - 1187.39 - 626.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 3682.6 - - - IBNSLayoutConstraint - IBProxyObject - IBUIBarButtonItem - IBUILabel - IBUINavigationBar - IBUINavigationItem - IBUISwitch - IBUITextField - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - - - - 290 - {320, 44} - - - - _NS:9 - IBCocoaTouchFramework - - - - Settings - - IBCocoaTouchFramework - 1 - - 0 - - IBCocoaTouchFramework - - - - - - 292 - {{20, 66}, {280, 30}} - - - - _NS:9 - NO - YES - IBCocoaTouchFramework - 0 - - 3 - email - - 3 - MAA - - 2 - - - YES - 17 - - IBCocoaTouchFramework - - 1 - - 1 - 14 - - - HelveticaNeue - 14 - 16 - - - - - 292 - {{20, 104}, {280, 30}} - - - - _NS:9 - NO - YES - IBCocoaTouchFramework - 0 - - 3 - password - - 3 - MAA - - - YES - 17 - - YES - IBCocoaTouchFramework - - 1 - - - - - - 292 - {{20, 142}, {280, 30}} - - - - _NS:9 - NO - YES - IBCocoaTouchFramework - 0 - - 3 - imap hostname (e.g. imap.gmail.com) - - 3 - MAA - - - YES - 17 - - IBCocoaTouchFramework - - 1 - - - - - - 292 - {{208, 180}, {94, 27}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - - - 292 - {{20, 183}, {143, 21}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Fetch full message - - 1 - MCAwIDAAA - darkTextColor - - - 0 - - - NO - - - - 292 - {{208, 215}, {94, 27}} - - - - _NS:9 - NO - IBCocoaTouchFramework - 0 - 0 - - - - 292 - {{20, 218}, {143, 21}} - - - - _NS:9 - NO - YES - 7 - NO - IBCocoaTouchFramework - Use OAuth 2.0 - - - 0 - - - NO - - - {{0, 20}, {320, 548}} - - - - - 1 - MC43MDI5NDc0NDMyIDAuNzAyOTQ3NDQzMiAwLjcwMjk0NzQ0MzIAA - - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - emailTextField - - - - 49 - - - - passwordTextField - - - - 50 - - - - hostnameTextField - - - - 55 - - - - fetchFullMessageSwitch - - - - 68 - - - - view - - - - 69 - - - - useOAuth2Switch - - - - 84 - - - - done: - - - - 16 - - - - - - 0 - - - - - - 1 - - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 10 - 0 - - 10 - 1 - - 0.0 - - 1000 - - 6 - 24 - 2 - NO - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 3 - 0 - - 4 - 1 - - 8 - - 1000 - - 6 - 24 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 3 - 1 - - 66 - - 1000 - - 3 - 9 - 3 - NO - - - - 5 - 0 - - 5 - 1 - - 20 - - 1000 - - 0 - 29 - 3 - NO - - - - 6 - 0 - - 6 - 1 - - 0.0 - - 1000 - - 0 - 29 - 3 - NO - - - - 5 - 0 - - 5 - 1 - - 0.0 - - 1000 - - 0 - 29 - 3 - NO - - - - 3 - 0 - - 3 - 1 - - 0.0 - - 1000 - - 0 - 29 - 3 - NO - - - - - - - - - - - - - - -1 - - - File's Owner - - - -2 - - - - - 4 - - - - - - - - 5 - - - - - - - - 9 - - - - - 10 - - - - - 11 - - - - - 15 - - - - - 39 - - - - - - 40 - - - - - 41 - - - - - 44 - - - - - 45 - - - - - 46 - - - - - 47 - - - - - 48 - - - - - 51 - - - - - 52 - - - - - 53 - - - - - 54 - - - - - 56 - - - - - 57 - - - - - 58 - - - - - 59 - - - - - 8 - 0 - - 0 - 1 - - 21 - - 1000 - - 3 - 9 - 1 - NO - - - - 7 - 0 - - 0 - 1 - - 143 - - 1000 - - 3 - 9 - 1 - NO - - - - - - 60 - - - - - 61 - - - - - 70 - - - - - 71 - - - - - 72 - - - - - 73 - - - - - 8 - 0 - - 0 - 1 - - 21 - - 1000 - - 3 - 9 - 1 - NO - - - - - - 75 - - - - - 76 - - - - - 80 - - - - - 81 - - - - - 82 - - - - - 83 - - - - - - - SettingsViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - - - - - - - - - - - - - - - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 84 - - - - - NSLayoutConstraint - NSObject - - IBProjectSource - ./Classes/NSLayoutConstraint.h - - - - SettingsViewController - UIViewController - - done: - id - - - done: - - done: - id - - - - UITextField - UISwitch - UITextField - UITextField - UISwitch - - - - emailTextField - UITextField - - - fetchFullMessageSwitch - UISwitch - - - hostnameTextField - UITextField - - - passwordTextField - UITextField - - - useOAuth2Switch - UISwitch - - - - IBProjectSource - ./Classes/SettingsViewController.h - - - - - 0 - IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - - - com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - - - YES - 3 - YES - 3682.6 - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard b/example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard index 2e9d223f..12392b1f 100644 --- a/example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard +++ b/example/ios/iOS UI Test/iOS UI Test/en.lproj/MainStoryboard.storyboard @@ -1,9 +1,8 @@ - + - - - + + @@ -25,33 +24,33 @@ - - + + - + - - + + - - - + @@ -74,17 +73,6 @@ - - - - - - - - - - - -- cgit v1.2.3