Skip to content
Open

Yo #14

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
Binary file added MarsWater/.DS_Store
Binary file not shown.
586 changes: 586 additions & 0 deletions MarsWater/MarsWater.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// AppDelegate.h
// SavingForever
// MarsWater
//
// Created by Michael Kavouras on 10/4/15.
// Copyright © 2015 Michael Kavouras. All rights reserved.
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import <UIKit/UIKit.h>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
//
// AppDelegate.m
// SavingForever
// MarsWater
//
// Created by Michael Kavouras on 10/4/15.
// Copyright © 2015 Michael Kavouras. All rights reserved.
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import "AppDelegate.h"
Expand Down Expand Up @@ -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.dryucatan.MarsWater" in the application's documents directory.
return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
}

Expand All @@ -60,7 +60,7 @@ - (NSManagedObjectModel *)managedObjectModel {
if (_managedObjectModel != nil) {
return _managedObjectModel;
}
NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"SavingForever" withExtension:@"momd"];
NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"MarsWater" withExtension:@"momd"];
_managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
return _managedObjectModel;
}
Expand All @@ -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:@"MarsWater.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]) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand Down
297 changes: 297 additions & 0 deletions MarsWater/MarsWater/Base.lproj/Main.storyboard

Large diffs are not rendered by default.

File renamed without changes.
25 changes: 25 additions & 0 deletions MarsWater/MarsWater/List+CoreDataProperties.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// List+CoreDataProperties.h
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. 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*>*task;

@end

NS_ASSUME_NONNULL_END
21 changes: 21 additions & 0 deletions MarsWater/MarsWater/List+CoreDataProperties.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//
// List+CoreDataProperties.m
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. 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
24 changes: 24 additions & 0 deletions MarsWater/MarsWater/List.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// List.h
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. 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"
16 changes: 16 additions & 0 deletions MarsWater/MarsWater/List.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// List.m
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import "List.h"
#import "Task.h"

@implementation List

// Insert code here to add functionality to your managed object subclass

@end
13 changes: 13 additions & 0 deletions MarsWater/MarsWater/ListCreationTableViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// ListCreationTableViewController.h
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface ListCreationTableViewController : UITableViewController

@end
69 changes: 69 additions & 0 deletions MarsWater/MarsWater/ListCreationTableViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
//
// ListCreationTableViewController.m
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import <CoreData/CoreData.h>
#import "ListCreationTableViewController.h"
#import "List.h"
#import "AppDelegate.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];

}

-(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)];

}

-(IBAction)colorButtonTapped:(UIButton*)sender {

self.list.color = sender.backgroundColor;

}

-(void)save{
self.list.title = self.titleTextField.text;
self.list.createdAt = [NSDate date];
NSLog(@"%@", self.list);

AppDelegate* delegate = [UIApplication sharedApplication].delegate;

[delegate.managedObjectContext save:nil];

[self dismissViewControllerAnimated:YES completion:nil];


}
-(void)cancel{

[self dismissViewControllerAnimated:YES completion:nil];
}


@end
13 changes: 13 additions & 0 deletions MarsWater/MarsWater/ListsTableViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
//
// ListsTableViewController.h
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface ListsTableViewController : UITableViewController

@end
95 changes: 95 additions & 0 deletions MarsWater/MarsWater/ListsTableViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
//
// ListsTableViewController.m
// MarsWater
//
// Created by Jackie Meggesto on 10/4/15.
// Copyright © 2015 Jackie Meggesto. All rights reserved.
//

#import "ListsTableViewController.h"
#import <CoreData/CoreData.h>
#import "AppDelegate.h"
#import "List.h"
#import "TaskViewController.h"

@interface ListsTableViewController () <NSFetchedResultsControllerDelegate>

@property (nonatomic) NSFetchedResultsController* fetchedResultsController;




@end

@implementation ListsTableViewController

- (void)viewDidLoad {
[super viewDidLoad];

NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] initWithEntityName:@"List"];

NSSortDescriptor *sort = [[NSSortDescriptor alloc]initWithKey:@"createdAt" ascending:NO];

fetchRequest.sortDescriptors = @[ sort];

AppDelegate *delegate = [UIApplication sharedApplication].delegate;




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)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
// Dispose of any resources that can be recreated.
}

#pragma mark - Table view data source

- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
#warning Incomplete implementation, return the number of sections
return 1;
}

- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
#warning Incomplete implementation, return the number of rows
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.detailTextLabel.text = [NSString stringWithFormat:@"%lu", list.task.count ];
cell.backgroundColor = list.color;


return cell;
}
-(void)controller:(NSFetchedResultsController *)controller didChangeObject:(id)anObject atIndexPath:(NSIndexPath *)indexPath forChangeType:(NSFetchedResultsChangeType)type newIndexPath:(NSIndexPath *)newIndexPath
{
[self.tableView reloadData];
}
-(void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {

List *list = self.fetchedResultsController.fetchedObjects[indexPath.row];
TaskViewController *tvc = [self.storyboard instantiateViewControllerWithIdentifier:@"TaskViewController"];
tvc.list = list;

[self.navigationController pushViewController:tvc animated:YES];



}

@end
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>_XCCurrentVersionName</key>
<string>SavingForever.xcdatamodel</string>
<string>MarsWater.xcdatamodel</string>
</dict>
</plist>
Original file line number Diff line number Diff line change
@@ -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="14F27" 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="dueAt" 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="-297" positionY="261" width="128" height="150"/>
<element name="List" positionX="-54" positionY="36" width="128" height="103"/>
</elements>
</model>
Loading