diff options
| author | mo khan <mo@mokhan.ca> | 2013-07-14 14:26:04 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2013-07-14 14:26:04 -0600 |
| commit | 6637d4ccb317185e63aab273f32b6849d3ab5e43 (patch) | |
| tree | 97e31bf11d3b47f4a1d48100992d5c6e3a846a65 | |
| parent | c6cf25e7ef7ea6156ee0c46e2ae37c8eef8932b6 (diff) | |
rename to view controller to login view controller
| -rw-r--r-- | cakeside-ios.xcodeproj/project.pbxproj | 24 | ||||
| -rw-r--r-- | cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate | bin | 8277 -> 13934 bytes | |||
| -rw-r--r-- | cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/WorkspaceSettings.xcsettings | 10 | ||||
| -rw-r--r-- | cakeside-ios/AppDelegate.h | 4 | ||||
| -rw-r--r-- | cakeside-ios/AppDelegate.m | 4 | ||||
| -rw-r--r-- | cakeside-ios/LoginViewController.h (renamed from cakeside-ios/ViewController.h) | 2 | ||||
| -rw-r--r-- | cakeside-ios/LoginViewController.m (renamed from cakeside-ios/ViewController.m) | 6 | ||||
| -rw-r--r-- | cakeside-ios/en.lproj/LoginViewController.xib (renamed from cakeside-ios/en.lproj/ViewController.xib) | 21 |
8 files changed, 40 insertions, 31 deletions
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 = "<group>"; }; CDCB346F1793405E00A25F1E /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; }; CDCB34711793405E00A25F1E /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; - CDCB34731793405E00A25F1E /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; }; - CDCB34741793405E00A25F1E /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; }; - CDCB34771793405E00A25F1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = "<group>"; }; + CDCB34731793405E00A25F1E /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; }; + CDCB34741793405E00A25F1E /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; }; + CDCB34771793405E00A25F1E /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/LoginViewController.xib; sourceTree = "<group>"; }; 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 = "<group>"; }; @@ -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 = "<group>"; }; - CDCB34761793405E00A25F1E /* ViewController.xib */ = { + CDCB34761793405E00A25F1E /* LoginViewController.xib */ = { isa = PBXVariantGroup; children = ( CDCB34771793405E00A25F1E /* en */, ); - name = ViewController.xib; + name = LoginViewController.xib; sourceTree = "<group>"; }; 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 Binary files differindex 1b9dbc3..fadc361 100644 --- a/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate +++ b/cakeside-ios.xcodeproj/project.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate 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 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key> + <true/> + <key>SnapshotAutomaticallyBeforeSignificantChanges</key> + <false/> +</dict> +</plist> 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 <UIKit/UIKit.h> -@class ViewController; +@class LoginViewController; @interface AppDelegate : UIResponder <UIApplicationDelegate> @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/ViewController.h b/cakeside-ios/LoginViewController.h index b017f48..ee8fc7a 100644 --- a/cakeside-ios/ViewController.h +++ b/cakeside-ios/LoginViewController.h @@ -8,6 +8,6 @@ #import <UIKit/UIKit.h> -@interface ViewController : UIViewController +@interface LoginViewController : UIViewController @end diff --git a/cakeside-ios/ViewController.m b/cakeside-ios/LoginViewController.m index 13d0034..cdadcef 100644 --- a/cakeside-ios/ViewController.m +++ b/cakeside-ios/LoginViewController.m @@ -6,13 +6,13 @@ // Copyright (c) 2013 mo khan. All rights reserved. // -#import "ViewController.h" +#import "LoginViewController.h" -@interface ViewController () +@interface LoginViewController () @end -@implementation ViewController +@implementation LoginViewController - (void)viewDidLoad { diff --git a/cakeside-ios/en.lproj/ViewController.xib b/cakeside-ios/en.lproj/LoginViewController.xib index 18825b5..265a608 100644 --- a/cakeside-ios/en.lproj/ViewController.xib +++ b/cakeside-ios/en.lproj/LoginViewController.xib @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <data> - <int key="IBDocument.SystemTarget">1536</int> - <string key="IBDocument.SystemVersion">12A269</string> - <string key="IBDocument.InterfaceBuilderVersion">2835</string> - <string key="IBDocument.AppKitVersion">1187</string> - <string key="IBDocument.HIToolboxVersion">624.00</string> + <int key="IBDocument.SystemTarget">1552</int> + <string key="IBDocument.SystemVersion">12E55</string> + <string key="IBDocument.InterfaceBuilderVersion">3084</string> + <string key="IBDocument.AppKitVersion">1187.39</string> + <string key="IBDocument.HIToolboxVersion">626.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string key="NS.object.0">1919</string> + <string key="NS.object.0">2083</string> </object> <array key="IBDocument.IntegratedClassDependencies"> <string>IBProxyObject</string> @@ -36,7 +36,6 @@ <string key="NSFrame">{{0, 20}, {320, 548}}</string> <reference key="NSSuperview"/> <reference key="NSWindow"/> - <reference key="NSNextKeyView"/> <object class="NSColor" key="IBUIBackgroundColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MC43NQA</bytes> @@ -104,7 +103,7 @@ </array> </object> <dictionary class="NSMutableDictionary" key="flattenedProperties"> - <string key="-1.CustomClassName">ViewController</string> + <string key="-1.CustomClassName">LoginViewController</string> <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.CustomClassName">UIResponder</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -119,11 +118,11 @@ <object class="IBClassDescriber" key="IBDocument.Classes"> <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> - <string key="className">ViewController</string> + <string key="className">LoginViewController</string> <string key="superclassName">UIViewController</string> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">./Classes/ViewController.h</string> + <string key="minorKey">./Classes/LoginViewController.h</string> </object> </object> </array> @@ -133,6 +132,6 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> <bool key="IBDocument.UseAutolayout">YES</bool> - <string key="IBCocoaTouchPluginVersion">1919</string> + <string key="IBCocoaTouchPluginVersion">2083</string> </data> </archive> |
