feat: 支持修改默认主题色

sapphirezzz · Mar 27, 2022 · bfaf6af · bfaf6af
1 parent f752473
commit bfaf6af
Show file tree

Hide file tree

Showing 20 changed files with 428 additions and 452 deletions.
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,5 +1,5 @@
 PODS:
-  - ZPhotoPicker (3.0.18)
+  - ZPhotoPicker (3.0.20)
 
 DEPENDENCIES:
   - ZPhotoPicker (from `../`)
@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  ZPhotoPicker: 633c854d6a4849cb882d8176802db6eed2d46285
+  ZPhotoPicker: 1daaa5721dc60f92b05b436dfec8db068692f6df
 
 PODFILE CHECKSUM: 8296adc76642b50c8369d5db18d18a804b891cec
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.11.3
diff --git a/Example/Pods/Local Podspecs/ZPhotoPicker.podspec.json b/Example/Pods/Local Podspecs/ZPhotoPicker.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/...ds/Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example-frameworks.sh b/...ds/Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example-frameworks.sh
diff --git a/...s/Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example.debug.xcconfig b/...s/Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example.debug.xcconfig
diff --git a/...Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example.release.xcconfig b/...Target Support Files/Pods-ZPhotoPicker_Example/Pods-ZPhotoPicker_Example.release.xcconfig
diff --git a/.../Pods/Target Support Files/Pods-ZPhotoPicker_Tests/Pods-ZPhotoPicker_Tests.debug.xcconfig b/.../Pods/Target Support Files/Pods-ZPhotoPicker_Tests/Pods-ZPhotoPicker_Tests.debug.xcconfig
diff --git a/...ods/Target Support Files/Pods-ZPhotoPicker_Tests/Pods-ZPhotoPicker_Tests.release.xcconfig b/...ods/Target Support Files/Pods-ZPhotoPicker_Tests/Pods-ZPhotoPicker_Tests.release.xcconfig
diff --git a/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker-Info.plist b/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker-Info.plist
diff --git a/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker.debug.xcconfig b/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker.release.xcconfig b/Example/Pods/Target Support Files/ZPhotoPicker/ZPhotoPicker.release.xcconfig
diff --git a/ZPhotoPicker.podspec b/ZPhotoPicker.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ZPhotoPicker'
-  s.version          = '3.0.18'
+  s.version          = '3.0.20'
   s.summary          = 'A short description of ZPhotoPicker.'
 
   s.description      = <<-DESC

diff --git a/ZPhotoPicker/Assets/images.xcassets/Contents.json b/ZPhotoPicker/Assets/images.xcassets/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}
diff --git a/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/Contents.json b/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/Contents.json
diff --git a/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/红色圆形选勾-1.png b/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/红色圆形选勾-1.png
diff --git a/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/红色圆形选勾-2.png b/ZPhotoPicker/Assets/images.xcassets/image_checked.imageset/红色圆形选勾-2.png
diff --git a/ZPhotoPicker/Classes/PhotoPickerImageCell.swift b/ZPhotoPicker/Classes/PhotoPickerImageCell.swift
@@ -50,15 +50,26 @@ class PhotoPickerImageCell: UICollectionViewCell {
         }
 
         if let index = index, self.isSelected {
-            let checkedImage: UIImage = UIImage(named: "image_checked", in: Bundle(for: ZPhotoPicker.self), compatibleWith: nil)!
-            checkedImage.draw(at: CGPoint(x: viewWidth - checkedImage.size.width, y: 0))
+            let checkedSideLength: CGFloat = 25
 
+            let rect = CGRect(origin: CGPoint(x: viewWidth - checkedSideLength, y: 0), size: CGSize(width: checkedSideLength, height: checkedSideLength))
+            let contextRef = UIGraphicsGetCurrentContext()!
+            ZPhotoPicker.themeColor.set()
+            contextRef.fillEllipse(in: rect)
+            UIColor.white.set()
+            contextRef.addEllipse(in: rect)
+            contextRef.strokePath()
+
             let indexLabel = UILabel()
+            indexLabel.backgroundColor = UIColor.red
+            indexLabel.layer.cornerRadius = checkedSideLength / 2
+            indexLabel.layer.borderWidth = 1
+            indexLabel.layer.borderColor = UIColor.white.cgColor
             indexLabel.textAlignment = .center
             indexLabel.textColor = .white
             indexLabel.font = .systemFont(ofSize: 13)
             indexLabel.text = "\(index)"
-            indexLabel.drawText(in: CGRect.init(x: viewWidth - checkedImage.size.width, y: 0, width: checkedImage.size.width, height: checkedImage.size.height))
+            indexLabel.drawText(in: CGRect(x: viewWidth - checkedSideLength, y: 0, width: checkedSideLength, height: checkedSideLength))
         }
 
         if videoDuration > 0 {

diff --git a/ZPhotoPicker/Classes/PhotoPickerSelectedCountView.swift b/ZPhotoPicker/Classes/PhotoPickerSelectedCountView.swift
@@ -25,7 +25,7 @@ class PhotoPickerSelectedCountView: UIView {
         let view = UIButton(type: .custom)
         view.backgroundColor = .clear
         view.setTitle("完成", for: .normal)
-        view.setTitleColor(UIColor(red: 1.0, green: 85.0 / 255, blue: 119.0 / 255, alpha: 1.0), for: .normal)
+        view.setTitleColor(ZPhotoPicker.themeColor, for: .normal)
         return view
     }()
 

diff --git a/ZPhotoPicker/Classes/ZPhotoPicker.swift b/ZPhotoPicker/Classes/ZPhotoPicker.swift
@@ -9,6 +9,8 @@ import Photos
 
 public class ZPhotoPicker {
 
+    public static var themeColor: UIColor = UIColor.blue
+
     public enum PhotoPickType {
 
         case camera(allowsCropping: Bool)