From b039fdd276ba43076d87d4df832cb9a41e8e26d8 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 18 Apr 2018 10:01:44 -0400 Subject: [PATCH] UI Fix: start with full hourglass on short timer durations We were positioning relative to "blink" time (2s), rather than delete time, which means that for 10s timers we were starting as though only 8s remained. // FREEBIE --- .../ConversationView/Cells/OWSExpirationTimerView.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSExpirationTimerView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSExpirationTimerView.m index 15532f8da..4cd15ca41 100644 --- a/Signal/src/ViewControllers/ConversationView/Cells/OWSExpirationTimerView.m +++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSExpirationTimerView.m @@ -159,8 +159,8 @@ const CGFloat kExpirationTimerViewSize = 16.f; OWSFail(@"initialDurationSeconds was unexpectedly 0"); return; } - - CGFloat ratioRemaining = (CGFloat)timeUntilFlashing / (CGFloat)self.initialDurationSeconds; + + CGFloat ratioRemaining = (CGFloat)secondsLeft / (CGFloat)self.initialDurationSeconds; CGFloat ratioComplete = CGFloatClamp((CGFloat)1.0 - ratioRemaining, 0, 1.0); CGPoint startPosition = CGPointMake(0, self.fullHourglassImageView.height * ratioComplete);