isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 01:08:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make streak colors consistent

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-26 08:49:02 -04:00
parent e2c99d745e
commit d14fbbd130
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/isoron/uhabits/views/HabitStreakView.java
View File

@@ -218,14 +218,7 @@ public class HabitStreakView extends View implements HabitDataView
float gap = (width - barWidth) / 2; float gap = (width - barWidth) / 2;
float paddingTopBottom = baseSize * 0.05f; float paddingTopBottom = baseSize * 0.05f;
float croppedPercentage; paint.setColor(percentageToColor(percentage));
if (maxLength == minLength)
croppedPercentage = 1.0f;
else
croppedPercentage = (float) (streak.length - minLength) / (maxLength - minLength);
int c = (int) (croppedPercentage * 3);
paint.setColor(colors[(c)]);
canvas.drawRect(rect.left + gap, rect.top + paddingTopBottom, rect.right - gap, canvas.drawRect(rect.left + gap, rect.top + paddingTopBottom, rect.right - gap,
rect.bottom - paddingTopBottom, paint); rect.bottom - paddingTopBottom, paint);
@@ -250,6 +243,14 @@ public class HabitStreakView extends View implements HabitDataView
} }
} }
private int percentageToColor(float percentage)
{
if(percentage >= 1.0f) return colors[3];
if(percentage >= 0.8f) return colors[2];
if(percentage >= 0.5f) return colors[1];
return colors[0];
}
public void setIsBackgroundTransparent(boolean isBackgroundTransparent) public void setIsBackgroundTransparent(boolean isBackgroundTransparent)
{ {
this.isBackgroundTransparent = isBackgroundTransparent; this.isBackgroundTransparent = isBackgroundTransparent;