mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 23:41:45 +02:00
Code Issues Releases Wiki Activity

Simplify reminder preference a bit

Browse Source
This commit is contained in:
Erik Johansson
2018-04-14 23:21:56 +02:00
parent 69e35cbe2f
commit b663137ca0
3 changed files with 11 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
View File

@@ -36,8 +36,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
public class ReminderPreferences extends PreferenceFragment public class ReminderPreferences extends PreferenceFragment
implements SharedPreferences.OnSharedPreferenceChangeListener implements SharedPreferences.OnSharedPreferenceChangeListener {
{
public static final String PREFERENCE_KEY_REMINDER_NOTIFY_TEXT = "reminderNotifyText"; public static final String PREFERENCE_KEY_REMINDER_NOTIFY_TEXT = "reminderNotifyText";
public static final String PREFERENCE_KEY_REMINDER_WEEKDAYS = "reminderWeekdays"; public static final String PREFERENCE_KEY_REMINDER_WEEKDAYS = "reminderWeekdays";
@@ -45,10 +44,6 @@ public class ReminderPreferences extends PreferenceFragment
private static final String PREFERENCE_KEY_REMINDER_ENABLE = "reminderEnable"; private static final String PREFERENCE_KEY_REMINDER_ENABLE = "reminderEnable";
private CheckBoxPreference reminderEnable; private CheckBoxPreference reminderEnable;
private MultiSelectListPreference reminderWeekdays;
private TimePreferenceDialog reminderTime;
private EditTextPreference reminderNotifyText;
@Override @Override
public void onCreate(Bundle savedInstanceState) public void onCreate(Bundle savedInstanceState)
@@ -58,9 +53,6 @@ public class ReminderPreferences extends PreferenceFragment
addPreferencesFromResource(R.xml.reminder_preferences); addPreferencesFromResource(R.xml.reminder_preferences);
reminderEnable = (CheckBoxPreference) findPreference(PREFERENCE_KEY_REMINDER_ENABLE); reminderEnable = (CheckBoxPreference) findPreference(PREFERENCE_KEY_REMINDER_ENABLE);
reminderWeekdays = (MultiSelectListPreference) findPreference(PREFERENCE_KEY_REMINDER_WEEKDAYS);
reminderTime = (TimePreferenceDialog) findPreference(PREFERENCE_KEY_REMINDER_TIME);
reminderNotifyText = (EditTextPreference) findPreference(PREFERENCE_KEY_REMINDER_NOTIFY_TEXT);
updateAlarmPreferences(); updateAlarmPreferences();
initSummary(getPreferenceScreen()); initSummary(getPreferenceScreen());
@@ -109,28 +101,18 @@ public class ReminderPreferences extends PreferenceFragment
PackageManager pm = getActivity().getApplicationContext().getPackageManager(); PackageManager pm = getActivity().getApplicationContext().getPackageManager();
AlarmHandler alarmHandler = new AlarmHandler(); AlarmHandler alarmHandler = new AlarmHandler();
if (reminderEnable.isChecked()) if (reminderEnable.isChecked()) {
{
alarmHandler.scheduleAlarms(getActivity()); alarmHandler.scheduleAlarms(getActivity());
pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED, pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
PackageManager.DONT_KILL_APP); PackageManager.DONT_KILL_APP);
reminderWeekdays.setEnabled(true);
reminderTime.setEnabled(true);
reminderNotifyText.setEnabled(true);
} }
else else {
{
alarmHandler.disableAllAlarms(getActivity()); alarmHandler.disableAllAlarms(getActivity());
pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
PackageManager.DONT_KILL_APP); PackageManager.DONT_KILL_APP);
}
reminderWeekdays.setEnabled(false);
reminderTime.setEnabled(false);
reminderNotifyText.setEnabled(false);
}
} }
private void updatePrefSummary(Preference p) private void updatePrefSummary(Preference p)

4
android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java
View File

@@ -108,8 +108,4 @@ public class TimePreferenceDialog extends DialogPreference {
} }
return DateFormat.getTimeFormat(getContext()).format(calendar.getTime()); return DateFormat.getTimeFormat(getContext()).format(calendar.getTime());
} }
public long getTimeInMillis() {
return calendar.getTimeInMillis();
}
} }

15
android_app/app/src/main/res/xml/reminder_preferences.xml
View File

@@ -9,24 +9,21 @@
<MultiSelectListPreference <MultiSelectListPreference
android:defaultValue="@array/weekdays_default" android:defaultValue="@array/weekdays_default"
android:dependency="reminderEnable"
android:dialogTitle="@string/label_reminder_weekdays" android:dialogTitle="@string/label_reminder_weekdays"
android:enabled="false"
android:entries="@array/weekdays_entries" android:entries="@array/weekdays_entries"
android:entryValues="@array/weekdays_values" android:entryValues="@array/weekdays_values"
android:key="reminderWeekdays" android:key="reminderWeekdays"
android:title="@string/label_reminder_weekdays" android:title="@string/label_reminder_weekdays" />
/>
<com.health.openscale.gui.preferences.TimePreferenceDialog <com.health.openscale.gui.preferences.TimePreferenceDialog
android:enabled="false" android:dependency="reminderEnable"
android:key="reminderTime" android:key="reminderTime"
android:title="@string/label_reminder_time" android:title="@string/label_reminder_time" />
/>
<EditTextPreference <EditTextPreference
android:defaultValue="@string/default_value_reminder_notify_text" android:defaultValue="@string/default_value_reminder_notify_text"
android:enabled="false" android:dependency="reminderEnable"
android:key="reminderNotifyText" android:key="reminderNotifyText"
android:title="@string/label_reminder_notify_text" android:title="@string/label_reminder_notify_text" />
/>
</PreferenceScreen> </PreferenceScreen>