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

Make bars round

Browse Source
This commit is contained in:
Alinson S. Xavier
2020-06-25 07:16:47 -05:00
parent 40bc35935f
commit d80b85ac8c
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/BarChart.java
View File

@@ -269,16 +269,22 @@ public class BarChart extends ScrollableChart
private void drawBar(Canvas canvas, RectF rect, double value) private void drawBar(Canvas canvas, RectF rect, double value)
{ {
float margin = baseSize * 0.225f; float margin = baseSize * 0.225f;
float round = dpToPixels(getContext(), 2);
int color = textColor; int color = textColor;
if (value / 1000 >= target) color = primaryColor; if (value / 1000 >= target) color = primaryColor;
rect.inset(-margin, 0); rect.inset(-margin, 0);
setModeOrColor(pGraph, XFERMODE_CLEAR, backgroundColor); setModeOrColor(pGraph, XFERMODE_CLEAR, backgroundColor);
canvas.drawRect(rect, pGraph); canvas.drawRoundRect(rect, round, round, pGraph);
rect.inset(margin, 0); rect.inset(margin, 0);
setModeOrColor(pGraph, XFERMODE_SRC, color); setModeOrColor(pGraph, XFERMODE_SRC, color);
canvas.drawRoundRect(rect, round, round, pGraph);
rect.set(rect.left,
rect.top + rect.height() / 2.0f,
rect.right,
rect.bottom);
canvas.drawRect(rect, pGraph); canvas.drawRect(rect, pGraph);
if (isTransparencyEnabled) pGraph.setXfermode(XFERMODE_SRC); if (isTransparencyEnabled) pGraph.setXfermode(XFERMODE_SRC);

3
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/HistoryChart.java
View File

@@ -375,7 +375,8 @@ public class HistoryChart extends ScrollableChart
} }
pSquareFg.setColor(reverseTextColor); pSquareFg.setColor(reverseTextColor);
canvas.drawRect(location, pSquareBg); float round = dpToPixels(getContext(), 2);
canvas.drawRoundRect(location, round, round, pSquareBg);
String text = Integer.toString(date.get(Calendar.DAY_OF_MONTH)); String text = Integer.toString(date.get(Calendar.DAY_OF_MONTH));
canvas.drawText(text, location.centerX(), canvas.drawText(text, location.centerX(),
location.centerY() + squareTextOffset, pSquareFg); location.centerY() + squareTextOffset, pSquareFg);

12
android/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/views/StreakChart.java
View File

@@ -34,7 +34,7 @@ import java.text.*;
import java.util.*; import java.util.*;
import static android.view.View.MeasureSpec.*; import static android.view.View.MeasureSpec.*;
import static org.isoron.androidbase.utils.InterfaceUtils.getDimension; import static org.isoron.androidbase.utils.InterfaceUtils.*;
public class StreakChart extends View public class StreakChart extends View
{ {
@@ -202,8 +202,14 @@ public class StreakChart extends View
paint.setColor(percentageToColor(percentage)); paint.setColor(percentageToColor(percentage));
canvas.drawRect(rect.left + gap, rect.top + paddingTopBottom, float round = dpToPixels(getContext(), 2);
rect.right - gap, rect.bottom - paddingTopBottom, paint); canvas.drawRoundRect(rect.left + gap,
rect.top + paddingTopBottom,
rect.right - gap,
rect.bottom - paddingTopBottom,
round,
round,
paint);
float yOffset = rect.centerY() + 0.3f * em; float yOffset = rect.centerY() + 0.3f * em;