Merge pull request #341 from wordpress-mobile/release/1.6.0

SergioEstevao · web-flow · commit f433fe9870fa · 2019-10-18T11:26:05.000+01:00
Release/1.6.0
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,21 +1,35 @@
 version: 2.1
 
 orbs:
-  # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
-  ios: wordpress-mobile/ios@0.0.25
+  # Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs
+  ios: wordpress-mobile/ios@1.0
 
 workflows:
   test_and_validate:
     jobs:
       - ios/test:
           name: Test
-          xcode-version: "10.2.0"
+          xcode-version: "11.0"
           cocoapods-working-directory: Example
           workspace: Example/WPMediaPicker.xcworkspace
           scheme: WPMediaPicker-Example
-          device: iPhone XS
-          ios-version: "12.2"
+          device: iPhone 11
+          ios-version: "13.0"
+          bundle-install: true
+          pod-install: true
       - ios/validate-podspec:
           name: Validate Podspec
-          xcode-version: "10.2.0"
+          xcode-version: "11.0"
           podspec-path: WPMediaPicker.podspec
+          bundle-install: true
+      - ios/publish-podspec:
+          name: Publish to Trunk
+          xcode-version: "11.0"
+          podspec-path: WPMediaPicker.podspec
+          bundle-install: true
+          post-to-slack: true
+          filters:
+            tags:
+              only: /.*/
+            branches:
+              ignore: /.*/
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 `WPMediaPicker` adheres to [Semantic Versioning](http://semver.org/).
 
 #### Releases
+- `1.6.0` Release  - [1.5](#1.6.0)
 - `1.5.0` Release  - [1.5](#1.5.0)
 - `1.4.2` Release  - [1.4](#1.4.2)
 - `1.4` Release  - [1.4](#1.4)
@@ -26,6 +27,13 @@ All notable changes to this project will be documented in this file.
 - `0.16` Releases - [0.16](#16)
 - `0.15` Releases - [0.15](#15)
 
+---
+## [1.6.0](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.6.0)
+Released on 2019-10-18. All issues associated with this milestone can be found using this [filter](https://github.com/wordpress-mobile/MediaPicker-iOS/pulls?utf8=✓&q=is%3Apr%20is%3Aclosed%20milestone%3A1.6.0).
+
+### Changes
+- Fix image/photo capture when it's done with the device rotated. #337 #338
+
 ---
 ## [1.5.0](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.5.0)
 Released on 2019-09-09. All issues associated with this milestone can be found using this [filter](https://github.com/wordpress-mobile/MediaPicker-iOS/pulls?utf8=✓&q=is%3Apr%20is%3Aclosed%20milestone%3A1.5.0).
diff --git a/Example/Podfile b/Example/Podfile
@@ -1,4 +1,4 @@
-source 'https://github.com/CocoaPods/Specs.git'
+source 'https://cdn.cocoapods.org/'
 platform :ios, '11.0'
 target 'WPMediaPicker' do
   pod "WPMediaPicker", :path => "../"
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.5.0)
+  - WPMediaPicker (1.6.0)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: 3f03b6deeb4d2360679b65c3b33d5c470c822bce
+  WPMediaPicker: e5d28197da6b467d4e5975d64a49255977e39455
 
-PODFILE CHECKSUM: 02a24c94627582ae16b486b76dc047a7f773dcc4
+PODFILE CHECKSUM: 6b0e391139d3864c72fde997a1418dbfe9bf5126
 
-COCOAPODS: 1.6.1
+COCOAPODS: 1.8.4
diff --git a/Example/Tests/WPDateTimeHelpersTests.m b/Example/Tests/WPDateTimeHelpersTests.m
@@ -26,43 +26,43 @@ - (void)testStringFromTimeInterval
 {
     NSTimeInterval timeInterval = 120;
     NSString * result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"2:00", result);
+    XCTAssertEqualObjects(@"02:00", result);
 
     timeInterval = 119.4;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"2:00", result);
+    XCTAssertEqualObjects(@"02:00", result);
 
     timeInterval = 119.5;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"2:00", result);
+    XCTAssertEqualObjects(@"02:00", result);
 
     timeInterval = 0.1;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"0:01", result);
+    XCTAssertEqualObjects(@"00:01", result);
 
     timeInterval = 30;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"0:30", result);
+    XCTAssertEqualObjects(@"00:30", result);
 
     timeInterval = 60;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"1:00", result);
+    XCTAssertEqualObjects(@"01:00", result);
 
     timeInterval = 65;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"1:05", result);
+    XCTAssertEqualObjects(@"01:05", result);
 
     timeInterval = 3600;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"1:00:00", result);
+    XCTAssertEqualObjects(@"01:00:00", result);
 
     timeInterval = 3605;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"1:00:05", result);
+    XCTAssertEqualObjects(@"01:00:05", result);
 
     timeInterval = 3667;
     result = [WPDateTimeHelpers stringFromTimeInterval:timeInterval];
-    XCTAssertEqualObjects(@"1:01:07", result);
+    XCTAssertEqualObjects(@"01:01:07", result);
 }
 
 - (void)testUserFriendlyStringDateFromDate {
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org' do
-  gem 'cocoapods', '1.6.1'
+  gem 'cocoapods', '~> 1.8.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,35 +1,40 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
+    CFPropertyList (3.0.1)
     activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
+    algoliasearch (1.27.1)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
     atomos (0.1.3)
-    claide (1.0.2)
-    cocoapods (1.6.1)
+    claide (1.0.3)
+    cocoapods (1.8.4)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.6.1)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
+      cocoapods-core (= 1.8.4)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.1, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (>= 2.2.0, < 3.0)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
       molinillo (~> 0.6.6)
       nap (~> 1.0)
       ruby-macho (~> 1.4)
-      xcodeproj (>= 1.8.1, < 2.0)
-    cocoapods-core (1.6.1)
+      xcodeproj (>= 1.11.1, < 2.0)
+    cocoapods-core (1.8.4)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
     cocoapods-deintegrate (1.0.4)
@@ -38,19 +43,21 @@ GEM
       nap
     cocoapods-search (1.0.0)
     cocoapods-stats (1.1.0)
-    cocoapods-trunk (1.3.1)
+    cocoapods-trunk (1.4.1)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
     cocoapods-try (1.1.0)
     colored2 (3.1.2)
     concurrent-ruby (1.1.5)
     escape (0.0.4)
-    fourflusher (2.2.0)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
+    json (2.2.0)
+    minitest (5.12.2)
     molinillo (0.6.6)
     nanaimo (0.2.6)
     nap (1.1.0)
@@ -59,7 +66,7 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    xcodeproj (1.8.2)
+    xcodeproj (1.13.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -70,7 +77,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.6.1)!
+  cocoapods (~> 1.8.0)!
 
 BUNDLED WITH
-   1.17.2
+   2.0.2
diff --git a/Pod/Classes/WPImageExporter.m b/Pod/Classes/WPImageExporter.m
@@ -3,7 +3,6 @@
 @import MobileCoreServices;
 @import ImageIO;
 
-
 @implementation WPImageExporter
 
 + (NSURL *)temporaryFileURLWithExtension:(NSString *)fileExtension
@@ -16,18 +15,50 @@ + (NSURL *)temporaryFileURLWithExtension:(NSString *)fileExtension
 
 + (BOOL)writeImage:(UIImage *)image withMetadata:(NSDictionary *)metadata toURL:(NSURL *)fileURL;
 {
-    NSMutableDictionary *properties = [[NSMutableDictionary alloc] initWithDictionary:@{ (NSString *)kCGImageDestinationLossyCompressionQuality: @(0.9)}];
+    NSMutableDictionary *properties = [[NSMutableDictionary alloc] initWithDictionary:@{ (NSString *)kCGImageDestinationLossyCompressionQuality: @(0.9) }];
+
+    NSMutableDictionary *adjustedMetadata = [[NSMutableDictionary alloc] initWithDictionary:metadata];
+    NSNumber *adjustedOrientation = @([self CGImagePropertyOrientationForUIImageOrientation: image.imageOrientation]);
+    adjustedMetadata[(NSString *)kCGImagePropertyOrientation] = adjustedOrientation;
+
+    if (adjustedMetadata[(NSString *)kCGImagePropertyTIFFDictionary] != nil) {
+        NSMutableDictionary *adjustedTIFF = [[NSMutableDictionary alloc] initWithDictionary:adjustedMetadata[(NSString *)kCGImagePropertyTIFFDictionary]];
+        adjustedTIFF[(NSString *)kCGImagePropertyTIFFOrientation] = adjustedOrientation;
+        adjustedMetadata[(NSString *)kCGImagePropertyTIFFDictionary] = adjustedTIFF;
+    }
+
+    if (adjustedMetadata[(NSString *)kCGImagePropertyIPTCDictionary] != nil) {
+        NSMutableDictionary *adjustedIPTC = [[NSMutableDictionary alloc] initWithDictionary:adjustedMetadata[(NSString *)kCGImagePropertyIPTCDictionary]];
+        adjustedIPTC[(NSString *)kCGImagePropertyIPTCImageOrientation] = adjustedOrientation;
+        adjustedMetadata[(NSString *)kCGImagePropertyIPTCDictionary] = adjustedIPTC;
+    }
+
     CGImageDestinationRef destination = CGImageDestinationCreateWithURL((CFURLRef)fileURL, kUTTypeJPEG, 1, nil);
     if (destination == NULL) {
         return NO;
     }
     CGImageRef imageRef = image.CGImage;
+
     CGImageDestinationSetProperties(destination, (CFDictionaryRef)properties);
-    CGImageDestinationAddImage(destination, imageRef, (CFDictionaryRef)metadata);
+    CGImageDestinationAddImage(destination, imageRef, (CFDictionaryRef)adjustedMetadata);
+
     BOOL result = CGImageDestinationFinalize(destination);
 
     CFRelease(destination);
     return result;
 }
 
++ (CGImagePropertyOrientation) CGImagePropertyOrientationForUIImageOrientation:(UIImageOrientation) uiOrientation {
+    switch (uiOrientation) {
+        case UIImageOrientationUp: return kCGImagePropertyOrientationUp;
+        case UIImageOrientationDown: return kCGImagePropertyOrientationDown;
+        case UIImageOrientationLeft: return kCGImagePropertyOrientationLeft;
+        case UIImageOrientationRight: return kCGImagePropertyOrientationRight;
+        case UIImageOrientationUpMirrored: return kCGImagePropertyOrientationUpMirrored;
+        case UIImageOrientationDownMirrored: return kCGImagePropertyOrientationDownMirrored;
+        case UIImageOrientationLeftMirrored: return kCGImagePropertyOrientationLeftMirrored;
+        case UIImageOrientationRightMirrored: return kCGImagePropertyOrientationRightMirrored;
+    }
+}
+
 @end
diff --git a/WPMediaPicker.podspec b/WPMediaPicker.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "1.5.0"
+  s.version          = "1.6.0"
   s.summary          = "WPMediaPicker is an iOS controller that allows capture and picking of media assets."
   s.description      = <<-DESC
                        WPMediaPicker is an iOS controller that allows capture and picking of media assets.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-source 'https://github.com/CocoaPods/Specs.git'`
	`1`	`+source 'https://cdn.cocoapods.org/'`
`2`	`2`	`platform :ios, '11.0'`
`3`	`3`	`target 'WPMediaPicker' do`
`4`	`4`	`pod "WPMediaPicker", :path => "../"`