From 1ac2fe08192e302a696096c4749487684fc034f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20C=C5=93ur?= Date: Fri, 8 Mar 2019 01:59:46 +0800 Subject: [PATCH] Fix incorrect duration for small number. Fix #5. --- Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m | 3 --- Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m b/Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m index ee68d56..c98aa7b 100644 --- a/Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m +++ b/Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m @@ -189,9 +189,6 @@ - (void)fn_setNumber:(NSNumber *)number duration:(NSTimeInterval)duration format [userInfo setObject:@(multiple) forKey:DDMultipleKey]; [userInfo setObject:@(endNumber) forKey:DDEndNumberKey]; - if ((endNumber * DDFrequency)/duration < 1) { - duration = duration * 0.3; - } [userInfo setObject:@((endNumber * DDFrequency)/duration) forKey:DDRangeIntegerKey]; if(attrs) diff --git a/Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift b/Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift index 795c9e5..4aacc07 100644 --- a/Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift +++ b/Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift @@ -200,7 +200,7 @@ extension UILabel { } //limit duration is positive number and it is larger than 0.3 - var durationTime : TimeInterval = Swift.max(fabs(duration), 0.3) + let durationTime : TimeInterval = Swift.max(fabs(duration), 0.3) self.fn_timer?.invalidate() @@ -235,9 +235,6 @@ extension UILabel { userDict.setValue(multiple, forKey: multipleName) userDict.setValue(NSNumber(value: endNumber), forKey: endNumberName) - if (Double(endNumber) * frequency)/durationTime < 1.0 { - durationTime = durationTime * 0.3 - } let rangeNumber = (Double(endNumber) * frequency)/durationTime userDict.setValue(NSNumber(value: rangeNumber), forKey: rangeIntegerName)