diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
index 14523b72..035a3711 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/MeasurementPreferences.java
@@ -102,6 +102,7 @@ public class MeasurementPreferences extends PreferenceFragment {
preference.setIcon(icon);
preference.setTitle(measurement.getName());
+ preference.setSummary(measurement.getPreferenceSummary());
measurementCategory.addPreference(preference);
}
@@ -256,6 +257,7 @@ public class MeasurementPreferences extends PreferenceFragment {
public void onDismiss(DialogInterface dialog) {
screen.onDismiss(dialog);
getPreferenceScreen().removePreference(screen);
+ setSummary(measurement.getPreferenceSummary());
}
});
}
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
index 2a7b8a32..fb221fdf 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/views/FloatMeasurementView.java
@@ -17,6 +17,7 @@
package com.health.openscale.gui.views;
import android.content.Context;
+import android.content.res.Resources;
import android.database.DataSetObserver;
import android.graphics.Color;
import android.graphics.drawable.Drawable;
@@ -419,6 +420,30 @@ public abstract class FloatMeasurementView extends MeasurementView {
showEvaluatorRow(show);
}
+ @Override
+ public String getPreferenceSummary() {
+ MeasurementViewSettings settings = getSettings();
+ Resources res = getResources();
+
+ final String separator = ", ";
+ String summary = "";
+ if (settings.isInOverviewGraph()) {
+ summary += res.getString(R.string.label_overview_graph) + separator;
+ }
+ if (canConvertPercentageToAbsoluteWeight() && settings.isPercentageEnabled()) {
+ summary += res.getString(R.string.label_percent) + separator;
+ }
+ if (isEstimationSupported() && settings.isEstimationEnabled()) {
+ summary += res.getString(R.string.label_estimated) + separator;
+ }
+
+ if (!summary.isEmpty()) {
+ return summary.substring(0, summary.length() - separator.length());
+ }
+
+ return "";
+ }
+
@Override
public boolean hasExtraPreferences() { return true; }
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 c1a759d8..b7414074 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
@@ -384,6 +384,7 @@ public abstract class MeasurementView extends TableLayout {
return openScale.getSelectedScaleUser();
}
+ public String getPreferenceSummary() { return ""; }
public boolean hasExtraPreferences() { return false; }
public void prepareExtraPreferencesScreen(PreferenceScreen screen) { };
diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml
index c26347d6..d010167a 100644
--- a/android_app/app/src/main/res/values-sv/strings.xml
+++ b/android_app/app/src/main/res/values-sv/strings.xml
@@ -186,4 +186,7 @@
Mörkt
Bidra översättning
Lägg till ny eller fixa befintlig
+ Översiktsgraf
+ Procent
+ Estimerat
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 8960d12d..2e8e1601 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -219,4 +219,7 @@
Dark
Contribute translation
Add new or fix existing
+ Overview graph
+ Percent
+ Estimated