Merge branch 'feature/add-photo-broswer'

alibaba-archive · Oct 30, 2017 · 888102c · 888102c
2 parents 3212076 + 17d8c1b
commit 888102c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/PhotoBrowser/PBCustomView.swift b/PhotoBrowser/PBCustomView.swift
@@ -196,12 +196,22 @@ class PBNavigationBar: UIView {
 
     func updateShareStatus(_ isEnableShare: Bool) {
         self.removeConstraint(self.moreTrailingConstraint!)
-        self.moreTrailingConstraint = NSLayoutConstraint(item: self.moreButton, attribute: .trailing, relatedBy: .equal, toItem: self, attribute: .trailing, multiplier: 1.0, constant: -15)
-        self.addConstraint(self.moreTrailingConstraint!)
-
+
         if !isEnableShare {
+            rightButton.isHidden = true
+
+//            self.moreTrailingConstraint = NSLayoutConstraint(item: self, attribute: .trailing, relatedBy: .equal, toItem: contentView, attribute: .trailing, multiplier: 1.0, constant: -15)
+
+            self.moreTrailingConstraint = NSLayoutConstraint(item: self.moreButton, attribute: .trailing, relatedBy: .equal, toItem: contentView, attribute: .trailing, multiplier: 1.0, constant: -15)
+            self.addConstraint(self.moreTrailingConstraint!)
+
             titleTrailingConstraint?.constant = 60
         } else {
+            rightButton.isHidden = false
+
+            self.moreTrailingConstraint = NSLayoutConstraint(item: self.moreButton, attribute: .trailing, relatedBy: .equal, toItem: self.rightButton, attribute: .leading, multiplier: 1.0, constant: 0)
+            self.addConstraint(self.moreTrailingConstraint!)
+
             titleTrailingConstraint?.constant = 85
         }
         layoutIfNeeded()
@@ -218,12 +228,6 @@ class PBNavigationBar: UIView {
         layoutIfNeeded()
     }
 
-//    func updateSkitchButton(_ isHiddenSkitch: Bool) {
-//        let skitchImage = isHiddenSkitch ? "filePreviewInvisibleIcon" : "filePreviewVisibleIcon"
-//        let image = UIImage(named: skitchImage, in: Bundle(for: classForCoder), compatibleWith: nil)
-//        moreButton.setImage(image, for: .normal)
-//    }
-
     func setup() {
         addSubview(backgroundView)
         backgroundView.frame = CGRect(x: 0, y: 0, width: frame.width, height: frame.height)

diff --git a/PhotoBrowser/PhotoBrowser.swift b/PhotoBrowser/PhotoBrowser.swift
@@ -93,9 +93,7 @@ open class PhotoBrowser: UIPageViewController {
     open var enableShare = true {
         didSet {
             headerView?.rightButton.isHidden = !enableShare
-            if !enableShare {
-                headerView?.updateShareStatus(false)
-            }
+            headerView?.updateShareStatus(enableShare)
         }
     }