diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
index 70ad8635..c5a85de2 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
@@ -23,6 +23,7 @@ import android.preference.MultiSelectListPreference;
import android.preference.Preference;
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
+import android.text.Html;
import com.health.openscale.R;
@@ -31,12 +32,21 @@ import java.util.List;
import java.util.Set;
public class BluetoothPreferences extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener {
+
+ String[] btDeviceSupportInit;
+ String[] btDeviceSupportDataTransfer;
+ String[] btDeviceSupportDataHistory;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.bluetooth_preferences);
+ btDeviceSupportInit = getResources().getStringArray(R.array.bt_device_support_initializing);
+ btDeviceSupportDataTransfer = getResources().getStringArray(R.array.bt_device_support_data_transfer);
+ btDeviceSupportDataHistory = getResources().getStringArray(R.array.bt_device_support_data_history);
+
initSummary(getPreferenceScreen());
}
@@ -72,7 +82,15 @@ public class BluetoothPreferences extends PreferenceFragment implements SharedPr
private void updatePrefSummary(Preference p) {
if (p instanceof ListPreference) {
ListPreference listPref = (ListPreference) p;
- p.setSummary(listPref.getEntry());
+
+ int i = Integer.parseInt(listPref.getValue());
+
+ p.setSummary(Html.fromHtml(listPref.getEntry() + "
" +
+ getResources().getString(R.string.label_bt_device_support) + ":" + "
" +
+ getResources().getString(R.string.label_bt_device_initialization) + ": " + btDeviceSupportInit[i] + "
" +
+ getResources().getString(R.string.label_bt_device_data_transfer) + ": " + btDeviceSupportDataTransfer[i] + "
" +
+ getResources().getString(R.string.label_bt_device_data_history) + ": " + btDeviceSupportDataHistory[i]
+ ));
}
if (p instanceof EditTextPreference) {
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index c0a991bc..86baa691 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -117,4 +117,8 @@
Wert ist erforderlich
Statistiken
Abbrechen
+ Bt Waage Datenhistorie
+ Bt Waage Datentransfer
+ Bt Waage Initialisierung
+ Folgendes wird unterstützt
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 980308fa..ce09d020 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -136,4 +136,8 @@
Friday
Saturday
Sunday
+ Bt scale initialization
+ Bt scale data transfer
+ Bt scale data history
+ Following will supported
diff --git a/android_app/app/src/main/res/values/type_btdevices.xml b/android_app/app/src/main/res/values/type_btdevices.xml
index d602a9a7..ff1afb0d 100644
--- a/android_app/app/src/main/res/values/type_btdevices.xml
+++ b/android_app/app/src/main/res/values/type_btdevices.xml
@@ -11,4 +11,23 @@
- 1
- 2
+
+
+ - @string/label_yes
+ - @string/label_yes
+ - @string/label_no
+
+
+
+ - @string/label_yes
+ - @string/label_yes
+ - @string/label_yes
+
+
+
+ - @string/label_yes
+ - @string/label_yes
+ - @string/label_no
+
+
\ No newline at end of file