From 3573bab922a5ae63288267eefa0a030d8286e08d Mon Sep 17 00:00:00 2001 From: mo khan Date: Sun, 14 Jul 2013 14:56:48 -0600 Subject: move controller files in to controller folder --- cakeside-ios.xcodeproj/project.pbxproj | 12 ++--- .../mo.xcuserdatad/UserInterfaceState.xcuserstate | Bin 15102 -> 15072 bytes cakeside-ios/LoginViewController.h | 16 ------ cakeside-ios/LoginViewController.m | 57 --------------------- cakeside-ios/controllers/LoginViewController.h | 16 ++++++ cakeside-ios/controllers/LoginViewController.m | 57 +++++++++++++++++++++ 6 files changed, 79 insertions(+), 79 deletions(-) delete mode 100644 cakeside-ios/LoginViewController.h delete mode 100644 cakeside-ios/LoginViewController.m create mode 100644 cakeside-ios/controllers/LoginViewController.h create mode 100644 cakeside-ios/controllers/LoginViewController.m diff --git a/cakeside-ios.xcodeproj/project.pbxproj b/cakeside-ios.xcodeproj/project.pbxproj index 8c7099f..346f190 100644 --- a/cakeside-ios.xcodeproj/project.pbxproj +++ b/cakeside-ios.xcodeproj/project.pbxproj @@ -17,13 +17,13 @@ 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 /* 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 */; }; CDCB348A1793405E00A25F1E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CDCB34881793405E00A25F1E /* InfoPlist.strings */; }; CDCB348D1793405E00A25F1E /* cakeside_iosTests.m in Sources */ = {isa = PBXBuildFile; fileRef = CDCB348C1793405E00A25F1E /* cakeside_iosTests.m */; }; + CDE67AB0179347D400B4742C /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CDE67AAF179347D400B4742C /* LoginViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -51,8 +51,6 @@ 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 /* LoginViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = LoginViewController.h; path = ../LoginViewController.h; sourceTree = ""; }; - CDCB34741793405E00A25F1E /* LoginViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = LoginViewController.m; 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; }; @@ -60,6 +58,8 @@ CDCB34891793405E00A25F1E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; CDCB348B1793405E00A25F1E /* cakeside_iosTests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = cakeside_iosTests.h; sourceTree = ""; }; CDCB348C1793405E00A25F1E /* cakeside_iosTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cakeside_iosTests.m; sourceTree = ""; }; + CDE67AAE179347D400B4742C /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; + CDE67AAF179347D400B4742C /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = ""; }; CE65D4B28521438085302B5E /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -184,8 +184,8 @@ CDE67AAD1793471B00B4742C /* controllers */ = { isa = PBXGroup; children = ( - CDCB34731793405E00A25F1E /* LoginViewController.h */, - CDCB34741793405E00A25F1E /* LoginViewController.m */, + CDE67AAE179347D400B4742C /* LoginViewController.h */, + CDE67AAF179347D400B4742C /* LoginViewController.m */, ); path = controllers; sourceTree = ""; @@ -334,7 +334,7 @@ files = ( CDCB34681793405E00A25F1E /* main.m in Sources */, CDCB346C1793405E00A25F1E /* AppDelegate.m in Sources */, - CDCB34751793405E00A25F1E /* LoginViewController.m in Sources */, + CDE67AB0179347D400B4742C /* LoginViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate b/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate index 4ac814a..9a54ebc 100644 Binary files a/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate and b/cakeside-ios.xcworkspace/xcuserdata/mo.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/cakeside-ios/LoginViewController.h b/cakeside-ios/LoginViewController.h deleted file mode 100644 index e1336cf..0000000 --- a/cakeside-ios/LoginViewController.h +++ /dev/null @@ -1,16 +0,0 @@ -// -// ViewController.h -// cakeside-ios -// -// Created by mo khan on 2013-07-14. -// Copyright (c) 2013 mo khan. All rights reserved. -// - -#import - -@interface LoginViewController : UIViewController -@property (strong, nonatomic) IBOutlet UITextField *emailTextBox; -@property (strong, nonatomic) IBOutlet UITextField *passwordTextBox; -@property (strong, nonatomic) IBOutlet UIButton *loginButton; - -@end diff --git a/cakeside-ios/LoginViewController.m b/cakeside-ios/LoginViewController.m deleted file mode 100644 index 5c0d897..0000000 --- a/cakeside-ios/LoginViewController.m +++ /dev/null @@ -1,57 +0,0 @@ -// -// 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. - UIView *emailPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)]; - self.emailTextBox.leftView = emailPaddingView; - self.emailTextBox.leftViewMode = UITextFieldViewModeAlways; - - UIView *passwordPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)]; - self.passwordTextBox.leftView = passwordPaddingView; - self.passwordTextBox.leftViewMode = UITextFieldViewModeAlways; - -// self.contentView.$y = 0; - - // prepopulate username/password with stored information - /* - NSError *error; - NSString *username = [SSKeychain passwordForService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT error:&error]; - if (error) { username = nil; } - NSString *password = [SSKeychain passwordForService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT error:&error]; - if (error) { password = nil; } - - if (username) - { - self.emailTextBox.text = username; - } - if (password) - { - self.passwordTextBox.text = password; - } - */ - -} - -- (void)didReceiveMemoryWarning -{ - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/cakeside-ios/controllers/LoginViewController.h b/cakeside-ios/controllers/LoginViewController.h new file mode 100644 index 0000000..e1336cf --- /dev/null +++ b/cakeside-ios/controllers/LoginViewController.h @@ -0,0 +1,16 @@ +// +// ViewController.h +// cakeside-ios +// +// Created by mo khan on 2013-07-14. +// Copyright (c) 2013 mo khan. All rights reserved. +// + +#import + +@interface LoginViewController : UIViewController +@property (strong, nonatomic) IBOutlet UITextField *emailTextBox; +@property (strong, nonatomic) IBOutlet UITextField *passwordTextBox; +@property (strong, nonatomic) IBOutlet UIButton *loginButton; + +@end diff --git a/cakeside-ios/controllers/LoginViewController.m b/cakeside-ios/controllers/LoginViewController.m new file mode 100644 index 0000000..5c0d897 --- /dev/null +++ b/cakeside-ios/controllers/LoginViewController.m @@ -0,0 +1,57 @@ +// +// 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. + UIView *emailPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)]; + self.emailTextBox.leftView = emailPaddingView; + self.emailTextBox.leftViewMode = UITextFieldViewModeAlways; + + UIView *passwordPaddingView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 5, 20)]; + self.passwordTextBox.leftView = passwordPaddingView; + self.passwordTextBox.leftViewMode = UITextFieldViewModeAlways; + +// self.contentView.$y = 0; + + // prepopulate username/password with stored information + /* + NSError *error; + NSString *username = [SSKeychain passwordForService:KEYCHAIN_USER_NAME account:KEYCHAIN_ACCOUNT error:&error]; + if (error) { username = nil; } + NSString *password = [SSKeychain passwordForService:KEYCHAIN_USER_PASSWORD account:KEYCHAIN_ACCOUNT error:&error]; + if (error) { password = nil; } + + if (username) + { + self.emailTextBox.text = username; + } + if (password) + { + self.passwordTextBox.text = password; + } + */ + +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +@end -- cgit v1.2.3