Merge branch 'release/0.4.1'

Author: SergioEstevao

WordPress-iOS-Shared-Example/Podfile.lock

@@ -28,7 +28,7 @@ PODS:
     - CocoaLumberjack/Core
   - CocoaLumberjack/Extensions (2.0.0):
     - CocoaLumberjack/Default
-  - WordPress-iOS-Shared (0.3.5):
+  - WordPress-iOS-Shared (0.4.1):
     - AFNetworking (~> 2.5)
     - CocoaLumberjack (= 2.0.0)
 
@@ -42,6 +42,6 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
   CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
-  WordPress-iOS-Shared: 155109cd666b8416ce0d2bdb2b8f6f6f6ec2ac50
+  WordPress-iOS-Shared: 1fa8e955d895f3b14d11fe0ddc54f857332aba2d
 
 COCOAPODS: 0.37.2

WordPress-iOS-Shared.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "WordPress-iOS-Shared"
-  s.version      = "0.4.0"
+  s.version      = "0.4.1"
   s.summary      = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description  = <<-DESC

WordPress-iOS-Shared/Core/WPStyleGuide.h

@@ -61,10 +61,11 @@
 // View and TableView Helpers
 + (void)configureColorsForView:(UIView *)view andTableView:(UITableView *)tableView;
 + (void)configureColorsForView:(UIView *)view collectionView:(UICollectionView *)collectionView;
-+ (void)configureTableViewActionCell:(UITableViewCell *)cell;
 + (void)configureTableViewCell:(UITableViewCell *)cell;
-+ (void)configureTableViewTextCell:(WPTextFieldTableViewCell *)cell;
 + (void)configureTableViewSmallSubtitleCell:(UITableViewCell *)cell;
++ (void)configureTableViewActionCell:(UITableViewCell *)cell;
++ (void)configureTableViewDestructiveActionCell:(UITableViewCell *)cell;
++ (void)configureTableViewTextCell:(WPTextFieldTableViewCell *)cell;
 
 // Move to a feature category
 + (UIColor *)buttonActionColor;

WordPress-iOS-Shared/Core/WPStyleGuide.m

@@ -127,17 +127,17 @@ + (NSDictionary *)regularTextAttributes
 
 + (UIFont *)tableviewTextFont
 {
-    return [WPFontManager openSansRegularFontOfSize:18.0];
+    return [WPFontManager openSansRegularFontOfSize:17.0];
 }
 
 + (UIFont *)tableviewSubtitleFont
 {
-    return [WPFontManager openSansLightFontOfSize:18.0];
+    return [WPFontManager openSansRegularFontOfSize:17.0];
 }
 
 + (UIFont *)tableviewSectionHeaderFont
 {
-    return [WPFontManager openSansBoldFontOfSize:12.0];
+    return [WPFontManager openSansRegularFontOfSize:13.0];
 }
 
 
@@ -287,18 +287,18 @@ + (UIColor *)tableViewActionColor
     return [self wordPressBlue];
 }
 
-// TODO: Move to fetaure category
+// TODO: Move to feature category
 + (UIColor *)buttonActionColor
 {
     return [self wordPressBlue];
 }
 
-// TODO: Move to fetaure category
+// TODO: Move to feature category
 + (UIColor *)nuxFormText {
     return [self darkGrey];
 }
 
-// TODO: Move to fetaure category
+// TODO: Move to feature category
 + (UIColor *)nuxFormPlaceholderText {
     return [self grey];
 }
@@ -339,22 +339,16 @@ + (UIBarButtonItem *)spacerForNavigationBarButtonItems
 + (void)configureColorsForView:(UIView *)view andTableView:(UITableView *)tableView
 {
     tableView.backgroundView = nil;
-    view.backgroundColor = [WPStyleGuide itsEverywhereGrey];
-    tableView.backgroundColor = [WPStyleGuide itsEverywhereGrey];
-    tableView.separatorColor = [WPStyleGuide readGrey];
+    view.backgroundColor = [WPStyleGuide greyLighten30];
+    tableView.backgroundColor = [WPStyleGuide greyLighten30];
+    tableView.separatorColor = [WPStyleGuide greyLighten20];
 }
 
 + (void)configureColorsForView:(UIView *)view collectionView:(UICollectionView *)collectionView
 {
     collectionView.backgroundView = nil;
-    collectionView.backgroundColor = [WPStyleGuide itsEverywhereGrey];
-    view.backgroundColor = [WPStyleGuide itsEverywhereGrey];
-}
-
-+ (void)configureTableViewActionCell:(UITableViewCell *)cell
-{
-    cell.textLabel.font = [self tableviewTextFont];
-    cell.textLabel.textColor = [self tableViewActionColor];
+    collectionView.backgroundColor = [WPStyleGuide greyLighten30];
+    view.backgroundColor = [WPStyleGuide greyLighten30];
 }
 
 + (void)configureTableViewCell:(UITableViewCell *)cell
@@ -365,12 +359,29 @@ + (void)configureTableViewCell:(UITableViewCell *)cell
     cell.detailTextLabel.font = [self tableviewSubtitleFont];
     [cell.detailTextLabel sizeToFit];
 
-    cell.textLabel.textColor = [self whisperGrey];
-    cell.detailTextLabel.textColor = [self whisperGrey];
-    if ([cell isKindOfClass:[WPTextFieldTableViewCell class]]) {
-        WPTextFieldTableViewCell *tfcell = (WPTextFieldTableViewCell *)cell;
-        [tfcell.textField setTextColor:[self whisperGrey]];
-    }
+    cell.textLabel.textColor = [self darkGrey];
+    cell.detailTextLabel.textColor = [self grey];
+}
+
++ (void)configureTableViewSmallSubtitleCell:(UITableViewCell *)cell
+{
+    [self configureTableViewCell:cell];
+    cell.detailTextLabel.font = [self subtitleFont];
+    cell.detailTextLabel.textColor = [self darkGrey];
+}
+
++ (void)configureTableViewActionCell:(UITableViewCell *)cell
+{
+    [self configureTableViewCell:cell];
+    cell.textLabel.font = [self tableviewTextFont];
+    cell.textLabel.textColor = [self tableViewActionColor];
+}
+
++ (void)configureTableViewDestructiveActionCell:(UITableViewCell *)cell
+{
+    [self configureTableViewActionCell:cell];
+    cell.textLabel.textAlignment = NSTextAlignmentCenter;
+    cell.textLabel.textColor = [self errorRed];
 }
 
 + (void)configureTableViewTextCell:(WPTextFieldTableViewCell *)cell
@@ -379,20 +390,14 @@ + (void)configureTableViewTextCell:(WPTextFieldTableViewCell *)cell
     cell.textField.font = [self tableviewSubtitleFont];
 
     if (cell.textField.enabled) {
-        cell.textField.textColor = [self darkAsNightGrey];
+        cell.textField.textColor = [self darkBlue];
         cell.textField.textAlignment = NSTextAlignmentLeft;
     } else {
-        cell.textField.textColor = [self textFieldPlaceholderGrey];
+        cell.textField.textColor = [self grey];
         cell.textField.textAlignment = NSTextAlignmentRight;
     }
 }
 
-+ (void)configureTableViewSmallSubtitleCell:(UITableViewCell *)cell
-{
-    [self configureTableViewCell:cell];
-    cell.detailTextLabel.font = [self subtitleFont];
-}
-
 // TODO: Move to fetaure category
 + (void)configureFollowButton:(UIButton *)followButton {
     followButton.contentHorizontalAlignment = UIControlContentHorizontalAlignmentLeft;