Skip to content

Fix incorrect duration for small number #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Coeur wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix incorrect duration for small number #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions Objective-C/FlickerNumber/Classes/UILabel+FlickerNumber.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions Swift/FlickerNumber-Swift/UILabel+FlickerNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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)

Expand Down