From 292acc4f8edd003300226a8d59f5424df1d63da7 Mon Sep 17 00:00:00 2001 From: JustineKay Date: Sat, 27 Jun 2015 12:04:09 -0400 Subject: [PATCH 01/14] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 082e4ed..a3dba2a 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,4 @@ All directions are here... https://github.com/accesscode-2-2/unit-0/tree/master/project Instructions on forking and pull requests here... https://github.com/accesscode-2-2/how-to-pr +HAHAHA From 090d93321cb38c2ebae0aa666426da98e83bbe01 Mon Sep 17 00:00:00 2001 From: Christian Date: Sat, 27 Jun 2015 12:54:47 -0400 Subject: [PATCH 02/14] justine's turn --- TodoList/TodoList/main.m | 91 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 187be40..53ba3a6 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -8,10 +8,97 @@ #import +@interface Manager : NSObject +-(void)addItem; +-(void)deleteItem; +-(void)markDone; +-(NSMutableArray)setPriority:(NSInteger *)i; + + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@implementation Manager; + + + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@interface List : NSObject + + +-(void)setListName:(NSString *)list; +-(NSString *) list; +-(void)addItem:(Item *)item; + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@implementation List{ + NSString * _list; + NSMutableArray* _listOfItems; +} + + +-(void)setListName:(NSString *)list{ + _list = list; +} +-(NSString *) list{ + return _list; +} +-(void)addItem:(Item *)item{ + if(_listOfItems == nil){ + _listOfItems = [[NSMutableArray alloc] init]; + } + [_listOfItems addObject:item]; +} + + +@end +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@interface Item : NSObject + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@implementation Item{ + + NSString * _item; +} + + +-(void)setItemName:(NSString *)item{ + _item = item; +} +-(NSString *) item{ + return _item; +} + + + + + + +@end + + + + + int main(int argc, const char * argv[]) { @autoreleasepool { - // insert code here... - NSLog(@"Hello, World!"); + } return 0; } + + +@end \ No newline at end of file From 5099961e53deb70c78c3a93fdd2200cfd3fdac0b Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Sat, 27 Jun 2015 15:40:08 -0400 Subject: [PATCH 03/14] Adding items and displaying them --- TodoList/TodoList/main.m | 116 ++++++++++++++++++++++++++++----------- 1 file changed, 84 insertions(+), 32 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 53ba3a6..091bb49 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -8,97 +8,149 @@ #import -@interface Manager : NSObject --(void)addItem; --(void)deleteItem; --(void)markDone; --(NSMutableArray)setPriority:(NSInteger *)i; - +@class List; +@class Item; +@class Manager; -@end +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -@implementation Manager; - +@interface List : NSObject -@end +- (instancetype)initWithListName:(NSString *)listName; -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +-(void)addItem:(Item *)item; -@interface List : NSObject +-(NSMutableArray *)listOfItems; --(void)setListName:(NSString *)list; --(NSString *) list; --(void)addItem:(Item *)item; @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation List{ - NSString * _list; + NSString* _list; NSMutableArray* _listOfItems; } --(void)setListName:(NSString *)list{ - _list = list; -} --(NSString *) list{ - return _list; +- (instancetype)initWithListName:(NSString *)listName{ + if (self = [super init]) { + _list = listName; + return self; + } + return nil; + } --(void)addItem:(Item *)item{ + +-(NSMutableArray *)listOfItems{ if(_listOfItems == nil){ _listOfItems = [[NSMutableArray alloc] init]; } - [_listOfItems addObject:item]; + return _listOfItems; } +-(void)addItem:(Item *)item{ + [[self listOfItems] addObject:item]; +} + + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + @interface Item : NSObject +- (instancetype)initWithItemName:(NSString *)itemName; + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Item{ - - NSString * _item; + NSString * _title; } --(void)setItemName:(NSString *)item{ - _item = item; -} --(NSString *) item{ - return _item; +- (instancetype)initWithItemName:(NSString *)itemName{ + if (self = [super init]) { + _title = itemName; + return self; + } + return nil; + } +@end +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@interface Manager : NSObject +-(void)displayItems:(NSMutableArray *)items; +//-(void)markDone; +//-(void)setPriority:(NSInteger *)i; @end +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@implementation Manager{ + +} + +-(void)displayItems:(List *)list{ + NSMutableArray *myListOfItems = [list listOfItems]; + for (int i = 0; i < [myListOfItems count]; i++) { + NSLog(@"%@", myListOfItems[i]); + } +} + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx int main(int argc, const char * argv[]) { @autoreleasepool { + Manager *listManagaer = [[Manager alloc] init]; + + List *toDoToday = [[List alloc] initWithListName:@"To Do Today"]; + + Item *swim = [[Item alloc] initWithItemName:@"swim"]; + Item *yoga = [[Item alloc] initWithItemName:@"yoga"]; + Item *practiceGuitar = [[Item alloc] initWithItemName:@"practice guitar"]; + + [toDoToday addItem:swim]; + [toDoToday addItem:yoga]; + [toDoToday addItem:practiceGuitar]; + + //NSLog(@"%@, %@, %@", toDoToday[0], toDoToday[1], toDoToday[2]); + + [listManagaer displayItems:toDoToday]; + + + + + + } return 0; } -@end \ No newline at end of file +//@end \ No newline at end of file From 17aa74abf9da1dcda18da9d83cb8277751efa1eb Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Sat, 27 Jun 2015 17:02:47 -0400 Subject: [PATCH 04/14] Created a method in Manager to display items in a list --- TodoList/TodoList/main.m | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 091bb49..46fb796 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -66,26 +66,32 @@ -(void)addItem:(Item *)item{ @interface Item : NSObject -- (instancetype)initWithItemName:(NSString *)itemName; +- (instancetype)initWithItemName:(NSString *)title; +- (NSString *) getItemName; @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Item{ - NSString * _title; + NSString * _itemName; } -- (instancetype)initWithItemName:(NSString *)itemName{ +- (instancetype)initWithItemName:(NSString *)title{ if (self = [super init]) { - _title = itemName; + _itemName = title; return self; } return nil; } +-(NSString *)getItemName{ + return _itemName; +} + + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -93,7 +99,7 @@ - (instancetype)initWithItemName:(NSString *)itemName{ @interface Manager : NSObject --(void)displayItems:(NSMutableArray *)items; +-(void)displayItems:(List *)list; //-(void)markDone; //-(void)setPriority:(NSInteger *)i; @@ -110,7 +116,7 @@ @implementation Manager{ -(void)displayItems:(List *)list{ NSMutableArray *myListOfItems = [list listOfItems]; for (int i = 0; i < [myListOfItems count]; i++) { - NSLog(@"%@", myListOfItems[i]); + NSLog(@"%@", [myListOfItems[i] getItemName]); } } @@ -127,7 +133,7 @@ -(void)displayItems:(List *)list{ int main(int argc, const char * argv[]) { @autoreleasepool { - Manager *listManagaer = [[Manager alloc] init]; + Manager *listManager = [[Manager alloc] init]; List *toDoToday = [[List alloc] initWithListName:@"To Do Today"]; @@ -139,11 +145,7 @@ int main(int argc, const char * argv[]) { [toDoToday addItem:yoga]; [toDoToday addItem:practiceGuitar]; - //NSLog(@"%@, %@, %@", toDoToday[0], toDoToday[1], toDoToday[2]); - - [listManagaer displayItems:toDoToday]; - - + [listManager displayItems:toDoToday]; From b8f7996c29176cd4d1ae28fca27fbca0e2d3bbe7 Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Sat, 27 Jun 2015 17:24:31 -0400 Subject: [PATCH 05/14] Changed Item object to Task --- TodoList/TodoList/main.m | 62 ++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 46fb796..6d950f2 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -9,7 +9,7 @@ #import @class List; -@class Item; +@class Task; @class Manager; @@ -21,9 +21,9 @@ @interface List : NSObject - (instancetype)initWithListName:(NSString *)listName; --(void)addItem:(Item *)item; +-(void)addTask:(Task *) task; --(NSMutableArray *)listOfItems; +-(NSMutableArray *)listOfTasks; @@ -33,7 +33,7 @@ -(NSMutableArray *)listOfItems; @implementation List{ NSString* _list; - NSMutableArray* _listOfItems; + NSMutableArray* _listOfTasks; } @@ -46,15 +46,15 @@ - (instancetype)initWithListName:(NSString *)listName{ } --(NSMutableArray *)listOfItems{ - if(_listOfItems == nil){ - _listOfItems = [[NSMutableArray alloc] init]; +-(NSMutableArray *)listOfTasks{ + if(_listOfTasks == nil){ + _listOfTasks = [[NSMutableArray alloc] init]; } - return _listOfItems; + return _listOfTasks; } --(void)addItem:(Item *)item{ - [[self listOfItems] addObject:item]; +-(void)addTask:(Task *)task{ + [[self listOfTasks] addObject:task]; } @@ -64,31 +64,31 @@ -(void)addItem:(Item *)item{ //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -@interface Item : NSObject +@interface Task : NSObject -- (instancetype)initWithItemName:(NSString *)title; -- (NSString *) getItemName; +- (instancetype)initWithTaskName:(NSString *)title; +- (NSString *) getTaskName; @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -@implementation Item{ - NSString * _itemName; +@implementation Task{ + NSString * _taskName; } -- (instancetype)initWithItemName:(NSString *)title{ +- (instancetype)initWithTaskName:(NSString *)title{ if (self = [super init]) { - _itemName = title; + _taskName = title; return self; } return nil; } --(NSString *)getItemName{ - return _itemName; +-(NSString *)getTaskName{ + return _taskName; } @@ -99,7 +99,7 @@ -(NSString *)getItemName{ @interface Manager : NSObject --(void)displayItems:(List *)list; +-(void)displayTasks:(List *)list; //-(void)markDone; //-(void)setPriority:(NSInteger *)i; @@ -113,10 +113,10 @@ @implementation Manager{ } --(void)displayItems:(List *)list{ - NSMutableArray *myListOfItems = [list listOfItems]; - for (int i = 0; i < [myListOfItems count]; i++) { - NSLog(@"%@", [myListOfItems[i] getItemName]); +-(void)displayTasks:(List *)list{ + NSMutableArray *myListOfTasks = [list listOfTasks]; + for (int i = 0; i < [myListOfTasks count]; i++) { + NSLog(@"%@", [myListOfTasks[i] getTaskName]); } } @@ -137,15 +137,15 @@ int main(int argc, const char * argv[]) { List *toDoToday = [[List alloc] initWithListName:@"To Do Today"]; - Item *swim = [[Item alloc] initWithItemName:@"swim"]; - Item *yoga = [[Item alloc] initWithItemName:@"yoga"]; - Item *practiceGuitar = [[Item alloc] initWithItemName:@"practice guitar"]; + Task *swim = [[Task alloc] initWithTaskName:@"swim"]; + Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; + Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; - [toDoToday addItem:swim]; - [toDoToday addItem:yoga]; - [toDoToday addItem:practiceGuitar]; + [toDoToday addTask:swim]; + [toDoToday addTask:yoga]; + [toDoToday addTask:practiceGuitar]; - [listManager displayItems:toDoToday]; + [listManager displayTasks:toDoToday]; From 391e05c7cb42f8c18aaf70e346d0dedfa9825f5b Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Sun, 28 Jun 2015 10:31:41 -0400 Subject: [PATCH 06/14] good morning. it's sunday. woo - hoo --- TodoList/TodoList/main.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 6d950f2..73d0691 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -101,6 +101,8 @@ @interface Manager : NSObject -(void)displayTasks:(List *)list; + + //-(void)markDone; //-(void)setPriority:(NSInteger *)i; From c45ea1eb2627789125a6449fb9d5c540ed36b08d Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 28 Jun 2015 12:50:01 -0400 Subject: [PATCH 07/14] must practice, must do yoga --- TodoList/TodoList/main.m | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 6d950f2..919cfb6 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -24,7 +24,7 @@ - (instancetype)initWithListName:(NSString *)listName; -(void)addTask:(Task *) task; -(NSMutableArray *)listOfTasks; - +-(void)removeObject:(id)object; @end @@ -57,6 +57,10 @@ -(void)addTask:(Task *)task{ [[self listOfTasks] addObject:task]; } +-(void)removeObject:(NSString *)object{ + [[self listOfTasks] removeObject:object]; +} + @end @@ -101,8 +105,7 @@ @interface Manager : NSObject -(void)displayTasks:(List *)list; -//-(void)markDone; -//-(void)setPriority:(NSInteger *)i; +-(void)removeTask:(List *)list; @end @@ -119,6 +122,27 @@ -(void)displayTasks:(List *)list{ NSLog(@"%@", [myListOfTasks[i] getTaskName]); } } +-(void)removeTask:(List *)list { + + [self displayTasks: list]; + NSLog(@"Which task would you like to remove?"); + + NSMutableArray *myListOfTasks = [list listOfTasks]; + for (int i = 0; i < [myListOfTasks count]; i++) { + + char userInput[40]; + scanf("%s", userInput); + NSString *objectToBeRemoved = [[NSString alloc] initWithCString: userInput encoding:NSUTF8StringEncoding]; + + if ([objectToBeRemoved isEqualToString: [myListOfTasks[i] getTaskName]]){ + + [list removeObject: myListOfTasks[i]]; + NSLog(@"Your new list:"); + [self displayTasks: list]; + + } + } +} @@ -147,6 +171,7 @@ int main(int argc, const char * argv[]) { [listManager displayTasks:toDoToday]; + [listManager removeTask:toDoToday]; From 17cea7d95785860c789fab4d3734e3f98d582c32 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 28 Jun 2015 18:00:07 -0400 Subject: [PATCH 08/14] Aaaaaaahhhhhhh --- TodoList/TodoList/main.m | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 8c00c8e..07f80fd 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -142,11 +142,13 @@ -(void)markTaskAsDone:(List *)list; //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Manager{ - + List *_completedTasks; + List *_activeTasks; } -(List *) createNewList: (NSString *)name{ List *newList = [[List alloc] initWithListName:name]; + return newList; } @@ -199,7 +201,8 @@ -(void)markTaskAsDone:(List *)list{ if ([objectToBeMarkedAsDone isEqualToString: [myListOfTasks[i] getTaskName]]){ - List *doneAndDone = [self createNewList:@"Done and Done"]; + + List *doneAndDone = [self _completedTasks]; Task *newDoneTask = [self createNewTask:objectToBeMarkedAsDone]; [doneAndDone addTask:newDoneTask]; From 43f5fb6d0de3eb4fdd26e29c65d925d3611d352f Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Tue, 30 Jun 2015 18:47:49 -0400 Subject: [PATCH 09/14] Reorganized the Madness --- TodoList/TodoList/main.m | 153 +++++++++++++++++++++++++-------------- 1 file changed, 97 insertions(+), 56 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 07f80fd..2eecbad 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -28,10 +28,10 @@ @interface List : NSObject - (instancetype)initWithListName:(NSString *)listName; -(NSMutableArray *)listOfTasks; --(NSMutableArray *)listOfDoneTasks; + -(void)addTask:(Task *) task; --(void)addTaskToDoneTasks:(Task *)task; + -(void)removeObject:(NSString *)object; @@ -45,7 +45,7 @@ -(void)removeObject:(NSString *)object; @implementation List{ NSString* _list; NSMutableArray* _listOfTasks; - NSMutableArray* _listOfDoneTasks; + } @@ -65,20 +65,13 @@ -(NSMutableArray *)listOfTasks{ return _listOfTasks; } --(NSMutableArray *)listOfDoneTasks{ - if(_listOfDoneTasks == nil){ - _listOfDoneTasks = [[NSMutableArray alloc] init]; - } - return _listOfDoneTasks; -} + -(void)addTask:(Task *)task{ [[self listOfTasks] addObject:task]; } --(void)addTaskToDoneTasks:(Task *)task{ - [[self listOfDoneTasks] addObject:task]; -} + -(void)removeObject:(NSString *)object{ [[self listOfTasks] removeObject:object]; @@ -126,15 +119,21 @@ -(NSString *)getTaskName{ @interface Manager : NSObject --(List *) createNewList; +- (List *)doneTasks; --(Task *) createNewTask; +- (List *)activeTasks; + +-(NSMutableArray *)listOfDoneTasks; + +-(Task *) createCompletedTask: (NSString *)name; + +-(void)addTaskToDoneTasks:(Task *)task; -(void)displayTasks:(List *)list; -(void)removeTask:(List *)list; --(void)markTaskAsDone:(List *)list; +-(void)markTaskAsDone:(NSInteger *)index fromList: (List *)list; @end @@ -142,20 +141,44 @@ -(void)markTaskAsDone:(List *)list; //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Manager{ - List *_completedTasks; + NSMutableArray* _listOfDoneTasks; + List *_doneTasks; List *_activeTasks; + Task *_completedTask; } --(List *) createNewList: (NSString *)name{ - List *newList = [[List alloc] initWithListName:name]; - - return newList; + +- (List *)doneTasks { + // if it is nil create it + if (_doneTasks == nil) { + _doneTasks = [[List alloc] initWithListName:@"Done and Done"]; + } + return _doneTasks; +} + +- (List *)activeTasks { + // if it is nil create it + if (_activeTasks == nil) { + _activeTasks = [[List alloc] initWithListName:@"To Do Today"]; + } + return _activeTasks; } --(Task *) createNewTask: (NSString *)name{ - Task *newTask = [[Task alloc] initWithTaskName:name]; - return newTask; +-(Task *) createCompletedTask: (NSString *)name{ + Task *completedTask = [[Task alloc] initWithTaskName:name]; + return completedTask; +} + +-(NSMutableArray *)listOfDoneTasks{ + if(_listOfDoneTasks == nil){ + _listOfDoneTasks = [[NSMutableArray alloc] init]; + } + return _listOfDoneTasks; +} + +-(void)addTaskToDoneTasks:(Task *)task{ + [[self listOfDoneTasks] addObject:task]; } @@ -188,33 +211,44 @@ -(void)removeTask:(List *)list { } } --(void)markTaskAsDone:(List *)list{ +-(void)markTaskAsDone:(NSInteger *)index fromList:(List *)list{ - [self displayTasks: list]; - NSLog(@"Which task would you like to mark as 'Done'?"); + // take task from active list, hold it in a variable, add to done list - NSString *objectToBeMarkedAsDone = scanUserInput(); + NSMutableArray *tempList = [list listOfTasks]; + Task *foundTask = [[list listOfTasks] objectAtIndex:index]; + [tempList removeObjectAtIndex:index]; + [[self doneTasks] addTask:foundTask]; + //[[_doneTasks listOfTasks] addObject:foundTask]; - NSMutableArray *myListOfTasks = [list listOfTasks]; - for (int i = 0; i < [myListOfTasks count]; i++) { - - if ([objectToBeMarkedAsDone isEqualToString: [myListOfTasks[i] getTaskName]]){ - - - List *doneAndDone = [self _completedTasks]; - Task *newDoneTask = [self createNewTask:objectToBeMarkedAsDone]; - [doneAndDone addTask:newDoneTask]; - - NSLog(@"Completed tasks:"); - [self displayTasks:doneAndDone]; - - [list removeObject: myListOfTasks[i]]; - NSLog(@"Your new list:"); - [self displayTasks: list]; - - } - } +// [self displayTasks: list]; +// NSLog(@"Which task would you like to mark as 'Done'?"); +// +// NSString *objectToBeMarkedAsDone = scanUserInput(); +// +// NSMutableArray *myListOfTasks = [list listOfTasks]; +// +// for (int i = 0; i < [myListOfTasks count]; i++) { +// +// if ([objectToBeMarkedAsDone isEqualToString: [myListOfTasks[i] getTaskName]]){ +// +// _completedTask = [self createCompletedTask:objectToBeMarkedAsDone]; +// [self addTaskToDoneTasks: _completedTask]; +// +//// List *doneAndDone = [self _completedTasks]; +//// Task *newDoneTask = [self createNewTask:objectToBeMarkedAsDone]; +//// [doneAndDone addTask:newDoneTask]; +// +// NSLog(@"Completed tasks:"); +// [self displayTasks:_listOfDoneTasks]; +// +// [list removeObject: myListOfTasks[i]]; +// NSLog(@"Your new list:"); +// [self displayTasks: list]; +// +// } +// } } @@ -230,27 +264,34 @@ int main(int argc, const char * argv[]) { @autoreleasepool { Manager *listManager = [[Manager alloc] init]; - - List *toDoToday = [[List alloc] initWithListName:@"To Do Today"]; - //List *doneAndDone = [[List alloc] initWithListName:@"Done and Done"]; +// +// while (true) { +// // print list of actions +// // user selects actions +// // perform task based on user action +// +// } Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; Task *swim = [[Task alloc] initWithTaskName:@"swim"]; Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; - [toDoToday addTask:practiceGuitar]; - [toDoToday addTask:swim]; - [toDoToday addTask:yoga]; + List *al = [listManager activeTasks]; + [al addTask:practiceGuitar]; + [al addTask:swim]; + [al addTask:yoga]; //[listManager displayTasks:toDoToday]; //[listManager removeTask:toDoToday]; - [listManager markTaskAsDone:toDoToday]; - - [listManager markTaskAsDone:toDoToday]; - + [listManager markTaskAsDone:1 fromList:al]; + [listManager markTaskAsDone:0 fromList:al]; +// [listManager markTaskAsDone:toDoToday]; +// +// [listManager markTaskAsDone:toDoToday]; + NSLog(@"whatever"); } return 0; From 69a38928d6d97d8c84e742ec35322e33dee9e37d Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Wed, 1 Jul 2015 14:18:52 -0400 Subject: [PATCH 10/14] Fresh and Clean, reorganized and adding main while loop for main features --- TodoList/TodoList/main.m | 291 ++++++++++++++++++++------------------- 1 file changed, 152 insertions(+), 139 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 2eecbad..907a0cd 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -22,20 +22,52 @@ //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -@interface List : NSObject +@interface Task : NSObject -- (instancetype)initWithListName:(NSString *)listName; +- (instancetype)initWithTaskName:(NSString *)title; + +- (NSString *) getTaskName; + +@end + +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + +@implementation Task{ + NSString * _taskName; +} + + +- (instancetype)initWithTaskName:(NSString *)title{ + if (self = [super init]) { + _taskName = title; + return self; + } + return nil; + +} + +-(NSString *)getTaskName{ + return _taskName; +} --(NSMutableArray *)listOfTasks; +@end +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx +//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + + + +@interface List : NSObject --(void)addTask:(Task *) task; +- (instancetype)initWithListName:(NSString *)listName; --(void)removeObject:(NSString *)object; +-(NSMutableArray *)listOfTasks; +-(void)addTaskToList:(Task *) task; +-(void)displayTasks:(List *)list; @end @@ -67,71 +99,32 @@ -(NSMutableArray *)listOfTasks{ --(void)addTask:(Task *)task{ +-(void)addTaskToList:(Task *)task{ [[self listOfTasks] addObject:task]; } - --(void)removeObject:(NSString *)object{ - [[self listOfTasks] removeObject:object]; -} - - - -@end -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - - -@interface Task : NSObject - -- (instancetype)initWithTaskName:(NSString *)title; -- (NSString *) getTaskName; - -@end - -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - -@implementation Task{ - NSString * _taskName; -} - - -- (instancetype)initWithTaskName:(NSString *)title{ - if (self = [super init]) { - _taskName = title; - return self; +-(void)displayTasks: (List *)list{ + NSMutableArray *tempListOfTasks = [list listOfTasks]; + for (int i = 0; i < [tempListOfTasks count]; i++) { + NSLog(@"%d %@", i,[tempListOfTasks[i] getTaskName]); } - return nil; - } --(NSString *)getTaskName{ - return _taskName; -} @end - //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx + @interface Manager : NSObject - (List *)doneTasks; - (List *)activeTasks; --(NSMutableArray *)listOfDoneTasks; - --(Task *) createCompletedTask: (NSString *)name; - --(void)addTaskToDoneTasks:(Task *)task; - --(void)displayTasks:(List *)list; - --(void)removeTask:(List *)list; +-(void)deleteTask:(NSInteger *)index from: (List *)list; -(void)markTaskAsDone:(NSInteger *)index fromList: (List *)list; @@ -141,10 +134,9 @@ -(void)markTaskAsDone:(NSInteger *)index fromList: (List *)list; //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Manager{ - NSMutableArray* _listOfDoneTasks; + //NSMutableArray* _listOfDoneTasks; List *_doneTasks; List *_activeTasks; - Task *_completedTask; } @@ -165,83 +157,22 @@ - (List *)activeTasks { } --(Task *) createCompletedTask: (NSString *)name{ - Task *completedTask = [[Task alloc] initWithTaskName:name]; - return completedTask; -} - --(NSMutableArray *)listOfDoneTasks{ - if(_listOfDoneTasks == nil){ - _listOfDoneTasks = [[NSMutableArray alloc] init]; - } - return _listOfDoneTasks; -} - --(void)addTaskToDoneTasks:(Task *)task{ - [[self listOfDoneTasks] addObject:task]; -} - - --(void)displayTasks:(List *)list{ - NSMutableArray *myListOfTasks = [list listOfTasks]; - for (int i = 0; i < [myListOfTasks count]; i++) { - NSLog(@"%@", [myListOfTasks[i] getTaskName]); - } -} - - --(void)removeTask:(List *)list { - - [self displayTasks: list]; - NSLog(@"Which task would you like to remove?"); - - NSString *objectToBeRemoved = scanUserInput(); - - NSMutableArray *myListOfTasks = [list listOfTasks]; - - for (int i = 0; i < [myListOfTasks count]; i++) { - - if ([objectToBeRemoved isEqualToString: [myListOfTasks[i] getTaskName]]){ - - [list removeObject: myListOfTasks[i]]; - NSLog(@"Your new list:"); - [self displayTasks: list]; - - } - } -} - --(void)markTaskAsDone:(NSInteger *)index fromList:(List *)list{ - - // take task from active list, hold it in a variable, add to done list - - NSMutableArray *tempList = [list listOfTasks]; - Task *foundTask = [[list listOfTasks] objectAtIndex:index]; - [tempList removeObjectAtIndex:index]; - [[self doneTasks] addTask:foundTask]; - //[[_doneTasks listOfTasks] addObject:foundTask]; +-(void)deleteTask:(NSInteger *)index from: (List *)list { + NSMutableArray *tempArrayOfTasks = [list listOfTasks]; + Task *taskToBeDeleted = [[list listOfTasks] objectAtIndex:index]; + [tempArrayOfTasks removeObjectAtIndex:index]; // [self displayTasks: list]; -// NSLog(@"Which task would you like to mark as 'Done'?"); +// NSLog(@"Which task would you like to remove?"); // -// NSString *objectToBeMarkedAsDone = scanUserInput(); +// NSString *objectToBeRemoved = scanUserInput(); // // NSMutableArray *myListOfTasks = [list listOfTasks]; // // for (int i = 0; i < [myListOfTasks count]; i++) { // -// if ([objectToBeMarkedAsDone isEqualToString: [myListOfTasks[i] getTaskName]]){ -// -// _completedTask = [self createCompletedTask:objectToBeMarkedAsDone]; -// [self addTaskToDoneTasks: _completedTask]; -// -//// List *doneAndDone = [self _completedTasks]; -//// Task *newDoneTask = [self createNewTask:objectToBeMarkedAsDone]; -//// [doneAndDone addTask:newDoneTask]; -// -// NSLog(@"Completed tasks:"); -// [self displayTasks:_listOfDoneTasks]; +// if ([objectToBeRemoved isEqualToString: [myListOfTasks[i] getTaskName]]){ // // [list removeObject: myListOfTasks[i]]; // NSLog(@"Your new list:"); @@ -251,6 +182,17 @@ -(void)markTaskAsDone:(NSInteger *)index fromList:(List *)list{ // } } +-(void)markTaskAsDone:(NSInteger *)index fromList:(List *)list{ + + // take task from active list, hold it in a variable, add to done list + + NSMutableArray *tempArrayOfTasks = [list listOfTasks]; + Task *doneTask = [[list listOfTasks] objectAtIndex:index]; + [tempArrayOfTasks removeObjectAtIndex:index]; + [[self doneTasks] addTaskToList:doneTask]; + +} + @end @@ -264,6 +206,21 @@ int main(int argc, const char * argv[]) { @autoreleasepool { Manager *listManager = [[Manager alloc] init]; + + List *al = [listManager activeTasks]; + List *dl = [listManager doneTasks]; + + List *mainFeatures = [[List alloc] init]; + + Task *add = [[Task alloc] initWithTaskName: @"Add a task to the To Do list"]; + Task *delete = [[Task alloc] initWithTaskName: @"Delete a task from the To Do list"]; + Task *markDone = [[Task alloc] initWithTaskName: @"Mark a task as done"]; + + [mainFeatures addTaskToList:add]; + [mainFeatures addTaskToList:delete]; + [mainFeatures addTaskToList:markDone]; + + NSLog(@"Hello!"); // // while (true) { // // print list of actions @@ -272,26 +229,82 @@ int main(int argc, const char * argv[]) { // // } - Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; - Task *swim = [[Task alloc] initWithTaskName:@"swim"]; - Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; - - List *al = [listManager activeTasks]; - [al addTask:practiceGuitar]; - [al addTask:swim]; - [al addTask:yoga]; - - //[listManager displayTasks:toDoToday]; - - //[listManager removeTask:toDoToday]; + while (true) { + + NSLog(@"What would you like TO DO?"); + + [mainFeatures displayTasks:mainFeatures]; + + NSLog(@"Enter a # here:"); + + NSInteger userInput; + scanf("%ld", &userInput); + + if (userInput == 0){ + + NSLog(@"Enter the title of the task you'd like to add:"); + + NSString *newUserTask = scanUserInput(); + + [al addTaskToList:newUserTask]; + + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; + } + + if (userInput == 1) { + + NSLog(@"Enter the # of the task you'd like to delete:"); + + NSInteger newUserInput = scanUserInput(); + + [listManager deleteTask:newUserInput from:al]; + + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; + + } + + if (userInput == 2) { + + NSLog(@"Enter the # of the task you'd like to mark DONE:"); + + NSInteger newUserInput = scanUserInput(); + + [listManager markTaskAsDone:newUserInput fromList:al]; + + NSLog(@"Your COMPLETED TASKS list:"); + + [dl displayTasks:dl]; + + } + +// if (userInput < [mainFeatures count] || userInput > [mainFeatures count]) { +// NSLog(@"Invalid #. Please try again."); +// } + + + } - [listManager markTaskAsDone:1 fromList:al]; - [listManager markTaskAsDone:0 fromList:al]; -// [listManager markTaskAsDone:toDoToday]; +// Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; +// Task *swim = [[Task alloc] initWithTaskName:@"swim"]; +// Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; // -// [listManager markTaskAsDone:toDoToday]; - - NSLog(@"whatever"); +// +// [al addTaskToList:practiceGuitar]; +// [al addTaskToList:swim]; +// [al addTaskToList:yoga]; +// +// +// +// [listManager markTaskAsDone:1 fromList:al]; +// [listManager markTaskAsDone:0 fromList:al]; +// +// +// [al displayTasks:al]; +// [dl displayTasks:dl]; } return 0; From da42cd97557a5e29d1cb0de086430ef6e28466c9 Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Wed, 1 Jul 2015 19:54:41 -0400 Subject: [PATCH 11/14] working simple version complete --- TodoList/TodoList/main.m | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 907a0cd..84ded95 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -124,9 +124,9 @@ - (List *)doneTasks; - (List *)activeTasks; --(void)deleteTask:(NSInteger *)index from: (List *)list; +-(void)deleteTask:(NSInteger)index from: (List *)list; --(void)markTaskAsDone:(NSInteger *)index fromList: (List *)list; +-(void)markTaskAsDone:(NSInteger)index fromList: (List *)list; @end @@ -134,7 +134,7 @@ -(void)markTaskAsDone:(NSInteger *)index fromList: (List *)list; //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @implementation Manager{ - //NSMutableArray* _listOfDoneTasks; + List *_doneTasks; List *_activeTasks; } @@ -157,7 +157,7 @@ - (List *)activeTasks { } --(void)deleteTask:(NSInteger *)index from: (List *)list { +-(void)deleteTask:(NSInteger)index from: (List *)list { NSMutableArray *tempArrayOfTasks = [list listOfTasks]; Task *taskToBeDeleted = [[list listOfTasks] objectAtIndex:index]; @@ -182,7 +182,7 @@ -(void)deleteTask:(NSInteger *)index from: (List *)list { // } } --(void)markTaskAsDone:(NSInteger *)index fromList:(List *)list{ +-(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ // take task from active list, hold it in a variable, add to done list @@ -244,7 +244,9 @@ int main(int argc, const char * argv[]) { NSLog(@"Enter the title of the task you'd like to add:"); - NSString *newUserTask = scanUserInput(); + NSString *newUserTaskTitle = scanUserInput(); + + Task *newUserTask = [[Task alloc] initWithTaskName: newUserTaskTitle]; [al addTaskToList:newUserTask]; @@ -257,9 +259,10 @@ int main(int argc, const char * argv[]) { NSLog(@"Enter the # of the task you'd like to delete:"); - NSInteger newUserInput = scanUserInput(); + NSString *newUserInput = scanUserInput(); + NSInteger inputAsInteger = [newUserInput integerValue]; - [listManager deleteTask:newUserInput from:al]; + [listManager deleteTask:inputAsInteger from:al]; NSLog(@"Your TO DO list:"); @@ -269,11 +272,16 @@ int main(int argc, const char * argv[]) { if (userInput == 2) { + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; + NSLog(@"Enter the # of the task you'd like to mark DONE:"); - NSInteger newUserInput = scanUserInput(); + NSString *newUserInput = scanUserInput(); + NSInteger inputAsInteger = [newUserInput integerValue]; - [listManager markTaskAsDone:newUserInput fromList:al]; + [listManager markTaskAsDone: inputAsInteger fromList:al]; NSLog(@"Your COMPLETED TASKS list:"); From 7bb7132a6279712c2ead447dd9f3d37dc8a58fca Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jul 2015 21:04:24 -0400 Subject: [PATCH 12/14] final touches --- TodoList/TodoList/main.m | 93 ++++++++++++++++++++++++++-------------- 1 file changed, 62 insertions(+), 31 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 84ded95..690dcf5 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -29,6 +29,8 @@ - (instancetype)initWithTaskName:(NSString *)title; - (NSString *) getTaskName; +- (void) setTaskName: (NSString *)taskName; + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -51,6 +53,10 @@ -(NSString *)getTaskName{ return _taskName; } +- (void) setTaskName: (NSString *)taskName{ + _taskName = taskName; +} + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -128,7 +134,6 @@ -(void)deleteTask:(NSInteger)index from: (List *)list; -(void)markTaskAsDone:(NSInteger)index fromList: (List *)list; - @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -194,6 +199,8 @@ -(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ } + + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -215,19 +222,21 @@ int main(int argc, const char * argv[]) { Task *add = [[Task alloc] initWithTaskName: @"Add a task to the To Do list"]; Task *delete = [[Task alloc] initWithTaskName: @"Delete a task from the To Do list"]; Task *markDone = [[Task alloc] initWithTaskName: @"Mark a task as done"]; + Task *editTask = [[Task alloc] initWithTaskName: @"Edit a task"]; [mainFeatures addTaskToList:add]; [mainFeatures addTaskToList:delete]; [mainFeatures addTaskToList:markDone]; - + [mainFeatures addTaskToList:editTask]; + NSLog(@"Hello!"); -// -// while (true) { -// // print list of actions -// // user selects actions -// // perform task based on user action -// -// } + // + // while (true) { + // // print list of actions + // // user selects actions + // // perform task based on user action + // + // } while (true) { @@ -255,7 +264,7 @@ int main(int argc, const char * argv[]) { [al displayTasks:al]; } - if (userInput == 1) { + else if (userInput == 1) { NSLog(@"Enter the # of the task you'd like to delete:"); @@ -270,7 +279,7 @@ int main(int argc, const char * argv[]) { } - if (userInput == 2) { + else if (userInput == 2) { NSLog(@"Your TO DO list:"); @@ -289,30 +298,52 @@ int main(int argc, const char * argv[]) { } -// if (userInput < [mainFeatures count] || userInput > [mainFeatures count]) { -// NSLog(@"Invalid #. Please try again."); -// } + else if (userInput == 3) { + NSLog(@"Which task would you like to edit?"); + + [al displayTasks:al]; + + NSLog(@"Enter the # here:"); + + NSString *newUserInput = scanUserInput(); + NSInteger inputAsInteger = [newUserInput integerValue]; + + NSLog(@"What do you want to replace it with?"); + + NSString *newUserTaskTitle = scanUserInput(); + + + [[[al listOfTasks] objectAtIndex:inputAsInteger] setTaskName:newUserTaskTitle]; + +// [[al listOfTasks[newUserInput]] setTaskName: newUserTaskTitle]; + + + } + + else { + NSLog(@"Invalid #. Please try again."); + } } -// Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; -// Task *swim = [[Task alloc] initWithTaskName:@"swim"]; -// Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; -// -// -// [al addTaskToList:practiceGuitar]; -// [al addTaskToList:swim]; -// [al addTaskToList:yoga]; -// -// -// -// [listManager markTaskAsDone:1 fromList:al]; -// [listManager markTaskAsDone:0 fromList:al]; -// -// -// [al displayTasks:al]; -// [dl displayTasks:dl]; + // Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; + // Task *swim = [[Task alloc] initWithTaskName:@"swim"]; + // Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; + // + // + // [al addTaskToList:practiceGuitar]; + // [al addTaskToList:swim]; + // [al addTaskToList:yoga]; + // + // + // + // [listManager markTaskAsDone:1 fromList:al]; + // [listManager markTaskAsDone:0 fromList:al]; + // + // + // [al displayTasks:al]; + // [dl displayTasks:dl]; } return 0; From 71bb87ce942bb31824490442f1c8edd473517b25 Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Wed, 1 Jul 2015 21:53:26 -0400 Subject: [PATCH 13/14] Final touches complete --- TodoList/TodoList/main.m | 94 +++++++++++++++++----------------------- 1 file changed, 39 insertions(+), 55 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 690dcf5..5c1ef0e 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -76,6 +76,7 @@ -(void)addTaskToList:(Task *) task; -(void)displayTasks:(List *)list; + @end //xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx @@ -167,26 +168,9 @@ -(void)deleteTask:(NSInteger)index from: (List *)list { NSMutableArray *tempArrayOfTasks = [list listOfTasks]; Task *taskToBeDeleted = [[list listOfTasks] objectAtIndex:index]; [tempArrayOfTasks removeObjectAtIndex:index]; - -// [self displayTasks: list]; -// NSLog(@"Which task would you like to remove?"); -// -// NSString *objectToBeRemoved = scanUserInput(); -// -// NSMutableArray *myListOfTasks = [list listOfTasks]; -// -// for (int i = 0; i < [myListOfTasks count]; i++) { -// -// if ([objectToBeRemoved isEqualToString: [myListOfTasks[i] getTaskName]]){ -// -// [list removeObject: myListOfTasks[i]]; -// NSLog(@"Your new list:"); -// [self displayTasks: list]; -// -// } -// } } + -(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ // take task from active list, hold it in a variable, add to done list @@ -195,7 +179,6 @@ -(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ Task *doneTask = [[list listOfTasks] objectAtIndex:index]; [tempArrayOfTasks removeObjectAtIndex:index]; [[self doneTasks] addTaskToList:doneTask]; - } @@ -212,6 +195,8 @@ -(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ int main(int argc, const char * argv[]) { @autoreleasepool { + //Ready-made List Manager, Active and Completed Lists, as well as a List of Features + Manager *listManager = [[Manager alloc] init]; List *al = [listManager activeTasks]; @@ -228,15 +213,11 @@ int main(int argc, const char * argv[]) { [mainFeatures addTaskToList:delete]; [mainFeatures addTaskToList:markDone]; [mainFeatures addTaskToList:editTask]; - + + + //Program begins: + NSLog(@"Hello!"); - // - // while (true) { - // // print list of actions - // // user selects actions - // // perform task based on user action - // - // } while (true) { @@ -246,10 +227,9 @@ int main(int argc, const char * argv[]) { NSLog(@"Enter a # here:"); - NSInteger userInput; - scanf("%ld", &userInput); + NSString *input = scanUserInput(); - if (userInput == 0){ + if ([input isEqualToString: @"0"]){ NSLog(@"Enter the title of the task you'd like to add:"); @@ -262,9 +242,15 @@ int main(int argc, const char * argv[]) { NSLog(@"Your TO DO list:"); [al displayTasks:al]; + + NSLog(@"\n"); } - else if (userInput == 1) { + else if ([input isEqualToString: @"1"]) { + + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; NSLog(@"Enter the # of the task you'd like to delete:"); @@ -277,9 +263,11 @@ int main(int argc, const char * argv[]) { [al displayTasks:al]; + NSLog(@"\n"); + } - else if (userInput == 2) { + else if ([input isEqualToString: @"2"]) { NSLog(@"Your TO DO list:"); @@ -296,9 +284,16 @@ int main(int argc, const char * argv[]) { [dl displayTasks:dl]; + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; + + NSLog(@"\n"); + } - else if (userInput == 3) { + else if ([input isEqualToString: @"3"]) { + NSLog(@"Which task would you like to edit?"); [al displayTasks:al]; @@ -312,38 +307,27 @@ int main(int argc, const char * argv[]) { NSString *newUserTaskTitle = scanUserInput(); - [[[al listOfTasks] objectAtIndex:inputAsInteger] setTaskName:newUserTaskTitle]; -// [[al listOfTasks[newUserInput]] setTaskName: newUserTaskTitle]; - - + NSLog(@"Your TO DO list:"); + + [al displayTasks:al]; + + NSLog(@"\n"); } else { - NSLog(@"Invalid #. Please try again."); + NSLog(@"Does not compute. Please try again."); + + NSLog(@"\n"); } } - // Task *practiceGuitar = [[Task alloc] initWithTaskName:@"practice guitar"]; - // Task *swim = [[Task alloc] initWithTaskName:@"swim"]; - // Task *yoga = [[Task alloc] initWithTaskName:@"yoga"]; - // - // - // [al addTaskToList:practiceGuitar]; - // [al addTaskToList:swim]; - // [al addTaskToList:yoga]; - // - // - // - // [listManager markTaskAsDone:1 fromList:al]; - // [listManager markTaskAsDone:0 fromList:al]; - // - // - // [al displayTasks:al]; - // [dl displayTasks:dl]; + + + } return 0; From 4df38359e8c4fb57ca857b4745100d33bd41305c Mon Sep 17 00:00:00 2001 From: Justine Gartner Date: Wed, 1 Jul 2015 21:58:53 -0400 Subject: [PATCH 14/14] Final final touches ;) --- TodoList/TodoList/main.m | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/TodoList/TodoList/main.m b/TodoList/TodoList/main.m index 5c1ef0e..262b2a5 100644 --- a/TodoList/TodoList/main.m +++ b/TodoList/TodoList/main.m @@ -5,6 +5,8 @@ // Created by Michael Kavouras on 6/25/15. // Copyright (c) 2015 Mike Kavouras. All rights reserved. // +// Project by Christian😎 & Justine🙏🏼 +// #import @@ -14,8 +16,8 @@ return userInput; } -@class List; @class Task; +@class List; @class Manager; @@ -173,8 +175,6 @@ -(void)deleteTask:(NSInteger)index from: (List *)list { -(void)markTaskAsDone:(NSInteger)index fromList:(List *)list{ - // take task from active list, hold it in a variable, add to done list - NSMutableArray *tempArrayOfTasks = [list listOfTasks]; Task *doneTask = [[list listOfTasks] objectAtIndex:index]; [tempArrayOfTasks removeObjectAtIndex:index];