diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..809aae8 Binary files /dev/null and b/.DS_Store differ diff --git a/IfElse/.DS_Store b/IfElse/.DS_Store new file mode 100644 index 0000000..35e6243 Binary files /dev/null and b/IfElse/.DS_Store differ diff --git a/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcshareddata/IfElse.xccheckout index c528788..6ee6a8a 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/maldonadoguitar/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/maldonadoguitar/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/AnimalsHouse.xcuserdatad/UserInterfaceState.xcuserstate b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcuserdata/AnimalsHouse.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000..679a7b3 Binary files /dev/null and b/IfElse/IfElse.xcodeproj/project.xcworkspace/xcuserdata/AnimalsHouse.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/IfElse.xcscheme b/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/IfElse.xcscheme new file mode 100644 index 0000000..6485954 --- /dev/null +++ b/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/IfElse.xcscheme @@ -0,0 +1,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/xcschememanagement.plist b/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..44aa48b --- /dev/null +++ b/IfElse/IfElse.xcodeproj/xcuserdata/AnimalsHouse.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,27 @@ + + + + + SchemeUserState + + IfElse.xcscheme + + orderHint + 0 + + + SuppressBuildableAutocreation + + 8DFE63E81B22A54400D3D7AA + + primary + + + 8DFE64011B22A54400D3D7AA + + primary + + + + + diff --git a/IfElse/IfElse/.DS_Store b/IfElse/IfElse/.DS_Store new file mode 100644 index 0000000..38f1a72 Binary files /dev/null and b/IfElse/IfElse/.DS_Store differ diff --git a/IfElse/IfElse/Base.lproj/Main.storyboard b/IfElse/IfElse/Base.lproj/Main.storyboard index 34c014c..b063b4a 100644 --- a/IfElse/IfElse/Base.lproj/Main.storyboard +++ b/IfElse/IfElse/Base.lproj/Main.storyboard @@ -2,6 +2,7 @@ + @@ -35,8 +36,11 @@ + + + - + @@ -46,11 +50,23 @@ - + + + + + + + + + + + + + @@ -73,20 +89,22 @@ + + - - - - - - + + + + + + + - @@ -95,23 +113,32 @@ + + - - - - - - + + + + + + + - + + + + + + + diff --git a/IfElse/IfElse/ViewController.m b/IfElse/IfElse/ViewController.m index b3ee131..aebf0a8 100644 --- a/IfElse/IfElse/ViewController.m +++ b/IfElse/IfElse/ViewController.m @@ -9,19 +9,46 @@ #import "ViewController.h" @interface ViewController () +@property (weak, nonatomic) IBOutlet UITextField *textField1; +@property (weak, nonatomic) IBOutlet UITextField *textField2; +@property (weak, nonatomic) IBOutlet UITextField *textField3; +@property (weak, nonatomic) IBOutlet UISwitch *toggle; +@property (weak, nonatomic) IBOutlet UISlider *slider; @end @implementation ViewController -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} +- (IBAction)buttonTapped:(id)sender { + NSLog (@"Tapped"); + + NSString *textField1Value = self.textField1.text; -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. + NSLog (@"%@", textField1Value); + + + + NSString *one = self.textField1.text; + NSString *two = self.textField2.text; + NSString *three = self.textField3.text; + + BOOL oneEqualsTwo = [one isEqualToString:two]; + if (oneEqualsTwo){ + [self.toggle setOn:YES animated:YES]; + } else { + [self.toggle setOn:NO animated:NO]; + + } + + if (one && [two length] ==0){ + NSLog(@"one not two or three"); + [self.slider setValue:0 animated:YES]; + } else if (two){ + + [self.slider setValue:5 animated:NO]; + } + } -@end + +@end \ No newline at end of file