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

Only show BMI on stats page if BMI is enabled

Browse Source
This commit is contained in:
Erik Johansson
2018-05-04 00:02:31 +02:00
parent ddb0af7fd9
commit a3f64be629
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
android_app/app/src/main/java/com/health/openscale/gui/fragments/StatisticsFragment.java
View File

@@ -17,6 +17,7 @@
package com.health.openscale.gui.fragments; package com.health.openscale.gui.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.text.Html; import android.text.Html;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@@ -33,11 +34,13 @@ 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.BMIMeasurementView;
import com.health.openscale.gui.views.BoneMeasurementView; import com.health.openscale.gui.views.BoneMeasurementView;
import com.health.openscale.gui.views.FatMeasurementView; import com.health.openscale.gui.views.FatMeasurementView;
import com.health.openscale.gui.views.HipMeasurementView; import com.health.openscale.gui.views.HipMeasurementView;
import com.health.openscale.gui.views.LBMMeasurementView; import com.health.openscale.gui.views.LBMMeasurementView;
import com.health.openscale.gui.views.MeasurementView; import com.health.openscale.gui.views.MeasurementView;
import com.health.openscale.gui.views.MeasurementViewSettings;
import com.health.openscale.gui.views.MuscleMeasurementView; import com.health.openscale.gui.views.MuscleMeasurementView;
import com.health.openscale.gui.views.WaistMeasurementView; import com.health.openscale.gui.views.WaistMeasurementView;
import com.health.openscale.gui.views.WaterMeasurementView; import com.health.openscale.gui.views.WaterMeasurementView;
@@ -194,37 +197,35 @@ public class StatisticsFragment extends Fragment implements FragmentUpdateListen
int days = Math.max(0, DateTimeHelpers.daysBetween(Calendar.getInstance(), goalCalendar)); int days = Math.max(0, DateTimeHelpers.daysBetween(Calendar.getInstance(), goalCalendar));
txtGoalDayLeft.setText(getResources().getQuantityString(R.plurals.label_days, days, days)); txtGoalDayLeft.setText(getResources().getQuantityString(R.plurals.label_days, days, days));
boolean isBmiEnabled = new MeasurementViewSettings(
PreferenceManager.getDefaultSharedPreferences(getActivity()), BMIMeasurementView.KEY)
.isEnabled();
final float goalBmi = goalScaleMeasurement.getBMI(currentScaleUser.getBodyHeight()); final float goalBmi = goalScaleMeasurement.getBMI(currentScaleUser.getBodyHeight());
txtLabelGoalWeight.setText( txtLabelGoalWeight.setText(
Html.fromHtml( isBmiEnabled
getResources().getString(R.string.label_goal_weight) + ? Html.fromHtml(String.format(
" <br> <font color='grey'><small>" + "%s<br><font color='grey'><small>%s: %.1f</small></font>",
getResources().getString(R.string.label_bmi) + getResources().getString(R.string.label_goal_weight),
": " + getResources().getString(R.string.label_bmi),
String.format("%.1f", goalBmi) + goalBmi))
" </small></font>" : getResources().getString(R.string.label_goal_weight));
)
);
txtLabelGoalDiff.setText( txtLabelGoalDiff.setText(
Html.fromHtml( isBmiEnabled
getResources().getString(R.string.label_weight_difference) + ? Html.fromHtml(String.format(
" <br> <font color='grey'><small>" + "%s<br><font color='grey'><small>%s: %.1f</small></font>",
getResources().getString(R.string.label_bmi) + getResources().getString(R.string.label_weight_difference),
": " + getResources().getString(R.string.label_bmi),
String.format("%.1f", lastScaleMeasurement.getBMI(currentScaleUser.getBodyHeight()) - goalBmi) + lastScaleMeasurement.getBMI(currentScaleUser.getBodyHeight()) - goalBmi))
" </small></font>" : getResources().getString(R.string.label_weight_difference));
)
);
txtLabelDayLeft.setText( txtLabelDayLeft.setText(
Html.fromHtml( Html.fromHtml(String.format(
getResources().getString(R.string.label_days_left) + "%s<br><font color='grey'><small>%s %s</small></font>",
" <br> <font color='grey'><small>" + getResources().getString(R.string.label_days_left),
getResources().getString(R.string.label_goal_date_is) + getResources().getString(R.string.label_goal_date_is),
" " DateFormat.getDateInstance(DateFormat.LONG).format(currentScaleUser.getGoalDate()))));
+ DateFormat.getDateInstance(DateFormat.LONG).format(currentScaleUser.getGoalDate()) +
" </small></font>"
)
);
} }
private void updateStatistics(List<ScaleMeasurement> scaleMeasurementList) { private void updateStatistics(List<ScaleMeasurement> scaleMeasurementList) {