demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

charts: follow syste, font scale settings, more contrast indicator

Browse Source
This commit is contained in:
Me7c7
2025-09-07 12:15:36 +02:00
committed by José Rebelo
parent 4836b83574
commit c51b404b45
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/sleep/SimpleSleepDetailsOverlay.java
+3 -1
View File
@@ -77,9 +77,11 @@ public class SimpleSleepDetailsOverlay implements SleepDetailsOverlay {
}
@Override
public void init(int horizontalLineCount) {
public void init(float scaleTextSize, float labelTextSize, int horizontalLineCount) {
this.horizontalLineCount = horizontalLineCount;
labels = data.getYLabels(horizontalLineCount);
labelPaint.setTextSize(labelTextSize);
scalePaint.setTextSize(scaleTextSize);
}
@Override
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/sleep/SleepDetailsOverlay.java
+1 -1
View File
@@ -20,7 +20,7 @@ import android.graphics.Canvas;
public interface SleepDetailsOverlay {
void init(int horizontalLineCount);
void init(float scaleTextSize, float labelTextSize, int horizontalLineCount);
void drawOverlayScale(Canvas canvas, int lineSpacing, int chartTopStart, int x);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/sleep/SleepDetailsView.java
+14 -7
View File
@@ -99,7 +99,9 @@ public class SleepDetailsView extends View {
private final int overlayAlpha = 128;
private final int infoTextSize = 25;
private int infoTextSize = 25;
private int scaleTextSize = 25;
private final float cornerRadius = 10.0F;
@@ -132,6 +134,11 @@ public class SleepDetailsView extends View {
horizontalLineCount = 8;
heightUnit = (float) (1.0 / 8);
float scale = getResources().getConfiguration().fontScale;
infoTextSize = (int) (25 * scale);
scaleTextSize = (int) (25 * scale);
gridPaint.setColor(Color.GRAY);
gridPaint.setStrokeWidth(1.0F);
gridPaint.setStrokeCap(Paint.Cap.ROUND);
@@ -144,17 +151,17 @@ public class SleepDetailsView extends View {
timeInfoTextPaint.setColor(Color.GRAY);
timeInfoTextPaint.setTextAlign(Paint.Align.CENTER);
timeInfoTextPaint.setTextSize(25);
timeInfoTextPaint.setTextSize(scaleTextSize);
infoTextPaint.setColor(Color.GRAY);
infoTextPaint.setTextAlign(Paint.Align.LEFT);
infoTextPaint.setTextSize(infoTextSize);
selectorPaint.setColor(Color.GRAY);
selectorPaint.setStrokeWidth(1.0F);
selectorPaint.setColor(Color.YELLOW);
selectorPaint.setStrokeWidth(2.0F);
selectorPaint.setStrokeCap(Paint.Cap.ROUND);
selectorPaint.setStyle(Paint.Style.STROKE);
selectorPaint.setPathEffect(new DashPathEffect(new float[]{2f, 10f}, 0f));
selectorPaint.setPathEffect(new DashPathEffect(new float[]{4f, 10f}, 0f));
}
@Override
@@ -383,7 +390,7 @@ public class SleepDetailsView extends View {
fillPaint.setColor(getColorFromType(curDetail.type));
final int iconSize = infoTextSize;
final float iconSize = infoTextSize;
final float infoIconX = chartLeftStart + ((float) chartWidth / 2) - (float) infoTextRect.width() / 2 - iconSize - 5;
@@ -465,7 +472,7 @@ public class SleepDetailsView extends View {
selectorPos = -1.0F;
curOverlay = overlay;
if(curOverlay != null) {
curOverlay.init(horizontalLineCount);
curOverlay.init(scaleTextSize, infoTextSize, horizontalLineCount);
}
invalidate();
}