From 48f310d646863f8a82bbd646693fd5fcdf2fd89f Mon Sep 17 00:00:00 2001 From: Rob Rhyne Date: Mon, 29 Mar 2010 01:06:52 -0400 Subject: [PATCH] More cleanup on the backside view of the brief preview. Still need to implement author and description properties in the briefs data format, but support exists in the app once they're in place. --- Briefs.xcdatamodel/elements | Bin 28910 -> 31922 bytes Briefs.xcdatamodel/layout | Bin 7584 -> 7649 bytes Briefs.xcodeproj/project.pbxproj | 10 +-- Classes/BFBriefInfo.m | 6 +- Classes/BFPreviewBriefViewController.m | 16 ++++- Classes/BFPreviewBriefViewController.xib | 76 +++++++++++------------ Classes/BriefRef.h | 8 ++- Classes/BriefRef.m | 8 ++- Classes/BriefsAppDelegate.m | 17 +---- 9 files changed, 74 insertions(+), 67 deletions(-) diff --git a/Briefs.xcdatamodel/elements b/Briefs.xcdatamodel/elements index f7bc6e40fdc6a2e53c694d5fe999fcad2ac7be61..a1b396dd436d5ef447afb23e95ec4f63b66b045f 100644 GIT binary patch literal 31922 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 OALVH4PvifUum1;%M;mSc literal 28910 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

w`6Y3+@853^ST%(=822M8gYqO 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 diff --git a/Briefs.xcodeproj/project.pbxproj b/Briefs.xcodeproj/project.pbxproj index bc43583..4bbffb0 100755 --- a/Briefs.xcodeproj/project.pbxproj +++ b/Briefs.xcodeproj/project.pbxproj @@ -63,6 +63,7 @@ D43CE959115FC77E00DA07D5 /* update-button.png in Resources */ = {isa = PBXBuildFile; fileRef = D43CE957115FC77E00DA07D5 /* update-button.png */; }; D43CEAB11160376500DA07D5 /* BFArrayBriefDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = D43CEAB01160376500DA07D5 /* BFArrayBriefDataSource.m */; }; D43CEB121160468F00DA07D5 /* howto.brieflist in Resources */ = {isa = PBXBuildFile; fileRef = D46414191069AB25001522F6 /* howto.brieflist */; }; + D43CEC36116061CD00DA07D5 /* BriefRef.m in Sources */ = {isa = PBXBuildFile; fileRef = D43CEC35116061CD00DA07D5 /* BriefRef.m */; }; D463E8FF107310170075CCCE /* BFBriefcastViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D463E8FE107310170075CCCE /* BFBriefcastViewController.m */; }; D464117110606DDE001522F6 /* BFTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D464117010606DDE001522F6 /* BFTableViewController.m */; }; D46411931065CF8C001522F6 /* BFBriefCellController.m in Sources */ = {isa = PBXBuildFile; fileRef = D46411921065CF8C001522F6 /* BFBriefCellController.m */; }; @@ -213,6 +214,8 @@ D43CE957115FC77E00DA07D5 /* update-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "update-button.png"; path = "images/buttons/update-button.png"; sourceTree = ""; }; D43CEAAF1160376500DA07D5 /* BFArrayBriefDataSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFArrayBriefDataSource.h; sourceTree = ""; }; D43CEAB01160376500DA07D5 /* BFArrayBriefDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFArrayBriefDataSource.m; sourceTree = ""; }; + D43CEC34116061CD00DA07D5 /* BriefRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BriefRef.h; sourceTree = ""; }; + D43CEC35116061CD00DA07D5 /* BriefRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BriefRef.m; sourceTree = ""; }; D463E8FD107310170075CCCE /* BFBriefcastViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFBriefcastViewController.h; sourceTree = ""; }; D463E8FE107310170075CCCE /* BFBriefcastViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFBriefcastViewController.m; sourceTree = ""; wrapsLines = 0; }; D464116F10606DDE001522F6 /* BFTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFTableViewController.h; sourceTree = ""; }; @@ -283,8 +286,6 @@ D4A39835113C6EAA004971E9 /* Icon-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-small.png"; path = "images/Icon-small.png"; sourceTree = ""; }; 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 = ""; }; - D4AF1B141147431B00D1B3B5 /* BriefRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BriefRef.h; sourceTree = ""; }; - D4AF1B151147431B00D1B3B5 /* BriefRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BriefRef.m; sourceTree = ""; }; D4AF1B30114808A300D1B3B5 /* BFBriefcast+CoreDataAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BFBriefcast+CoreDataAdditions.h"; sourceTree = ""; }; D4AF1B31114808A300D1B3B5 /* BFBriefcast+CoreDataAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BFBriefcast+CoreDataAdditions.m"; sourceTree = ""; }; D4AF1B4611480B3C00D1B3B5 /* BriefcastRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BriefcastRef.h; sourceTree = ""; }; @@ -750,10 +751,10 @@ D4AF1B071147369A00D1B3B5 /* data */ = { isa = PBXGroup; children = ( + D43CEC34116061CD00DA07D5 /* BriefRef.h */, + D43CEC35116061CD00DA07D5 /* BriefRef.m */, D4AF1B4611480B3C00D1B3B5 /* BriefcastRef.h */, D4AF1B4711480B3C00D1B3B5 /* BriefcastRef.m */, - D4AF1B141147431B00D1B3B5 /* BriefRef.h */, - D4AF1B151147431B00D1B3B5 /* BriefRef.m */, ); name = data; sourceTree = ""; @@ -982,6 +983,7 @@ D43CE3A81154785500DA07D5 /* BFBriefInfoView.m in Sources */, D43CE5331157055100DA07D5 /* BFPagedContainerView.m in Sources */, D43CEAB11160376500DA07D5 /* BFArrayBriefDataSource.m in Sources */, + D43CEC36116061CD00DA07D5 /* BriefRef.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/Classes/BFBriefInfo.m b/Classes/BFBriefInfo.m index 3f60c89..69f85f6 100644 --- a/Classes/BFBriefInfo.m +++ b/Classes/BFBriefInfo.m @@ -31,8 +31,8 @@ - (id)initWithDictionary:(NSDictionary *)dictionary atPath:(NSString *)path numberOfScenes = (scenes != nil) ? [scenes count] : 0; pathToBrieflist = path; - author = [dictionary objectForKey:@"author" orDefaultValue:@"None"]; - desc = [dictionary objectForKey:@"desc" orDefaultValue:@"None"]; + author = [dictionary objectForKey:@"author" orDefaultValue:@"None provided."]; + desc = [dictionary objectForKey:@"desc" orDefaultValue:@"None provided."]; NSString *defaultTitle = [path stringByReplacingOccurrencesOfString:@".brieflist" withString:@""]; @@ -57,6 +57,8 @@ - (BriefRef *)insertIntoManagedContext:(NSManagedObjectContext *)context [ref setTotalNumberOfScenes:[NSNumber numberWithInt:numberOfScenes]]; // TODO: add author, desc information + [ref setAuthor:author]; + [ref setDesc:desc]; return ref; } diff --git a/Classes/BFPreviewBriefViewController.m b/Classes/BFPreviewBriefViewController.m index c388c45..f8a5b14 100644 --- a/Classes/BFPreviewBriefViewController.m +++ b/Classes/BFPreviewBriefViewController.m @@ -57,7 +57,21 @@ - (void)prepareInfoView:(BriefRef *)ref { infoView.titleLabel.text = ref.title; infoView.numberOfScenesLabel.text = [NSString stringWithFormat:@"%@", [ref totalNumberOfScenes]]; - infoView.fromLabel.text = [[NSURL URLWithString:[ref fromURL]] host]; + infoView.authorLabel.text = ref.author; + + // adjust size of description box + // to account for multiple lines + CGSize adjustedSize = [ref.desc sizeWithFont:infoView.infoLabel.font constrainedToSize:CGSizeMake(116.0f, 50.0f)]; + CGRect adjustedFrame = infoView.infoLabel.frame; + adjustedFrame.size = adjustedSize; + infoView.infoLabel.frame = adjustedFrame; + infoView.infoLabel.text = ref.desc; + + // check if locally stored + if ([[ref fromURL] isEqual:kBFLocallyStoredBriefURLString]) { + infoView.fromLabel.text = @"Built-in"; + } + else infoView.fromLabel.text = [[NSURL URLWithString:[ref fromURL]] host]; // format date NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; diff --git a/Classes/BFPreviewBriefViewController.xib b/Classes/BFPreviewBriefViewController.xib index e6b49df..4863fde 100644 --- a/Classes/BFPreviewBriefViewController.xib +++ b/Classes/BFPreviewBriefViewController.xib @@ -12,9 +12,9 @@ YES - - + + YES @@ -134,7 +134,7 @@ MC41NzYzMDcyOTY4IDAuNTkzNDY4Nzg1MyAwLjYwNzE2NTIxNzQAA - + 3 MAA @@ -189,6 +189,8 @@ YES + + NSImage preview-play-bg.png @@ -303,10 +305,7 @@ MC4yOTcxMTQwNzQyIDAuMzMxNzU4NTg4NiAwLjQxODY1NDg1OTEAA - - 3 - MQA - + {0, 1} 1 NO @@ -325,6 +324,31 @@ NO NO + + + 308 + {{67, 147}, {116, 45}} + + + NO + YES + 5 + NO + If I were to put three lines of text in here, it would look like... + + Helvetica + 12 + 16 + + + 1 + MC4xNzg4MDUwODMgMC4xODAwNDg5ODczIDAuMTgyOTgwNjcxNQA + + + 0 + 10 + 0 + {{9, 4}, {192, 288}} @@ -495,38 +519,14 @@ YES NO Unknown - - Helvetica - 12 - 16 - - - 1 - MC4xNzg4MDUwODMgMC4xODAwNDg5ODczIDAuMTgyOTgwNjcxNQA - - - 1 - 10 - - - - 292 - {{76, 137}, {119, 74}} - - - NO - YES - NO - A typical three line description that can span, multiple lines 1 MC4xNzg4MDUwODMgMC4xODAwNDg5ODczIDAuMTgyOTgwNjcxNQA - 0 + 1 10 - 3 @@ -872,7 +872,6 @@ - @@ -996,17 +995,13 @@ - - 48 - - - 58 YES + @@ -1037,6 +1032,11 @@ + + 48 + + + diff --git a/Classes/BriefRef.h b/Classes/BriefRef.h index e1190a3..b6ae02b 100644 --- a/Classes/BriefRef.h +++ b/Classes/BriefRef.h @@ -2,7 +2,7 @@ // BriefRef.h // Briefs // -// Created by Rob Rhyne on 3/10/10. +// Created by Rob Rhyne on 3/29/10. // Copyright 2010 __MyCompanyName__. All rights reserved. // @@ -14,13 +14,15 @@ { } -@property (nonatomic, retain) NSString * fromURL; +@property (nonatomic, retain) NSDate * dateLastOpened; +@property (nonatomic, retain) NSString * author; @property (nonatomic, retain) NSNumber * lastSceneOpened; @property (nonatomic, retain) NSNumber * totalNumberOfScenes; @property (nonatomic, retain) NSString * title; +@property (nonatomic, retain) NSString * desc; @property (nonatomic, retain) NSDate * dateLastDownloaded; +@property (nonatomic, retain) NSString * fromURL; @property (nonatomic, retain) NSString * filePath; -@property (nonatomic, retain) NSDate * dateLastOpened; @property (nonatomic, retain) BriefcastRef * briefcast; @end diff --git a/Classes/BriefRef.m b/Classes/BriefRef.m index 8a84c4d..e10af88 100644 --- a/Classes/BriefRef.m +++ b/Classes/BriefRef.m @@ -2,7 +2,7 @@ // BriefRef.m // Briefs // -// Created by Rob Rhyne on 3/10/10. +// Created by Rob Rhyne on 3/29/10. // Copyright 2010 __MyCompanyName__. All rights reserved. // @@ -12,13 +12,15 @@ @implementation BriefRef -@dynamic fromURL; +@dynamic dateLastOpened; +@dynamic author; @dynamic lastSceneOpened; @dynamic totalNumberOfScenes; @dynamic title; +@dynamic desc; @dynamic dateLastDownloaded; +@dynamic fromURL; @dynamic filePath; -@dynamic dateLastOpened; @dynamic briefcast; @end diff --git a/Classes/BriefsAppDelegate.m b/Classes/BriefsAppDelegate.m index 3c5116b..1352f03 100644 --- a/Classes/BriefsAppDelegate.m +++ b/Classes/BriefsAppDelegate.m @@ -10,6 +10,7 @@ #import "BFSceneViewController.h" #import "BFMainViewController.h" #import "BFDataManager.h" +#import "BFPagedBrowseViewController.h" @implementation BriefsAppDelegate @@ -46,22 +47,6 @@ - (void)applicationWillTerminate:(UIApplication *)application [[BFDataManager sharedBFDataManager] save]; } -//- (BOOL)application:(UIApplication *)application handleOpenURL:(NSURL *)url -//{ -// if ([[url scheme] isEqualToString:@"brief"]) { -// NSLog(@"Received the following URL for a brief: %@", url); -// -// -// -// return YES; -// } -// else if ([[url scheme] isEqualToString:@"brieflist"]) { -// NSLog(@"Received the following URL for a briefcast: %@", url); -// return YES; -// } -// return NO; -//} - - (void)dealloc { [navigationController release];