From 6637d4ccb317185e63aab273f32b6849d3ab5e43 Mon Sep 17 00:00:00 2001 From: mo khan Date: Sun, 14 Jul 2013 14:26:04 -0600 Subject: rename to view controller to login view controller --- cakeside-ios.xcodeproj/project.pbxproj | 24 ++-- .../mo.xcuserdatad/UserInterfaceState.xcuserstate | Bin 8277 -> 13934 bytes .../mo.xcuserdatad/WorkspaceSettings.xcsettings | 10 ++ cakeside-ios/AppDelegate.h | 4 +- cakeside-ios/AppDelegate.m | 4 +- cakeside-ios/LoginViewController.h | 13 ++ cakeside-ios/LoginViewController.m | 29 +++++ cakeside-ios/ViewController.h | 13 -- cakeside-ios/ViewController.m | 29 ----- cakeside-ios/en.lproj/LoginViewController.xib | 137 ++++++++++++++++++++ cakeside-ios/en.lproj/ViewController.xib | 138 --------------------- 11 files changed, 205 insertions(+), 196 deletions(-) create mode 100644 cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/WorkspaceSettings.xcsettings create mode 100644 cakeside-ios/LoginViewController.h create mode 100644 cakeside-ios/LoginViewController.m delete mode 100644 cakeside-ios/ViewController.h delete mode 100644 cakeside-ios/ViewController.m create mode 100644 cakeside-ios/en.lproj/LoginViewController.xib delete mode 100644 cakeside-ios/en.lproj/ViewController.xib diff --git a/cakeside-ios.xcodeproj/project.pbxproj b/cakeside-ios.xcodeproj/project.pbxproj index 7311e04..e784ad1 100644 --- a/cakeside-ios.xcodeproj/project.pbxproj +++ b/cakeside-ios.xcodeproj/project.pbxproj @@ -16,8 +16,8 @@ CDCB346E1793405E00A25F1E /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = CDCB346D1793405E00A25F1E /* Default.png */; }; CDCB34701793405E00A25F1E /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CDCB346F1793405E00A25F1E /* Default@2x.png */; }; CDCB34721793405E00A25F1E /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CDCB34711793405E00A25F1E /* Default-568h@2x.png */; }; - CDCB34751793405E00A25F1E /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CDCB34741793405E00A25F1E /* ViewController.m */; }; - CDCB34781793405E00A25F1E /* ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CDCB34761793405E00A25F1E /* ViewController.xib */; }; + CDCB34751793405E00A25F1E /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CDCB34741793405E00A25F1E /* LoginViewController.m */; }; + CDCB34781793405E00A25F1E /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CDCB34761793405E00A25F1E /* LoginViewController.xib */; }; CDCB34801793405E00A25F1E /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCB347F1793405E00A25F1E /* SenTestingKit.framework */; }; CDCB34811793405E00A25F1E /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCB345B1793405E00A25F1E /* UIKit.framework */; }; CDCB34821793405E00A25F1E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CDCB345D1793405E00A25F1E /* Foundation.framework */; }; @@ -49,9 +49,9 @@ CDCB346D1793405E00A25F1E /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; CDCB346F1793405E00A25F1E /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; CDCB34711793405E00A25F1E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - CDCB34731793405E00A25F1E /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = ""; }; - CDCB34741793405E00A25F1E /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = ""; }; - CDCB34771793405E00A25F1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = ""; }; + CDCB34731793405E00A25F1E /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; + CDCB34741793405E00A25F1E /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; + CDCB34771793405E00A25F1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LoginViewController.xib; sourceTree = ""; }; CDCB347E1793405E00A25F1E /* cakeside-iosTests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "cakeside-iosTests.octest"; sourceTree = BUILT_PRODUCTS_DIR; }; CDCB347F1793405E00A25F1E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; }; CDCB34871793405E00A25F1E /* cakeside-iosTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "cakeside-iosTests-Info.plist"; sourceTree = ""; }; @@ -119,9 +119,9 @@ children = ( CDCB346A1793405E00A25F1E /* AppDelegate.h */, CDCB346B1793405E00A25F1E /* AppDelegate.m */, - CDCB34731793405E00A25F1E /* ViewController.h */, - CDCB34741793405E00A25F1E /* ViewController.m */, - CDCB34761793405E00A25F1E /* ViewController.xib */, + CDCB34731793405E00A25F1E /* LoginViewController.h */, + CDCB34741793405E00A25F1E /* LoginViewController.m */, + CDCB34761793405E00A25F1E /* LoginViewController.xib */, CDCB34621793405E00A25F1E /* Supporting Files */, ); path = "cakeside-ios"; @@ -235,7 +235,7 @@ CDCB346E1793405E00A25F1E /* Default.png in Resources */, CDCB34701793405E00A25F1E /* Default@2x.png in Resources */, CDCB34721793405E00A25F1E /* Default-568h@2x.png in Resources */, - CDCB34781793405E00A25F1E /* ViewController.xib in Resources */, + CDCB34781793405E00A25F1E /* LoginViewController.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -272,7 +272,7 @@ files = ( CDCB34681793405E00A25F1E /* main.m in Sources */, CDCB346C1793405E00A25F1E /* AppDelegate.m in Sources */, - CDCB34751793405E00A25F1E /* ViewController.m in Sources */, + CDCB34751793405E00A25F1E /* LoginViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -303,12 +303,12 @@ name = InfoPlist.strings; sourceTree = ""; }; - CDCB34761793405E00A25F1E /* ViewController.xib */ = { + CDCB34761793405E00A25F1E /* LoginViewController.xib */ = { isa = PBXVariantGroup; children = ( CDCB34771793405E00A25F1E /* en */, ); - name = ViewController.xib; + name = LoginViewController.xib; sourceTree = ""; }; CDCB34881793405E00A25F1E /* InfoPlist.strings */ = { diff --git a/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate b/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate index 1b9dbc3..fadc361 100644 Binary files a/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate and b/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/WorkspaceSettings.xcsettings b/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/WorkspaceSettings.xcsettings new file mode 100644 index 0000000..bfffcfe --- /dev/null +++ b/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/WorkspaceSettings.xcsettings @@ -0,0 +1,10 @@ + + + + + HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges + + SnapshotAutomaticallyBeforeSignificantChanges + + + diff --git a/cakeside-ios/AppDelegate.h b/cakeside-ios/AppDelegate.h index 573f71a..8cbeda4 100644 --- a/cakeside-ios/AppDelegate.h +++ b/cakeside-ios/AppDelegate.h @@ -8,12 +8,12 @@ #import -@class ViewController; +@class LoginViewController; @interface AppDelegate : UIResponder @property (strong, nonatomic) UIWindow *window; -@property (strong, nonatomic) ViewController *viewController; +@property (strong, nonatomic) LoginViewController *viewController; @end diff --git a/cakeside-ios/AppDelegate.m b/cakeside-ios/AppDelegate.m index 05eb4f7..2b4d4ea 100644 --- a/cakeside-ios/AppDelegate.m +++ b/cakeside-ios/AppDelegate.m @@ -8,7 +8,7 @@ #import "AppDelegate.h" -#import "ViewController.h" +#import "LoginViewController.h" @implementation AppDelegate @@ -16,7 +16,7 @@ { self.window = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]; // Override point for customization after application launch. - self.viewController = [[ViewController alloc] initWithNibName:@"ViewController" bundle:nil]; + self.viewController = [[LoginViewController alloc] initWithNibName:@"LoginViewController" bundle:nil]; self.window.rootViewController = self.viewController; [self.window makeKeyAndVisible]; return YES; diff --git a/cakeside-ios/LoginViewController.h b/cakeside-ios/LoginViewController.h new file mode 100644 index 0000000..ee8fc7a --- /dev/null +++ b/cakeside-ios/LoginViewController.h @@ -0,0 +1,13 @@ +// +// ViewController.h +// cakeside-ios +// +// Created by mo khan on 2013-07-14. +// Copyright (c) 2013 mo khan. All rights reserved. +// + +#import + +@interface LoginViewController : UIViewController + +@end diff --git a/cakeside-ios/LoginViewController.m b/cakeside-ios/LoginViewController.m new file mode 100644 index 0000000..cdadcef --- /dev/null +++ b/cakeside-ios/LoginViewController.m @@ -0,0 +1,29 @@ +// +// ViewController.m +// cakeside-ios +// +// Created by mo khan on 2013-07-14. +// Copyright (c) 2013 mo khan. All rights reserved. +// + +#import "LoginViewController.h" + +@interface LoginViewController () + +@end + +@implementation LoginViewController + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view, typically from a nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end diff --git a/cakeside-ios/ViewController.h b/cakeside-ios/ViewController.h deleted file mode 100644 index b017f48..0000000 --- a/cakeside-ios/ViewController.h +++ /dev/null @@ -1,13 +0,0 @@ -// -// ViewController.h -// cakeside-ios -// -// Created by mo khan on 2013-07-14. -// Copyright (c) 2013 mo khan. All rights reserved. -// - -#import - -@interface ViewController : UIViewController - -@end diff --git a/cakeside-ios/ViewController.m b/cakeside-ios/ViewController.m deleted file mode 100644 index 13d0034..0000000 --- a/cakeside-ios/ViewController.m +++ /dev/null @@ -1,29 +0,0 @@ -// -// ViewController.m -// cakeside-ios -// -// Created by mo khan on 2013-07-14. -// Copyright (c) 2013 mo khan. All rights reserved. -// - -#import "ViewController.h" - -@interface ViewController () - -@end - -@implementation ViewController - -- (void)viewDidLoad -{ - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/cakeside-ios/en.lproj/LoginViewController.xib b/cakeside-ios/en.lproj/LoginViewController.xib new file mode 100644 index 0000000..265a608 --- /dev/null +++ b/cakeside-ios/en.lproj/LoginViewController.xib @@ -0,0 +1,137 @@ + + + + 1552 + 12E55 + 3084 + 1187.39 + 626.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 2083 + + + IBProxyObject + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 274 + {{0, 20}, {320, 548}} + + + + 3 + MC43NQA + + 2 + + + NO + + + IBUIScreenMetrics + + YES + + + + + + {320, 568} + {568, 320} + + + IBCocoaTouchFramework + Retina 4 Full Screen + 2 + + IBCocoaTouchFramework + + + + + + + view + + + + 7 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 6 + + + + + + + LoginViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 7 + + + + + LoginViewController + UIViewController + + IBProjectSource + ./Classes/LoginViewController.h + + + + + 0 + IBCocoaTouchFramework + YES + 3 + YES + 2083 + + diff --git a/cakeside-ios/en.lproj/ViewController.xib b/cakeside-ios/en.lproj/ViewController.xib deleted file mode 100644 index 18825b5..0000000 --- a/cakeside-ios/en.lproj/ViewController.xib +++ /dev/null @@ -1,138 +0,0 @@ - - - - 1536 - 12A269 - 2835 - 1187 - 624.00 - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 1919 - - - IBProxyObject - IBUIView - - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - PluginDependencyRecalculationVersion - - - - - IBFilesOwner - IBCocoaTouchFramework - - - IBFirstResponder - IBCocoaTouchFramework - - - - 274 - {{0, 20}, {320, 548}} - - - - - 3 - MC43NQA - - 2 - - - NO - - - IBUIScreenMetrics - - YES - - - - - - {320, 568} - {568, 320} - - - IBCocoaTouchFramework - Retina 4 Full Screen - 2 - - IBCocoaTouchFramework - - - - - - - view - - - - 7 - - - - - - 0 - - - - - - -1 - - - File's Owner - - - -2 - - - - - 6 - - - - - - - ViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - - - - - 7 - - - - - ViewController - UIViewController - - IBProjectSource - ./Classes/ViewController.h - - - - - 0 - IBCocoaTouchFramework - YES - 3 - YES - 1919 - - -- cgit v1.2.3