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

Add padding to HabitScoreView

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-03-04 07:03:05 -05:00
parent d196e01da0
commit 58aa7f6687
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/isoron/uhabits/views/HabitScoreView.java
View File

@@ -51,6 +51,7 @@ public class HabitScoreView extends ScrollableDataView
private Paint pText, pGraph; private Paint pText, pGraph;
private RectF rect, prevRect; private RectF rect, prevRect;
private int baseSize; private int baseSize;
private int paddingTop;
private int columnWidth; private int columnWidth;
private int columnHeight; private int columnHeight;
@@ -149,6 +150,7 @@ public class HabitScoreView extends ScrollableDataView
columnWidth = baseSize; columnWidth = baseSize;
columnHeight = 8 * baseSize; columnHeight = 8 * baseSize;
nColumns = width / baseSize; nColumns = width / baseSize;
paddingTop = (int) (baseSize * 0.15f);
pText.setTextSize(baseSize * 0.5f); pText.setTextSize(baseSize * 0.5f);
pGraph.setTextSize(baseSize * 0.5f); pGraph.setTextSize(baseSize * 0.5f);
@@ -196,7 +198,7 @@ public class HabitScoreView extends ScrollableDataView
float lineHeight = pText.getFontSpacing(); float lineHeight = pText.getFontSpacing();
rect.set(0, 0, nColumns * columnWidth, columnHeight); rect.set(0, 0, nColumns * columnWidth, columnHeight);
rect.offset(0, 1f); rect.offset(0, paddingTop);
drawGrid(canvas, rect); drawGrid(canvas, rect);
@@ -225,7 +227,7 @@ public class HabitScoreView extends ScrollableDataView
int height = (int) (columnHeight * sRelative); int height = (int) (columnHeight * sRelative);
rect.set(0, 0, baseSize, baseSize); rect.set(0, 0, baseSize, baseSize);
rect.offset(k * columnWidth, columnHeight - height - columnWidth / 2); rect.offset(k * columnWidth, paddingTop + columnHeight - height - columnWidth / 2);
if (!prevRect.isEmpty()) if (!prevRect.isEmpty())
{ {
@@ -238,7 +240,7 @@ public class HabitScoreView extends ScrollableDataView
prevRect.set(rect); prevRect.set(rect);
rect.set(0, 0, columnWidth, columnHeight); rect.set(0, 0, columnWidth, columnHeight);
rect.offset(k * columnWidth, 0); rect.offset(k * columnWidth, paddingTop);
if (!month.equals(previousMonth)) if (!month.equals(previousMonth))
canvas.drawText(month, rect.centerX(), rect.bottom + lineHeight * 1.2f, pText); canvas.drawText(month, rect.centerX(), rect.bottom + lineHeight * 1.2f, pText);