fix frame error：#31，#30，#29

jkpang · May 13, 2019 · d18d8a0 · d18d8a0
1 parent 5b17bd2
commit d18d8a0
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 16 deletions.
diff --git a/PPBadgeView.podspec b/PPBadgeView.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
 
     s.name         = "PPBadgeView"
 
-    s.version      = "3.0.0"
+    s.version      = "3.1.0"
 
     s.platform     = :ios, '8.0'
 

diff --git a/PPBadgeView/objc/PPBadgeControl.m b/PPBadgeView/objc/PPBadgeControl.m
@@ -63,14 +63,12 @@ - (void)setupSubviews
 - (void)addLayoutWith:(UIView *)view leading:(CGFloat)leading trailing:(CGFloat)trailing
 {
     [view setTranslatesAutoresizingMaskIntoConstraints:NO];
-
     NSLayoutConstraint *topConstraint = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
     NSLayoutConstraint *leadingConstraint = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeLeading relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeLeading multiplier:1.0 constant:leading];
     NSLayoutConstraint *bottomConstraint = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeBottom relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeBottom multiplier:1.0 constant:0];
     NSLayoutConstraint *trailingConstraint = [NSLayoutConstraint constraintWithItem:view attribute:NSLayoutAttributeTrailing relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTrailing multiplier:1.0 constant:trailing];
     leadingConstraint.priority = 999;
     trailingConstraint.priority = 999;
-
     [self addConstraints:@[topConstraint, leadingConstraint, bottomConstraint, trailingConstraint]];
 }
 

diff --git a/PPBadgeView/objc/UIView+PPBadgeView.m b/PPBadgeView/objc/UIView+PPBadgeView.m
@@ -165,14 +165,11 @@ - (void)pp_decreaseBy:(NSInteger)number
 
 - (void)addBadgeViewLayoutConstraint
 {
-    [self setTranslatesAutoresizingMaskIntoConstraints:NO];
     [self.badgeView setTranslatesAutoresizingMaskIntoConstraints:NO];
-
     NSLayoutConstraint *centerXConstraint = [NSLayoutConstraint constraintWithItem:self.badgeView attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTrailing multiplier:1.0 constant:0];
     NSLayoutConstraint *centerYConstraint = [NSLayoutConstraint constraintWithItem:self.badgeView attribute:NSLayoutAttributeCenterY relatedBy:NSLayoutRelationEqual toItem:self attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
     NSLayoutConstraint *widthConstraint = [NSLayoutConstraint constraintWithItem:self.badgeView attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationGreaterThanOrEqual toItem:self.badgeView attribute:NSLayoutAttributeHeight multiplier:1.0 constant:0];
     NSLayoutConstraint *heightConstraint = [NSLayoutConstraint constraintWithItem:self.badgeView attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:18];
-
     [self addConstraints:@[centerXConstraint, centerYConstraint]];
     [self.badgeView addConstraints:@[widthConstraint, heightConstraint]];
 }

diff --git a/PPBadgeView/swift/PPBadgeControl.swift b/PPBadgeView/swift/PPBadgeControl.swift
@@ -114,14 +114,12 @@ open class PPBadgeControl: UIControl {
 
     private func addLayout(with view: UIView, leading: CGFloat, trailing: CGFloat) {
         view.translatesAutoresizingMaskIntoConstraints = false
-
         let topConstraint = NSLayoutConstraint(item: view, attribute: .top, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0)
         let leadingConstraint = NSLayoutConstraint(item: view, attribute: .leading, relatedBy: .equal, toItem: self, attribute: .leading, multiplier: 1.0, constant: leading)
         let bottomConstraint = NSLayoutConstraint(item: view, attribute: .bottom, relatedBy: .equal, toItem: self, attribute: .bottom, multiplier: 1.0, constant: 0)
         let trailingConstraint = NSLayoutConstraint(item: view, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: trailing)
         leadingConstraint.priority = UILayoutPriority(rawValue: 999)
         trailingConstraint.priority = UILayoutPriority(rawValue: 999)
-
         addConstraints([topConstraint, leadingConstraint, bottomConstraint, trailingConstraint])
     }
 }
diff --git a/PPBadgeView/swift/UIView+PPBadgeView.swift b/PPBadgeView/swift/UIView+PPBadgeView.swift
@@ -197,14 +197,11 @@ public extension PP where Base: UIView {
 extension UIView {
 
     private func addBadgeViewLayoutConstraint() {
-        translatesAutoresizingMaskIntoConstraints = false
         badgeView.translatesAutoresizingMaskIntoConstraints = false
-
         let centerXConstraint = NSLayoutConstraint(item: badgeView, attribute: .centerX, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: 0)
         let centerYConstraint = NSLayoutConstraint(item: badgeView, attribute: .centerY, relatedBy: .equal, toItem: self, attribute: .top, multiplier: 1.0, constant: 0)
         let widthConstraint = NSLayoutConstraint(item: badgeView, attribute: .width, relatedBy: .greaterThanOrEqual, toItem: badgeView, attribute: .height, multiplier: 1.0, constant: 0)
         let heightConstraint = NSLayoutConstraint(item: badgeView, attribute: .height, relatedBy: .equal, toItem: nil, attribute: .notAnAttribute, multiplier: 1.0, constant: 18)
-
         addConstraints([centerXConstraint, centerYConstraint])
         badgeView.addConstraints([widthConstraint, heightConstraint])
     }

diff --git a/PPBadgeViewObjc/PPBadgeViewObjc/Info.plist b/PPBadgeViewObjc/PPBadgeViewObjc/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>3.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/PPBadgeViewSwift.podspec b/PPBadgeViewSwift.podspec
@@ -3,7 +3,7 @@ Pod::Spec.new do |s|
 
     s.name         = "PPBadgeViewSwift"
 
-    s.version      = "3.0.0"
+    s.version      = "3.1.0"
 
     s.platform     = :ios, '8.0'
 

diff --git a/PPBadgeViewSwift/PPBadgeViewSwift/Classes/Controllers/PPViewController2.swift b/PPBadgeViewSwift/PPBadgeViewSwift/Classes/Controllers/PPViewController2.swift
@@ -12,8 +12,14 @@ class PPViewController2: UIViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
-
-        // Do any additional setup after loading the view.
+
+        view.backgroundColor = UIColor.white
+
+        let testView = UIView(frame: CGRect(x: 100, y: 100, width: 100, height: 100))
+        testView.backgroundColor = UIColor.blue
+        testView.pp.addBadge(number: 10)
+        view.addSubview(testView)
+
     }
 
     override func didReceiveMemoryWarning() {

diff --git a/PPBadgeViewSwift/PPBadgeViewSwift/Info.plist b/PPBadgeViewSwift/PPBadgeViewSwift/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>3.1.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>