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

Chart: use themed colors, show not worn on the sleep chart

Browse Source
This commit is contained in:
Me7c7
2025-09-12 14:59:32 +03:00
parent 2d62e11148
commit b194142aa6
3 changed files with 21 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/AbstractActivityChartFragment.java
+6 -4
View File
@@ -147,13 +147,13 @@ public abstract class AbstractActivityChartFragment<D extends ChartsData> extend
return false;
}
protected Integer getColorFor(ActivityKind activityKind) {
protected int getColorFor(ActivityKind activityKind) {
return switch (activityKind) {
case DEEP_SLEEP -> akDeepSleep.color;
case LIGHT_SLEEP -> akLightSleep.color;
case REM_SLEEP -> akRemSleep.color;
case AWAKE_SLEEP -> akAwakeSleep.color;
case ACTIVITY -> akActivity.color;
case NOT_WORN -> akNotWorn.color;
default -> akActivity.color;
};
}
@@ -328,19 +328,21 @@ public abstract class AbstractActivityChartFragment<D extends ChartsData> extend
int currentType = getIndexOfActivity(samples.get(0).getKind());
long timestamp = samples.get(0).getTimestamp() * 1000L;
int duration = 0;
int color = getColorFor(samples.get(0).getKind());
for (ActivitySample sample : samples) {
int value = getIndexOfActivity(sample.getKind());
if (value != currentType) {
result.add(new SleepDetailsView.SleepDetail(currentType, duration, timestamp));
result.add(new SleepDetailsView.SleepDetail(currentType, duration, timestamp, color));
currentType = value;
timestamp = sample.getTimestamp() * 1000L;
duration = 0;
color = getColorFor(sample.getKind());
}
duration++;
}
result.add(new SleepDetailsView.SleepDetail(currentType, duration, timestamp));
result.add(new SleepDetailsView.SleepDetail(currentType, duration, timestamp, color));
return result;
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/SleepDailyFragment.java
+5 -5
View File
@@ -523,11 +523,11 @@ public class SleepDailyFragment extends SleepFragment<SleepDailyFragment.MyChart
binding.sleepchartInfo.setMaxLines(sleepLinesLimit);
SleepDetailsView.DataConfig[] config = new SleepDetailsView.DataConfig[]{
new SleepDetailsView.DataConfig(getIndexOfActivity(ActivityKind.AWAKE_SLEEP), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_awake_sleep_light)),
new SleepDetailsView.DataConfig(getIndexOfActivity(ActivityKind.REM_SLEEP), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_rem_sleep_light)),
new SleepDetailsView.DataConfig(getIndexOfActivity(ActivityKind.LIGHT_SLEEP), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_light_sleep_light)),
new SleepDetailsView.DataConfig(getIndexOfActivity(ActivityKind.DEEP_SLEEP), ContextCompat.getColor(GBApplication.getContext(), R.color.chart_deep_sleep_light)),
int[] config = new int[]{
getIndexOfActivity(ActivityKind.AWAKE_SLEEP),
getIndexOfActivity(ActivityKind.REM_SLEEP),
getIndexOfActivity(ActivityKind.LIGHT_SLEEP),
getIndexOfActivity(ActivityKind.DEEP_SLEEP)
};
binding.sleepDetails.setConfig(config);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/sleep/SleepDetailsView.java
+10 -26
View File
@@ -30,6 +30,7 @@ import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import androidx.annotation.ColorInt;
import androidx.annotation.NonNull;
import java.text.SimpleDateFormat;
@@ -47,21 +48,12 @@ public class SleepDetailsView extends View {
public int type;
public int durationMinutes;
public long startTimestamp;
public int color;
public SleepDetail(int type, int durationMinutes, long startTimestamp) {
public SleepDetail(int type, int durationMinutes, long startTimestamp, @ColorInt int color) {
this.type = type;
this.durationMinutes = durationMinutes;
this.startTimestamp = startTimestamp;
}
}
public static class DataConfig {
public int type;
public int color;
public DataConfig(int type, int color) {
this.type = type;
this.color = color;
}
}
@@ -74,7 +66,7 @@ public class SleepDetailsView extends View {
private long startTimestamp;
private long endTimestamp;
private DataConfig[] config;
private int[] config;
private float heightUnit;
@@ -173,7 +165,7 @@ public class SleepDetailsView extends View {
if (config == null)
return -1;
for (int i = 0; i < config.length; i++) {
if (config[i].type == type) {
if (config[i] == type) {
return i;
}
}
@@ -206,14 +198,6 @@ public class SleepDetailsView extends View {
return idx * 2;
}
private int getColorFromType(int type) {
int idx = getIndexByType(type);
if (idx == -1) {
return Color.GRAY;
}
return config[idx].color;
}
private void drawConnections(Canvas canvas, List<SleepDetail> details, int currentIndex, float left) {
if (currentIndex <= 0 || currentIndex >= details.size()) {
return;
@@ -234,8 +218,8 @@ public class SleepDetailsView extends View {
float topY = Math.min(prevY, curY) + barHeight;
float bottomY = Math.max(prevY, curY);
int startColor = (curIdx < prevIdx) ? getColorFromType(curType) : getColorFromType(prevType);
int endColor = (curIdx < prevIdx) ? getColorFromType(prevType) : getColorFromType(curType);
int startColor = (curIdx < prevIdx) ? details.get(currentIndex).color : details.get(currentIndex - 1).color;
int endColor = (curIdx < prevIdx) ? details.get(currentIndex - 1).color: details.get(currentIndex).color;
Shader shader = new LinearGradient(left, topY, left, bottomY, startColor, endColor, Shader.TileMode.MIRROR);
connectionPaint.setShader(shader);
@@ -337,7 +321,7 @@ public class SleepDetailsView extends View {
SleepDetail sd = sleepDetails.get(i);
float top = chartTopStart + getPositionFromType(sd.type) * barHeight;
fillPaint.setColor(getColorFromType(sd.type));
fillPaint.setColor(sd.color);
final float currentUnitWidth = sd.durationMinutes * unitWidth;
@@ -388,7 +372,7 @@ public class SleepDetailsView extends View {
infoTextPaint.getTextBounds(info, 0, info.length(), infoTextRect);
fillPaint.setColor(getColorFromType(curDetail.type));
fillPaint.setColor(curDetail.color);
final float iconSize = infoTextSize;
@@ -451,7 +435,7 @@ public class SleepDetailsView extends View {
}
}
public void setConfig(DataConfig[] config) {
public void setConfig(int[] config) {
this.config = config;
horizontalLineCount = config.length * 2;
heightUnit = (float) (1.0 / (config.length * 2));