MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-25 19:36:50 +01:00
Code Releases Wiki Activity

Upgrade Mi Band preferences to androidx

Browse Source
This commit is contained in:
José Rebelo 2023-07-28 18:37:58 +01:00
parent 61a78c0ad8
commit f0067ebeae
6 changed files with 170 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -126,7 +126,7 @@
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".devices.miband.MiBandPreferencesActivity" android:name=".devices.miband.MiBandPreferencesActivity"
android:label="@string/preferences_miband_settings" android:label="@string/preferences_miband_1_2_settings"
android:parentActivityName=".activities.SettingsActivity" /> android:parentActivityName=".activities.SettingsActivity" />
<activity <activity
android:name=".activities.loyaltycards.LoyaltyCardsSettingsActivity" android:name=".activities.loyaltycards.LoyaltyCardsSettingsActivity"

121
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/miband/MiBandPreferencesActivity.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2015-2021 Andreas Shimokawa, Carsten Pfeiffer, Christian /* Copyright (C) 2015-2023 Andreas Shimokawa, Carsten Pfeiffer, Christian
Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek Fischer, Daniele Gobbetti, José Rebelo, Szymon Tomasz Stefanek
This file is part of Gadgetbridge. This file is part of Gadgetbridge.
@ -17,103 +17,76 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
package nodomain.freeyourgadget.gadgetbridge.devices.miband; package nodomain.freeyourgadget.gadgetbridge.devices.miband;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.preference.Preference; import android.text.InputType;
import android.widget.Toast;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.Preference;
import java.util.HashSet; import androidx.preference.PreferenceFragmentCompat;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.GBApplication; import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.R; import nodomain.freeyourgadget.gadgetbridge.R;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivity; import nodomain.freeyourgadget.gadgetbridge.activities.AbstractPreferenceFragment;
import nodomain.freeyourgadget.gadgetbridge.activities.AbstractSettingsActivityV2;
import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceManager;
import nodomain.freeyourgadget.gadgetbridge.model.ActivityUser;
import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec;
import nodomain.freeyourgadget.gadgetbridge.model.NotificationType; import nodomain.freeyourgadget.gadgetbridge.model.NotificationType;
import nodomain.freeyourgadget.gadgetbridge.util.GB;
import nodomain.freeyourgadget.gadgetbridge.util.Prefs;
import static nodomain.freeyourgadget.gadgetbridge.activities.devicesettings.DeviceSettingsPreferenceConst.PREF_INACTIVITY_THRESHOLD; public class MiBandPreferencesActivity extends AbstractSettingsActivityV2 {
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_ALARM_CLOCK;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.ORIGIN_INCOMING_CALL;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.PREF_MIBAND_ADDRESS;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.VIBRATION_COUNT;
import static nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst.getNotificationPrefKey;
import static nodomain.freeyourgadget.gadgetbridge.model.ActivityUser.PREF_USER_NAME;
public class MiBandPreferencesActivity extends AbstractSettingsActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected String fragmentTag() {
super.onCreate(savedInstanceState); return MiBandPreferencesFragment.FRAGMENT_TAG;
addPreferencesFromResource(R.xml.miband_preferences);
addTryListeners();
}
/**
* delayed execution so that the preferences are applied first
*/
private void invokeLater(Runnable runnable) {
getListView().post(runnable);
} }
@Override @Override
protected void onPostCreate(Bundle savedInstanceState) { protected PreferenceFragmentCompat newFragment() {
super.onPostCreate(savedInstanceState); return new MiBandPreferencesFragment();
final Preference developmentMiaddr = findPreference(PREF_MIBAND_ADDRESS);
developmentMiaddr.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newVal) {
Intent refreshIntent = new Intent(DeviceManager.ACTION_REFRESH_DEVICELIST);
LocalBroadcastManager.getInstance(getApplicationContext()).sendBroadcast(refreshIntent);
preference.setSummary(newVal.toString());
return true;
}
});
} }
private void addTryListeners() { public static class MiBandPreferencesFragment extends AbstractPreferenceFragment {
for (final NotificationType type : NotificationType.values()) { static final String FRAGMENT_TAG = "MIBAND_PREFERENCES_FRAGMENT";
String prefKey = "mi_try_" + type.getGenericType();
final Preference tryPref = findPreference(prefKey); @Override
if (tryPref != null) { public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
tryPref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { setPreferencesFromResource(R.xml.miband_preferences, rootKey);
@Override
public boolean onPreferenceClick(Preference preference) { for (final NotificationType type : NotificationType.values()) {
String countPrefKey = "mi_vibration_count_" + type.getGenericType();
setInputTypeFor(countPrefKey, InputType.TYPE_CLASS_NUMBER);
String tryPrefKey = "mi_try_" + type.getGenericType();
final Preference tryPref = findPreference(tryPrefKey);
if (tryPref != null) {
tryPref.setOnPreferenceClickListener(preference -> {
tryVibration(type); tryVibration(type);
return true; return true;
} });
}
}
final Preference developmentMiAddr = findPreference(PREF_MIBAND_ADDRESS);
if (developmentMiAddr != null) {
developmentMiAddr.setOnPreferenceChangeListener((preference, newVal) -> {
Intent refreshIntent = new Intent(DeviceManager.ACTION_REFRESH_DEVICELIST);
LocalBroadcastManager.getInstance(requireActivity().getBaseContext()).sendBroadcast(refreshIntent);
return true;
}); });
} else {
GB.toast(getBaseContext(), "Unable to find preference key: " + prefKey + ", trying the vibration won't work", Toast.LENGTH_LONG, GB.WARN);
} }
} }
}
private void tryVibration(NotificationType type) { /**
NotificationSpec spec = new NotificationSpec(); * delayed execution so that the preferences are applied first
spec.type = type; */
GBApplication.deviceService().onNotification(spec); private void invokeLater(Runnable runnable) {
} getListView().post(runnable);
@Override
protected String[] getPreferenceKeysWithSummary() {
Set<String> prefKeys = new HashSet<>();
prefKeys.add(PREF_MIBAND_ADDRESS);
prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_ALARM_CLOCK));
prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, ORIGIN_INCOMING_CALL));
for (NotificationType type : NotificationType.values()) {
String key = type.getGenericType();
prefKeys.add(getNotificationPrefKey(VIBRATION_COUNT, key));
} }
return prefKeys.toArray(new String[0]); private void tryVibration(NotificationType type) {
NotificationSpec spec = new NotificationSpec();
spec.type = type;
GBApplication.deviceService().onNotification(spec);
}
} }
} }

10
app/src/main/res/drawable/ic_email.xml Normal file
View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#7E7E7E"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM20,8l-8,5 -8,-5L4,6l8,5 8,-5v2z" />
</vector>

3
app/src/main/res/values/strings.xml
View File

@ -584,7 +584,8 @@
<string name="pairing_already_bonded">"Already bonded with %1$s (%2$s), connecting…"</string> <string name="pairing_already_bonded">"Already bonded with %1$s (%2$s), connecting…"</string>
<string name="message_cannot_pair_no_mac">No MAC address passed, cannot pair.</string> <string name="message_cannot_pair_no_mac">No MAC address passed, cannot pair.</string>
<string name="preferences_category_device_specific_settings">Device specific settings</string> <string name="preferences_category_device_specific_settings">Device specific settings</string>
<string name="preferences_miband_settings">Mi Band / Amazfit settings</string> <string name="preferences_miband_1_2_settings" tools:ignore="TypographyFractions">Mi Band 1/2 settings</string>
<string name="preferences_miband_1_2_warning">Warning: These preferences only apply to the Mi Bands 1 and 2.</string>
<string name="male">Male</string> <string name="male">Male</string>
<string name="female">Female</string> <string name="female">Female</string>
<string name="other">Other</string> <string name="other">Other</string>

167
app/src/main/res/xml/miband_preferences.xml
View File

@ -1,18 +1,26 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Preference
android:icon="@drawable/ic_warning"
android:key="preferences_miband_1_2_warning"
android:summary="@string/preferences_miband_1_2_warning" />
<PreferenceCategory <PreferenceCategory
android:key="pref_category_miband_notification" android:key="pref_category_miband_notification"
android:title="@string/pref_header_vibration_settings"> android:title="@string/pref_header_vibration_settings"
app:iconSpaceReserved="false">
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_message_outline"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_sms" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_sms">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_sms" android:title="@string/pref_screen_notification_profile_sms"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_staccato" android:defaultValue="@string/p_staccato"
@ -20,30 +28,35 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic_sms" android:key="mi_vibration_profile_generic_sms"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic_sms" android:key="mi_vibration_count_generic_sms"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic_sms" android:key="mi_try_generic_sms"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_phone"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_incoming_call" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_incoming_call">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_incoming_call" android:title="@string/pref_screen_notification_profile_incoming_call"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_ring" android:defaultValue="@string/p_ring"
@ -51,25 +64,29 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_incoming_call" android:key="mi_vibration_profile_incoming_call"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="60" android:defaultValue="60"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_incoming_call" android:key="mi_vibration_count_incoming_call"
android:maxLength="2" android:maxLength="2"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_email"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_email" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_email">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_email" android:title="@string/pref_screen_notification_profile_email"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_medium" android:defaultValue="@string/p_medium"
@ -77,29 +94,34 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic_email" android:key="mi_vibration_profile_generic_email"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="2" android:defaultValue="2"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic_email" android:key="mi_vibration_count_generic_email"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic_email" android:key="mi_try_generic_email"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_message_outline"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_generic_chat" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_generic_chat">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_generic_chat" android:title="@string/pref_screen_notification_profile_generic_chat"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_waterdrop" android:defaultValue="@string/p_waterdrop"
@ -107,29 +129,34 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic_chat" android:key="mi_vibration_profile_generic_chat"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic_chat" android:key="mi_vibration_count_generic_chat"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic_chat" android:key="mi_try_generic_chat"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_person"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_generic_social" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_generic_social">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_generic_social" android:title="@string/pref_screen_notification_profile_generic_social"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_waterdrop" android:defaultValue="@string/p_waterdrop"
@ -137,29 +164,34 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic_social" android:key="mi_vibration_profile_generic_social"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic_social" android:key="mi_vibration_count_generic_social"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic_social" android:key="mi_try_generic_social"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_access_alarms"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_alarm_clock" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_alarm_clock">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_alarm_clock" android:title="@string/pref_screen_notification_profile_alarm_clock"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_alarm_clock" android:defaultValue="@string/p_alarm_clock"
@ -167,29 +199,34 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_alarm_clock" android:key="mi_vibration_profile_alarm_clock"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_alarm_clock" android:key="mi_vibration_count_alarm_clock"
android:maxLength="2" android:maxLength="2"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic_alarm_clock" android:key="mi_try_generic_alarm_clock"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_map"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_generic_navigation" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_generic_navigation">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_generic_navigation" android:title="@string/pref_screen_notification_profile_generic_navigation"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_waterdrop" android:defaultValue="@string/p_waterdrop"
@ -197,29 +234,34 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic_navigation" android:key="mi_vibration_profile_generic_navigation"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic_navigation" android:key="mi_vibration_count_generic_navigation"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:persistent="false"
android:key="mi_try_generic_navigation" android:key="mi_try_generic_navigation"
android:title="@string/vibration_try"/> android:persistent="false"
android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
<PreferenceScreen <PreferenceScreen
android:icon="@drawable/ic_notifications"
android:key="vibration_profile_key" android:key="vibration_profile_key"
android:title="@string/pref_screen_notification_profile_generic" android:persistent="false"
android:persistent="false"> android:title="@string/pref_screen_notification_profile_generic">
<!-- workaround for missing toolbar --> <!-- workaround for missing toolbar -->
<PreferenceCategory <PreferenceCategory
android:title="@string/pref_screen_notification_profile_generic" android:title="@string/pref_screen_notification_profile_generic"
/> app:iconSpaceReserved="false" />
<ListPreference <ListPreference
android:defaultValue="@string/p_waterdrop" android:defaultValue="@string/p_waterdrop"
@ -227,39 +269,48 @@
android:entryValues="@array/vibration_profile_values" android:entryValues="@array/vibration_profile_values"
android:key="mi_vibration_profile_generic" android:key="mi_vibration_profile_generic"
android:title="@string/miband_prefs_vibration" android:title="@string/miband_prefs_vibration"
android:summary="%s" /> app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<EditTextPreference <EditTextPreference
android:defaultValue="3" android:defaultValue="3"
android:inputType="number" android:inputType="number"
android:key="mi_vibration_count_generic" android:key="mi_vibration_count_generic"
android:maxLength="1" android:maxLength="1"
android:title="@string/pref_title_notifications_repetitions" /> android:title="@string/pref_title_notifications_repetitions"
app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<Preference <Preference
android:key="mi_try_generic" android:key="mi_try_generic"
android:persistent="false" android:persistent="false"
android:title="@string/vibration_try"/> android:title="@string/vibration_try"
app:iconSpaceReserved="false" />
</PreferenceScreen> </PreferenceScreen>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory <PreferenceCategory
android:key="pref_key_development" android:key="pref_key_development"
android:title="@string/pref_header_development"> android:title="@string/pref_header_development"
<CheckBoxPreference app:iconSpaceReserved="false">
<SwitchPreference
android:defaultValue="true"
android:key="mi_setup_bt_pairing" android:key="mi_setup_bt_pairing"
android:title="@string/pref_title_setup_bt_pairing"
android:summary="@string/pref_summary_setup_bt_pairing" android:summary="@string/pref_summary_setup_bt_pairing"
android:defaultValue="true" /> android:title="@string/pref_title_setup_bt_pairing"
app:iconSpaceReserved="false" />
<EditTextPreference <EditTextPreference
android:digits="0123456789ABCDEF:" android:digits="0123456789ABCDEF:"
android:key="development_miaddr" android:key="development_miaddr"
android:maxLength="17" android:maxLength="17"
android:title="@string/pref_title_development_miaddr" /> android:title="@string/pref_title_development_miaddr"
<CheckBoxPreference app:iconSpaceReserved="false"
app:useSimpleSummaryProvider="true" />
<SwitchPreference
android:defaultValue="false"
android:key="mi_dont_ack_transfer" android:key="mi_dont_ack_transfer"
android:title="@string/pref_title_keep_data_on_device"
android:summary="@string/pref_summary_keep_data_on_device" android:summary="@string/pref_summary_keep_data_on_device"
android:defaultValue="false" /> android:title="@string/pref_title_keep_data_on_device"
app:iconSpaceReserved="false" />
</PreferenceCategory> </PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>

2
app/src/main/res/xml/preferences.xml
View File

@ -225,7 +225,7 @@
<Preference <Preference
android:icon="@drawable/ic_device_miband" android:icon="@drawable/ic_device_miband"
android:key="pref_key_miband" android:key="pref_key_miband"
android:title="@string/preferences_miband_settings" /> android:title="@string/preferences_miband_1_2_settings" />
<Preference <Preference
android:icon="@drawable/ic_device_pebble" android:icon="@drawable/ic_device_pebble"