Merge branch 'release/1.4.2'

Author: SergioEstevao

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.4.2` Release  - [1.4](#1.4.2)
 - `1.4` Release  - [1.4](#1.4)
 - `1.3.4` Release  - [1.3.4](#1.3.4)
 - `1.3` Release  - [1.3](#1.3)
@@ -24,6 +25,15 @@ 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.4.2](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.4.2)
+Released on 2019-06-14. 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.4.2).
+
+### Fixed
+- Sorting of user albums alphabetically. #329
+- Fix selection frame when rotating device. #332
+- Fix asset display on device. #333
+
 ---
 ## [1.4](https://github.com/wordpress-mobile/MediaPicker-iOS/releases/tag/1.4.0)
 Released on 2019-05-01. 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.4.0).

CONTRIBUTING.md

@@ -1,25 +1,31 @@
-# Contributing to WPMediaPicker
+# How to Contribute
 
-Hi! Thank you for your interest in contributing to the app, we really appreciate it.
+First off, thank you for contributing! We're excited to collaborate with you! 🎉
 
-There are many ways to contribute – reporting bugs, feature suggestions, fixing bugs, submitting pull requests for enhancements.
+The following is a set of guidelines for the many ways you can join our collective effort.
 
-## Reporting Bugs, Asking Questions, Sending Suggestions
+Before anything else, please take a moment to read our [Code of Conduct](CODE_OF_CONDUCT.md). We expect all participants, from full-timers to occasional tinkerers, to uphold it.
 
-Just [file a GitHub issue](https://github.com/wordpress-mobile/MediaPicker-iOS/issues), that’s all. If you want to prefix the title with a “Question:”, “Bug:”, "Feature Request:", or the general area of the application, that would be helpful, but by no means mandatory. If you have write access, add the appropriate labels.
+## Reporting Bugs, Asking Questions, and Suggesting Features
 
-If you’re filing a bug, specific steps to reproduce are helpful. Please include the part of the app that has the bug, along with what you expected to see and what happened instead.  A screenshot is always helpful as well.
+Have a suggestion or feedback? Please go to [Issues](https://github.com/wordpress-mobile/MediaPicker-iOS/issues) and [open a new issue](https://github.com/wordpress-mobile/MediaPicker-iOS/issues/new). Prefix the title with a category like _"Bug:"_, _"Question:"_, or _"Feature Request:"_. Screenshots help us resolve issues and answer questions faster, so thanks for including some if you can.
 
-## Submitting code changes
+## Submitting Code Changes
 
-We welcome Pull Requests for bug fixes on any open issues that you'd like to contribute!  More details on our process can be found in the [Make WordPress Mobile handbook](https://make.wordpress.org/mobile/handbook/pathways/ios/), specifically [here](https://make.wordpress.org/mobile/handbook/pathways/ios/how-to-contribute/).
+If you're just getting started and want to familiarize yourself with the app’s code, we suggest looking at [these issues](https://github.com/wordpress-mobile/MediaPicker-iOS/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22) with the **good first issue** label. But if you’d like to tackle something different, you're more than welcome to visit the [Issues](https://github.com/wordpress-mobile/MediaPicker-iOS/issues) page and pick an item that interests you.
 
-## Discussion
+We always try to avoid duplicating efforts, so if you decide to work on an issue, leave a comment to state your intent. If you choose to focus on a new feature or the change you’re proposing is significant, we recommend waiting for a response before proceeding. The issue may no longer align with project goals.
 
-Aside from writing issues and pull requests, you can also hang out in the #mobile WordPress.org Slack channel with other WordPress Mobile developers/contributors. Check out chat.wordpress.org for instructions on how to create an account in Slack.
+If the change is trivial, feel free to send a pull request without notifying us.
 
-The purpose of the Slack chat is to provide updates about ongoing initiatives regarding the mobile apps and to discuss, prioritize and coordinate future changes. If you have questions, Slack chat is a great place to start.
+### Pull Requests and Code Reviews
 
-## Contribute to translations
+All code contributions pass through pull requests. If you haven't created a pull request before, we recommend this free video series, [How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github).
 
-We use a tool called GlotPress to manage translations. The WordPress-iOS GlotPress instance lives [here](http://translate.wordpress.org/projects/apps/ios/dev). To add new translations or fix existing ones, create an account over at GlotPress and submit your changes over at the GlotPress site.
+The core team monitors and reviews all pull requests. Depending on the changes, we will either approve them or close them with an explanation. We might also work with you to improve a pull request before approval.
+
+We do our best to respond quickly to all pull requests. If you don't get a response from us after a week, feel free to reach out to us via Slack.
+
+## Getting in Touch
+
+If you have questions or just want to say hi, join the [WordPress Slack](https://make.wordpress.org/chat/) and drop a message on the `#mobile` channel.

Example/Podfile.lock

@@ -1,5 +1,5 @@
 PODS:
-  - WPMediaPicker (1.4.1-beta.1)
+  - WPMediaPicker (1.4.2)
 
 DEPENDENCIES:
   - WPMediaPicker (from `../`)
@@ -9,7 +9,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  WPMediaPicker: c6873fefaee96c4cae808a3e9401f50ee694075e
+  WPMediaPicker: 1897f312c7b41114ffd239fb782431ae602134a1
 
 PODFILE CHECKSUM: 7c47e10b39aca62b1f30c3c4260cc99456cf95f8
 

Pod/Classes/WPAssetViewController.m

@@ -36,15 +36,15 @@ - (void)viewDidLoad
     self.imageView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.imageView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
     [self.imageView.widthAnchor constraintEqualToAnchor:self.view.widthAnchor].active = YES;
-    [self.imageView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.topAnchor].active = YES;
-    [self.imageView.heightAnchor constraintEqualToAnchor:self.view.heightAnchor].active = YES;
+    [self.imageView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.bottomAnchor].active = YES;
+    [self.imageView.bottomAnchor constraintEqualToAnchor:self.bottomLayoutGuide.topAnchor].active = YES;
 
     [self.view addSubview:self.videoView];
     self.videoView.translatesAutoresizingMaskIntoConstraints = NO;
     [self.videoView.leftAnchor constraintEqualToAnchor:self.view.leftAnchor].active = YES;
     [self.videoView.widthAnchor constraintEqualToAnchor:self.view.widthAnchor].active = YES;
-    [self.videoView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.topAnchor].active = YES;
-    [self.videoView.heightAnchor constraintEqualToAnchor:self.view.heightAnchor].active = YES;
+    [self.videoView.topAnchor constraintEqualToAnchor:self.topLayoutGuide.bottomAnchor].active = YES;
+    [self.videoView.bottomAnchor constraintEqualToAnchor:self.bottomLayoutGuide.topAnchor].active = YES;
     self.videoView.delegate = self;
 
     [self.view addSubview:self.activityIndicatorView];

Pod/Classes/WPMediaCollectionViewCell.m

@@ -67,6 +67,7 @@ - (void)prepareForReuse
 - (void)layoutSubviews {
     [super layoutSubviews];
     self.gradientView.layer.sublayers.firstObject.frame = self.gradientView.bounds;
+    self.selectionFrame.frame = self.backgroundView.frame;
 }
 
 - (void)commonInit

Pod/Classes/WPPHAssetDataSource.m

@@ -214,9 +214,10 @@ - (void)loadGroupsWithSuccess:(WPMediaSuccessBlock)successBlock
 
     PHFetchOptions *albumOptions = [[PHFetchOptions alloc] init];
     albumOptions.predicate = [NSPredicate predicateWithFormat:@"(estimatedAssetCount != 0)"];
+    albumOptions.sortDescriptors = @[[NSSortDescriptor sortDescriptorWithKey:@"localizedTitle" ascending:YES]];
     self.albums = [PHAssetCollection fetchAssetCollectionsWithType:PHAssetCollectionTypeAlbum
                                                            subtype:PHAssetCollectionSubtypeAny
-                                                           options:nil];
+                                                           options:albumOptions];
 
     [collectionsArray addObjectsFromArray:[self.albums objectsAtIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, self.albums.count)]]];
 

README.md

@@ -110,6 +110,14 @@ To run the example project, clone the repo, and run `pod install` from the `Exam
  * XCode 9 or above
  * iOS 10 or above
 
+## Contributing
+
+Read our [Contributing Guide](CONTRIBUTING.md) to learn about reporting issues, contributing code, and more ways to contribute.
+
+## Getting in Touch
+
+If you have questions about getting setup or just want to say hi, join the [WordPress Slack](https://chat.wordpress.org) and drop a message on the `#mobile` channel.
+
 ## Author
 
 WordPress, [email protected]

WPMediaPicker.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "WPMediaPicker"
-  s.version          = "1.4.1"
+  s.version          = "1.4.2"
   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.