diff --git a/.github/ISSUE_TEMPLATE.MD b/.github/ISSUE_TEMPLATE.MD
index 9ba5d574..ba17bf70 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.0.9
+ ZLPhotoBrowser version: e.g. 4.1.0
Device: e.g. iPhone X
Device version: e.g. iOS 14.0
Xcode version: e.g. Xcode 12.0
diff --git a/Example/Example/PhotoConfigureCNViewController.swift b/Example/Example/PhotoConfigureCNViewController.swift
index 46e12145..1ca1a5da 100644
--- a/Example/Example/PhotoConfigureCNViewController.swift
+++ b/Example/Example/PhotoConfigureCNViewController.swift
@@ -509,7 +509,7 @@ class PhotoConfigureCNViewController: UIViewController {
make.centerY.equalTo(editImageLabel)
}
- // 编辑视频工具
+ // 编辑图片工具
self.editImageToolView = UIView()
self.editImageToolView.alpha = config.allowEditImage ? 1 : 0
containerView.addSubview(self.editImageToolView)
diff --git a/Example/Example/PhotoConfigureViewController.swift b/Example/Example/PhotoConfigureViewController.swift
index 9c37a9c3..c00061ae 100644
--- a/Example/Example/PhotoConfigureViewController.swift
+++ b/Example/Example/PhotoConfigureViewController.swift
@@ -509,7 +509,7 @@ class PhotoConfigureViewController: UIViewController {
make.centerY.equalTo(editImageLabel)
}
- // 编辑视频工具
+ // 编辑图片工具
self.editImageToolView = UIView()
self.editImageToolView.alpha = config.allowEditImage ? 1 : 0
containerView.addSubview(self.editImageToolView)
diff --git a/README.md b/README.md
index fe3d6cd2..cdfdb944 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
----------------------------------------
-ZLPhotoBrowser is a lightweight and pure Swift implemented library for select photos from album. Support select multiple photos, video, gif, livePhoto. Support edit image and crop video.
+ZLPhotoBrowser is a Wechat-like image picker. Support select normal photos, videos, gif and livePhoto. Support edit image and crop video.
[中文简介](https://github.com/longitachi/ZLPhotoBrowser/blob/master/README_CN.md)
@@ -55,7 +55,7 @@ Detailed usage of `Swift` and `OC`, please refer to [Wiki](https://github.com/lo
### Usage
- Preview selection
- ```
+ ```swift
let ps = ZLPhotoPreviewSheet()
ps.selectImageBlock = { [weak self] (images, assets, isOriginal) in
// your code
@@ -64,7 +64,7 @@ Detailed usage of `Swift` and `OC`, please refer to [Wiki](https://github.com/lo
```
- Library selection
- ```
+ ```swift
let ps = ZLPhotoPreviewSheet()
ps.selectImageBlock = { [weak self] (images, assets, isOriginal) in
// your code
@@ -89,6 +89,16 @@ Detailed usage of `Swift` and `OC`, please refer to [Wiki](https://github.com/lo
### Update Log
> [More logs](https://github.com/longitachi/ZLPhotoBrowser/blob/master/UPDATELOG.md)
```
+● 4.1.0:
+ Add:
+ Image editor add text sticker and image sticker feature.
+ Customizable order of editing image tools.
+ Can set the maximum and minimum number of choices for the video.
+ Pinch to adjust zoom factor of the custom camera.
+ Long press to save the local image and network image.
+ iOS14 limited mode, change the way to select more photos.
+ Fix:
+ Fix the bug that will crash when has request failed images.
● 4.0.9:
Support languages of more countries (French, German, Russian, Vietnamese, Korean, Malay, Italian).
Support iOS14 limited authority.
@@ -97,10 +107,6 @@ Detailed usage of `Swift` and `OC`, please refer to [Wiki](https://github.com/lo
Support show image crop vc directly.
● 4.0.8:
Add filter to image editor.
-● 4.0.7:
- Image editor support crop ratios.
- Custom camera supports switching camera during recording.
- bug fixed.
...
```
diff --git a/README_CN.md b/README_CN.md
index 8c251f6f..561f5c62 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -96,10 +96,23 @@
### 更新日志
> [更多更新日志](https://github.com/longitachi/ZLPhotoBrowser/blob/master/UPDATELOG.md)
```
-● 4.0.9: 支持更多国家的语言; 完善iOS14 limited authority 权限的适配; 提供可以同时预览PHAsset、本地图片/视频及网络图片/视频的功能; 优化部分UI效果; 编辑图片可直接跳转裁剪界面;
-● 4.0.8: 编辑图片添加滤镜功能;
-● 4.0.7: 支持设置图片裁剪比例; 自定义相机支持录制时切换摄像头; 新增已选照片边框功能; 新增是否允许预览大图功能；其他细节优化及已知bug修复；
-● 4.0.5: 适配iOS14 limited权限; 优化图片预览显示; 优化大长/宽图编辑;
+● 4.1.0:
+ 新增:
+ 编辑图片工具新增文本贴纸和图片贴纸;
+ 可自定义编辑图片工具顺序;
+ 可设置视频最大最小选择数;
+ 自定义相机界面可捏合调整焦距;
+ 长按保存本地及网络图片;
+ 修改iOS14 limited权限下，选择更多照片的形式;
+ Fix:
+ 修复请求图片失败导致crash的bug;
+● 4.0.9:
+ 支持更多国家的语言;
+ 完善iOS14 limited authority 权限的适配;
+ 提供可以同时预览PHAsset、本地图片/视频及网络图片/视频的功能; 优化部分UI效果;
+ 编辑图片可直接跳转裁剪界面;
+● 4.0.8:
+ 编辑图片添加滤镜功能;
...
```
diff --git a/Sources/General/ZLPhotoBrowser.swift b/Sources/General/ZLPhotoBrowser.swift
index 9c56ec6e..bdf70e18 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.0.9"
+let version = "4.1.0"
diff --git a/Sources/General/ZLThumbnailViewController.swift b/Sources/General/ZLThumbnailViewController.swift
index 04426b4a..d710ab4f 100644
--- a/Sources/General/ZLThumbnailViewController.swift
+++ b/Sources/General/ZLThumbnailViewController.swift
@@ -222,8 +222,8 @@ class ZLThumbnailViewController: UIViewController {
self.previewBtn.frame = CGRect(x: 15, y: btnY, width: previewBtnW, height: btnH)
let originalTitle = localLanguageTextValue(.originalPhoto)
- let w = originalTitle.boundingRect(font: ZLLayout.bottomToolTitleFont, limitSize: CGSize(width: CGFloat.greatestFiniteMagnitude, height: 30)).width + 30
- self.originalBtn.frame = CGRect(x: (self.bottomView.bounds.width-w)/2-5, y: btnY, width: w, height: btnH)
+ let originBtnW = originalTitle.boundingRect(font: ZLLayout.bottomToolTitleFont, limitSize: CGSize(width: CGFloat.greatestFiniteMagnitude, height: 30)).width + 30
+ self.originalBtn.frame = CGRect(x: (self.bottomView.bounds.width-originBtnW)/2-5, y: btnY, width: originBtnW, height: btnH)
self.refreshDoneBtnFrame()
diff --git a/UPDATELOG.md b/UPDATELOG.md
index 5bff529e..cd333e3a 100755
--- a/UPDATELOG.md
+++ b/UPDATELOG.md
@@ -1,6 +1,23 @@
# Update Log
-----
+
+## [4.1.0](https://github.com/longitachi/ZLPhotoBrowser/releases/tag/4.1.0) (2020-11-21)
+
+### Add
+* Image editor add text sticker and image sticker feature.[#552](https://github.com/longitachi/ZLPhotoBrowser/pull/552)
+* Customizable order of editing image tools.
+* Can set the maximum and minimum number of choices for the video.
+* Pinch to adjust zoom factor of the custom camera.
+* Long press to save the local image and network image.
+* iOS14 limited mode, change the way to select more photos.[#548](https://github.com/longitachi/ZLPhotoBrowser/pull/548)
+
+### Fix
+* Fix the bug that will crash when has request failed images.[#549](https://github.com/longitachi/ZLPhotoBrowser/pull/549)
+
+---
+
+
## [4.0.9](https://github.com/longitachi/ZLPhotoBrowser/releases/tag/4.0.9) (2020-10-29)
### Add
@@ -15,7 +32,7 @@
---
------
+
## [4.0.8](https://github.com/longitachi/ZLPhotoBrowser/releases/tag/4.0.8) (2020-10-10)
### Add
diff --git a/ZLPhotoBrowser.podspec b/ZLPhotoBrowser.podspec
index b61bc187..ee0f5504 100644
--- a/ZLPhotoBrowser.podspec
+++ b/ZLPhotoBrowser.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'ZLPhotoBrowser'
- s.version = '4.0.9'
+ s.version = '4.1.0'
s.summary = 'A lightweight and pure Swift implemented library for select photos from album'
s.description = <<-DESC