Adds some publicity

hyperoslo · Nov 25, 2015 · 7b3a27a · 7b3a27a
1 parent 33b66a0
commit 7b3a27a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/...isperDemo.xcworkspace/xcuserdata/RamonGilabert.xcuserdatad/UserInterfaceState.xcuserstate b/...isperDemo.xcworkspace/xcuserdata/RamonGilabert.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Source/WhisperFactory.swift b/Source/WhisperFactory.swift
@@ -99,6 +99,11 @@ class WhisperFactory: NSObject {
       self.whisperView.frame.size.height = WhisperView.Dimensions.height
       for subview in self.whisperView.transformViews {
         subview.frame.origin.y = 0
+
+        if subview == self.whisperView.complementImageView {
+          subview.frame.origin.y = (WhisperView.Dimensions.height - WhisperView.Dimensions.imageSize) / 2
+        }
+
         subview.alpha = 1
       }
     })
@@ -111,6 +116,11 @@ class WhisperFactory: NSObject {
       self.whisperView.frame.size.height = WhisperView.Dimensions.height
       for subview in self.whisperView.transformViews {
         subview.frame.origin.y = 0
+
+        if subview == self.whisperView.complementImageView {
+          subview.frame.origin.y = (WhisperView.Dimensions.height - WhisperView.Dimensions.imageSize) / 2
+        }
+
         subview.alpha = 1
       }
       }, completion: { _ in
@@ -191,8 +201,8 @@ class WhisperFactory: NSObject {
     edgeInsetHeight = down ? WhisperView.Dimensions.height : -WhisperView.Dimensions.height
 
     UIView.animateWithDuration(AnimationTiming.movement, animations: {
-        self.performControllerMove(visibleController)
-      })
+      self.performControllerMove(visibleController)
+    })
   }
 
   func performControllerMove(viewController: UIViewController) {

diff --git a/Source/WhisperView.swift b/Source/WhisperView.swift
@@ -16,7 +16,7 @@ public class WhisperView: UIView {
 
   lazy private(set) var transformViews: [UIView] = [self.titleLabel, self.complementImageView]
 
-  lazy var titleLabel: UILabel = {
+  public lazy var titleLabel: UILabel = {
     let label = UILabel()
     label.textAlignment = .Center
     label.textColor = UIColor.whiteColor()
@@ -60,6 +60,7 @@ public class WhisperView: UIView {
 
     titleLabel.sizeToFit()
     setupFrames()
+    clipsToBounds = true
   }
 
   public required init?(coder aDecoder: NSCoder) {
@@ -80,11 +81,10 @@ extension WhisperView {
         height: frame.height)
 
       complementImageView.frame = CGRect(
-        x: titleLabel.frame.origin.y - Dimensions.imageSize - Dimensions.loaderTitleOffset,
-        y: (frame.height - Dimensions.imageSize) / 2,
+        x: titleLabel.frame.origin.x - Dimensions.imageSize - Dimensions.loaderTitleOffset,
+        y: (Dimensions.height - Dimensions.imageSize) / 2,
         width: Dimensions.imageSize,
         height: Dimensions.imageSize)
-
     } else {
       titleLabel.frame = CGRect(
         x: (frame.width - titleLabel.frame.width) / 2,