oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Slow the timer animation down a bit. 

fixes #1384

// FREEBIE
This commit is contained in:
Michael Kirk 2016-10-12 14:46:56 -04:00
parent 6a4fc3168d
commit 04f5c3ce22
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Signal/src/views/OWSExpirationTimerView.m
View File

@ -125,7 +125,9 @@ double const OWSExpirationTimerViewBlinkingSeconds = 2;
CAGradientLayer *maskLayer = [CAGradientLayer new];
self.fullHourglassImageView.layer.mask = maskLayer;
maskLayer.frame = self.fullHourglassImageView.frame;
// Without this the hourglass appears empty too soon.
CGFloat borderOffset = 2.0;
maskLayer.frame = CGRectInset(self.fullHourglassImageView.frame, 0, -borderOffset);
// Blur the top of the mask a bit with gradient
maskLayer.colors = @[ (id)[UIColor clearColor].CGColor, (id)[UIColor blackColor].CGColor ];
@ -137,9 +139,11 @@ double const OWSExpirationTimerViewBlinkingSeconds = 2;
ratioRemaining = 0.0;
}
CGPoint defaultPosition = maskLayer.position;
CGPoint finalPosition = CGPointMake(defaultPosition.x, defaultPosition.y + maskLayer.bounds.size.height);
CGPoint startingPosition
= CGPointMake(defaultPosition.x, finalPosition.y - maskLayer.bounds.size.height * ratioRemaining);
CGPoint finalPosition
= CGPointMake(defaultPosition.x, defaultPosition.y + maskLayer.bounds.size.height - 2 * borderOffset);
CGPoint startingPosition = CGPointMake(
defaultPosition.x, finalPosition.y - maskLayer.bounds.size.height * ratioRemaining + borderOffset);
maskLayer.position = startingPosition;
CABasicAnimation *revealAnimation = [CABasicAnimation animationWithKeyPath:@"position"];