MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-02-10 17:06:48 +01:00
Code Releases Wiki Activity

Mi Band 2: Grey out "rotate wrist to switch info" when "activate display upon lift" in not enabled in preferences

Browse Source 
Closes #1124
This commit is contained in:
Andreas Shimokawa 2018-06-24 22:05:45 +02:00
parent 9d01989b27
commit 979a44a077
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -151,7 +151,11 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
} }
}); });
String displayOnLiftState = prefs.getString(MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_MI2_DO_NOT_DISTURB_OFF);
boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_MI2_DO_NOT_DISTURB_SCHEDULED);
final Preference rotateWristCycleInfo = findPreference(PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO); final Preference rotateWristCycleInfo = findPreference(PREF_MI2_ROTATE_WRIST_TO_SWITCH_INFO);
rotateWristCycleInfo.setEnabled(!PREF_MI2_DO_NOT_DISTURB_OFF.equals(displayOnLiftState));
rotateWristCycleInfo.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { rotateWristCycleInfo.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newVal) { public boolean onPreferenceChange(Preference preference, Object newVal) {
@ -315,9 +319,6 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
} }
}); });
String displayOnLiftState = prefs.getString(MiBandConst.PREF_ACTIVATE_DISPLAY_ON_LIFT, PREF_MI2_DO_NOT_DISTURB_OFF);
boolean displayOnLiftScheduled = displayOnLiftState.equals(PREF_MI2_DO_NOT_DISTURB_SCHEDULED);
final Preference displayOnLiftStart = findPreference(PREF_DISPLAY_ON_LIFT_START); final Preference displayOnLiftStart = findPreference(PREF_DISPLAY_ON_LIFT_START);
displayOnLiftStart.setEnabled(displayOnLiftScheduled); displayOnLiftStart.setEnabled(displayOnLiftScheduled);
displayOnLiftStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { displayOnLiftStart.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@ -358,7 +359,7 @@ public class MiBandPreferencesActivity extends AbstractSettingsActivity {
displayOnLiftStart.setEnabled(scheduled); displayOnLiftStart.setEnabled(scheduled);
displayOnLiftEnd.setEnabled(scheduled); displayOnLiftEnd.setEnabled(scheduled);
rotateWristCycleInfo.setEnabled(!PREF_MI2_DO_NOT_DISTURB_OFF.equals(newVal.toString()));
invokeLater(new Runnable() { invokeLater(new Runnable() {
@Override @Override
public void run() { public void run() {

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

@ -139,20 +139,17 @@
<nodomain.freeyourgadget.gadgetbridge.util.TimePreference <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
android:defaultValue="00:00" android:defaultValue="00:00"
android:dependency="activate_display_on_lift_wrist"
android:key="display_on_lift_start" android:key="display_on_lift_start"
android:title="@string/mi2_prefs_do_not_disturb_start" /> android:title="@string/mi2_prefs_do_not_disturb_start" />
<nodomain.freeyourgadget.gadgetbridge.util.TimePreference <nodomain.freeyourgadget.gadgetbridge.util.TimePreference
android:defaultValue="00:00" android:defaultValue="00:00"
android:dependency="activate_display_on_lift_wrist"
android:key="display_on_lift_end" android:key="display_on_lift_end"
android:title="@string/mi2_prefs_do_not_disturb_end" /> android:title="@string/mi2_prefs_do_not_disturb_end" />
</PreferenceScreen> </PreferenceScreen>
<CheckBoxPreference <CheckBoxPreference
android:defaultValue="false" android:defaultValue="false"
android:dependency="activate_display_on_lift_wrist"
android:key="mi2_rotate_wrist_to_switch_info" android:key="mi2_rotate_wrist_to_switch_info"
android:title="@string/mi2_prefs_rotate_wrist_to_switch_info" /> android:title="@string/mi2_prefs_rotate_wrist_to_switch_info" />