HW pull request

SavingForever/SavingForever/AppDelegate.h → MarsWaterCore/MarsWaterCore/AppDelegate.h

@@ -1,9 +1,9 @@
 //
 //  AppDelegate.h
-//  SavingForever
+//  MarsWaterCore
 //
-//  Created by Michael Kavouras on 10/4/15.
-//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

SavingForever/SavingForever/AppDelegate.m → MarsWaterCore/MarsWaterCore/AppDelegate.m

@@ -1,9 +1,9 @@
 //
 //  AppDelegate.m
-//  SavingForever
+//  MarsWaterCore
 //
-//  Created by Michael Kavouras on 10/4/15.
-//  Copyright © 2015 Michael Kavouras. All rights reserved.
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
 //
 
 #import "AppDelegate.h"
@@ -51,7 +51,7 @@ - (void)applicationWillTerminate:(UIApplication *)application {
 @synthesize persistentStoreCoordinator = _persistentStoreCoordinator;
 
 - (NSURL *)applicationDocumentsDirectory {
-    // The directory the application uses to store the Core Data store file. This code uses a directory named "com.mikekavouras.SavingForever" in the application's documents directory.
+    // The directory the application uses to store the Core Data store file. This code uses a directory named "nyc.c4q.MarsWaterCore" in the application's documents directory.
     return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
 }
 
@@ -60,7 +60,7 @@ - (NSManagedObjectModel *)managedObjectModel {
     if (_managedObjectModel != nil) {
         return _managedObjectModel;
     }
-    NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"SavingForever" withExtension:@"momd"];
+    NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"MarsWaterCore" withExtension:@"momd"];
     _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
     return _managedObjectModel;
 }
@@ -74,7 +74,7 @@ - (NSPersistentStoreCoordinator *)persistentStoreCoordinator {
     // Create the coordinator and store
 
     _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
-    NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"SavingForever.sqlite"];
+    NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"MarsWaterCore.sqlite"];
     NSError *error = nil;
     NSString *failureReason = @"There was an error creating or loading the application's saved data.";
     if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {

MarsWaterCore/MarsWaterCore/List+CoreDataProperties.h

@@ -0,0 +1,25 @@
+//
+//  List+CoreDataProperties.h
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+//  Choose "Create NSManagedObject Subclass…" from the Core Data editor menu
+//  to delete and recreate this implementation file for your updated model.
+//
+
+#import "List.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface List (CoreDataProperties)
+
+@property (nullable, nonatomic, retain) NSString *title;
+@property (nullable, nonatomic, retain) NSDate *createdAt;
+@property (nullable, nonatomic, retain) id color;
+@property (nullable, nonatomic, retain) NSOrderedSet *task;
+
+@end
+
+NS_ASSUME_NONNULL_END

MarsWaterCore/MarsWaterCore/List+CoreDataProperties.m

@@ -0,0 +1,21 @@
+//
+//  List+CoreDataProperties.m
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+//  Choose "Create NSManagedObject Subclass…" from the Core Data editor menu
+//  to delete and recreate this implementation file for your updated model.
+//
+
+#import "List+CoreDataProperties.h"
+
+@implementation List (CoreDataProperties)
+
+@dynamic title;
+@dynamic createdAt;
+@dynamic color;
+@dynamic task;
+
+@end

MarsWaterCore/MarsWaterCore/List.h

@@ -0,0 +1,24 @@
+//
+//  List.h
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+@class Task;
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface List : NSManagedObject
+
+// Insert code here to declare functionality of your managed object subclass
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#import "List+CoreDataProperties.h"

MarsWaterCore/MarsWaterCore/List.m

@@ -0,0 +1,16 @@
+//
+//  List.m
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import "List.h"
+#import "Task.h"
+
+@implementation List
+
+// Insert code here to add functionality to your managed object subclass
+
+@end

MarsWaterCore/MarsWaterCore/ListCreationTableViewController.h

@@ -0,0 +1,13 @@
+//
+//  ListCreationTableViewController.h
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ListCreationTableViewController : UITableViewController
+
+@end

MarsWaterCore/MarsWaterCore/ListCreationTableViewController.m

@@ -0,0 +1,60 @@
+//
+//  ListCreationTableViewController.m
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import "ListCreationTableViewController.h"
+#import "List.h"
+#import "AppDelegate.h"
+#import <CoreData/CoreData.h>
+
+@interface ListCreationTableViewController ()
+@property (weak, nonatomic) IBOutlet UITextField *titleTextField;
+@property (nonatomic) List *list;
+
+@end
+
+@implementation ListCreationTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    [self setupNavigationBar];
+
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+
+    self.list = [NSEntityDescription insertNewObjectForEntityForName:@"List" inManagedObjectContext:delegate.managedObjectContext];
+
+}
+- (IBAction)shadedButtonTapped:(UIButton *)sender {
+
+    self.list.color = sender.backgroundColor;
+}
+
+- (void) setupNavigationBar {
+    self.navigationItem.title = @"Create new list";
+    self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];
+
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(save)];
+}
+
+- (void) cancel {
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+- (void) save {
+    self.list.title = self.titleTextField.text;
+    self.list.createdAt = [NSDate date];
+
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+    [delegate.managedObjectContext save:nil];
+
+    NSLog(@"%@", self.list);
+
+    [self dismissViewControllerAnimated:YES completion:nil];
+}
+
+@end

MarsWaterCore/MarsWaterCore/ListsTableViewController.h

@@ -0,0 +1,13 @@
+//
+//  ListsTableViewController.h
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface ListsTableViewController : UITableViewController
+
+@end

MarsWaterCore/MarsWaterCore/ListsTableViewController.m

@@ -0,0 +1,89 @@
+//
+//  ListsTableViewController.m
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+
+#import "ListsTableViewController.h"
+#import <CoreData/CoreData.h>
+#import "AppDelegate.h"
+#import "List.h"
+#import "TasksTableViewController.h"
+
+@interface ListsTableViewController () <NSFetchedResultsControllerDelegate>
+
+@property (nonatomic) NSFetchedResultsController *fetchedResultsController;
+
+@end
+
+@implementation ListsTableViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+
+    self.tableView.delegate = self;
+    self.tableView.dataSource = self;
+
+
+    AppDelegate *delegate = [UIApplication sharedApplication].delegate;
+
+    //create an instance of NSFetchRequest with an entity name
+    NSFetchRequest *fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"List"];
+
+    //make sure to add a sortDescriptor - your NSFetchRequest won't work without it!
+    NSSortDescriptor *sortDescriptor = [[NSSortDescriptor alloc] initWithKey:@"createdAt" ascending:NO];
+
+    //set the sortDescriptor to the instance of NSFetchRequest
+    fetchRequest.sortDescriptors = @[sortDescriptor];
+
+    //create an NSFetchedResultsController with a fetchRequest and a managedObjectContext
+    self.fetchedResultsController = [[NSFetchedResultsController alloc] initWithFetchRequest:fetchRequest managedObjectContext:delegate.managedObjectContext sectionNameKeyPath:nil cacheName:nil];
+
+    self.fetchedResultsController.delegate = self;
+    [self.fetchedResultsController performFetch:nil];
+
+    [self.tableView reloadData];
+}
+
+-(void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if ([segue.identifier isEqualToString:@"TasksSegue"]) {
+        NSIndexPath *indexPath = [self.tableView indexPathForSelectedRow];
+        TasksTableViewController *viewController = [segue destinationViewController];
+        List *list = self.fetchedResultsController.fetchedObjects[indexPath.row];
+        viewController.navigationItem.title = [NSString stringWithFormat:@"%@", list.title];
+        viewController.list = list;
+    }
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
+
+    return self.fetchedResultsController.fetchedObjects.count;
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"ListCellIdentifier" forIndexPath:indexPath];
+
+    List *list = self.fetchedResultsController.fetchedObjects[indexPath.row];
+    cell.textLabel.text = list.title;
+    cell.backgroundColor = (UIColor *)list.color;
+    cell.detailTextLabel.text = [list.createdAt description];
+
+    return cell;
+}
+
+-(void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath {
+
+    [self.tableView reloadData];
+}
+
+
+@end

SavingForever/SavingForever/SavingForever.xcdatamodeld/.xccurrentversion → MarsWaterCore/MarsWaterCore/MarsWaterCore.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>SavingForever.xcdatamodel</string>
+	<string>MarsWaterCore.xcdatamodel</string>
 </dict>
 </plist>

MarsWaterCore/MarsWaterCore/MarsWaterCore.xcdatamodeld/MarsWaterCore.xcdatamodel/contents

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="8195" systemVersion="14E46" minimumToolsVersion="Automatic">
+    <entity name="List" representedClassName="List" syncable="YES">
+        <attribute name="color" optional="YES" attributeType="Transformable" syncable="YES"/>
+        <attribute name="createdAt" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="title" optional="YES" attributeType="String" syncable="YES"/>
+        <relationship name="task" optional="YES" toMany="YES" deletionRule="Nullify" ordered="YES" destinationEntity="Task" inverseName="list" inverseEntity="Task" syncable="YES"/>
+    </entity>
+    <entity name="Task" representedClassName="Task" syncable="YES">
+        <attribute name="completedAt" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="createdAt" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="doAt" optional="YES" attributeType="Date" syncable="YES"/>
+        <attribute name="priority" optional="YES" attributeType="Integer 64" defaultValueString="0" syncable="YES"/>
+        <attribute name="taskDescription" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="updatedAt" optional="YES" attributeType="Date" syncable="YES"/>
+        <relationship name="list" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="List" inverseName="task" inverseEntity="List" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Task" positionX="-63" positionY="-18" width="128" height="150"/>
+        <element name="List" positionX="-54" positionY="36" width="128" height="105"/>
+    </elements>
+</model>

MarsWaterCore/MarsWaterCore/Task+CoreDataProperties.h

@@ -0,0 +1,28 @@
+//
+//  Task+CoreDataProperties.h
+//  MarsWaterCore
+//
+//  Created by Daniel Distant on 10/4/15.
+//  Copyright © 2015 ddistant. All rights reserved.
+//
+//  Choose "Create NSManagedObject Subclass…" from the Core Data editor menu
+//  to delete and recreate this implementation file for your updated model.
+//
+
+#import "Task.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface Task (CoreDataProperties)
+
+@property (nullable, nonatomic, retain) NSString *taskDescription;
+@property (nullable, nonatomic, retain) NSDate *createdAt;
+@property (nullable, nonatomic, retain) NSDate *doAt;
+@property (nullable, nonatomic, retain) NSDate *updatedAt;
+@property (nullable, nonatomic, retain) NSNumber *priority;
+@property (nullable, nonatomic, retain) NSDate *completedAt;
+@property (nullable, nonatomic, retain) NSManagedObject *list;
+
+@end
+
+NS_ASSUME_NONNULL_END