diff --git a/OneThing.xcodeproj/project.pbxproj b/OneThing.xcodeproj/project.pbxproj index 2b65011..dd24e8f 100644 --- a/OneThing.xcodeproj/project.pbxproj +++ b/OneThing.xcodeproj/project.pbxproj @@ -8,6 +8,7 @@ /* Begin PBXBuildFile section */ C4484E9F1707ECC600ACF36F /* DSEInputViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C4484E9E1707ECC600ACF36F /* DSEInputViewController.m */; }; + C4484EA21707F24600ACF36F /* DSEEventCell.m in Sources */ = {isa = PBXBuildFile; fileRef = C4484EA11707F24600ACF36F /* DSEEventCell.m */; }; C481C1811706282F00AF9EBB /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C481C1801706282F00AF9EBB /* UIKit.framework */; }; C481C1831706282F00AF9EBB /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C481C1821706282F00AF9EBB /* Foundation.framework */; }; C481C1851706282F00AF9EBB /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C481C1841706282F00AF9EBB /* CoreGraphics.framework */; }; @@ -29,6 +30,8 @@ /* Begin PBXFileReference section */ C4484E9D1707ECC600ACF36F /* DSEInputViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSEInputViewController.h; sourceTree = ""; }; C4484E9E1707ECC600ACF36F /* DSEInputViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DSEInputViewController.m; sourceTree = ""; }; + C4484EA01707F24600ACF36F /* DSEEventCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DSEEventCell.h; sourceTree = ""; }; + C4484EA11707F24600ACF36F /* DSEEventCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DSEEventCell.m; sourceTree = ""; }; C481C17D1706282F00AF9EBB /* OneThing.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OneThing.app; sourceTree = BUILT_PRODUCTS_DIR; }; C481C1801706282F00AF9EBB /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; C481C1821706282F00AF9EBB /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; @@ -114,6 +117,8 @@ C481C1891706282F00AF9EBB /* Supporting Files */, C4484E9D1707ECC600ACF36F /* DSEInputViewController.h */, C4484E9E1707ECC600ACF36F /* DSEInputViewController.m */, + C4484EA01707F24600ACF36F /* DSEEventCell.h */, + C4484EA11707F24600ACF36F /* DSEEventCell.m */, ); path = OneThing; sourceTree = ""; @@ -207,6 +212,7 @@ C481C1A81706282F00AF9EBB /* DSEDetailViewController.m in Sources */, C481C1B0170628D500AF9EBB /* Event.m in Sources */, C4484E9F1707ECC600ACF36F /* DSEInputViewController.m in Sources */, + C4484EA21707F24600ACF36F /* DSEEventCell.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/OneThing.xcodeproj/project.xcworkspace/xcuserdata/bob.xcuserdatad/UserInterfaceState.xcuserstate b/OneThing.xcodeproj/project.xcworkspace/xcuserdata/bob.xcuserdatad/UserInterfaceState.xcuserstate index dd52cb5..f43825a 100644 Binary files a/OneThing.xcodeproj/project.xcworkspace/xcuserdata/bob.xcuserdatad/UserInterfaceState.xcuserstate and b/OneThing.xcodeproj/project.xcworkspace/xcuserdata/bob.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/OneThing/DSEEventCell.h b/OneThing/DSEEventCell.h new file mode 100644 index 0000000..421becc --- /dev/null +++ b/OneThing/DSEEventCell.h @@ -0,0 +1,15 @@ +// +// DSEEventCell.h +// OneThing +// +// Created by Bob Martens on 3/30/13. +// Copyright (c) 2013 Deck78. All rights reserved. +// + +#import + +@interface DSEEventCell : UITableViewCell +@property (weak, nonatomic) IBOutlet UILabel *titleLabel; +@property (weak, nonatomic) IBOutlet UILabel *descriptionLabel; +@property (weak, nonatomic) IBOutlet UILabel *dateLabel; +@end diff --git a/OneThing/DSEEventCell.m b/OneThing/DSEEventCell.m new file mode 100644 index 0000000..a55f50e --- /dev/null +++ b/OneThing/DSEEventCell.m @@ -0,0 +1,13 @@ +// +// DSEEventCell.m +// OneThing +// +// Created by Bob Martens on 3/30/13. +// Copyright (c) 2013 Deck78. All rights reserved. +// + +#import "DSEEventCell.h" + +@implementation DSEEventCell + +@end diff --git a/OneThing/DSEMasterViewController.m b/OneThing/DSEMasterViewController.m index af43d6d..7368a49 100644 --- a/OneThing/DSEMasterViewController.m +++ b/OneThing/DSEMasterViewController.m @@ -9,6 +9,7 @@ #import "DSEMasterViewController.h" #import "DSEDetailViewController.h" #import "DSEInputViewController.h" +#import "DSEEventCell.h" #import "Event.h" @interface DSEMasterViewController () @@ -74,7 +75,7 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath]; + DSEEventCell *cell = [tableView dequeueReusableCellWithIdentifier:@"Cell" forIndexPath:indexPath]; [self configureCell:cell atIndexPath:indexPath]; return cell; } @@ -224,10 +225,12 @@ - (void)controllerDidChangeContent:(NSFetchedResultsController *)controller } */ -- (void)configureCell:(UITableViewCell *)cell atIndexPath:(NSIndexPath *)indexPath +- (void)configureCell:(DSEEventCell *)cell atIndexPath:(NSIndexPath *)indexPath { Event *event = [self.fetchedResultsController objectAtIndexPath:indexPath]; - cell.textLabel.text = event.title; + cell.titleLabel.text = event.title; + cell.descriptionLabel.text = event.eventDescription; + cell.dateLabel.text = [event.timeStamp description]; } @end diff --git a/OneThing/en.lproj/MainStoryboard_iPad.storyboard b/OneThing/en.lproj/MainStoryboard_iPad.storyboard index ba23fa0..90c2228 100644 --- a/OneThing/en.lproj/MainStoryboard_iPad.storyboard +++ b/OneThing/en.lproj/MainStoryboard_iPad.storyboard @@ -1,7 +1,7 @@ - + - + @@ -19,7 +19,7 @@ - + @@ -27,11 +27,11 @@ - @@ -68,34 +68,64 @@ - + - + - - + + - + - + + + + + + + + + + + + + + + + @@ -104,7 +134,15 @@ - + + + + + + + + + @@ -125,7 +163,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/OneThing/en.lproj/MainStoryboard_iPhone.storyboard b/OneThing/en.lproj/MainStoryboard_iPhone.storyboard index 83d7698..7773271 100644 --- a/OneThing/en.lproj/MainStoryboard_iPhone.storyboard +++ b/OneThing/en.lproj/MainStoryboard_iPhone.storyboard @@ -23,30 +23,58 @@ - + - - + + - + - + + + + + + + + + + + + + + @@ -172,6 +200,14 @@ + + + + + + + +