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

Design: update values text color across fragments it improve visibility

Browse Source
This commit is contained in:
a0z
2025-08-17 10:24:29 +02:00
parent 67f016d902
commit b0721f1de8
36 changed files with 159 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/BodyEnergyFragment.java
+3 -1
View File
@@ -59,6 +59,7 @@ public class BodyEnergyFragment extends AbstractChartFragment<BodyEnergyFragment
protected int CHART_TEXT_COLOR;
protected int LEGEND_TEXT_COLOR;
protected int TEXT_COLOR;
protected int SUBTEXT_COLOR;
protected int AVERAGE_LINE_COLOR;
// Number of days to include in the average calculation
@@ -96,6 +97,7 @@ public class BodyEnergyFragment extends AbstractChartFragment<BodyEnergyFragment
@Override
protected void init() {
TEXT_COLOR = GBApplication.getTextColor(requireContext());
SUBTEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
LEGEND_TEXT_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
AVERAGE_LINE_COLOR = Color.GRAY;
@@ -366,7 +368,7 @@ public class BodyEnergyFragment extends AbstractChartFragment<BodyEnergyFragment
int yPos = (int) ((float) height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2)) ;
canvas.drawText(String.valueOf(value), width / 2f, yPos, textPaint);
Paint textLowerPaint = new Paint();
textLowerPaint.setColor(TEXT_COLOR);
textLowerPaint.setColor(SUBTEXT_COLOR);
textLowerPaint.setTextAlign(Paint.Align.CENTER);
float textLowerPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, width * 0.025f, requireContext().getResources().getDisplayMetrics());
textLowerPaint.setTextSize(textLowerPixels);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/CaloriesPeriodFragment.java
+2 -3
View File
@@ -143,10 +143,9 @@ public class CaloriesPeriodFragment extends CaloriesFragment<CaloriesPeriodFragm
@Override
protected void init() {
TEXT_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
BACKGROUND_COLOR = GBApplication.getBackgroundColor(getContext());
DESCRIPTION_COLOR = GBApplication.getTextColor(getContext());
DESCRIPTION_COLOR = TEXT_COLOR = GBApplication.getTextColor(getContext());
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(getContext());
}
@@ -177,7 +176,7 @@ public class CaloriesPeriodFragment extends CaloriesFragment<CaloriesPeriodFragm
caloriesChart.getAxisLeft().setAxisMaximum((float) Math.max(set.getYMax() * 1.1, CALORIES_GOAL));
BarData barData = new BarData(set);
barData.setValueTextColor(Color.GRAY); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
barData.setValueTextColor(TEXT_COLOR); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
barData.setValueTextSize(10f);
if (TOTAL_DAYS > 7) {
caloriesChart.setRenderer(new AngledLabelsChartRenderer(caloriesChart, caloriesChart.getAnimator(), caloriesChart.getViewPortHandler()));
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/HRVStatusFragment.java
+4 -4
View File
@@ -143,12 +143,12 @@ public class HRVStatusFragment extends AbstractChartFragment<HRVStatusFragment.H
lineDataSet.setFillAlpha(255);
lineDataSet.setCircleRadius(5f);
lineDataSet.setDrawCircles(true);
lineDataSet.setDrawCircleHole(true);
lineDataSet.setDrawCircleHole(false);
lineDataSet.setCircleColor(getResources().getColor(R.color.hrv_status_char_line_color));
lineDataSet.setAxisDependency(YAxis.AxisDependency.LEFT);
lineDataSet.setDrawValues(true);
lineDataSet.setValueTextSize(10f);
lineDataSet.setValueTextColor(CHART_TEXT_COLOR);
lineDataSet.setValueTextColor(TEXT_COLOR);
lineDataSet.setValueFormatter(new ValueFormatter() {
@Override
public String getFormattedValue(float value) {
@@ -325,8 +325,8 @@ public class HRVStatusFragment extends AbstractChartFragment<HRVStatusFragment.H
xAxisBottom.setDrawGridLines(false);
xAxisBottom.setEnabled(true);
xAxisBottom.setDrawLimitLinesBehindData(true);
xAxisBottom.setAxisMaximum(6 + 0.5f);
xAxisBottom.setAxisMinimum(0 - 0.5f);
xAxisBottom.setAxisMaximum(6);
xAxisBottom.setAxisMinimum(0);
xAxisBottom.setTextColor(CHART_TEXT_COLOR);
final YAxis yAxisLeft = mWeeklyHRVStatusChart.getAxisLeft();
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/HeartRatePeriodFragment.java
+4 -2
View File
@@ -61,6 +61,7 @@ public class HeartRatePeriodFragment extends AbstractChartFragment<HeartRatePeri
protected int BACKGROUND_COLOR;
protected int DESCRIPTION_COLOR;
protected int LEGEND_TEXT_COLOR;
protected int TEXT_COLOR;
private TextView mDateView;
private TextView hrResting;
@@ -137,7 +138,7 @@ public class HeartRatePeriodFragment extends AbstractChartFragment<HeartRatePeri
protected void init() {
Prefs prefs = GBApplication.getPrefs();
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(getContext());
DESCRIPTION_COLOR = LEGEND_TEXT_COLOR = GBApplication.getTextColor(getContext());
DESCRIPTION_COLOR = LEGEND_TEXT_COLOR = TEXT_COLOR = GBApplication.getTextColor(getContext());
if (prefs.getBoolean("chart_heartrate_color", false)) {
HEARTRATE_COLOR = ContextCompat.getColor(getContext(), R.color.chart_heartrate_alternative);
}else{
@@ -277,7 +278,8 @@ public class HeartRatePeriodFragment extends AbstractChartFragment<HeartRatePeri
dataSet.setDrawValues(true);
dataSet.setAxisDependency(YAxis.AxisDependency.RIGHT);
dataSet.setColor(color);
dataSet.setValueTextColor(CHART_TEXT_COLOR);
dataSet.setValueTextColor(TEXT_COLOR);
dataSet.setValueTextSize(10f);
return dataSet;
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/LoadFragment.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class LoadFragment extends AbstractChartFragment<LoadFragment.LoadsData>
dailyLoadChart.getAxisLeft().setAxisMaximum(Math.max(set.getYMax(), 200) + 100);
dailyLoadChart.setRenderer(new AngledLabelsChartRenderer(dailyLoadChart, dailyLoadChart.getAnimator(), dailyLoadChart.getViewPortHandler()));
BarData barData = new BarData(set);
barData.setValueTextColor(Color.GRAY);
barData.setValueTextColor(TEXT_COLOR);
barData.setValueTextSize(10f);
dailyLoadChart.setData(barData);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/PaiChartFragment.java
+3 -2
View File
@@ -87,6 +87,7 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
protected int DESCRIPTION_COLOR;
protected int CHART_TEXT_COLOR;
protected int LEGEND_TEXT_COLOR;
protected int TEXT_COLOR;
protected int PAI_TOTAL_COLOR;
protected int PAI_DAY_COLOR;
@@ -94,7 +95,7 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
@Override
protected void init() {
BACKGROUND_COLOR = GBApplication.getBackgroundColor(requireContext());
LEGEND_TEXT_COLOR = DESCRIPTION_COLOR = GBApplication.getTextColor(requireContext());
LEGEND_TEXT_COLOR = DESCRIPTION_COLOR = TEXT_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = ContextCompat.getColor(requireContext(), R.color.secondarytext);
PAI_TOTAL_COLOR = ContextCompat.getColor(requireContext(), R.color.chart_pai_weekly);
@@ -315,7 +316,7 @@ public class PaiChartFragment extends AbstractChartFragment<PaiChartFragment.Pai
set.setValueFormatter(getRoundFormatter());
BarData barData = new BarData(set);
barData.setValueTextColor(Color.GRAY); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
barData.setValueTextColor(TEXT_COLOR); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
barData.setValueTextSize(10f);
barChart.getAxisLeft().setAxisMaximum(Math.max(maxPai, getPaiTarget()));
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/RespiratoryRatePeriodFragment.java
+2 -1
View File
@@ -142,7 +142,8 @@ public class RespiratoryRatePeriodFragment extends RespiratoryRateFragment<Respi
lineDataSet.setFillAlpha(255);
lineDataSet.setCircleRadius(5f);
lineDataSet.setDrawCircles(true);
lineDataSet.setDrawCircleHole(true);
lineDataSet.setDrawCircleHole(false);
lineDataSet.setValueTextSize(TEXT_COLOR);
lineDataSet.setCircleColor(getResources().getColor(color));
lineDataSet.setAxisDependency(YAxis.AxisDependency.LEFT);
lineDataSet.setDrawValues(false);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/Spo2ChartFragment.java
+3 -2
View File
@@ -66,6 +66,7 @@ public class Spo2ChartFragment extends AbstractChartFragment<Spo2ChartFragment.S
private int BACKGROUND_COLOR;
private int CHART_TEXT_COLOR;
private int TEXT_COLOR;
private int LEGEND_TEXT_COLOR;
private TimestampTranslation tsTranslation;
@@ -73,7 +74,7 @@ public class Spo2ChartFragment extends AbstractChartFragment<Spo2ChartFragment.S
@Override
protected void init() {
BACKGROUND_COLOR = GBApplication.getBackgroundColor(requireContext());
LEGEND_TEXT_COLOR = GBApplication.getTextColor(requireContext());
LEGEND_TEXT_COLOR = TEXT_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
}
@@ -112,7 +113,7 @@ public class Spo2ChartFragment extends AbstractChartFragment<Spo2ChartFragment.S
lineDataSet.setDrawCircles(false);
lineDataSet.setLineWidth(2.2f);
lineDataSet.setFillAlpha(255);
lineDataSet.setValueTextColor(CHART_TEXT_COLOR);
lineDataSet.setValueTextColor(TEXT_COLOR);
lineDataSet.setAxisDependency(YAxis.AxisDependency.LEFT);
if (manualPoints) {
lineDataSet.setDrawCircles(true);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsDailyFragment.java
-5
View File
@@ -1,9 +1,5 @@
package nodomain.freeyourgadget.gadgetbridge.activities.charts;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.graphics.Paint;
import android.os.Build;
import android.os.Bundle;
import android.util.TypedValue;
@@ -13,7 +9,6 @@ import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.ColorInt;
import androidx.fragment.app.FragmentManager;
import com.github.mikephil.charting.charts.Chart;
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StepsPeriodFragment.java
+1 -1
View File
@@ -186,7 +186,7 @@ public class StepsPeriodFragment extends StepsFragment<StepsPeriodFragment.Steps
stepsChart.getAxisLeft().setAxisMaximum(Math.max(set.getYMax(), STEPS_GOAL) + 2000);
BarData barData = new BarData(set);
barData.setValueTextColor(Color.GRAY); //prevent tearing other graph elements with the black text. Another approach would be to hide the values cmpletely with data.setDrawValues(false);
set.setValueTextColor(TEXT_COLOR);
barData.setValueTextSize(10f);
if (TOTAL_DAYS > 7) {
stepsChart.setRenderer(new AngledLabelsChartRenderer(stepsChart, stepsChart.getAnimator(), stepsChart.getViewPortHandler()));
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressDailyFragment.java
+5
View File
@@ -22,12 +22,15 @@ import android.os.Bundle;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
import android.text.style.RelativeSizeSpan;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.github.mikephil.charting.animation.Easing;
import com.github.mikephil.charting.charts.Chart;
import com.github.mikephil.charting.charts.LineChart;
@@ -157,11 +160,13 @@ public class StressDailyFragment extends StressFragment<StressDailyFragment.Stre
SpannableString pieChartCenterText = new SpannableString(stressData.getAverage() + "\n" + requireContext().getString(R.string.stress_average));
pieChartCenterText.setSpan(new RelativeSizeSpan(1.75f), 0, noc, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
pieChartCenterText.setSpan(new RelativeSizeSpan(0.72f), noc, pieChartCenterText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
pieChartCenterText.setSpan(new ForegroundColorSpan(SUB_TEXT_COLOR), noc, pieChartCenterText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
mStressLevelsPieChart.setCenterText(pieChartCenterText);
} else {
SpannableString pieChartCenterText = new SpannableString("-\n" + requireContext().getString(R.string.stress_average));
pieChartCenterText.setSpan(new RelativeSizeSpan(1.25f), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
pieChartCenterText.setSpan(new RelativeSizeSpan(0.72f), 2, pieChartCenterText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
pieChartCenterText.setSpan(new ForegroundColorSpan(SUB_TEXT_COLOR), 2, pieChartCenterText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
mStressLevelsPieChart.setCenterText(pieChartCenterText);
}
mStressLevelsPieChart.setData(pieData);
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/StressFragment.java
+4 -2
View File
@@ -25,6 +25,8 @@ abstract class StressFragment<D extends ChartsData> extends AbstractChartFragmen
protected int BACKGROUND_COLOR;
protected int DESCRIPTION_COLOR;
protected int CHART_TEXT_COLOR;
protected int TEXT_COLOR;
protected int SUB_TEXT_COLOR;
protected int LEGEND_TEXT_COLOR;
@Override
@@ -35,8 +37,8 @@ abstract class StressFragment<D extends ChartsData> extends AbstractChartFragmen
@Override
protected void init() {
BACKGROUND_COLOR = GBApplication.getBackgroundColor(requireContext());
LEGEND_TEXT_COLOR = DESCRIPTION_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
LEGEND_TEXT_COLOR = DESCRIPTION_COLOR = TEXT_COLOR = GBApplication.getTextColor(requireContext());
CHART_TEXT_COLOR = SUB_TEXT_COLOR = GBApplication.getSecondaryTextColor(requireContext());
}
protected List<? extends StressSample> getStressSamples(DBHandler db, GBDevice device, int tsStart, int tsEnd) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/charts/VO2MaxFragment.java
+2 -2
View File
@@ -232,12 +232,12 @@ public class VO2MaxFragment extends AbstractChartFragment<VO2MaxFragment.VO2MaxD
lineDataSet.setFillAlpha(255);
lineDataSet.setCircleRadius(5f);
lineDataSet.setDrawCircles(true);
lineDataSet.setDrawCircleHole(true);
lineDataSet.setDrawCircleHole(false);
lineDataSet.setCircleColor(color);
lineDataSet.setAxisDependency(YAxis.AxisDependency.LEFT);
lineDataSet.setDrawValues(true);
lineDataSet.setValueTextSize(10f);
lineDataSet.setValueTextColor(CHART_TEXT_COLOR);
lineDataSet.setValueTextColor(TEXT_COLOR);
lineDataSet.setValueFormatter(new ValueFormatter() {
@Override
public String getFormattedValue(float value) {
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/dashboard/GaugeDrawer.java
+4 -2
View File
@@ -205,6 +205,7 @@ public class GaugeDrawer {
String lowerText,
Context context) {
int TEXT_COLOR = GBApplication.getTextColor(context);
int SUBTEXT_COLOR = GBApplication.getSecondaryTextColor(context);
int height = width;
int barMargin = (int) Math.ceil(barWidth / 2f);
@@ -276,7 +277,7 @@ public class GaugeDrawer {
int yPos = (int) ((float) height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2)) ;
canvas.drawText(String.valueOf(text), width / 2f, yPos, textPaint);
Paint textLowerPaint = new Paint();
textLowerPaint.setColor(TEXT_COLOR);
textLowerPaint.setColor(SUBTEXT_COLOR);
textLowerPaint.setTextAlign(Paint.Align.CENTER);
float textLowerPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, width * 0.025f, context.getResources().getDisplayMetrics());
textLowerPaint.setTextSize(textLowerPixels);
@@ -293,6 +294,7 @@ public class GaugeDrawer {
int maxValue,
Context context) {
int TEXT_COLOR = GBApplication.getTextColor(context);
int SUB_TEXT_COLOR = GBApplication.getSecondaryTextColor(context);
int height = width;
int barMargin = (int) Math.ceil(barWidth / 2f);
float filledFactor = (float) value / maxValue;
@@ -335,7 +337,7 @@ public class GaugeDrawer {
int yPos = (int) ((float) height / 2 - ((textPaint.descent() + textPaint.ascent()) / 2)) ;
canvas.drawText(String.valueOf(value), width / 2f, yPos, textPaint);
Paint textLowerPaint = new Paint();
textLowerPaint.setColor(TEXT_COLOR);
textLowerPaint.setColor(SUB_TEXT_COLOR);
textLowerPaint.setTextAlign(Paint.Align.CENTER);
float textLowerPixels = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP, width * 0.025f, context.getResources().getDisplayMetrics());
textLowerPaint.setTextSize(textLowerPixels);
app/src/main/res/layout/fragment_body_energy.xml
+5 -1
View File
@@ -17,7 +17,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<ImageView
android:id="@+id/body_energy_gauge"
@@ -46,6 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="+ 0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -65,6 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="- 0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_calories.xml
+7 -1
View File
@@ -16,7 +16,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<ImageView
android:id="@+id/calories_gauge"
@@ -44,6 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -64,6 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -83,6 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -102,6 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_calories_period.xml
+5
View File
@@ -19,6 +19,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
/>
@@ -65,6 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -84,6 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -101,6 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -117,6 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
app/src/main/res/layout/fragment_heart_rate.xml
+7 -1
View File
@@ -16,7 +16,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -46,6 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -66,6 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -84,6 +88,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -108,6 +113,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_hrv_status.xml
+9
View File
@@ -15,6 +15,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
/>
@@ -40,6 +41,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="28dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="30sp" />
<TextView
@@ -69,6 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -87,6 +90,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -104,6 +108,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -123,6 +128,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -140,6 +146,8 @@
android:id="@+id/hrv_status_last_night"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -158,6 +166,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="-"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_load.xml
+6
View File
@@ -15,6 +15,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
/>
@@ -44,6 +45,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="28dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="30sp" />
<TextView
@@ -89,6 +91,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -107,6 +110,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -154,6 +158,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -172,6 +177,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
app/src/main/res/layout/fragment_pai_chart.xml
+8 -1
View File
@@ -17,7 +17,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<ImageView
android:layout_weight="2"
@@ -50,6 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -74,6 +77,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -111,6 +115,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-black"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -140,6 +145,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-black"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -169,6 +175,7 @@
android:layout_height="wrap_content"
android:fontFamily="sans-serif-black"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_respiratory_rate.xml
+7 -1
View File
@@ -16,7 +16,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -46,6 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -66,6 +69,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -83,6 +87,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -100,6 +105,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_respiratory_rate_period.xml
+5 -1
View File
@@ -16,7 +16,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -46,6 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -64,6 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_sleepchart.xml
+11 -1
View File
@@ -13,7 +13,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<TextView
android:id="@+id/sleepchart_info"
@@ -58,6 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -83,6 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -117,6 +121,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -152,6 +157,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -201,6 +207,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -219,6 +226,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -237,6 +245,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -257,6 +266,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_spo2.xml
+4
View File
@@ -15,6 +15,7 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<LinearLayout
@@ -45,6 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -65,6 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -83,6 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_steps.xml
+3
View File
@@ -19,6 +19,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
/>
@@ -60,6 +61,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -78,6 +80,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
app/src/main/res/layout/fragment_steps_period.xml
+5
View File
@@ -19,6 +19,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
/>
@@ -65,6 +66,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -84,6 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -101,6 +104,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -117,6 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
app/src/main/res/layout/fragment_stresschart.xml
+7 -1
View File
@@ -12,7 +12,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<com.github.mikephil.charting.charts.PieChart
android:id="@+id/stress_pie_chart"
@@ -45,6 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -72,6 +75,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -98,6 +102,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -126,6 +131,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_temperature.xml
+6 -1
View File
@@ -14,7 +14,9 @@
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
android:gravity="center"
android:textSize="20sp" />
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
/>
<LinearLayout
android:layout_width="match_parent"
@@ -44,6 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -64,6 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -82,6 +86,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_vo2max.xml
+3
View File
@@ -13,6 +13,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp"
/>
@@ -48,6 +49,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="28dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="30sp" />
<TextView
@@ -84,6 +86,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="28dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="30sp" />
<TextView
app/src/main/res/layout/fragment_weeksleep_chart.xml
+8
View File
@@ -15,6 +15,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp"
/>
@@ -49,6 +50,7 @@
<TextView
android:id="@+id/sleep_chart_legend_deep_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -74,6 +76,7 @@
<TextView
android:id="@+id/sleep_chart_legend_light_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -107,6 +110,7 @@
<TextView
android:id="@+id/sleep_chart_legend_rem_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -141,6 +145,7 @@
<TextView
android:id="@+id/sleep_chart_legend_awake_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -199,6 +204,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -219,6 +225,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
@@ -237,6 +244,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
app/src/main/res/layout/fragment_weekstress_chart.xml
+5
View File
@@ -16,6 +16,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="10dp" />
@@ -43,6 +44,7 @@
<TextView
android:id="@+id/stress_chart_relaxed_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -64,6 +66,7 @@
<TextView
android:id="@+id/stress_chart_mild_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -85,6 +88,7 @@
<TextView
android:id="@+id/stress_chart_moderate_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
@@ -106,6 +110,7 @@
<TextView
android:id="@+id/stress_chart_high_time"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
app/src/main/res/layout/fragment_weightchart.xml
+3
View File
@@ -8,6 +8,7 @@
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="20sp"
android:textColor="?attr/textColorPrimary"
android:layout_marginTop="15dp"
android:layout_marginBottom="20dp" />
<com.github.mikephil.charting.charts.LineChart
@@ -39,6 +40,7 @@
android:layout_gravity="left"
android:layout_marginTop="20dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
@@ -66,6 +68,7 @@
android:layout_gravity="left"
android:layout_marginTop="20dp"
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="20sp" />
<TextView
android:layout_width="wrap_content"
app/src/main/res/layout/item_spo2_manual_measurment.xml
+4 -3
View File
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="25dp"
android:layout_weight="1"
android:text="08:00"
android:text="@string/stats_empty_value"
android:textSize="14sp" />
<TextView
@@ -24,8 +24,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="25dp"
android:text="120"
android:textSize="14sp" />
android:text="@string/stats_empty_value"
android:textColor="?attr/textColorPrimary"
android:textSize="16sp" />
</LinearLayout>
<View
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -1106,7 +1106,7 @@
<string name="sleep_avg">Sleep AVG</string>
<string name="lowest">Lowest</string>
<string name="highest">Highest</string>
<string name="sleep_score">Sleep score</string>
<string name="sleep_score">Sleep Score</string>
<string name="sleep_score_value">Score: %1d</string>
<string name="stats_empty_value">-</string>
<string name="time_empty_value" translatable="false">--:--</string>
app/src/main/res/values/styles.xml
+2
View File
@@ -97,6 +97,7 @@
<!-- Material 3 dynamic color (Material You) themes -->
<style name="GadgetbridgeThemeDynamicLight" parent="Theme.Material3.DynamicColors.Light">
<item name="textColorPrimary">@color/primarytext_light</item>
<item name="actionBarStyle">@style/GadgetbridgeThemeDynamic.ActionBar</item>
<item name="actionOverflowMenuStyle">@style/GadgetbridgeTheme.OverflowMenuStyle</item>
<item name="android:statusBarColor">?attr/colorSurface</item>
@@ -118,6 +119,7 @@
<item name="deviceIconDark">?attr/colorPrimaryDark</item>
</style>
<style name="GadgetbridgeThemeDynamicDark" parent="Theme.Material3.DynamicColors.Dark">
<item name="textColorPrimary">@color/primarytext_dark</item>
<item name="actionBarStyle">@style/GadgetbridgeThemeDynamic.ActionBar</item>
<item name="actionOverflowMenuStyle">@style/GadgetbridgeTheme.OverflowMenuStyle</item>
<item name="android:statusBarColor">?attr/colorSurface</item>