Added remaining install types to Briefcast view (get, update, already…

… installed). Also cleaned up the loading view, giving it only a single dismiss button. (instead of an optional action button)
capttaco · Apr 6, 2010 · b06dccc · b06dccc
1 parent 3ce393f
commit b06dccc
Show file tree

Hide file tree

Showing 13 changed files with 92 additions and 86 deletions.
diff --git a/Briefs.xcodeproj/project.pbxproj b/Briefs.xcodeproj/project.pbxproj
@@ -64,6 +64,7 @@
 		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 */; };
+		D43CEF6F1162E3EC00DA07D5 /* already-button.png in Resources */ = {isa = PBXBuildFile; fileRef = D43CEF6E1162E3EC00DA07D5 /* already-button.png */; };
 		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 */; };
@@ -216,6 +217,7 @@
 		D43CEAB01160376500DA07D5 /* BFArrayBriefDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFArrayBriefDataSource.m; sourceTree = "<group>"; };
 		D43CEC34116061CD00DA07D5 /* BriefRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BriefRef.h; sourceTree = "<group>"; };
 		D43CEC35116061CD00DA07D5 /* BriefRef.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BriefRef.m; sourceTree = "<group>"; };
+		D43CEF6E1162E3EC00DA07D5 /* already-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "already-button.png"; path = "images/buttons/already-button.png"; sourceTree = "<group>"; };
 		D463E8FD107310170075CCCE /* BFBriefcastViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFBriefcastViewController.h; sourceTree = "<group>"; };
 		D463E8FE107310170075CCCE /* BFBriefcastViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BFBriefcastViewController.m; sourceTree = "<group>"; wrapsLines = 0; };
 		D464116F10606DDE001522F6 /* BFTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BFTableViewController.h; sourceTree = "<group>"; };
@@ -565,6 +567,7 @@
 		D43CE955115FC76E00DA07D5 /* buttons */ = {
 			isa = PBXGroup;
 			children = (
+				D43CEF6E1162E3EC00DA07D5 /* already-button.png */,
 				D43CE956115FC77E00DA07D5 /* install-button.png */,
 				D43CE957115FC77E00DA07D5 /* update-button.png */,
 			);
@@ -914,6 +917,7 @@
 				D43CE8B5115F196C00DA07D5 /* remote-play.png in Resources */,
 				D43CE958115FC77E00DA07D5 /* install-button.png in Resources */,
 				D43CE959115FC77E00DA07D5 /* update-button.png in Resources */,
+				D43CEF6F1162E3EC00DA07D5 /* already-button.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Classes/BFBriefCellController.h b/Classes/BFBriefCellController.h
@@ -18,7 +18,7 @@ typedef enum {
     BFBriefCellInstallTypeNewInstall = -122,
 
     /** Brief is installed with the newest version */
-    BFBriefCellInstallTypeAlreadyInstalled = -123
+    BFBriefCellInstallTypeAlreadyInstalled = -133
 
 } BFBriefCellInstallType;
 

diff --git a/Classes/BFBriefCellController.m b/Classes/BFBriefCellController.m
@@ -14,10 +14,12 @@
 #import "BFColor.h"
 
 
-#define kRightAccessoryNormalRect           CGRectMake(271.0f, 0.0f,  49.0f,  80.0f)
-#define kRightAccessoryExpandedRect         CGRectMake(240.0f, 0.0f,  80.0f,  80.0f)
-#define kInstallButtonNormalRect            CGRectMake(270.0f, 23.0f, 42.0f,  24.0f)
-#define kInstallButtonExpandedRect          CGRectMake(240.0f, 23.0f, 72.0f,  24.0f)
+#define kInstallButtonNormalRect            CGRectMake(270.0f, 0.0f, 42.0f,  70.0f)
+#define kInstallButtonExpandedRect          CGRectMake(240.0f, 0.0f, 72.0f,  70.0f)
+#define kInstallButtonBgNormalRect          CGRectMake(270.0f, 23.0f, 42.0f,  24.0f)
+#define kInstallButtonBgExpandedRect        CGRectMake(240.0f, 23.0f, 72.0f,  24.0f)
+
+
 
 @interface BFBriefCellController (PrivateMethods)
 
@@ -26,7 +28,6 @@ - (void)setInstallButtonExpanded:(BOOL)expand;
 @end
 
 
-
 @implementation BFBriefCellController
 @synthesize brief, delegate;
 
@@ -52,7 +53,18 @@ - (id)initWithEnclosure:(FPItem *)item
             installType = BFBriefCellInstallTypeAlreadyInstalled;
 
         // style install/update button
-        UIImage *buttonBG = [[UIImage imageNamed:@"install-button.png"] stretchableImageWithLeftCapWidth:4 topCapHeight:0];
+        UIImage *buttonBG;
+        switch (installType) {
+            case BFBriefCellInstallTypeUpdate:
+                buttonBG = [[UIImage imageNamed:@"update-button.png"] stretchableImageWithLeftCapWidth:4 topCapHeight:0];
+                break;
+            case BFBriefCellInstallTypeAlreadyInstalled:
+                buttonBG = [[UIImage imageNamed:@"already-button.png"] stretchableImageWithLeftCapWidth:4 topCapHeight:0];
+                break;
+            default:
+                buttonBG = [[UIImage imageNamed:@"install-button.png"] stretchableImageWithLeftCapWidth:4 topCapHeight:0];                
+        }
+
         installButtonBg = [[UIImageView alloc] initWithImage:buttonBG];
 
     }
@@ -113,14 +125,14 @@ - (void)setInstallButtonExpanded:(BOOL)expand
         // expand the button
 //        rightAccessoryView.frame = kRightAccessoryExpandedRect;
         installButton.frame = kInstallButtonExpandedRect;
-        installButtonBg.frame = kInstallButtonExpandedRect;
+        installButtonBg.frame = kInstallButtonBgExpandedRect;
     }
 
     else {
         // unexpand the button
 //        rightAccessoryView.frame = kRightAccessoryNormalRect;
         installButton.frame = kInstallButtonNormalRect;
-        installButtonBg.frame = kInstallButtonNormalRect;
+        installButtonBg.frame = kInstallButtonBgNormalRect;
     }
 
     [UIView commitAnimations];
@@ -147,10 +159,35 @@ - (UITableViewCell *)tableView:(UITableView *)tv cellForRowAtIndexPath:(NSIndexP
     [leftAccessoryView addSubview:indexView];
 
     if (installButtonBg != nil) {
-        installButtonBg.frame = kInstallButtonNormalRect;
-        installButton.frame = kInstallButtonNormalRect;
-        [installButton setTitle:@"NEW" forState:UIControlStateNormal];
 
+        CGRect theFrame, theFrameBg;
+        switch (installType) {
+            case BFBriefCellInstallTypeUpdate:
+                [installButton setTitle:@"UPDATE" forState:UIControlStateNormal];
+                theFrame = kInstallButtonExpandedRect;
+                theFrameBg = kInstallButtonBgExpandedRect;
+                break;
+
+            case BFBriefCellInstallTypeAlreadyInstalled:
+                [installButton setTitle:@"INSTALLED" forState:UIControlStateNormal];
+                installButton.enabled = NO;
+                theFrame = kInstallButtonExpandedRect;
+                theFrameBg = kInstallButtonBgExpandedRect;
+                [installButton setTitleColor:[UIColor grayColor] forState:UIControlStateDisabled];
+                [installButton setTitleShadowColor:[UIColor clearColor] forState:UIControlStateDisabled];
+
+                break;
+
+            default:
+                [installButton setTitle:@"NEW" forState:UIControlStateNormal];
+                theFrame = kInstallButtonNormalRect;
+                theFrameBg = kInstallButtonBgNormalRect;
+
+        }
+
+        installButtonBg.frame = theFrameBg;
+        installButton.frame = theFrame;
+
         [cell addSubview:installButtonBg]; 
         [cell addSubview:installButton];
     }

diff --git a/Classes/BFBriefcastViewController.m b/Classes/BFBriefcastViewController.m
@@ -8,16 +8,20 @@
 
 #import "BFBriefcastViewController.h"
 #import "FeedParser.h"
-//#import "BFTitleCellController.h"
-//#import "BFLabelCellController.h"
-//#import "BFParagraphCellController.h"
-//#import "BFHeaderCellController.h"
 #import "BFBriefCellController.h"
 #import "BFRemoteBriefCellController.h"
 #import "BFDataManager.h"
 #import "BFColor.h"
 
 
+@interface BFBriefcastViewController (PrivateMethods) 
+
+- (void)dismissLoadingViewAnimation:(UIView *)loadingView;
+
+@end
+
+
+
 @implementation BFBriefcastViewController
 
 @synthesize channelTitle, channelLink, channelDescription, locationOfBriefcast, enclosedBriefs, recievedData, briefcast;
@@ -112,6 +116,8 @@ - (void)dismissLoadingViewAnimation:(UIView *)loadingView
     [UIView setAnimationDidStopSelector:@selector(fadeLoadingViewDidStop:finished:context:)];
     loadingView.alpha = 0.0f;
     [UIView commitAnimations];
+
+    [self updateAndReload];
 }
 
 

diff --git a/Classes/BFColor.h b/Classes/BFColor.h
@@ -13,6 +13,7 @@
 
 // tint colors
 + (UIColor *)tintColorForNavigationBar;
++ (UIColor *)tintColorForNavigationButton;
 
 // background colors
 + (UIColor *)backgroundForTableView;

diff --git a/Classes/BFColor.m b/Classes/BFColor.m
@@ -12,6 +12,12 @@
 @implementation BFColor
 
 + (UIColor *)tintColorForNavigationBar
+{
+    return [UIColor colorWithRed:0.5098f green:0.5412f blue:0.6f alpha:1.0f];
+//    return [UIColor colorWithRed:0.6f green:0.6f blue:0.6f alpha:1.0f];
+}
+
++ (UIColor *)tintColorForNavigationButton
 {
     return [UIColor colorWithRed:0.5098f green:0.5412f blue:0.6f alpha:1.0f];
 }

diff --git a/Classes/BFLoadingViewController.h b/Classes/BFLoadingViewController.h
@@ -17,7 +17,7 @@
     IBOutlet UISlider           *progressSlider;
     IBOutlet UIImageView        *imageView;
     IBOutlet UIButton           *cancelButton;
-    IBOutlet UIButton           *actionButton;
+//    IBOutlet UIButton           *actionButton;
 
     id<BFLoadingViewDelegate>   delegate;
     NSURLConnection             *connection;

diff --git a/Classes/BFLoadingViewController.m b/Classes/BFLoadingViewController.m
@@ -72,7 +72,7 @@ - (void)load:(NSString *)location withInitialStatus:(NSString *)status action:(N
         [statusLabel setText:status];
 
     if (actionText)
-        [actionButton setTitle:actionText forState:UIControlStateNormal];
+        [cancelButton setTitle:actionText forState:UIControlStateNormal];
 
     NSURLRequest *request = [NSURLRequest requestWithURL:[NSURL URLWithString:location]];
     connection = [[[NSURLConnection alloc] initWithRequest:request delegate:self startImmediately:YES] autorelease];   
@@ -107,7 +107,7 @@ - (void)connectionDidFinishLoading:(NSURLConnection *)connection
 {    
     [statusLabel setText:@"Download Complete"];
     [self.delegate loadingView:self didCompleteWithData:self.data];
-    [actionButton setEnabled:YES];
+//    [actionButton setEnabled:YES];
     safeToClose = YES;
 }