From 5f9578a9463c0d2d314dcbee5eaf6a19ff1a3a01 Mon Sep 17 00:00:00 2001 From: longitachi Date: Mon, 7 Mar 2022 18:55:24 +0800 Subject: [PATCH] Bumped version to 4.2.3 --- .github/ISSUE_TEMPLATE.MD | 2 +- CHANGELOG.md | 6 ++++++ README.md | 12 +++--------- README_CN.md | 20 +++++++------------- Sources/General/ZLAlbumListModel.swift | 9 ++++++--- Sources/General/ZLPhotoBrowser.swift | 2 +- Sources/General/ZLPhotoConfiguration.swift | 2 +- Sources/General/ZLPhotoModel.swift | 9 ++++++--- ZLPhotoBrowser.podspec | 2 +- 9 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.MD b/.github/ISSUE_TEMPLATE.MD index 8e14cf37..a8cf2600 100644 --- a/.github/ISSUE_TEMPLATE.MD +++ b/.github/ISSUE_TEMPLATE.MD @@ -5,7 +5,7 @@ Please fill in the detailed description of the issue (full output of any stack trace, compiler error, ...) and the steps to reproduce the issue. #### Info - ZLPhotoBrowser version: e.g. 4.2.2 + ZLPhotoBrowser version: e.g. 4.2.3 Device: e.g. iPhone X Device version: e.g. iOS 14.0 Xcode version: e.g. Xcode 12.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index aebe66f4..fc119cb2 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ----- +## [4.2.3](https://github.com/longitachi/ZLPhotoBrowser/releases/tag/4.2.3) (2022-03-07) +### Add: +* Done button title color can be defined separately. + +--- + ## [4.2.2](https://github.com/longitachi/ZLPhotoBrowser/releases/tag/4.2.2) (2022-01-13) ### Add: * Support Spanish and Portuguese.[#677](https://github.com/longitachi/ZLPhotoBrowser/pull/677) diff --git a/README.md b/README.md index 82e02a18..82e12889 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ ![image](https://github.com/longitachi/ImageFolder/blob/master/ZLPhotoBrowser/preview_with_title.png) ---------------------------------------- -# Warning: If your APP includes China in the App Store sales area, please update to the latest version(>= 4.1.9). [issue](https://github.com/longitachi/ZLPhotoBrowser/issues/650) English | [简体中文](https://github.com/longitachi/ZLPhotoBrowser/blob/master/README_CN.md) @@ -92,6 +91,9 @@ If you only want to use the image edit feature, please move to [ZLImageEditor](h ### Change Log > [More logs](https://github.com/longitachi/ZLPhotoBrowser/blob/master/CHANGELOG.md) ``` +● 4.2.3 + Add: + Done button title color can be defined separately. ● 4.2.2 Add: Support Spanish and Portuguese. @@ -104,14 +106,6 @@ If you only want to use the image edit feature, please move to [ZLImageEditor](h Add ZLEditImageConfiguration class to configuration the image editor. Fix: Crash when calling showPhotoLibrary in UISplitViewController. -● 4.2.0 - Add: - Add chained calls. - Optmize the custom camera code. - Add image style of cancel button. - Fix: - Selected video duplicates after editing mode.[#655] - Unable to deselect photos under certain conditions.[#659] ... ``` diff --git a/README_CN.md b/README_CN.md index 026a1d64..47ab6118 100644 --- a/README_CN.md +++ b/README_CN.md @@ -8,7 +8,6 @@ ![image](https://github.com/longitachi/ImageFolder/blob/master/ZLPhotoBrowser/preview_with_title.png) ---------------------------------------- -# Warning: 如果您的App在中国地区上架，请更新至最新版本(>=4.1.9)。[issue](https://github.com/longitachi/ZLPhotoBrowser/issues/650) [English](https://github.com/longitachi/ZLPhotoBrowser/blob/master/README.md) | 简体中文 @@ -103,26 +102,21 @@ ZLPhotoBrowser是一款微信样式的图片选择器，支持预览/相册内 ### 更新日志 > [更多更新日志](https://github.com/longitachi/ZLPhotoBrowser/blob/master/CHANGELOG.md) ``` -● 4.1.9 +● 4.2.3 + 新增: + `完成`按钮的标题颜色可以单独定义; +● 4.2.2 新增: 支持西班牙语和葡萄牙语; Fix: 修复iPad上显示UIAlertController时crash的bug; -● 4.2.0 +● 4.2.1 新增: 编辑图片时支持调整图片亮度、对比度和饱和度; 支持印尼语; - 抽出图片编辑相关配置类：ZLEditImageConfiguration. - Fix: - Crash when calling showPhotoLibrary in UISplitViewController. -● 4.2.0 - 新增: - 支持链式调用; - 优化自定义相机代码; - 小图界面取消按钮添加图片类型; + 抽出图片编辑相关配置类：ZLEditImageConfiguration; Fix: - 编辑视频未操作进度条的情况下也会重建一个新视频.[#655] - 某些条件下，无法取消选择已选的照片.[#659] + Crash when calling showPhotoLibrary in UISplitViewController; ... ``` diff --git a/Sources/General/ZLAlbumListModel.swift b/Sources/General/ZLAlbumListModel.swift index ea8cf422..0e05ce4b 100644 --- a/Sources/General/ZLAlbumListModel.swift +++ b/Sources/General/ZLAlbumListModel.swift @@ -75,7 +75,10 @@ public class ZLAlbumListModel: NSObject { } - -func ==(lhs: ZLAlbumListModel, rhs: ZLAlbumListModel) -> Bool { - return lhs.title == rhs.title && lhs.count == rhs.count && lhs.headImageAsset?.localIdentifier == rhs.headImageAsset?.localIdentifier +extension ZLAlbumListModel { + + static func ==(lhs: ZLAlbumListModel, rhs: ZLAlbumListModel) -> Bool { + return lhs.title == rhs.title && lhs.count == rhs.count && lhs.headImageAsset?.localIdentifier == rhs.headImageAsset?.localIdentifier + } + } diff --git a/Sources/General/ZLPhotoBrowser.swift b/Sources/General/ZLPhotoBrowser.swift index 7b7984f2..13f00441 100644 --- a/Sources/General/ZLPhotoBrowser.swift +++ b/Sources/General/ZLPhotoBrowser.swift @@ -24,4 +24,4 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. -let version = "4.2.2" +let version = "4.2.3" diff --git a/Sources/General/ZLPhotoConfiguration.swift b/Sources/General/ZLPhotoConfiguration.swift index 20d74485..c0c35734 100644 --- a/Sources/General/ZLPhotoConfiguration.swift +++ b/Sources/General/ZLPhotoConfiguration.swift @@ -541,7 +541,7 @@ public class ZLPhotoThemeColorDeploy: NSObject { /// A color for background in album list. /// 相册列表背景色 - @objc public var albumListBgColor = zlRGB(205, 45, 45) + @objc public var albumListBgColor = zlRGB(45, 45, 45) /// A color for album list title label. /// 相册列表标题颜色 diff --git a/Sources/General/ZLPhotoModel.swift b/Sources/General/ZLPhotoModel.swift index 001b0bae..8989e819 100644 --- a/Sources/General/ZLPhotoModel.swift +++ b/Sources/General/ZLPhotoModel.swift @@ -145,7 +145,10 @@ public class ZLPhotoModel: NSObject { } - -public func ==(lhs: ZLPhotoModel, rhs: ZLPhotoModel) -> Bool { - return lhs.ident == rhs.ident +extension ZLPhotoModel { + + public static func ==(lhs: ZLPhotoModel, rhs: ZLPhotoModel) -> Bool { + return lhs.ident == rhs.ident + } + } diff --git a/ZLPhotoBrowser.podspec b/ZLPhotoBrowser.podspec index 70338a05..395f1c9d 100644 --- a/ZLPhotoBrowser.podspec +++ b/ZLPhotoBrowser.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'ZLPhotoBrowser' - s.version = '4.2.2' + s.version = '4.2.3' s.summary = 'A lightweight and pure Swift implemented library for select photos from album' s.description = <<-DESC