update

feixue299 · feixue299 · commit 75e38d65d01f · 2022-07-02T02:54:09.000+08:00
diff --git a/Sources/Core/Views/CapsuleView.swift b/Sources/Core/Views/CapsuleView.swift
@@ -7,10 +7,38 @@
 #if !os(macOS)
 import UIKit
 
-open class CapsuleView: UIView {
+open class CapsuleView<T: UIView>: UIView {
+
+    public let contentView: T
+    
+    public init(contentView: T) {
+        self.contentView = contentView
+        super.init(frame: .zero)
+        configView()
+    }
+    
+    override init(frame: CGRect) {
+        self.contentView = T(frame: frame)
+        super.init(frame: frame)
+        configView()
+    }
+    
+    required public init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     open override func layoutSubviews() {
         super.layoutSubviews()
-        layer.cornerRadius = frame.height / 2
+        layer.cornerRadius = bounds.height / 2
+        layer.masksToBounds = true
     }
+
 }
+
+extension CapsuleView: ContentViewProtocol {
+    var containerView: UIView {
+        return contentView
+    }
+}
+
 #endif
diff --git a/Sources/Core/Views/ContentView.swift b/Sources/Core/Views/ContentView.swift
@@ -11,10 +11,10 @@ import UIKit
 
 public class ContentView<View: UIView>: UIView {
     
-    private lazy var leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: edges.left)
+    private lazy var leftConstraint = contentView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: edges.left)
     private lazy var topConstraint = contentView.topAnchor.constraint(equalTo: topAnchor, constant: edges.top)
     private lazy var bottomConstraint = contentView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -edges.bottom)
-    private lazy var rightConstraint = contentView.rightAnchor.constraint(equalTo: rightAnchor, constant: -edges.right)
+    private lazy var rightConstraint = contentView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -edges.right)
     
     public let contentView: View
     
@@ -43,4 +43,5 @@ public class ContentView<View: UIView>: UIView {
     }
     
 }
+
 #endif
diff --git a/Sources/Core/Views/ContentViewProtocol.swift b/Sources/Core/Views/ContentViewProtocol.swift
@@ -0,0 +1,25 @@
+//
+//  ContentViewProtocol.swift
+//  FXViewKit
+//
+//  Created by aria on 2022/7/2.
+//
+
+import Foundation
+
+protocol ContentViewProtocol {
+    var containerView: UIView { get }
+}
+
+extension ContentViewProtocol where Self: UIView {
+    func configView() {
+        containerView.translatesAutoresizingMaskIntoConstraints = false
+        addSubview(containerView)
+        NSLayoutConstraint.activate([
+            containerView.leadingAnchor.constraint(equalTo: leadingAnchor),
+            containerView.topAnchor.constraint(equalTo: topAnchor),
+            containerView.trailingAnchor.constraint(equalTo: trailingAnchor),
+            containerView.bottomAnchor.constraint(equalTo: bottomAnchor),
+        ])
+    }
+}
diff --git a/Sources/Core/Views/GradientView.swift b/Sources/Core/Views/GradientView.swift
@@ -8,7 +8,7 @@
 #if !os(macOS)
 import UIKit
 
-open class GradientView: UIView {
+open class GradientView<T: UIView>: UIView {
     open override class var layerClass: AnyClass {
         return CAGradientLayer.classForCoder()
     }
@@ -17,17 +17,33 @@ open class GradientView: UIView {
         return layer as! CAGradientLayer
     }
     
+    public let contentView: T
+    
     public convenience init() {
         self.init(frame: .zero)
     }
     
+    public init(contentView: T) {
+        self.contentView = contentView
+        super.init(frame: .zero)
+        configView()
+    }
+    
     public override init(frame: CGRect) {
+        self.contentView = T()
         super.init(frame: frame)
         isUserInteractionEnabled = false
+        configView()
     }
     
     required public init?(coder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
 }
+
+extension GradientView: ContentViewProtocol {
+    var containerView: UIView {
+        return contentView
+    }
+}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,10 @@ import UIKit`
`11`	`11`
`12`	`12`	`public class ContentView<View: UIView>: UIView {`
`13`	`13`
`14`		`- private lazy var leftConstraint = contentView.leftAnchor.constraint(equalTo: leftAnchor, constant: edges.left)`
	`14`	`+ private lazy var leftConstraint = contentView.leadingAnchor.constraint(equalTo: leadingAnchor, constant: edges.left)`
`15`	`15`	`private lazy var topConstraint = contentView.topAnchor.constraint(equalTo: topAnchor, constant: edges.top)`
`16`	`16`	`private lazy var bottomConstraint = contentView.bottomAnchor.constraint(equalTo: bottomAnchor, constant: -edges.bottom)`
`17`		`- private lazy var rightConstraint = contentView.rightAnchor.constraint(equalTo: rightAnchor, constant: -edges.right)`
	`17`	`+ private lazy var rightConstraint = contentView.trailingAnchor.constraint(equalTo: trailingAnchor, constant: -edges.right)`
`18`	`18`
`19`	`19`	`public let contentView: View`
`20`	`20`
`@@ -43,4 +43,5 @@ public class ContentView<View: UIView>: UIView {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`}`
	`46`	`+`
`46`	`47`	`#endif`