Finished styling of the briefcast browser view.

capttaco · Apr 12, 2010 · 506c960 · 506c960
1 parent cc72309
commit 506c960
Show file tree

Hide file tree

Showing 16 changed files with 590 additions and 14 deletions.
diff --git a/BFBriefcastCell.xib b/BFBriefcastCell.xib
diff --git a/Briefs.xcodeproj/project.pbxproj b/Briefs.xcodeproj/project.pbxproj
@@ -114,6 +114,14 @@
 		D4A39833113C6E9D004971E9 /* Briefcast.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A39831113C6E9D004971E9 /* Briefcast.png */; };
 		D4A39834113C6E9D004971E9 /* Briefs.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A39832113C6E9D004971E9 /* Briefs.png */; };
 		D4A39836113C6EAA004971E9 /* Icon-small.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A39835113C6EAA004971E9 /* Icon-small.png */; };
+		D4A4595E1172C2D600D9C1DF /* BFBriefcastCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = D4A4595D1172C2D600D9C1DF /* BFBriefcastCell.xib */; };
+		D4A459621172C3BC00D9C1DF /* Briefcast 32.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A459611172C3BC00D9C1DF /* Briefcast 32.png */; };
+		D4A4597F1172CE0B00D9C1DF /* cell-middle.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A4597C1172CE0B00D9C1DF /* cell-middle.png */; };
+		D4A459801172CE0B00D9C1DF /* cell-bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A4597D1172CE0B00D9C1DF /* cell-bottom.png */; };
+		D4A459811172CE0B00D9C1DF /* cell-top.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A4597E1172CE0B00D9C1DF /* cell-top.png */; };
+		D4A459CF1172D7AF00D9C1DF /* cell-middle-sel.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A459CE1172D7AF00D9C1DF /* cell-middle-sel.png */; };
+		D4A459DA1172DCDD00D9C1DF /* cell-bottom-sel.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A459D81172DCDD00D9C1DF /* cell-bottom-sel.png */; };
+		D4A459DB1172DCDD00D9C1DF /* cell-top-sel.png in Resources */ = {isa = PBXBuildFile; fileRef = D4A459D91172DCDD00D9C1DF /* cell-top-sel.png */; };
 		D4AF1A341147312400D1B3B5 /* CoreData.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4AF1A331147312400D1B3B5 /* CoreData.framework */; };
 		D4AF1B061147362200D1B3B5 /* Briefs.xcdatamodel in Sources */ = {isa = PBXBuildFile; fileRef = D4AF1B051147362200D1B3B5 /* Briefs.xcdatamodel */; };
 		D4AF1B32114808A300D1B3B5 /* BFBriefcast+CoreDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = D4AF1B31114808A300D1B3B5 /* BFBriefcast+CoreDataAdditions.m */; };
@@ -312,6 +320,14 @@
 		D4A39831113C6E9D004971E9 /* Briefcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Briefcast.png; path = images/Briefcast.png; sourceTree = "<group>"; };
 		D4A39832113C6E9D004971E9 /* Briefs.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Briefs.png; path = images/Briefs.png; sourceTree = "<group>"; };
 		D4A39835113C6EAA004971E9 /* Icon-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-small.png"; path = "images/Icon-small.png"; sourceTree = "<group>"; };
+		D4A4595D1172C2D600D9C1DF /* BFBriefcastCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BFBriefcastCell.xib; sourceTree = "<group>"; };
+		D4A459611172C3BC00D9C1DF /* Briefcast 32.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Briefcast 32.png"; path = "images/icons/Briefcast 32.png"; sourceTree = "<group>"; };
+		D4A4597C1172CE0B00D9C1DF /* cell-middle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-middle.png"; path = "images/bg/cell-middle.png"; sourceTree = "<group>"; };
+		D4A4597D1172CE0B00D9C1DF /* cell-bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-bottom.png"; path = "images/bg/cell-bottom.png"; sourceTree = "<group>"; };
+		D4A4597E1172CE0B00D9C1DF /* cell-top.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-top.png"; path = "images/bg/cell-top.png"; sourceTree = "<group>"; };
+		D4A459CE1172D7AF00D9C1DF /* cell-middle-sel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-middle-sel.png"; path = "images/bg/cell-middle-sel.png"; sourceTree = "<group>"; };
+		D4A459D81172DCDD00D9C1DF /* cell-bottom-sel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-bottom-sel.png"; path = "images/bg/cell-bottom-sel.png"; sourceTree = "<group>"; };
+		D4A459D91172DCDD00D9C1DF /* cell-top-sel.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "cell-top-sel.png"; path = "images/bg/cell-top-sel.png"; sourceTree = "<group>"; };
 		D4AF1A331147312400D1B3B5 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		D4AF1B051147362200D1B3B5 /* Briefs.xcdatamodel */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = wrapper.xcdatamodel; path = Briefs.xcdatamodel; sourceTree = "<group>"; };
 		D4AF1B30114808A300D1B3B5 /* BFBriefcast+CoreDataAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BFBriefcast+CoreDataAdditions.h"; sourceTree = "<group>"; };
@@ -468,6 +484,7 @@
 				D4CA29371076F60500AA84FE /* MainWindow.xib */,
 				D4641312106879AF001522F6 /* BFAddBriefcastViewController.xib */,
 				D43CE8B1115F134800DA07D5 /* BFBriefCellController.xib */,
+				D4A4595D1172C2D600D9C1DF /* BFBriefcastCell.xib */,
 			);
 			name = nib;
 			sourceTree = "<group>";
@@ -547,6 +564,12 @@
 		D43CE16C114F0DC800DA07D5 /* backgrounds */ = {
 			isa = PBXGroup;
 			children = (
+				D4A459D81172DCDD00D9C1DF /* cell-bottom-sel.png */,
+				D4A459D91172DCDD00D9C1DF /* cell-top-sel.png */,
+				D4A459CE1172D7AF00D9C1DF /* cell-middle-sel.png */,
+				D4A4597C1172CE0B00D9C1DF /* cell-middle.png */,
+				D4A4597D1172CE0B00D9C1DF /* cell-bottom.png */,
+				D4A4597E1172CE0B00D9C1DF /* cell-top.png */,
 				D4D4BC9C11728248009D70D0 /* navigation-bar.png */,
 				D4D4BC80117278F9009D70D0 /* screens */,
 				D4D4BC361172552B009D70D0 /* preview-refresh-bg.png */,
@@ -797,6 +820,7 @@
 		D4A39830113C6E7F004971E9 /* icons */ = {
 			isa = PBXGroup;
 			children = (
+				D4A459611172C3BC00D9C1DF /* Briefcast 32.png */,
 				D4A39835113C6EAA004971E9 /* Icon-small.png */,
 				D4A39831113C6E9D004971E9 /* Briefcast.png */,
 				D4A39832113C6E9D004971E9 /* Briefs.png */,
@@ -1000,6 +1024,14 @@
 				D4D4BC821172790C009D70D0 /* browse-briefcasts.png in Resources */,
 				D4D4BC8411727A7C009D70D0 /* built-in-button.png in Resources */,
 				D4D4BC9D11728248009D70D0 /* navigation-bar.png in Resources */,
+				D4A4595E1172C2D600D9C1DF /* BFBriefcastCell.xib in Resources */,
+				D4A459621172C3BC00D9C1DF /* Briefcast 32.png in Resources */,
+				D4A4597F1172CE0B00D9C1DF /* cell-middle.png in Resources */,
+				D4A459801172CE0B00D9C1DF /* cell-bottom.png in Resources */,
+				D4A459811172CE0B00D9C1DF /* cell-top.png in Resources */,
+				D4A459CF1172D7AF00D9C1DF /* cell-middle-sel.png in Resources */,
+				D4A459DA1172DCDD00D9C1DF /* cell-bottom-sel.png in Resources */,
+				D4A459DB1172DCDD00D9C1DF /* cell-top-sel.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Classes/BFBriefcastCellController.h b/Classes/BFBriefcastCellController.h
@@ -12,6 +12,9 @@
 
 @interface BFBriefcastCellController : NSObject<BFCellController> 
 {
+    IBOutlet UILabel    *titleLabel;
+    IBOutlet UILabel    *descLabel;
+
     BriefcastRef *briefcast;
 }
 

diff --git a/Classes/BFBriefcastCellController.m b/Classes/BFBriefcastCellController.m
@@ -9,6 +9,7 @@
 #import "BFBriefcastCellController.h"
 #import "BFBriefcastViewController.h"
 #import "BFDataManager.h"
+#import "BFConfig.h"
 
 
 @implementation BFBriefcastCellController
@@ -34,11 +35,46 @@ - (id)initWithBriefcast:(BriefcastRef *)bcast
 
 - (UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
+
     UITableViewCell *cell = [tv dequeueReusableCellWithIdentifier:@"BriefcastCell"];
     if (cell == nil) {
-        cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:@"BriefcastCell"] autorelease];
+        NSArray *nibArray = [[NSBundle mainBundle] loadNibNamed:@"BFBriefcastCell" owner:self options:nil];
+        cell = (UITableViewCell *) [nibArray objectAtIndex:0];
+    }
+
+    titleLabel.text = [self.briefcast title];
+
+    if ([self.briefcast.totalNumberOfBriefcasts intValue] > 0)
+        descLabel.text = [NSString stringWithFormat:@"%@ Briefs, last opened on %@", 
+                      self.briefcast.totalNumberOfBriefcasts, [BFConfig shortDateStringFromDate:self.briefcast.dateLastOpened]];
+
+    else descLabel.text = @"No information available.";
+
+
+    // calculate background
+    UIImage *bgImage, *selectedBgImage;
+    if (indexPath.row == 0) {
+        // top
+        bgImage = [[UIImage imageNamed:@"cell-top.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
+        selectedBgImage = [[UIImage imageNamed:@"cell-top-sel.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
+    } 
+
+    else if (indexPath.row == [tv numberOfRowsInSection:indexPath.section]-1) {
+        // bottom
+        bgImage = [[UIImage imageNamed:@"cell-bottom.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
+        selectedBgImage = [[UIImage imageNamed:@"cell-bottom-sel.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
     }
-    cell.textLabel.text = [self.briefcast title];
+
+    else {
+        // middle
+        bgImage = [[UIImage imageNamed:@"cell-middle.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
+        selectedBgImage = [[UIImage imageNamed:@"cell-middle-sel.png"] stretchableImageWithLeftCapWidth:10 topCapHeight:0];
+    }
+
+    cell.backgroundView = [[UIImageView alloc] initWithImage:bgImage];
+    cell.selectedBackgroundView = [[UIImageView alloc] initWithImage:selectedBgImage];
+
+
     return cell;
 }
 
@@ -61,6 +97,11 @@ - (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEd
         [[BFDataManager sharedBFDataManager] removeBriefcast:self.briefcast];
 }
 
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    return 49.0f;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 
 @end
diff --git a/Classes/BFBriefcastViewController.m b/Classes/BFBriefcastViewController.m
@@ -239,6 +239,11 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
 
     [UIView commitAnimations];
 
+    // update the briefcast reference
+    self.briefcast.totalNumberOfBriefcasts = [NSNumber numberWithInt:[[feed items] count]];
+    self.briefcast.dateLastOpened = [NSDate date];
+    [[BFDataManager sharedBFDataManager] save];
+
     [super updateAndReload];
     [spinner stopAnimating];
 }

diff --git a/Classes/BFBrowseBriefcastViewController.xib b/Classes/BFBrowseBriefcastViewController.xib
@@ -191,7 +191,7 @@
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="IBUIText">Briefcasts are a way to share briefs. Each contains briefs that you can preview and install on your device.</string>
+						<string key="IBUIText">Briefcasts are an easy way to share briefs. Each contains briefs that you can preview and install on your device.</string>
 						<object class="NSFont" key="IBUIFont" id="671686307">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">13</double>

diff --git a/Classes/BFBrowseBriefcastsViewController.m b/Classes/BFBrowseBriefcastsViewController.m
@@ -31,6 +31,7 @@ - (void)viewDidLoad
     self.title = @"Briefcasts";
     self.navigationController.navigationBar.tintColor = [BFConfig tintColorForNavigationBar];
     self.tableView.backgroundColor = [UIColor clearColor];
+    self.tableView.separatorColor = [BFConfig separatorColorForTableView];
     tableFooterView.alpha = 0.0;
 
     // Edit button

diff --git a/Classes/BFConfig.h b/Classes/BFConfig.h
@@ -15,7 +15,12 @@
 + (UIColor *)tintColorForNavigationBar;
 + (UIColor *)tintColorForNavigationButton;
 
-// background colors
+// table colors
 + (UIColor *)backgroundForTableView;
++ (UIColor *)separatorColorForTableView;
+
+// dates
++ (NSString *)shortDateStringFromDate:(NSDate *)date;
++ (NSString *)shortTimeStringFromDate:(NSDate *)date;
 
 @end
diff --git a/Classes/BFConfig.m b/Classes/BFConfig.m
@@ -26,4 +26,26 @@ + (UIColor *)backgroundForTableView
     return [UIColor colorWithRed:0.8667f green:0.8784f blue:0.8902f alpha:1.0f];
 }
 
++ (UIColor *)separatorColorForTableView
+{
+    return [UIColor colorWithHue:0.58333f saturation:0.19f brightness:0.12f alpha:1.0f];
+}
+
+
++ (NSString *)shortDateStringFromDate:(NSDate *)date;
+{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setTimeStyle:NSDateFormatterNoStyle];
+    [dateFormatter setDateStyle:NSDateFormatterShortStyle];
+    return [dateFormatter stringFromDate:date];
+}
+
++ (NSString *)shortTimeStringFromDate:(NSDate *)date
+{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateStyle:NSDateFormatterNoStyle];
+    [dateFormatter setTimeStyle:NSDateFormatterShortStyle];
+    return [[dateFormatter stringFromDate:date] stringByReplacingOccurrencesOfString:@" " withString:@""];
+}
+
 @end
diff --git a/Classes/BFPreviewBriefViewController.m b/Classes/BFPreviewBriefViewController.m
@@ -12,6 +12,7 @@
 #import "BFSceneViewController.h"
 #import "BFSceneManager.h"
 #import "BFPagedBrowseViewController.h"
+#import "BFConfig.h"
 
 
 @interface BFPreviewBriefViewController (PrivateMethods)
@@ -75,16 +76,8 @@ - (void)prepareInfoView:(BriefRef *)ref
     else infoView.fromLabel.text = [[NSURL URLWithString:[ref fromURL]] host];
 
     // format date
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setTimeStyle:NSDateFormatterNoStyle];
-    [dateFormatter setDateStyle:NSDateFormatterShortStyle];
-    infoView.dateLabel.text = [dateFormatter stringFromDate:[ref dateLastDownloaded]];
-
-    [dateFormatter setDateStyle:NSDateFormatterNoStyle];
-    [dateFormatter setTimeStyle:NSDateFormatterShortStyle];
-    infoView.timeLabel.text = [[dateFormatter stringFromDate:[ref dateLastDownloaded]] stringByReplacingOccurrencesOfString:@" " withString:@""];
-
-    [dateFormatter release];
+    infoView.dateLabel.text = [BFConfig shortDateStringFromDate:[ref dateLastDownloaded]];    
+    infoView.timeLabel.text = [BFConfig shortTimeStringFromDate:[ref dateLastDownloaded]];
 }
 
 - (void)preparePreview:(BriefRef *)ref

diff --git a/images/bg/cell-bottom-sel.png b/images/bg/cell-bottom-sel.png
diff --git a/images/bg/cell-bottom.png b/images/bg/cell-bottom.png
diff --git a/images/bg/cell-middle-sel.png b/images/bg/cell-middle-sel.png
diff --git a/images/bg/cell-middle.png b/images/bg/cell-middle.png
diff --git a/images/bg/cell-top-sel.png b/images/bg/cell-top-sel.png
diff --git a/images/bg/cell-top.png b/images/bg/cell-top.png