diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java index 1babdc1f..1aa36cc5 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/GraphFragment.java @@ -23,8 +23,6 @@ import android.graphics.Color; import android.graphics.DashPathEffect; import android.os.Bundle; import android.preference.PreferenceManager; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import androidx.fragment.app.Fragment; import android.view.GestureDetector; import android.view.LayoutInflater; import android.view.MenuItem; @@ -39,6 +37,7 @@ import android.widget.RelativeLayout; import android.widget.TextView; import android.widget.Toast; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.health.openscale.R; import com.health.openscale.core.OpenScale; import com.health.openscale.core.datatypes.ScaleMeasurement; @@ -50,6 +49,7 @@ import com.health.openscale.gui.views.BMRMeasurementView; import com.health.openscale.gui.views.FloatMeasurementView; import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementViewSettings; +import com.health.openscale.gui.views.TDEEMeasurementView; import com.health.openscale.gui.views.WeightMeasurementView; import java.text.SimpleDateFormat; @@ -59,6 +59,7 @@ import java.util.List; import java.util.Locale; import java.util.Stack; +import androidx.fragment.app.Fragment; import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter; import lecho.lib.hellocharts.listener.ColumnChartOnValueSelectListener; import lecho.lib.hellocharts.listener.LineChartOnValueSelectListener; @@ -339,7 +340,8 @@ public class GraphFragment extends Fragment implements FragmentUpdateListener { if (view instanceof FloatMeasurementView) { FloatMeasurementView measurementView = (FloatMeasurementView) view; - if (measurementView instanceof BMRMeasurementView) { + if (measurementView instanceof BMRMeasurementView + || measurementView instanceof TDEEMeasurementView) { continue; } diff --git a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java index 10b84b9c..69496430 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/fragments/OverviewFragment.java @@ -21,7 +21,6 @@ import android.content.res.Configuration; import android.graphics.Color; import android.os.Bundle; import android.preference.PreferenceManager; -import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -41,6 +40,7 @@ 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.MeasurementView; +import com.health.openscale.gui.views.TDEEMeasurementView; import java.text.DateFormat; import java.util.ArrayList; @@ -48,6 +48,7 @@ import java.util.Calendar; import java.util.List; import java.util.Stack; +import androidx.fragment.app.Fragment; import lecho.lib.hellocharts.formatter.SimpleLineChartValueFormatter; import lecho.lib.hellocharts.listener.LineChartOnValueSelectListener; import lecho.lib.hellocharts.listener.PieChartOnValueSelectListener; @@ -274,7 +275,8 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener for (MeasurementView view : measurementViews) { if (!view.isVisible() || !(view instanceof FloatMeasurementView) - || view instanceof BMRMeasurementView) { + || view instanceof BMRMeasurementView + || view instanceof TDEEMeasurementView) { continue; }