Merge branch 'develop' for 0.5.4 release

wordpress-mobile · Apr 8, 2016 · 0ed676e · 0ed676e
2 parents 85dce9b + bf1dd19
commit 0ed676e
Show file tree

Hide file tree

Showing 17 changed files with 158 additions and 73 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
+osx_image: xcode7.1
 language: objective-c
 xcode_workspace: WordPress-iOS-Shared.xcworkspace
 xcode_scheme: WordPress-iOS-Shared
-xcode_sdk: iphonesimulator8.1
+xcode_sdk: iphonesimulator
diff --git a/Podfile.lock b/Podfile.lock
@@ -43,4 +43,4 @@ SPEC CHECKSUMS:
   OCMock: a10ea9f0a6e921651f96f78b6faee95ebc813b92
   OHHTTPStubs: cc1b9cb45b963daf891aa736f35d29d74308f0c9
 
-COCOAPODS: 0.37.2
+COCOAPODS: 0.39.0
diff --git a/WordPress-iOS-Shared-Example/Podfile.lock b/WordPress-iOS-Shared-Example/Podfile.lock
@@ -1,36 +1,36 @@
 PODS:
-  - AFNetworking (2.5.4):
-    - AFNetworking/NSURLConnection (= 2.5.4)
-    - AFNetworking/NSURLSession (= 2.5.4)
-    - AFNetworking/Reachability (= 2.5.4)
-    - AFNetworking/Security (= 2.5.4)
-    - AFNetworking/Serialization (= 2.5.4)
-    - AFNetworking/UIKit (= 2.5.4)
-  - AFNetworking/NSURLConnection (2.5.4):
+  - AFNetworking (2.6.3):
+    - AFNetworking/NSURLConnection (= 2.6.3)
+    - AFNetworking/NSURLSession (= 2.6.3)
+    - AFNetworking/Reachability (= 2.6.3)
+    - AFNetworking/Security (= 2.6.3)
+    - AFNetworking/Serialization (= 2.6.3)
+    - AFNetworking/UIKit (= 2.6.3)
+  - AFNetworking/NSURLConnection (2.6.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/NSURLSession (2.5.4):
+  - AFNetworking/NSURLSession (2.6.3):
     - AFNetworking/Reachability
     - AFNetworking/Security
     - AFNetworking/Serialization
-  - AFNetworking/Reachability (2.5.4)
-  - AFNetworking/Security (2.5.4)
-  - AFNetworking/Serialization (2.5.4)
-  - AFNetworking/UIKit (2.5.4):
+  - AFNetworking/Reachability (2.6.3)
+  - AFNetworking/Security (2.6.3)
+  - AFNetworking/Serialization (2.6.3)
+  - AFNetworking/UIKit (2.6.3):
     - AFNetworking/NSURLConnection
     - AFNetworking/NSURLSession
-  - CocoaLumberjack (2.0.0):
-    - CocoaLumberjack/Default (= 2.0.0)
-    - CocoaLumberjack/Extensions (= 2.0.0)
-  - CocoaLumberjack/Core (2.0.0)
-  - CocoaLumberjack/Default (2.0.0):
+  - CocoaLumberjack (2.2.0):
+    - CocoaLumberjack/Default (= 2.2.0)
+    - CocoaLumberjack/Extensions (= 2.2.0)
+  - CocoaLumberjack/Core (2.2.0)
+  - CocoaLumberjack/Default (2.2.0):
     - CocoaLumberjack/Core
-  - CocoaLumberjack/Extensions (2.0.0):
+  - CocoaLumberjack/Extensions (2.2.0):
     - CocoaLumberjack/Default
-  - WordPress-iOS-Shared (0.4.3):
+  - WordPress-iOS-Shared (0.5.3):
     - AFNetworking (~> 2.5)
-    - CocoaLumberjack (= 2.0.0)
+    - CocoaLumberjack (~> 2.2.0)
 
 DEPENDENCIES:
   - WordPress-iOS-Shared (from `../`)
@@ -40,8 +40,8 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  AFNetworking: 05edc0ac4c4c8cf57bcf4b84be5b0744b6d8e71e
-  CocoaLumberjack: a6f77d987d65dc7ba86b0f84db7d0b9084f77bcb
-  WordPress-iOS-Shared: 20307f6ca50f833cf6bbf98f3a7ef7643d90ce8c
+  AFNetworking: cb8d14a848e831097108418f5d49217339d4eb60
+  CocoaLumberjack: 17fe8581f84914d5d7e6360f7c70022b173c3ae0
+  WordPress-iOS-Shared: 43f55f24f0685e431167084071b7914d7c7134a8
 
-COCOAPODS: 0.37.2
+COCOAPODS: 0.39.0
diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example.xcodeproj/project.pbxproj
@@ -156,6 +156,7 @@
 				852FBB42197755CC002C5249 /* Frameworks */,
 				852FBB43197755CC002C5249 /* Resources */,
 				BB9A98FF658A4D29953551D1 /* Copy Pods Resources */,
+				20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -207,6 +208,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		20790AE04201DFFC0FF9F3EB /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-Shared-Example/Pods-WordPress-iOS-Shared-Example-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		601245E04F1A43469E176EE1 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/ColorsTableViewController.m
@@ -1,5 +1,5 @@
 #import "ColorsTableViewController.h"
-#import <WordPress-iOS-Shared/WPStyleGuide.h>
+#import <WordPressShared/WPStyleGuide.h>
 
 @interface ColorsTableViewController ()
 

diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/DeviceTableViewController.m
@@ -2,9 +2,9 @@
 #import "DeviceTableViewCell.h"
 #import "DeviceTest.h"
 #import "FontTableViewCell.h"
-#import <WordPress-iOS-Shared/WPDeviceIdentification.h>
-#import <WordPress-iOS-Shared/WPStyleGuide.h>
-#import <WordPress-iOS-Shared/WPFontManager.h>
+#import <WordPressShared/WPDeviceIdentification.h>
+#import <WordPressShared/WPStyleGuide.h>
+#import <WordPressShared/WPFontManager.h>
 
 @interface DeviceTableViewController ()
 

diff --git a/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m b/WordPress-iOS-Shared-Example/WordPress-iOS-Shared-Example/FontsTableViewController.m
@@ -1,7 +1,7 @@
 #import "FontsTableViewController.h"
 #import "FontTableViewCell.h"
-#import <WordPress-iOS-Shared/WPStyleGuide.h>
-#import <WordPress-iOS-Shared/WPFontManager.h>
+#import <WordPressShared/WPStyleGuide.h>
+#import <WordPressShared/WPFontManager.h>
 
 static const CGFloat FontSize = 20.0;
 
@@ -96,7 +96,13 @@ - (NSArray *)fontDetails {
              @{@"title": NSLocalizedString(@"OpenSans Light Italic",nil), @"font": [WPFontManager openSansLightItalicFontOfSize:FontSize]},
              @{@"title": NSLocalizedString(@"OpenSans Semi-Bold",nil), @"font": [WPFontManager openSansSemiBoldFontOfSize:FontSize]},
              @{@"title": NSLocalizedString(@"OpenSans Semi-Bold Italic",nil), @"font": [WPFontManager openSansSemiBoldItalicFontOfSize:FontSize]},
-
+
+             @{@"title": NSLocalizedString(@"System",nil), @"font": [WPFontManager systemRegularFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Bold",nil), @"font": [WPFontManager systemBoldFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Italic",nil), @"font": [WPFontManager systemItalicFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Light",nil), @"font": [WPFontManager systemLightFontOfSize:FontSize]},
+             @{@"title": NSLocalizedString(@"System Semi-Bold",nil), @"font": [WPFontManager systemSemiBoldFontOfSize:FontSize]},
+
              @{@"title": NSLocalizedString(@"Large Post Title Font", nil), @"font": [WPStyleGuide largePostTitleFont], @"attributes": [WPStyleGuide largePostTitleAttributes]},
              @{@"title": NSLocalizedString(@"Post Title Font", nil), @"font": [WPStyleGuide postTitleFont], @"attributes": [WPStyleGuide postTitleAttributes]},
              @{@"title": NSLocalizedString(@"Post Title Font Bold", nil), @"font": [WPStyleGuide postTitleFontBold], @"attributes": [WPStyleGuide postTitleAttributesBold]},

diff --git a/WordPress-iOS-Shared.podspec b/WordPress-iOS-Shared.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "WordPress-iOS-Shared"
-  s.version      = "0.4.4"
+  s.version      = "0.5.4"
   s.summary      = "Shared components used in building the WordPress iOS apps and other library components."
 
   s.description  = <<-DESC
@@ -15,12 +15,14 @@ Pod::Spec.new do |s|
   s.social_media_url   = "http://twitter.com/WordPressiOS"
   s.platform     = :ios, "7.0"
   s.source       = { :git => "https://github.com/wordpress-mobile/WordPress-iOS-Shared.git", :tag => s.version.to_s }
-  s.source_files = 'WordPress-iOS-Shared/Core'
+  s.source_files = [ 'WordPress-iOS-Shared/Core', 'WordPress-iOS-Shared/Private' ]
+  s.public_header_files = 'WordPress-iOS-Shared/Core/*.h'
   s.ios.resource_bundle = { 'WordPress-iOS-Shared' => 'WordPress-iOS-Shared/Assets/*.{ttf,otf}' }
   s.exclude_files = 'WordPress-iOS-Shared/Exclude'
   s.prefix_header_file = "WordPress-iOS-Shared/WordPress-iOS-Shared-Prefix.pch"
   s.requires_arc = true
+  s.header_dir = 'WordPressShared'
 
   s.dependency 'AFNetworking',	'~> 2.5'
-  s.dependency 'CocoaLumberjack', '= 2.0.0'
+  s.dependency 'CocoaLumberjack', '~> 2.2.0'
 end
diff --git a/WordPress-iOS-Shared.xcodeproj/project.pbxproj b/WordPress-iOS-Shared.xcodeproj/project.pbxproj
@@ -68,8 +68,8 @@
 		897FA2B40A6E81DB4E7F0435 /* Pods-WordPress-iOS-SharedTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPress-iOS-SharedTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests.debug.xcconfig"; sourceTree = "<group>"; };
 		9309B52B192BEECC00B69F69 /* WordPressShared.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WordPressShared.h; path = Exclude/WordPressShared.h; sourceTree = "<group>"; };
 		9309B52C192BEECC00B69F69 /* WordPressShared.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WordPressShared.m; path = Exclude/WordPressShared.m; sourceTree = "<group>"; };
-		9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WPAnimatedImageResponseSerializer.h; path = Core/WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
-		9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WPAnimatedImageResponseSerializer.m; path = Core/WPAnimatedImageResponseSerializer.m; sourceTree = "<group>"; };
+		9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPAnimatedImageResponseSerializer.h; sourceTree = "<group>"; };
+		9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPAnimatedImageResponseSerializer.m; sourceTree = "<group>"; };
 		931A0FEA192A9CDD00D3CC11 /* libWordPress-iOS-Shared.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libWordPress-iOS-Shared.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		931A0FED192A9CDD00D3CC11 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		931A0FF1192A9CDD00D3CC11 /* WordPress-iOS-Shared-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WordPress-iOS-Shared-Prefix.pch"; sourceTree = "<group>"; };
@@ -168,6 +168,7 @@
 		931A0FEF192A9CDD00D3CC11 /* WordPress-iOS-Shared */ = {
 			isa = PBXGroup;
 			children = (
+				E13D93EF1BF235BA00CCBA7C /* Private */,
 				E154809F1A43035700FA4EDD /* Core */,
 				931A0FF0192A9CDD00D3CC11 /* Supporting Files */,
 			);
@@ -210,8 +211,6 @@
 			children = (
 				744DA844194F3A76002CD6E9 /* UIImage+Util.h */,
 				744DA845194F3A76002CD6E9 /* UIImage+Util.m */,
-				9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
-				9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
 				931A101A192A9DA500D3CC11 /* WPImageSource.h */,
 				931A101B192A9DA500D3CC11 /* WPImageSource.m */,
 				931A1014192A9D5200D3CC11 /* NSString+Util.h */,
@@ -265,6 +264,15 @@
 			name = "Test Data";
 			sourceTree = "<group>";
 		};
+		E13D93EF1BF235BA00CCBA7C /* Private */ = {
+			isa = PBXGroup;
+			children = (
+				9309B531192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.h */,
+				9309B532192F9C2000B69F69 /* WPAnimatedImageResponseSerializer.m */,
+			);
+			path = Private;
+			sourceTree = "<group>";
+		};
 		E154809F1A43035700FA4EDD /* Core */ = {
 			isa = PBXGroup;
 			children = (
@@ -316,6 +324,7 @@
 				931A0FF7192A9CDD00D3CC11 /* Frameworks */,
 				931A0FF8192A9CDD00D3CC11 /* Resources */,
 				01EFB93CB9504D3780477772 /* Copy Pods Resources */,
+				0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -397,6 +406,21 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
+		0DD01DEF03ABC712BB9DEA89 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WordPress-iOS-SharedTests/Pods-WordPress-iOS-SharedTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		D2BBEB69E91E4B0798D536DF /* Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

diff --git a/WordPress-iOS-Shared/Core/WPFontManager.h b/WordPress-iOS-Shared/Core/WPFontManager.h
@@ -2,14 +2,20 @@
 
 @interface WPFontManager : NSObject
 
-+ (UIFont *)openSansLightFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansBoldFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size;
-+ (UIFont *)openSansRegularFontOfSize:(CGFloat)size;
++ (UIFont *)openSansLightFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightFontOfSize instead");
++ (UIFont *)openSansItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemItalicFontOfSize instead");
++ (UIFont *)openSansLightItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemLightItalicFontOfSize instead");
++ (UIFont *)openSansBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldFontOfSize instead");
++ (UIFont *)openSansBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemBoldItalicFontOfSize instead");
++ (UIFont *)openSansSemiBoldFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldFontOfSize instead");
++ (UIFont *)openSansSemiBoldItalicFontOfSize:(CGFloat)size __deprecated_msg("Use systemSemiBoldItalicFontOfSize instead");
++ (UIFont *)openSansRegularFontOfSize:(CGFloat)size __deprecated_msg("Use systemRegularFontOfSize instead");
+
++ (UIFont *)systemLightFontOfSize:(CGFloat)size;
++ (UIFont *)systemItalicFontOfSize:(CGFloat)size;
++ (UIFont *)systemBoldFontOfSize:(CGFloat)size;
++ (UIFont *)systemSemiBoldFontOfSize:(CGFloat)size;
++ (UIFont *)systemRegularFontOfSize:(CGFloat)size;
 
 + (UIFont *)merriweatherBoldFontOfSize:(CGFloat)size;
 + (UIFont *)merriweatherBoldItalicFontOfSize:(CGFloat)size;

diff --git a/WordPress-iOS-Shared/Core/WPFontManager.m b/WordPress-iOS-Shared/Core/WPFontManager.m
@@ -65,6 +65,32 @@ + (UIFont *)openSansRegularFontOfSize:(CGFloat)size
     return [self fontNamed:fontName resourceName:resourceName fontType:FontTypeTTF size:size];
 }
 
+#pragma mark - System Fonts
+
++ (UIFont *)systemLightFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightLight];
+}
+
++ (UIFont *)systemItalicFontOfSize:(CGFloat)size
+{
+    return [UIFont italicSystemFontOfSize:size];
+}
+
++ (UIFont *)systemBoldFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightBold];
+}
+
++ (UIFont *)systemSemiBoldFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightSemibold];
+}
+
++ (UIFont *)systemRegularFontOfSize:(CGFloat)size
+{
+    return [UIFont systemFontOfSize:size weight:UIFontWeightRegular];
+}
 
 #pragma mark - Merryweather Fonts
 

diff --git a/WordPress-iOS-Shared/Core/WPNUXUtility.m b/WordPress-iOS-Shared/Core/WPNUXUtility.m
@@ -7,37 +7,37 @@ @implementation WPNUXUtility
 
 + (UIFont *)textFieldFont
 {
-    return [WPFontManager openSansRegularFontOfSize:16.0];
+    return [WPFontManager systemRegularFontOfSize:16.0];
 }
 
 + (UIFont *)descriptionTextFont
 {
-    return [WPFontManager openSansRegularFontOfSize:15.0];
+    return [WPFontManager systemRegularFontOfSize:15.0];
 }
 
 + (UIFont *)titleFont
 {
-    return [WPFontManager openSansLightFontOfSize:24.0];
+    return [WPFontManager systemLightFontOfSize:24.0];
 }
 
 + (UIFont *)swipeToContinueFont
 {
-    return [WPFontManager openSansRegularFontOfSize:10.0];
+    return [WPFontManager systemRegularFontOfSize:10.0];
 }
 
 + (UIFont *)tosLabelFont
 {
-    return [WPFontManager openSansRegularFontOfSize:12.0];
+    return [WPFontManager systemRegularFontOfSize:12.0];
 }
 
 + (UIFont *)tosLabelSmallerFont
 {
-    return [WPFontManager openSansRegularFontOfSize:9.0];
+    return [WPFontManager systemRegularFontOfSize:9.0];
 }
 
 + (UIFont *)confirmationLabelFont
 {
-    return [WPFontManager openSansRegularFontOfSize:14.0];
+    return [WPFontManager systemRegularFontOfSize:14.0];
 }
 
 #pragma mark - Colors

diff --git a/WordPress-iOS-Shared/Core/WPNoResultsView.m b/WordPress-iOS-Shared/Core/WPNoResultsView.m
@@ -41,7 +41,7 @@ - (instancetype)init {
 
         // Message Label
         _messageLabel               = [[UILabel alloc] init];
-        _messageLabel.font          = [WPFontManager openSansRegularFontOfSize:14.0];
+        _messageLabel.font          = [WPFontManager systemRegularFontOfSize:14.0];
         _messageLabel.textColor     = [WPStyleGuide allTAllShadeGrey];
         _messageLabel.numberOfLines = 0;
         _messageLabel.textAlignment = NSTextAlignmentCenter;