mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2026-02-05 02:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Remember last sleep timer value per type (#8175)

Browse Source
This commit is contained in:
Hans-Peter Lehmann
2025-12-26 09:18:20 +01:00
committed by GitHub
parent b7530255ee
commit 3941bac55a
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/de/danoeh/antennapod/ui/screen/playback/SleepTimerDialog.java
View File

@ -145,6 +145,11 @@ public class SleepTimerDialog extends BottomSheetDialogFragment {
@Override
public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
try {
SleepTimerPreferences.setLastTimer(String.valueOf(getSelectedSleepTime()));
} catch (NumberFormatException ignore) {
// Ignore silently and just not save it
}
final SleepTimerType sleepType = SleepTimerType.fromIndex(position);
SleepTimerPreferences.setSleepTimerType(sleepType);
// this callback is called even when the spinner is first initialized
@ -154,12 +159,7 @@ public class SleepTimerDialog extends BottomSheetDialogFragment {
if (isSleepTimerConfiguredForMostOfTheDay()) {
viewBinding.autoEnableCheckbox.setChecked(false);
}
// change suggested value back to default value for sleep type
if (sleepType == SleepTimerType.EPISODES) {
viewBinding.timeEditText.setText(SleepTimerPreferences.DEFAULT_SLEEP_TIMER_EPISODES);
} else {
viewBinding.timeEditText.setText(SleepTimerPreferences.DEFAULT_SLEEP_TIMER_MINUTES);
}
viewBinding.timeEditText.setText(SleepTimerPreferences.lastTimerValue());
}
sleepTimerTypeInitialized = true;
refreshUiState();

14
storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/SleepTimerPreferences.java
View File

@ -13,7 +13,8 @@ public class SleepTimerPreferences {
private static final String TAG = "SleepTimerPreferences";
public static final String PREF_NAME = "SleepTimerDialog";
private static final String PREF_VALUE = "LastValue";
private static final String PREF_VALUE_MINUTES = "LastValue";
private static final String PREF_VALUE_EPISODES = "LastValueEpisodes";
private static final String PREF_TIMER_TYPE = "sleepTimerType";
private static final String PREF_VIBRATE = "Vibrate";
@ -22,8 +23,6 @@ public class SleepTimerPreferences {
private static final String PREF_AUTO_ENABLE_FROM = "AutoEnableFrom";
private static final String PREF_AUTO_ENABLE_TO = "AutoEnableTo";
public static final String DEFAULT_SLEEP_TIMER_MINUTES = "15";
public static final String DEFAULT_SLEEP_TIMER_EPISODES = "1";
private static final int DEFAULT_TIMER_TYPE = 0;
private static final int DEFAULT_AUTO_ENABLE_FROM = 22;
private static final int DEFAULT_AUTO_ENABLE_TO = 6;
@ -41,11 +40,16 @@ public class SleepTimerPreferences {
}
public static void setLastTimer(String value) {
prefs.edit().putString(PREF_VALUE, value).apply();
prefs.edit().putString(getSleepTimerType() == SleepTimerType.CLOCK
? PREF_VALUE_MINUTES : PREF_VALUE_EPISODES, value).apply();
}
public static String lastTimerValue() {
return prefs.getString(PREF_VALUE, DEFAULT_SLEEP_TIMER_MINUTES);
if (getSleepTimerType() == SleepTimerType.CLOCK) {
return prefs.getString(PREF_VALUE_MINUTES, "15");
} else {
return prefs.getString(PREF_VALUE_EPISODES, "1");
}
}
public static long timerMillisOrEpisodes() {