diff --git a/IfElse/IfElse.xcodeproj/project.pbxproj b/IfElse/IfElse.xcodeproj/project.pbxproj index e14722f..73e6898 100644 --- a/IfElse/IfElse.xcodeproj/project.pbxproj +++ b/IfElse/IfElse.xcodeproj/project.pbxproj @@ -7,6 +7,12 @@ objects = { /* Begin PBXBuildFile section */ + 3B218DCC1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DCA1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf */; }; + 3B218DCD1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DCA1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf */; }; + 3B218DCE1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DCB1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf */; }; + 3B218DCF1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DCB1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf */; }; + 3B218DD11B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DD01B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf */; }; + 3B218DD21B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3B218DD01B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf */; }; 8DFE63EF1B22A54400D3D7AA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE63EE1B22A54400D3D7AA /* main.m */; }; 8DFE63F21B22A54400D3D7AA /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE63F11B22A54400D3D7AA /* AppDelegate.m */; }; 8DFE63F51B22A54400D3D7AA /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8DFE63F41B22A54400D3D7AA /* ViewController.m */; }; @@ -27,6 +33,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 3B218DCA1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Fette Bauersche Antiqua Shadow UNZ1.ttf"; sourceTree = ""; }; + 3B218DCB1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Fette Bauersche Antiqua UNZ1 Hollow.ttf"; sourceTree = ""; }; + 3B218DD01B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Fette Bauersche Antiqua UNZ1.ttf"; sourceTree = ""; }; 8DFE63E91B22A54400D3D7AA /* IfElse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = IfElse.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8DFE63ED1B22A54400D3D7AA /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8DFE63EE1B22A54400D3D7AA /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; @@ -81,6 +90,9 @@ 8DFE63EB1B22A54400D3D7AA /* IfElse */ = { isa = PBXGroup; children = ( + 3B218DD01B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf */, + 3B218DCA1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf */, + 3B218DCB1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf */, 8DFE63F01B22A54400D3D7AA /* AppDelegate.h */, 8DFE63F11B22A54400D3D7AA /* AppDelegate.m */, 8DFE63F31B22A54400D3D7AA /* ViewController.h */, @@ -199,6 +211,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3B218DD11B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf in Resources */, + 3B218DCE1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf in Resources */, + 3B218DCC1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf in Resources */, 8DFE63F81B22A54400D3D7AA /* Main.storyboard in Resources */, 8DFE63FD1B22A54400D3D7AA /* LaunchScreen.xib in Resources */, 8DFE63FA1B22A54400D3D7AA /* Images.xcassets in Resources */, @@ -209,6 +224,9 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 3B218DD21B23DE230050DF9B /* Fette Bauersche Antiqua UNZ1.ttf in Resources */, + 3B218DCD1B23D9F30050DF9B /* Fette Bauersche Antiqua Shadow UNZ1.ttf in Resources */, + 3B218DCF1B23D9F30050DF9B /* Fette Bauersche Antiqua UNZ1 Hollow.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -416,6 +434,7 @@ 8DFE640E1B22A54400D3D7AA /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; 8DFE640F1B22A54400D3D7AA /* Build configuration list for PBXNativeTarget "IfElseTests" */ = { isa = XCConfigurationList; @@ -424,6 +443,7 @@ 8DFE64111B22A54400D3D7AA /* Release */, ); defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; }; /* End XCConfigurationList section */ }; diff --git a/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout index c528788..c6a4caf 100644 --- a/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout +++ b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout @@ -7,34 +7,34 @@ IDESourceControlProjectIdentifier 1FB1EB48-B010-423E-B8FC-A6EF94AD96F8 IDESourceControlProjectName - project + IfElse IDESourceControlProjectOriginsDictionary - 871AD5BEB35E842816B7B3CF4033C4298E764D23 - https://github.com/accesscode-2-2/unit-0.git + BAD0033D05756E529C5FF0EABC2DBC15B8B8219E + https://github.com/elberdev/IfElse.git IDESourceControlProjectPath - lessons/week-0/IfElse/IfElse.xcodeproj/project.xcworkspace + IfElse/IfElse.xcodeproj IDESourceControlProjectRelativeInstallPathDictionary - 871AD5BEB35E842816B7B3CF4033C4298E764D23 - ../../../../.. + BAD0033D05756E529C5FF0EABC2DBC15B8B8219E + ../../.. IDESourceControlProjectURL - https://github.com/accesscode-2-2/unit-0.git + https://github.com/elberdev/IfElse.git IDESourceControlProjectVersion 111 IDESourceControlProjectWCCIdentifier - 871AD5BEB35E842816B7B3CF4033C4298E764D23 + BAD0033D05756E529C5FF0EABC2DBC15B8B8219E IDESourceControlProjectWCConfigurations IDESourceControlRepositoryExtensionIdentifierKey public.vcs.git IDESourceControlWCCIdentifierKey - 871AD5BEB35E842816B7B3CF4033C4298E764D23 + BAD0033D05756E529C5FF0EABC2DBC15B8B8219E IDESourceControlWCCName - unit-0 + IfElse diff --git a/IfElse/IfElse.xcodeproj/project.xcworkspace/xcuserdata/elbercarneiro.xcuserdatad/UserInterfaceState.xcuserstate b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcuserdata/elbercarneiro.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..81335f0 Binary files /dev/null and b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcuserdata/elbercarneiro.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..b8e5498 --- /dev/null +++ b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/IfElse.xcscheme b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/IfElse.xcscheme new file mode 100644 index 0000000..6485954 --- /dev/null +++ b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/IfElse.xcscheme @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/xcschememanagement.plist b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..44aa48b --- /dev/null +++ b/IfElse/IfElse.xcodeproj/xcuserdata/elbercarneiro.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + IfElse.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 8DFE63E81B22A54400D3D7AA + + primary + + + 8DFE64011B22A54400D3D7AA + + primary + + + + + diff --git a/IfElse/IfElse/Base.lproj/Main.storyboard b/IfElse/IfElse/Base.lproj/Main.storyboard index 34c014c..cef45ce 100644 --- a/IfElse/IfElse/Base.lproj/Main.storyboard +++ b/IfElse/IfElse/Base.lproj/Main.storyboard @@ -2,8 +2,14 @@ + + + + FetteBauerscheAntiquaShaddowUNZPro + + @@ -22,7 +28,9 @@ - + + + @@ -35,83 +43,93 @@ + + + - + + + + + - - - - - - + + + + + + - + - - - - - + + - - - + - - - + + + - - - + + - - - + - - - + + + - + + + + + diff --git a/IfElse/IfElse/Fette Bauersche Antiqua Shadow UNZ1.ttf b/IfElse/IfElse/Fette Bauersche Antiqua Shadow UNZ1.ttf new file mode 100755 index 0000000..dc64369 Binary files /dev/null and b/IfElse/IfElse/Fette Bauersche Antiqua Shadow UNZ1.ttf differ diff --git a/IfElse/IfElse/Fette Bauersche Antiqua UNZ1 Hollow.ttf b/IfElse/IfElse/Fette Bauersche Antiqua UNZ1 Hollow.ttf new file mode 100755 index 0000000..e17d861 Binary files /dev/null and b/IfElse/IfElse/Fette Bauersche Antiqua UNZ1 Hollow.ttf differ diff --git a/IfElse/IfElse/Fette Bauersche Antiqua UNZ1.ttf b/IfElse/IfElse/Fette Bauersche Antiqua UNZ1.ttf new file mode 100755 index 0000000..697fbac Binary files /dev/null and b/IfElse/IfElse/Fette Bauersche Antiqua UNZ1.ttf differ diff --git a/IfElse/IfElse/ViewController.m b/IfElse/IfElse/ViewController.m index b3ee131..b2e64f3 100644 --- a/IfElse/IfElse/ViewController.m +++ b/IfElse/IfElse/ViewController.m @@ -9,19 +9,65 @@ #import "ViewController.h" @interface ViewController () +@property (weak, nonatomic) IBOutlet UITextField *textField1; +@property (weak, nonatomic) IBOutlet UITextField *textField2; +@property (weak, nonatomic) IBOutlet UILabel *messageLabel; @end @implementation ViewController +- (IBAction)buttonTapped:(id)sender { + NSLog(@"Tapped"); + + NSString *one = self.textField1.text; + NSString *two = self.textField2.text; + UIColor *denied = [UIColor colorWithRed:247.0f/255.0f + green:45.0f/255.0f blue:45.0f/255.0f alpha:1.0f]; + UIColor *accepted = [UIColor colorWithRed:19.0f/255.0f + green:204.0f/255.0f blue:12.0f/255.0f alpha:1.0f]; + + NSString *userName = @"user"; + NSString *password = @"password"; + + UIFont *font = [UIFont fontWithName:@"FetteBauerscheAntiquaShaddowUNZPro" size:20]; + + BOOL validateUserName = [one isEqualToString:userName]; + BOOL validatePassword = [two isEqualToString:password]; + + if (validateUserName && validatePassword) { + NSLog(@"Success!"); + self.messageLabel.font = [font fontWithSize:70]; + self.messageLabel.text = @"success!"; + [self.view setBackgroundColor:accepted]; + } else if (validateUserName && !validatePassword) { + NSLog(@"User forgot password"); + self.messageLabel.font = [font fontWithSize:50]; + self.messageLabel.text = @"invalid password!";; + [self.view setBackgroundColor:denied]; + } else if (!validateUserName && validatePassword) { + NSLog(@"User forgot user name"); + self.messageLabel.font = [font fontWithSize:50]; + self.messageLabel.text = @"invalid user name!"; + [self.view setBackgroundColor:denied]; + } else { + NSLog(@"User forgot everything"); + self.messageLabel.font = [font fontWithSize:70]; + self.messageLabel.text = @"denied!"; + [self.view setBackgroundColor:denied]; + } +} -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. +- (IBAction)clickedOnUserName:(id)sender { + self.textField1.text = @""; + self.textField1.text = @""; + self.textField1.textColor = [UIColor blackColor]; } -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. +- (IBAction)clickedOnPassword:(id)sender { + self.textField2.text = @""; + self.textField2.text = @""; + self.textField2.textColor = [UIColor blackColor]; } + @end diff --git a/IfElse/IfElseTests/Info.plist b/IfElse/IfElseTests/Info.plist index 9b528e9..7a9be8a 100644 --- a/IfElse/IfElseTests/Info.plist +++ b/IfElse/IfElseTests/Info.plist @@ -18,6 +18,11 @@ 1.0 CFBundleSignature ???? + UIAppFonts + + Fette Bauersche Antiqua Shadow UNZ1.ttf + Fette Bauersche Antiqua UNZ1 Hollow.ttf + CFBundleVersion 1