From f489f23237ceedc1551e327dcf15eeec9d1cb0d1 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Sun, 24 Feb 2019 18:19:18 +0100 Subject: [PATCH] color y-axis and table header icons correctly in dark theme mode --- .../java/com/health/openscale/gui/fragments/TableFragment.java | 3 +++ .../com/health/openscale/gui/views/ChartMeasurementView.java | 2 ++ .../java/com/health/openscale/gui/views/MeasurementView.java | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java index adc40620..1a94b9e6 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java @@ -32,6 +32,7 @@ import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.gui.activities.DataEntryActivity; +import com.health.openscale.gui.utils.ColorUtil; import com.health.openscale.gui.views.MeasurementView; import java.util.ArrayList; @@ -108,8 +109,10 @@ public class TableFragment extends Fragment implements FragmentUpdateListener { if (!measurement.isVisible()) { continue; } + ImageView headerIcon = new ImageView(tableView.getContext()); headerIcon.setImageDrawable(measurement.getIcon()); + headerIcon.setColorFilter(ColorUtil.getTextColor(tableView.getContext())); headerIcon.setLayoutParams(new TableRow.LayoutParams(0, iconHeight, 1)); headerIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE); diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java index f1c9cccf..35aaa9f1 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java @@ -149,6 +149,8 @@ public class ChartMeasurementView extends LineChart { getDescription().setEnabled(false); getAxisLeft().setEnabled(prefs.getBoolean("yaxisEnable", false)); getAxisRight().setEnabled(prefs.getBoolean("yaxisEnable", false)); + getAxisLeft().setTextColor(ColorUtil.getTextColor(getContext())); + getAxisRight().setTextColor(ColorUtil.getTextColor(getContext())); getXAxis().setPosition(XAxis.XAxisPosition.BOTTOM); getXAxis().setTextColor(ColorUtil.getTextColor(getContext())); } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java index 1d0d51bf..57537351 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java @@ -208,7 +208,7 @@ public abstract class MeasurementView extends TableLayout { iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); iconView.setPadding(25,25,25,25); - iconView.setColorFilter(getForegroundColor()); + iconView.setColorFilter(ColorUtil.COLOR_BLACK); iconView.setBackground(iconViewBackground); nameView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);