Merge branch 'ui_1_dot_0' of /Users/rob/Dropbox/code/iphone/Briefs in…

…to ui_1_dot_0 Conflicts: Briefs.xcodeproj/project.pbxproj
yresk · May 1, 2010 · ea8cc1b · ea8cc1b
2 parents fafbeb0 + e95af09
commit ea8cc1b
Show file tree

Hide file tree

Showing 131 changed files with 10,264 additions and 848 deletions.
diff --git a/BFBriefcastCell.xib b/BFBriefcastCell.xib
diff --git a/Briefs-Info.plist b/Briefs-Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>app-icon.png</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.digitalarch.briefs</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -26,5 +26,19 @@
 	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainWindow</string>
+	<key>UIPrerenderedIcon</key>
+	<true/>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string>com.digitalarch.briefs</string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>brief</string>
+				<string>briefcast</string>
+			</array>
+		</dict>
+	</array>
 </dict>
 </plist>
diff --git a/Briefs.xcdatamodel/elements b/Briefs.xcdatamodel/elements
diff --git a/Briefs.xcdatamodel/layout b/Briefs.xcdatamodel/layout
diff --git a/Briefs.xcodeproj/project.pbxproj b/Briefs.xcodeproj/project.pbxproj
diff --git a/Briefs_Prefix.pch b/Briefs_Prefix.pch
@@ -2,7 +2,16 @@
 // Prefix header for all source files of the 'Briefs' target in the 'Briefs' project
 //
 
+#import <Availability.h>
+
+#ifndef __IPHONE_3_0
+    #warning "This project uses features only available in iPhone SDK 3.0 and later."
+#endif
+
+
 #ifdef __OBJC__
     #import <Foundation/Foundation.h>
     #import <UIKit/UIKit.h>
-#endif
+    #import <CoreData/CoreData.h>
+    #import <QuartzCore/QuartzCore.h>
+#endif
diff --git a/Classes/BFAddBriefcastCellController.h b/Classes/BFAddBriefcastCellController.h
@@ -0,0 +1,18 @@
+//
+//  BFAddBriefcastCellController.h
+//  Briefs
+//
+//  Created by Rob Rhyne on 3/13/10.
+//  Copyright Digital Arch Design, 2009-2010. See LICENSE file for details.
+//
+
+#import "BFButtonCellController.h"
+
+@interface BFAddBriefcastCellController : BFButtonCellController 
+{
+    id delegate;
+}
+
+@property (nonatomic, retain) id delegate;
+
+@end
diff --git a/Classes/BFAddBriefcastCellController.m b/Classes/BFAddBriefcastCellController.m
@@ -0,0 +1,22 @@
+//
+//  BFAddBriefcastCellController.m
+//  Briefs
+//
+//  Created by Rob Rhyne on 3/13/10.
+//  Copyright Digital Arch Design, 2009-2010. See LICENSE file for details.
+//
+
+#import "BFAddBriefcastCellController.h"
+
+
+@implementation BFAddBriefcastCellController
+@synthesize delegate;
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
+{
+    if ([delegate respondsToSelector:@selector(addBriefcast)]) {
+        [delegate addBriefcast];
+    }
+}
+
+@end
diff --git a/Classes/BFAddBriefcastViewController.m b/Classes/BFAddBriefcastViewController.m
@@ -8,6 +8,7 @@
 
 #import "BFAddBriefcastViewController.h"
 #import "BFTextCellController.h"
+#import "BFConfig.h"
 
 @implementation BFAddBriefcastViewController
 
@@ -70,6 +71,15 @@ - (void)didReceiveMemoryWarning
     // Release any cached data, images, etc that aren't in use.
 }
 
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    self.navigationController.navigationBar.tintColor = [BFConfig tintColorForNavigationBar];
+    self.view.backgroundColor = [BFConfig backgroundForTableView];
+    //self.view.separatorColor = [UIColor colorWithRed:0.7667f green:0.7784f blue:0.7902f alpha:1.0f];
+}
+
 - (void)viewDidUnload 
 {
     self.delegate = nil;

diff --git a/Classes/BFArrayBriefDataSource.h b/Classes/BFArrayBriefDataSource.h
@@ -0,0 +1,18 @@
+//
+//  BFArrayBriefDataSource.h
+//  Briefs
+//
+//  Created by Rob Rhyne on 3/28/10.
+//  Copyright Digital Arch Design, 2009-2010. See LICENSE file for details.
+//
+
+#import "BFBriefDataSource.h"
+
+@interface BFArrayBriefDataSource : NSObject <BFBriefDataSource>
+{
+    NSArray *backingArray;
+}
+
+- (id)initWithArray:(NSArray *)backing;
+
+@end
diff --git a/Classes/BFArrayBriefDataSource.m b/Classes/BFArrayBriefDataSource.m
@@ -0,0 +1,49 @@
+//
+//  BFArrayBriefDataSource.m
+//  Briefs
+//
+//  Created by Rob Rhyne on 3/28/10.
+//  Copyright Digital Arch Design, 2009-2010. See LICENSE file for details.
+//
+
+#import "BFArrayBriefDataSource.h"
+
+
+@implementation BFArrayBriefDataSource
+
+///////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark Initialization
+
+- (id)initWithArray:(NSArray *)backing
+{
+    if (self = [super init]) {
+        backingArray = [backing retain];
+    }
+
+    return self;
+}
+
+- (void)dealloc
+{
+    [backingArray release];
+    [super dealloc];
+}
+
+///////////////////////////////////////////////////////////////////////////////
+#pragma mark -
+#pragma mark BFBriefDataSource Compliance
+
+- (int)numberOfRecords
+{
+    return [backingArray count];
+}
+
+- (BriefRef *)dataForIndex:(NSInteger)index
+{
+    return [backingArray objectAtIndex:index];
+}
+
+///////////////////////////////////////////////////////////////////////////////
+
+@end
diff --git a/Classes/BFBriefCellController.h b/Classes/BFBriefCellController.h
@@ -3,20 +3,61 @@
 //  Briefs
 //
 //  Created by Rob Rhyne on 9/19/09.
-//  Copyright Digital Arch Design, 2009. See LICENSE file for details.
+//  Copyright Digital Arch Design, 2009-2010. See LICENSE file for details.
 //
 
-#import <Foundation/Foundation.h>
 #import "BFCellController.h"
+#import "FeedParser.h"
+#import "BFBriefcastEventDelegate.h"
+
+typedef enum {
+    /** Brief already exists, but a newer version exists */
+    BFBriefCellInstallTypeUpdate = -123,
+
+    /** Brief is not installed */
+    BFBriefCellInstallTypeNewInstall = -122,
+
+    /** Brief is installed with the newest version */
+    BFBriefCellInstallTypeAlreadyInstalled = -133
+
+} BFBriefCellInstallType;
 
 
 @interface BFBriefCellController : NSObject<BFCellController> 
 {
-    NSString *brief;
+    id<BFBriefcastEventDelegate>  delegate;
+    BFBriefCellInstallType          installType;
+    FPItem                          *brief;
+
+    // UI State
+    BOOL    isSelected;
+    BOOL    isInstallButtonExpanded;
+
+
+    // Text
+    IBOutlet UILabel    *indexLabel;
+    IBOutlet UILabel    *titleLabel;
+    IBOutlet UILabel    *descLabel;
+
+    // Layout
+    IBOutlet UIView     *leftAccessoryView;
+    IBOutlet UIView     *contentView;
+    IBOutlet UIView     *rightAccessoryView;
+
+    // Controls
+    IBOutlet UIView     *indexView;
+    IBOutlet UIView     *remotePlayView;
+    IBOutlet UIButton   *remotePlayButton;
+    IBOutlet UIButton   *installButton;
+    UIImageView         *installButtonBg;
 }
 
-@property (nonatomic, retain) NSString *brief;
+@property (nonatomic, retain) FPItem                            *brief;
+@property (nonatomic, assign) id<BFBriefcastEventDelegate>    delegate;
+
+- (id)initWithEnclosure:(FPItem *)item;
 
-- (id)initWithNameOfBrief:(NSString *)name;
+- (IBAction)shouldBeginRemotePlay;
+- (IBAction)shouldStartDownloadingBrief;
 
 @end