mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-13 20:24:14 +02:00
Code Issues Releases Wiki Activity

color y-axis and table header icons correctly in dark theme mode

Browse Source
This commit is contained in:
oliexdev
2019-02-24 18:19:18 +01:00
parent e7e8dff7e3
commit f489f23237
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android_app/app/src/main/java/com/health/openscale/gui/fragments/TableFragment.java
View File

@@ -32,6 +32,7 @@ import com.health.openscale.R;
import com.health.openscale.core.OpenScale; import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.gui.activities.DataEntryActivity; import com.health.openscale.gui.activities.DataEntryActivity;
import com.health.openscale.gui.utils.ColorUtil;
import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementView;
import java.util.ArrayList; import java.util.ArrayList;
@@ -108,8 +109,10 @@ public class TableFragment extends Fragment implements FragmentUpdateListener {
if (!measurement.isVisible()) { if (!measurement.isVisible()) {
continue; continue;
} }
ImageView headerIcon = new ImageView(tableView.getContext()); ImageView headerIcon = new ImageView(tableView.getContext());
headerIcon.setImageDrawable(measurement.getIcon()); headerIcon.setImageDrawable(measurement.getIcon());
headerIcon.setColorFilter(ColorUtil.getTextColor(tableView.getContext()));
headerIcon.setLayoutParams(new TableRow.LayoutParams(0, iconHeight, 1)); headerIcon.setLayoutParams(new TableRow.LayoutParams(0, iconHeight, 1));
headerIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE); headerIcon.setScaleType(ImageView.ScaleType.CENTER_INSIDE);

2
android_app/app/src/main/java/com/health/openscale/gui/views/ChartMeasurementView.java
View File

@@ -149,6 +149,8 @@ public class ChartMeasurementView extends LineChart {
getDescription().setEnabled(false); getDescription().setEnabled(false);
getAxisLeft().setEnabled(prefs.getBoolean("yaxisEnable", false)); getAxisLeft().setEnabled(prefs.getBoolean("yaxisEnable", false));
getAxisRight().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().setPosition(XAxis.XAxisPosition.BOTTOM);
getXAxis().setTextColor(ColorUtil.getTextColor(getContext())); getXAxis().setTextColor(ColorUtil.getTextColor(getContext()));
} }

2
android_app/app/src/main/java/com/health/openscale/gui/views/MeasurementView.java
View File

@@ -208,7 +208,7 @@ public abstract class MeasurementView extends TableLayout {
iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE); iconView.setScaleType(ImageView.ScaleType.CENTER_INSIDE);
iconView.setPadding(25,25,25,25); iconView.setPadding(25,25,25,25);
iconView.setColorFilter(getForegroundColor()); iconView.setColorFilter(ColorUtil.COLOR_BLACK);
iconView.setBackground(iconViewBackground); iconView.setBackground(iconViewBackground);
nameView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15); nameView.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15);