diff --git a/Classes/MyBookmarkCell.h b/Classes/MyBookmarkCell.h index 39928eb..5cdfd8f 100644 --- a/Classes/MyBookmarkCell.h +++ b/Classes/MyBookmarkCell.h @@ -1,13 +1,15 @@ #import @interface MyBookmarkCell : UITableViewCell { - IBOutlet UILabel *titleLabel; - IBOutlet UILabel *linkLabel; - IBOutlet UILabel *numberLabel; + NSString *titleText; + NSString *linkText; + NSString *numberText; } -@property (nonatomic, retain) UILabel *titleLabel; -@property (nonatomic, retain) UILabel *linkLabel; -@property (nonatomic, retain) UILabel *numberLabel; +@property (nonatomic, retain) NSString *titleText; +@property (nonatomic, retain) NSString *linkText; +@property (nonatomic, retain) NSString *numberText; + +- (void)drawSelectedBackgroundRect:(CGRect)rect; @end diff --git a/Classes/MyBookmarkCell.m b/Classes/MyBookmarkCell.m index 6530090..6b5b779 100644 --- 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 linkLabel; -@synthesize numberLabel; +@synthesize titleText; +@synthesize linkText; +@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)]; - [titleLabel setOpaque:YES]; - [titleLabel setNumberOfLines:2]; - [titleLabel setFont:[UIFont boldSystemFontOfSize:14.0f]]; - [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]; + MyBookmarkCellSelectedBackgroundView *selectedBackgroundView = [[MyBookmarkCellSelectedBackgroundView 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]; + [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]; - [linkLabel release]; - [numberLabel release]; + [titleText release]; + [linkText release]; + [numberText release]; [super dealloc]; } diff --git a/Classes/MyBookmarkCellSelectedBackgroundView.h b/Classes/MyBookmarkCellSelectedBackgroundView.h new file mode 100644 index 0000000..4339669 --- /dev/null +++ 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 + +@class MyBookmarkCell; + +@interface MyBookmarkCellSelectedBackgroundView : UITableViewCell { + MyBookmarkCell *cell; +} + +@property (nonatomic, assign) MyBookmarkCell *cell; + +@end diff --git a/Classes/MyBookmarkCellSelectedBackgroundView.m b/Classes/MyBookmarkCellSelectedBackgroundView.m new file mode 100644 index 0000000..3b5533e --- /dev/null +++ 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 index 9ce3e14..f9cdd2b 100644 --- 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 index 7889f1d..de1a456 100644 --- 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 new file mode 100644 index 0000000..9a1aedf --- /dev/null +++ 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 + +@class MyBookmarkNextCell; + +@interface MyBookmarkNextCellSelectedBackgroundView : UITableViewCell { + MyBookmarkNextCell *cell; +} + +@property (nonatomic, assign) MyBookmarkNextCell *cell; + +@end diff --git a/Classes/MyBookmarkNextCellSelectedBackgroundView.m b/Classes/MyBookmarkNextCellSelectedBackgroundView.m new file mode 100644 index 0000000..055d662 --- /dev/null +++ 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 index 5d3f225..dca3254 100644 --- 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,10 +89,8 @@ - (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; } } @@ -110,9 +98,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N if (indexPath.row == [myBookmarks count]) { MyBookmarkNextCell *cell = (MyBookmarkNextCell *)[tableView dequeueReusableCellWithIdentifier:@"MyBookmarkNextCell"]; if (cell == nil) { - MyBookmarkNextCellController *controller = [[MyBookmarkNextCellController alloc] initWithNibName:@"MyBookmarkNextCell" bundle:nil]; - cell = (MyBookmarkNextCell *)controller.view; - [controller release]; + cell = [[[MyBookmarkNextCell alloc] initWithFrame:CGRectMake(0.0f, 0.0f, 320.0f, 70.0f) reuseIdentifier:@"MyBookmarkNextCell"] autorelease]; } 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.linkLabel setText:[entry objectForKey:@"related"]]; - [cell.numberLabel setText:[NSString stringWithFormat:@"%d", indexPath.row +1]]; + [cell setTitleText:[entry objectForKey:@"title"]]; + [cell setLinkText:[entry objectForKey:@"related"]]; + [cell setNumberText:[NSString stringWithFormat:@"%d", indexPath.row +1]]; return cell; } @@ -139,7 +125,7 @@ - (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInte #pragma mark 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 index 1ac7074..5fb5897 100644 Binary files a/English.lproj/Localizable.strings and b/English.lproj/Localizable.strings differ diff --git a/HatenaTouch.xcodeproj/project.pbxproj b/HatenaTouch.xcodeproj/project.pbxproj index 156d69d..94efb2d 100755 --- a/HatenaTouch.xcodeproj/project.pbxproj +++ b/HatenaTouch.xcodeproj/project.pbxproj @@ -27,7 +27,6 @@ 141DE8FA0E71A27300FBA9A5 /* InformationSheet.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE8F70E71A27300FBA9A5 /* InformationSheet.xib */; }; 141DE9000E71A28900FBA9A5 /* AddBookmarkView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE8FC0E71A28900FBA9A5 /* AddBookmarkView.xib */; }; 141DE9010E71A28900FBA9A5 /* PageBookmarkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE8FE0E71A28900FBA9A5 /* PageBookmarkCell.xib */; }; - 141DE90B0E71A2CC00FBA9A5 /* MyBookmarkNextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE9090E71A2CC00FBA9A5 /* MyBookmarkNextCell.xib */; }; 141DE9210E71A32000FBA9A5 /* DiaryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE9190E71A32000FBA9A5 /* DiaryCell.xib */; }; 141DE9220E71A32000FBA9A5 /* DiaryNextCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE91B0E71A32000FBA9A5 /* DiaryNextCell.xib */; }; 141DE9230E71A32000FBA9A5 /* DiaryTitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 141DE91D0E71A32000FBA9A5 /* DiaryTitleCell.xib */; }; @@ -46,7 +45,6 @@ 141DE95F0E71A3D900FBA9A5 /* MyBookmarkViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE9560E71A3D900FBA9A5 /* MyBookmarkViewController.m */; }; 141DE9600E71A3D900FBA9A5 /* MyBookmarkCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE9580E71A3D900FBA9A5 /* MyBookmarkCell.m */; }; 141DE9620E71A3D900FBA9A5 /* MyBookmarkNextCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE95C0E71A3D900FBA9A5 /* MyBookmarkNextCell.m */; }; - 141DE9630E71A3D900FBA9A5 /* MyBookmarkNextCellController.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE95E0E71A3D900FBA9A5 /* MyBookmarkNextCellController.m */; }; 141DE96B0E71A3EF00FBA9A5 /* HotEntryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE9660E71A3EF00FBA9A5 /* HotEntryViewController.m */; }; 141DE96D0E71A3EF00FBA9A5 /* EntryCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE96A0E71A3EF00FBA9A5 /* EntryCell.m */; }; 141DE97D0E71A40300FBA9A5 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 141DE9700E71A40300FBA9A5 /* WebViewController.m */; }; @@ -69,6 +67,8 @@ 149EE4611049962D0022308F /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 149EE4601049962D0022308F /* Default.png */; }; 149EE46B1049965E0022308F /* back.png in Resources */ = {isa = PBXBuildFile; fileRef = 149EE4691049965E0022308F /* back.png */; }; 149EE46C1049965E0022308F /* forward.png in Resources */ = {isa = PBXBuildFile; fileRef = 149EE46A1049965E0022308F /* forward.png */; }; + 149EE48F10499C720022308F /* MyBookmarkCellSelectedBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 149EE48E10499C720022308F /* MyBookmarkCellSelectedBackgroundView.m */; }; + 149EE49F10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 149EE49E10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.m */; }; 149F5E050EE168A300327D14 /* HttpClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 149F5E020EE168A300327D14 /* HttpClient.m */; }; 149F5E060EE168A300327D14 /* StringHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 149F5E040EE168A300327D14 /* StringHelper.m */; }; 149F5E230EE16A9500327D14 /* dialogue.png in Resources */ = {isa = PBXBuildFile; fileRef = 149F5E220EE16A9500327D14 /* dialogue.png */; }; @@ -118,8 +118,6 @@ 141DE8FF0E71A28900FBA9A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/PageBookmarkCell.xib; sourceTree = ""; }; 141DE9020E71A29300FBA9A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Japanese; path = Japanese.lproj/AddBookmarkView.xib; sourceTree = ""; }; 141DE9030E71A29400FBA9A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Japanese; path = Japanese.lproj/PageBookmarkCell.xib; sourceTree = ""; }; - 141DE90A0E71A2CC00FBA9A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MyBookmarkNextCell.xib; sourceTree = ""; }; - 141DE90C0E71A2D300FBA9A5 /* Japanese */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Japanese; path = Japanese.lproj/MyBookmarkNextCell.xib; sourceTree = ""; }; 141DE91A0E71A32000FBA9A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DiaryCell.xib; sourceTree = ""; }; 141DE91C0E71A32000FBA9A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DiaryNextCell.xib; sourceTree = ""; }; 141DE91E0E71A32000FBA9A5 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/DiaryTitleCell.xib; sourceTree = ""; }; @@ -156,8 +154,6 @@ 141DE9580E71A3D900FBA9A5 /* MyBookmarkCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBookmarkCell.m; sourceTree = ""; }; 141DE95B0E71A3D900FBA9A5 /* MyBookmarkNextCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBookmarkNextCell.h; sourceTree = ""; }; 141DE95C0E71A3D900FBA9A5 /* MyBookmarkNextCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBookmarkNextCell.m; sourceTree = ""; }; - 141DE95D0E71A3D900FBA9A5 /* MyBookmarkNextCellController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBookmarkNextCellController.h; sourceTree = ""; }; - 141DE95E0E71A3D900FBA9A5 /* MyBookmarkNextCellController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBookmarkNextCellController.m; sourceTree = ""; }; 141DE9650E71A3EF00FBA9A5 /* HotEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HotEntryViewController.h; sourceTree = ""; }; 141DE9660E71A3EF00FBA9A5 /* HotEntryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HotEntryViewController.m; sourceTree = ""; }; 141DE9690E71A3EF00FBA9A5 /* EntryCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EntryCell.h; sourceTree = ""; }; @@ -197,6 +193,10 @@ 149EE4601049962D0022308F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; 149EE4691049965E0022308F /* back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back.png; sourceTree = ""; }; 149EE46A1049965E0022308F /* forward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward.png; sourceTree = ""; }; + 149EE48D10499C720022308F /* MyBookmarkCellSelectedBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBookmarkCellSelectedBackgroundView.h; sourceTree = ""; }; + 149EE48E10499C720022308F /* MyBookmarkCellSelectedBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBookmarkCellSelectedBackgroundView.m; sourceTree = ""; }; + 149EE49D10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MyBookmarkNextCellSelectedBackgroundView.h; sourceTree = ""; }; + 149EE49E10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MyBookmarkNextCellSelectedBackgroundView.m; sourceTree = ""; }; 149F5E010EE168A300327D14 /* HttpClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpClient.h; sourceTree = ""; }; 149F5E020EE168A300327D14 /* HttpClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpClient.m; sourceTree = ""; }; 149F5E030EE168A300327D14 /* StringHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringHelper.h; sourceTree = ""; }; @@ -278,14 +278,6 @@ name = Web; sourceTree = ""; }; - 141DE9040E71A2A100FBA9A5 /* MyBookmark */ = { - isa = PBXGroup; - children = ( - 141DE9090E71A2CC00FBA9A5 /* MyBookmarkNextCell.xib */, - ); - name = MyBookmark; - sourceTree = ""; - }; 141DE9120E71A2FD00FBA9A5 /* Diary */ = { isa = PBXGroup; children = ( @@ -342,10 +334,12 @@ 141DE9560E71A3D900FBA9A5 /* MyBookmarkViewController.m */, 141DE9570E71A3D900FBA9A5 /* MyBookmarkCell.h */, 141DE9580E71A3D900FBA9A5 /* MyBookmarkCell.m */, - 141DE95D0E71A3D900FBA9A5 /* MyBookmarkNextCellController.h */, - 141DE95E0E71A3D900FBA9A5 /* MyBookmarkNextCellController.m */, + 149EE48D10499C720022308F /* MyBookmarkCellSelectedBackgroundView.h */, + 149EE48E10499C720022308F /* MyBookmarkCellSelectedBackgroundView.m */, 141DE95B0E71A3D900FBA9A5 /* MyBookmarkNextCell.h */, 141DE95C0E71A3D900FBA9A5 /* MyBookmarkNextCell.m */, + 149EE49D10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.h */, + 149EE49E10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.m */, ); name = MyBookmark; sourceTree = ""; @@ -480,7 +474,6 @@ 141DE84E0E71A1AB00FBA9A5 /* Localizable.strings */, 141DE8ED0E71A1D100FBA9A5 /* help.html */, 141DE9120E71A2FD00FBA9A5 /* Diary */, - 141DE9040E71A2A100FBA9A5 /* MyBookmark */, 141DE8F50E71A26800FBA9A5 /* Web */, 141DE9290E71A36F00FBA9A5 /* Images */, ); @@ -557,7 +550,6 @@ 141DE8FA0E71A27300FBA9A5 /* InformationSheet.xib in Resources */, 141DE9000E71A28900FBA9A5 /* AddBookmarkView.xib in Resources */, 141DE9010E71A28900FBA9A5 /* PageBookmarkCell.xib in Resources */, - 141DE90B0E71A2CC00FBA9A5 /* MyBookmarkNextCell.xib in Resources */, 141DE9210E71A32000FBA9A5 /* DiaryCell.xib in Resources */, 141DE9220E71A32000FBA9A5 /* DiaryNextCell.xib in Resources */, 141DE9230E71A32000FBA9A5 /* DiaryTitleCell.xib in Resources */, @@ -598,7 +590,6 @@ 141DE95F0E71A3D900FBA9A5 /* MyBookmarkViewController.m in Sources */, 141DE9600E71A3D900FBA9A5 /* MyBookmarkCell.m in Sources */, 141DE9620E71A3D900FBA9A5 /* MyBookmarkNextCell.m in Sources */, - 141DE9630E71A3D900FBA9A5 /* MyBookmarkNextCellController.m in Sources */, 141DE96B0E71A3EF00FBA9A5 /* HotEntryViewController.m in Sources */, 141DE96D0E71A3EF00FBA9A5 /* EntryCell.m in Sources */, 141DE97D0E71A40300FBA9A5 /* WebViewController.m in Sources */, @@ -626,6 +617,8 @@ 146996201000F54A00B155FD /* FeedParser.m in Sources */, 1404AFE71001162E00E133B9 /* EntryCellSelectedBackgroundView.m in Sources */, 1404AFFC10011A9100E133B9 /* TableCellDrawing.m in Sources */, + 149EE48F10499C720022308F /* MyBookmarkCellSelectedBackgroundView.m in Sources */, + 149EE49F10499FB30022308F /* MyBookmarkNextCellSelectedBackgroundView.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -686,15 +679,6 @@ name = PageBookmarkCell.xib; sourceTree = ""; }; - 141DE9090E71A2CC00FBA9A5 /* MyBookmarkNextCell.xib */ = { - isa = PBXVariantGroup; - children = ( - 141DE90A0E71A2CC00FBA9A5 /* English */, - 141DE90C0E71A2D300FBA9A5 /* Japanese */, - ); - name = MyBookmarkNextCell.xib; - sourceTree = ""; - }; 141DE9190E71A32000FBA9A5 /* DiaryCell.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/Japanese.lproj/Localizable.strings b/Japanese.lproj/Localizable.strings index 22b7b90..0f7f09c 100644 Binary files a/Japanese.lproj/Localizable.strings and b/Japanese.lproj/Localizable.strings differ