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

Small changes to the layout of NumberButtonView

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-03-26 10:57:04 -04:00
parent 1dfa0c6b0d
commit 177525817c
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
View File

@@ -326,7 +326,7 @@ public class HistoryChart extends ScrollableChart
else else
{ {
int checkmark = checkmarks[checkmarkOffset]; int checkmark = checkmarks[checkmarkOffset];
pSquareBg.setColor(colors[Integer.min(2, checkmark)]); pSquareBg.setColor(colors[Math.min(2, checkmark)]);
} }
pSquareFg.setColor(reverseTextColor); pSquareFg.setColor(reverseTextColor);

23
app/src/main/java/org/isoron/uhabits/activities/habits/list/views/NumberButtonView.java
View File

@@ -58,10 +58,12 @@ public class NumberButtonView extends View
private TextPaint pBold; private TextPaint pBold;
private int grey; private int lightGrey;
private float em; private float em;
private int darkGrey;
public NumberButtonView(@Nullable Context context) public NumberButtonView(@Nullable Context context)
{ {
super(context); super(context);
@@ -137,16 +139,12 @@ public class NumberButtonView extends View
@Override @Override
protected void onDraw(Canvas canvas) protected void onDraw(Canvas canvas)
{ {
if(value < threshold) int activeColor = lightGrey;
{ if(value > 0 && value < threshold) activeColor = darkGrey;
pRegular.setColor(grey); if(value >= threshold) activeColor = color;
pBold.setColor(grey);
} pRegular.setColor(activeColor);
else pBold.setColor(activeColor);
{
pRegular.setColor(color);
pBold.setColor(color);
}
String fv = formatValue(value); String fv = formatValue(value);
@@ -184,6 +182,7 @@ public class NumberButtonView extends View
pBold.setTextAlign(Paint.Align.CENTER); pBold.setTextAlign(Paint.Align.CENTER);
em = pBold.measureText("m"); em = pBold.measureText("m");
grey = sr.getColor(R.attr.lowContrastTextColor); lightGrey = sr.getColor(R.attr.lowContrastTextColor);
darkGrey = sr.getColor(R.attr.mediumContrastTextColor);
} }
} }

2
app/src/main/res/layout/list_habits_panel_preview.xml
View File

@@ -62,7 +62,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:button_count="8" app:button_count="8"
app:color="6" app:color="6"
app:threshold="10" app:threshold="2"
app:unit="min" app:unit="min"
/> />