Merge pull request facebookarchive#461 from rogchap/fix-tableview-cel…

…l-labels Fix backgroundColor in tableview cell labels closes #73
bygreencn · Jul 10, 2011 · 48af7a1 · 48af7a1
2 parents 2912b80 + b3b42b2
commit 48af7a1
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 0 deletions.
diff --git a/src/Three20Style/Headers/TTDefaultStyleSheet.h b/src/Three20Style/Headers/TTDefaultStyleSheet.h
@@ -24,6 +24,7 @@
 // Common styles
 @property (nonatomic, readonly) UIColor*  textColor;
 @property (nonatomic, readonly) UIColor*  highlightedTextColor;
+@property (nonatomic, readonly) UIColor*  backgroundTextColor;
 @property (nonatomic, readonly) UIFont*   font;
 @property (nonatomic, readonly) UIColor*  backgroundColor;
 @property (nonatomic, readonly) UIColor*  navigationBarTintColor;

diff --git a/src/Three20Style/Sources/TTDefaultStyleSheet.m b/src/Three20Style/Sources/TTDefaultStyleSheet.m
@@ -741,6 +741,11 @@ - (UIColor*)highlightedTextColor {
   return [UIColor whiteColor];
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+- (UIColor*)backgroundTextColor {
+	return [UIColor whiteColor];
+}
+
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (UIFont*)font {

diff --git a/src/Three20UI/Sources/TTTableCaptionItemCell.m b/src/Three20UI/Sources/TTTableCaptionItemCell.m
@@ -42,6 +42,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.textLabel.font = TTSTYLEVAR(tableTitleFont);
     self.textLabel.textColor = TTSTYLEVAR(linkTextColor);
     self.textLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.textLabel.textAlignment = UITextAlignmentRight;
     self.textLabel.lineBreakMode = UILineBreakModeTailTruncation;
     self.textLabel.numberOfLines = 1;
@@ -50,6 +51,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.detailTextLabel.font = TTSTYLEVAR(tableSmallFont);
     self.detailTextLabel.textColor = TTSTYLEVAR(textColor);
     self.detailTextLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.detailTextLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.detailTextLabel.adjustsFontSizeToFitWidth = YES;
     self.detailTextLabel.minimumFontSize = 8;
     self.detailTextLabel.lineBreakMode = UILineBreakModeWordWrap;

diff --git a/src/Three20UI/Sources/TTTableMessageItemCell.m b/src/Three20UI/Sources/TTTableMessageItemCell.m
@@ -47,6 +47,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.textLabel.font = TTSTYLEVAR(font);
     self.textLabel.textColor = TTSTYLEVAR(textColor);
     self.textLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.textLabel.textAlignment = UITextAlignmentLeft;
     self.textLabel.lineBreakMode = UILineBreakModeTailTruncation;
     self.textLabel.adjustsFontSizeToFitWidth = YES;
@@ -55,6 +56,7 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.detailTextLabel.font = TTSTYLEVAR(font);
     self.detailTextLabel.textColor = TTSTYLEVAR(tableSubTextColor);
     self.detailTextLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.detailTextLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.detailTextLabel.textAlignment = UITextAlignmentLeft;
     self.detailTextLabel.contentMode = UIViewContentModeTop;
     self.detailTextLabel.lineBreakMode = UILineBreakModeTailTruncation;

diff --git a/src/Three20UI/Sources/TTTableMoreButtonCell.m b/src/Three20UI/Sources/TTTableMoreButtonCell.m
@@ -45,6 +45,7 @@ @implementation TTTableMoreButtonCell
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)identifier {
   if (self = [super initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:identifier]) {
     self.textLabel.font = TTSTYLEVAR(tableSmallFont);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
   }
 
   return self;

diff --git a/src/Three20UI/Sources/TTTableRightCaptionItemCell.m b/src/Three20UI/Sources/TTTableRightCaptionItemCell.m
@@ -37,10 +37,12 @@ @implementation TTTableRightCaptionItemCell
 - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)identifier {
   if (self = [super initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:identifier]) {
     self.textLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.textLabel.lineBreakMode = UILineBreakModeWordWrap;
     self.textLabel.numberOfLines = 0;
 
     self.detailTextLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.detailTextLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
 
     // XXXjoe TODO
   }

diff --git a/src/Three20UI/Sources/TTTableSubtextItemCell.m b/src/Three20UI/Sources/TTTableSubtextItemCell.m
@@ -38,11 +38,13 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.detailTextLabel.font = TTSTYLEVAR(tableFont);
     self.detailTextLabel.textColor = TTSTYLEVAR(textColor);
     self.detailTextLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.detailTextLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.detailTextLabel.adjustsFontSizeToFitWidth = YES;
 
     self.textLabel.font = TTSTYLEVAR(font);
     self.textLabel.textColor = TTSTYLEVAR(tableSubTextColor);
     self.textLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.textLabel.textAlignment = UITextAlignmentLeft;
     self.textLabel.contentMode = UIViewContentModeTop;
     self.textLabel.lineBreakMode = UILineBreakModeWordWrap;

diff --git a/src/Three20UI/Sources/TTTableSubtitleItemCell.m b/src/Three20UI/Sources/TTTableSubtitleItemCell.m
@@ -42,13 +42,15 @@ - (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString*)ident
     self.textLabel.font = TTSTYLEVAR(tableFont);
     self.textLabel.textColor = TTSTYLEVAR(textColor);
     self.textLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.textLabel.textAlignment = UITextAlignmentLeft;
     self.textLabel.lineBreakMode = UILineBreakModeTailTruncation;
     self.textLabel.adjustsFontSizeToFitWidth = YES;
 
     self.detailTextLabel.font = TTSTYLEVAR(font);
     self.detailTextLabel.textColor = TTSTYLEVAR(tableSubTextColor);
     self.detailTextLabel.highlightedTextColor = TTSTYLEVAR(highlightedTextColor);
+	self.detailTextLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
     self.detailTextLabel.textAlignment = UITextAlignmentLeft;
     self.detailTextLabel.contentMode = UIViewContentModeTop;
     self.detailTextLabel.lineBreakMode = UILineBreakModeTailTruncation;

diff --git a/src/Three20UI/Sources/TTTableTextItemCell.m b/src/Three20UI/Sources/TTTableTextItemCell.m
@@ -124,6 +124,7 @@ - (void)setObject:(id)object {
 
     TTTableTextItem* item = object;
     self.textLabel.text = item.text;
+	self.textLabel.backgroundColor = TTSTYLEVAR(backgroundTextColor);
 
     if ([object isKindOfClass:[TTTableButton class]]) {
       self.textLabel.font = TTSTYLEVAR(tableButtonFont);