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

Use instanceof instead of comparing name string

Browse Source 
The resource id for the name string should not be known by users of MeasurementView.
This commit is contained in:
Erik Johansson
2018-03-23 23:18:29 +01:00
parent bebfe2c1a5
commit 284c09bf2e
2 changed files with 4 additions and 2 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/GraphFragment.java
View File

@@ -43,6 +43,7 @@ import com.health.openscale.core.OpenScale;
import com.health.openscale.core.datatypes.ScaleMeasurement; import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.utils.PolynomialFitter; import com.health.openscale.core.utils.PolynomialFitter;
import com.health.openscale.gui.activities.DataEntryActivity; import com.health.openscale.gui.activities.DataEntryActivity;
import com.health.openscale.gui.views.BMRMeasurementView;
import com.health.openscale.gui.views.FloatMeasurementView; import com.health.openscale.gui.views.FloatMeasurementView;
import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementView;
import com.health.openscale.gui.views.WeightMeasurementView; import com.health.openscale.gui.views.WeightMeasurementView;
@@ -326,7 +327,7 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener {
if (view instanceof FloatMeasurementView) { if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view; FloatMeasurementView measurementView = (FloatMeasurementView) view;
if (measurementView.getName().equals(getString(R.string.label_bmr))) { if (measurementView instanceof BMRMeasurementView) {
continue; continue;
} }

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

@@ -38,6 +38,7 @@ import com.health.openscale.core.datatypes.ScaleMeasurement;
import com.health.openscale.core.datatypes.ScaleUser; import com.health.openscale.core.datatypes.ScaleUser;
import com.health.openscale.core.utils.Converters; import com.health.openscale.core.utils.Converters;
import com.health.openscale.core.utils.DateTimeHelpers; import com.health.openscale.core.utils.DateTimeHelpers;
import com.health.openscale.gui.views.BMRMeasurementView;
import com.health.openscale.gui.views.FloatMeasurementView; import com.health.openscale.gui.views.FloatMeasurementView;
import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementView;
@@ -276,7 +277,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
if (view instanceof FloatMeasurementView) { if (view instanceof FloatMeasurementView) {
FloatMeasurementView measurementView = (FloatMeasurementView) view; FloatMeasurementView measurementView = (FloatMeasurementView) view;
if (measurementView.getName().equals(getString(R.string.label_bmr))) { if (measurementView instanceof BMRMeasurementView) {
continue; continue;
} }