mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-06 08:47:56 +02:00
Code Issues Releases Wiki Activity

show Bluetooth information what is supported and what is not

Browse Source
This commit is contained in:
OliE
2017-05-07 09:52:45 +02:00
parent 8274cdc25c
commit 53492b2bc4
4 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
android_app/app/src/main/java/com/health/openscale/gui/preferences/BluetoothPreferences.java
View File

@@ -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() + "<br>" +
getResources().getString(R.string.label_bt_device_support) + ":" + "<br>" +
getResources().getString(R.string.label_bt_device_initialization) + ": " + btDeviceSupportInit[i] + "<br>" +
getResources().getString(R.string.label_bt_device_data_transfer) + ": " + btDeviceSupportDataTransfer[i] + "<br>" +
getResources().getString(R.string.label_bt_device_data_history) + ": " + btDeviceSupportDataHistory[i]
));
}
if (p instanceof EditTextPreference) {

4
android_app/app/src/main/res/values-de/strings.xml
View File

@@ -117,4 +117,8 @@
<string name="error_value_required">Wert ist erforderlich</string>
<string name="title_statistics">Statistiken</string>
<string name="label_cancel">Abbrechen</string>
<string name="label_bt_device_data_history">Bt Waage Datenhistorie</string>
<string name="label_bt_device_data_transfer">Bt Waage Datentransfer</string>
<string name="label_bt_device_initialization">Bt Waage Initialisierung</string>
<string name="label_bt_device_support">Folgendes wird unterstützt</string>
</resources>

4
android_app/app/src/main/res/values/strings.xml
View File

@@ -136,4 +136,8 @@
<string name="Friday">Friday</string>
<string name="Saturday">Saturday</string>
<string name="Sunday">Sunday</string>
<string name="label_bt_device_initialization">Bt scale initialization</string>
<string name="label_bt_device_data_transfer">Bt scale data transfer</string>
<string name="label_bt_device_data_history">Bt scale data history</string>
<string name="label_bt_device_support">Following will supported</string>
</resources>

19
android_app/app/src/main/res/values/type_btdevices.xml
View File

@@ -11,4 +11,23 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="bt_device_support_initializing">
<item>@string/label_yes</item>
<item>@string/label_yes</item>
<item>@string/label_no</item>
</string-array>
<string-array name="bt_device_support_data_transfer">
<item>@string/label_yes</item>
<item>@string/label_yes</item>
<item>@string/label_yes</item>
</string-array>
<string-array name="bt_device_support_data_history">
<item>@string/label_yes</item>
<item>@string/label_yes</item>
<item>@string/label_no</item>
</string-array>
</resources>