Refactor table cells.

kishikawakatsumi · Aug 29, 2009 · 34d9c17 · 34d9c17
1 parent 5d5420c
commit 34d9c17
Show file tree

Hide file tree

Showing 12 changed files with 219 additions and 88 deletions.
diff --git a/Classes/MyBookmarkCell.h b/Classes/MyBookmarkCell.h
@@ -1,13 +1,15 @@
 #import <UIKit/UIKit.h>
 
 @interface MyBookmarkCell : UITableViewCell {
-	IBOutlet UILabel *titleLabel;
+	NSString *titleText;
-	IBOutlet UILabel *linkLabel;
+	NSString *linkText;
-	IBOutlet UILabel *numberLabel;
+	NSString *numberText;
 }
 
-@property (nonatomic, retain) UILabel *titleLabel;
+@property (nonatomic, retain) NSString *titleText;
-@property (nonatomic, retain) UILabel *linkLabel;
+@property (nonatomic, retain) NSString *linkText;
-@property (nonatomic, retain) UILabel *numberLabel;
+@property (nonatomic, retain) NSString *numberText;
+
+- (void)drawSelectedBackgroundRect:(CGRect)rect;
 
 @end
diff --git a/Classes/MyBookmarkCell.m b/Classes/MyBookmarkCell.m
@@ -1,50 +1,88 @@
 #import "MyBookmarkCell.h"
+#import "MyBookmarkCellSelectedBackgroundView.h"
+#import "TableCellDrawing.h"
 
 @implementation MyBookmarkCell
 
-@synthesize titleLabel;
+@synthesize titleText;
-@synthesize linkLabel;
+@synthesize linkText;
-@synthesize numberLabel;
+@synthesize numberText;
+
+static UIColor *blueColor = NULL;
+static UIColor *darkGrayColor = NULL;
+
++ (void)initialize {
+	blueColor = [[UIColor colorWithRed:0.0f green:0.2f blue:1.0f alpha:1.0f] retain];
+	darkGrayColor = [[UIColor colorWithRed:0.2f green:0.2f blue:0.2f alpha:1.0f] retain];
+}
+
+- (void)setTitleText:(NSString *)text {
+	if (titleText != text) {
+		[titleText release];
+		titleText = [text retain];
+		[self setNeedsDisplay];
+	}
+}
+
+- (void)setLinkText:(NSString *)text {
+	if (linkText != text) {
+		[linkText release];
+		linkText = [text retain];
+		[self setNeedsDisplay];
+	}
+}
+
+- (void)setNumberText:(NSString *)text {
+	if (numberText != text) {
+		[numberText release];
+		numberText = [text retain];
+		[self setNeedsDisplay];
+	}
+}
 
 - (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
     if (self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) {
         [self setAccessoryType:UITableViewCellAccessoryDisclosureIndicator];
 		[self setOpaque:YES];
 
-		titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(20.0f, 5.0f, 277.0f, 37.0f)];
+		MyBookmarkCellSelectedBackgroundView *selectedBackgroundView = [[MyBookmarkCellSelectedBackgroundView alloc] initWithFrame:[self frame]];
-		[titleLabel setOpaque:YES];
+		[selectedBackgroundView setCell:self];
-		[titleLabel setNumberOfLines:2];
+		[self setSelectedBackgroundView:selectedBackgroundView];
-		[titleLabel setFont:[UIFont boldSystemFontOfSize:14.0f]];
+		[selectedBackgroundView release];
-		[titleLabel setTextColor:[UIColor colorWithRed:0.0f green:0.2f blue:1.0f alpha:1.0f]];
-		[titleLabel setHighlightedTextColor:[UIColor whiteColor]];
-		[self addSubview:titleLabel];
-
-		linkLabel = [[UILabel alloc] initWithFrame:CGRectMake(20.0f, 42.0f, 277.0f, 26.0f)];
-		[linkLabel setOpaque:YES];
-		[linkLabel setFont:[UIFont systemFontOfSize:12.0f]];
-		[linkLabel setTextColor:[UIColor colorWithRed:0.2f green:0.2f blue:0.2f alpha:1.0f]];
-		[linkLabel setHighlightedTextColor:[UIColor whiteColor]];
-		[self addSubview:linkLabel];
-
-		numberLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 25.0f, 16.0f, 21.0f)];
-		[numberLabel setOpaque:YES];
-		[numberLabel setFont:[UIFont systemFontOfSize:9.0f]];
-		[numberLabel setTextAlignment:UITextAlignmentRight];
-		[numberLabel setTextColor:[UIColor blackColor]];
-		[numberLabel setHighlightedTextColor:[UIColor whiteColor]];
-		[self addSubview:numberLabel];
     }
     return self;
 }
 
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
-	[super setSelected:selected animated:animated];
+    [super setSelected:selected animated:animated];
+	[self setNeedsDisplay];
+	[self.selectedBackgroundView setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+	[super drawRect:rect];
+	[blueColor set];
+	[titleText drawInRect:CGRectMake(20.0f, 5.0f, 277.0f, 37.0f) withFont:[UIFont boldSystemFontOfSize:14.0f] lineBreakMode:UILineBreakModeTailTruncation];
+	[darkGrayColor set];
+	[linkText drawInRect:CGRectMake(20.0f, 46.0f, 277.0f, 26.0f) withFont:[UIFont systemFontOfSize:12.0f] lineBreakMode:UILineBreakModeTailTruncation];
+	[[UIColor blackColor] set];
+	[numberText drawInRect:CGRectMake(0.0f, 28.0f, 16.0f, 21.0f) withFont:[UIFont systemFontOfSize:9.0f] lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentRight];
+}
+
+- (void)drawSelectedBackgroundRect:(CGRect)rect {
+	CGGradientRef gradientForSelected = createTwoColorsGradient(5, 140, 245, 1, 93, 230);
+	drawRoundedRectBackgroundGradient(rect, gradientForSelected, NO, NO, NO);
+	CGGradientRelease(gradientForSelected);
+	[[UIColor whiteColor] set];
+	[titleText drawInRect:CGRectMake(20.0f, 5.0f, 277.0f, 37.0f) withFont:[UIFont boldSystemFontOfSize:14.0f] lineBreakMode:UILineBreakModeTailTruncation];
+	[linkText drawInRect:CGRectMake(20.0f, 46.0f, 277.0f, 26.0f) withFont:[UIFont systemFontOfSize:12.0f] lineBreakMode:UILineBreakModeTailTruncation];
+	[numberText drawInRect:CGRectMake(0.0f, 28.0f, 16.0f, 21.0f) withFont:[UIFont systemFontOfSize:9.0f] lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentRight];
 }
 
 - (void)dealloc {
-	[titleLabel release];
+	[titleText release];
-	[linkLabel release];
+	[linkText release];
-	[numberLabel release];
+	[numberText release];
 	[super dealloc];
 }
 

diff --git a/Classes/MyBookmarkCellSelectedBackgroundView.h b/Classes/MyBookmarkCellSelectedBackgroundView.h
@@ -0,0 +1,19 @@
+//
+//  MyBookmarkCellSelectedBackgroundView.h
+//  HatenaTouch
+//
+//  Created by KISHIKAWA Katsumi on 09/08/30.
+//  Copyright 2009 KISHIKAWA Katsumi. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class MyBookmarkCell;
+
+@interface MyBookmarkCellSelectedBackgroundView : UITableViewCell {
+	MyBookmarkCell *cell;
+}
+
+@property (nonatomic, assign) MyBookmarkCell *cell;
+
+@end
diff --git a/Classes/MyBookmarkCellSelectedBackgroundView.m b/Classes/MyBookmarkCellSelectedBackgroundView.m
@@ -0,0 +1,24 @@
+//
+//  MyBookmarkCellSelectedBackgroundView.m
+//  HatenaTouch
+//
+//  Created by KISHIKAWA Katsumi on 09/08/30.
+//  Copyright 2009 KISHIKAWA Katsumi. All rights reserved.
+//
+
+#import "MyBookmarkCellSelectedBackgroundView.h"
+#import "MyBookmarkCell.h"
+
+@implementation MyBookmarkCellSelectedBackgroundView
+
+@synthesize cell;
+
+- (void)drawRect:(CGRect)rect {
+    [cell drawSelectedBackgroundRect:rect];
+}
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+@end
diff --git a/Classes/MyBookmarkNextCell.h b/Classes/MyBookmarkNextCell.h
@@ -2,4 +2,6 @@
 
 @interface MyBookmarkNextCell : UITableViewCell
 
+- (void)drawSelectedBackgroundRect:(CGRect)rect;
+
 @end
diff --git a/Classes/MyBookmarkNextCell.m b/Classes/MyBookmarkNextCell.m
@@ -1,9 +1,46 @@
 #import "MyBookmarkNextCell.h"
+#import "MyBookmarkNextCellSelectedBackgroundView.h"
+#import "TableCellDrawing.h"
 
 @implementation MyBookmarkNextCell
 
+static NSString *cellText;
+
++ (void)initialize {
+	cellText = NSLocalizedString(@"Read Next 20 Entries...", nil);
+}
+
+- (id)initWithFrame:(CGRect)frame reuseIdentifier:(NSString *)reuseIdentifier {
+    if (self = [super initWithFrame:frame reuseIdentifier:reuseIdentifier]) {
+        [self setAccessoryType:UITableViewCellAccessoryNone];
+		[self setOpaque:YES];
+
+		MyBookmarkNextCellSelectedBackgroundView *selectedBackgroundView = [[MyBookmarkNextCellSelectedBackgroundView alloc] initWithFrame:[self frame]];
+		[selectedBackgroundView setCell:self];
+		[self setSelectedBackgroundView:selectedBackgroundView];
+		[selectedBackgroundView release];
+    }
+    return self;
+}
+
 - (void)setSelected:(BOOL)selected animated:(BOOL)animated {
 	[super setSelected:selected animated:animated];
+	[self setNeedsDisplay];
+	[self.selectedBackgroundView setNeedsDisplay];
+}
+
+- (void)drawRect:(CGRect)rect {
+	[super drawRect:rect];
+	[[UIColor blackColor] set];
+	[cellText drawInRect:CGRectMake(20.0f, 24.0f, 280.0f, 21.0f) withFont:[UIFont boldSystemFontOfSize:17.0f] lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
+}
+
+- (void)drawSelectedBackgroundRect:(CGRect)rect {
+	CGGradientRef gradientForSelected = createTwoColorsGradient(5, 140, 245, 1, 93, 230);
+	drawRoundedRectBackgroundGradient(rect, gradientForSelected, NO, NO, NO);
+	CGGradientRelease(gradientForSelected);
+	[[UIColor whiteColor] set];
+	[cellText drawInRect:CGRectMake(20.0f, 24.0f, 280.0f, 21.0f) withFont:[UIFont boldSystemFontOfSize:17.0f] lineBreakMode:UILineBreakModeClip alignment:UITextAlignmentCenter];
 }
 
 - (void)dealloc {

diff --git a/Classes/MyBookmarkNextCellSelectedBackgroundView.h b/Classes/MyBookmarkNextCellSelectedBackgroundView.h
@@ -0,0 +1,19 @@
+//
+//  MyBookmarkNextCellSelectedBackgroundView.h
+//  HatenaTouch
+//
+//  Created by KISHIKAWA Katsumi on 09/08/30.
+//  Copyright 2009 KISHIKAWA Katsumi. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class MyBookmarkNextCell;
+
+@interface MyBookmarkNextCellSelectedBackgroundView : UITableViewCell {
+	MyBookmarkNextCell *cell;
+}
+
+@property (nonatomic, assign) MyBookmarkNextCell *cell;
+
+@end
diff --git a/Classes/MyBookmarkNextCellSelectedBackgroundView.m b/Classes/MyBookmarkNextCellSelectedBackgroundView.m
@@ -0,0 +1,24 @@
+//
+//  MyBookmarkNextCellSelectedBackgroundView.m
+//  HatenaTouch
+//
+//  Created by KISHIKAWA Katsumi on 09/08/30.
+//  Copyright 2009 KISHIKAWA Katsumi. All rights reserved.
+//
+
+#import "MyBookmarkNextCellSelectedBackgroundView.h"
+#import "MyBookmarkNextCell.h"
+
+@implementation MyBookmarkNextCellSelectedBackgroundView
+
+@synthesize cell;
+
+- (void)drawRect:(CGRect)rect {
+    [cell drawSelectedBackgroundRect:rect];
+}
+
+- (void)dealloc {
+    [super dealloc];
+}
+
+@end
diff --git a/Classes/MyBookmarkViewController.m b/Classes/MyBookmarkViewController.m
@@ -4,7 +4,6 @@
 #import "HatenaTouchAppDelegate.h"
 #import "WebViewController.h"
 #import "HatenaAtomPub.h"
-#import "MyBookmarkNextCellController.h";
 #import "MyBookmarkNextCell.h"
 #import "Debug.h"
 
@@ -16,13 +15,6 @@ @implementation MyBookmarkViewController
 @synthesize myBookmarks;
 @synthesize selectedRow;
 
-- (id)initWithStyle:(UITableViewStyle)style {
-	if (self = [super initWithStyle:style]) {
-		;
-	}
-	return self;
-}
-
 - (void)dealloc {
 	[selectedRow release];
 	[myBookmarks release];
@@ -72,10 +64,8 @@ - (void)refleshIfNeeded {
 }
 
 - (void)loadNext {
-	[myBookmarks release];
-	myBookmarks = nil;
 	offset += FEED_OFFSET;
-	[self refleshIfNeeded];
+	[self loadMyBookmarks];
 }
 
 - (BOOL)deleteEntry:(NSDictionary *)entry {
@@ -99,20 +89,16 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
 	NSInteger count = [myBookmarks count];
 	if (count == 0) {
 		return 0;
-	} else if (count == FEED_OFFSET) {
-		return count + 1;
 	} else {
-		return count;
+		return count + 1;
 	}
 }
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {	
 	if (indexPath.row == [myBookmarks count]) {
 		MyBookmarkNextCell *cell = (MyBookmarkNextCell *)[tableView dequeueReusableCellWithIdentifier:@"MyBookmarkNextCell"];
 		if (cell == nil) {
-			MyBookmarkNextCellController *controller = [[MyBookmarkNextCellController alloc] initWithNibName:@"MyBookmarkNextCell" bundle:nil];
+			cell = [[[MyBookmarkNextCell alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 320.0f, 70.0f) reuseIdentifier:@"MyBookmarkNextCell"] autorelease];
-			cell = (MyBookmarkNextCell *)controller.view;
-			[controller release];
 		}
 
 		return cell;
@@ -123,9 +109,9 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 		}
 
 		NSDictionary *entry = [myBookmarks objectAtIndex:indexPath.row];
-		[cell.titleLabel setText:[entry objectForKey:@"title"]];
+		[cell setTitleText:[entry objectForKey:@"title"]];
-		[cell.linkLabel setText:[entry objectForKey:@"related"]];
+		[cell setLinkText:[entry objectForKey:@"related"]];
-		[cell.numberLabel setText:[NSString stringWithFormat:@"%d", indexPath.row +1]];
+		[cell setNumberText:[NSString stringWithFormat:@"%d", indexPath.row +1]];
 
 		return cell;
 	}
@@ -139,7 +125,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte
 #pragma mark <UITableViewDelegate> Methods
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-	if (indexPath.row == FEED_OFFSET) {
+	if (indexPath.row == [myBookmarks count]) {
 		[self loadNext];
 		[tableView deselectRowAtIndexPath:indexPath animated:YES];
 	} else {
@@ -185,10 +171,6 @@ - (void)viewWillAppear:(BOOL)animated {
 	[self refleshIfNeeded];
 }
 
-- (void)viewDidAppear:(BOOL)animated {
-	[super viewDidAppear:animated];
-}
-
 - (void)didReceiveMemoryWarning {
 	LOG_CURRENT_METHOD;
 	[super didReceiveMemoryWarning];

diff --git a/English.lproj/Localizable.strings b/English.lproj/Localizable.strings