From 60eb41048f0d3654b629be7476b476641b4f2223 Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Sat, 14 Sep 2019 00:09:24 +0200 Subject: Converted playback speed in media preferences to a float instead of String --- .../java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java | 9 +++++---- .../main/java/de/danoeh/antennapod/fragment/QueueFragment.java | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'app/src/main/java/de/danoeh/antennapod/fragment') diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java index 143f719f5..0e6afe355 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java @@ -19,6 +19,7 @@ import de.danoeh.antennapod.dialog.EpisodeFilterDialog; import de.danoeh.antennapod.viewmodel.FeedSettingsViewModel; import static de.danoeh.antennapod.activity.FeedSettingsActivity.EXTRA_FEED_ID; +import static de.danoeh.antennapod.core.feed.FeedPreferences.SPEED_USE_GLOBAL; public class FeedSettingsFragment extends PreferenceFragmentCompat { private static final CharSequence PREF_EPISODE_FILTER = "episodeFilter"; @@ -55,7 +56,7 @@ public class FeedSettingsFragment extends PreferenceFragmentCompat { String[] speeds = UserPreferences.getPlaybackSpeedArray(); String[] values = new String[speeds.length + 1]; - values[0] = "global"; + values[0] = Float.toString(SPEED_USE_GLOBAL); String[] entries = new String[speeds.length + 1]; entries[0] = getString(R.string.feed_auto_download_global); @@ -67,7 +68,7 @@ public class FeedSettingsFragment extends PreferenceFragmentCompat { feedPlaybackSpeedPreference.setEntries(entries); feedPlaybackSpeedPreference.setOnPreferenceChangeListener((preference, newValue) -> { - feedPreferences.setFeedPlaybackSpeed((String) newValue); + feedPreferences.setFeedPlaybackSpeed(Float.parseFloat((String) newValue)); feed.savePreferences(); updatePlaybackSpeedPreference(); return false; @@ -126,8 +127,8 @@ public class FeedSettingsFragment extends PreferenceFragmentCompat { private void updatePlaybackSpeedPreference() { ListPreference feedPlaybackSpeedPreference = (ListPreference) findPreference(PREF_FEED_PLAYBACK_SPEED); - String speedValue = feedPreferences.getFeedPlaybackSpeed(); - feedPlaybackSpeedPreference.setValue(speedValue); + float speedValue = feedPreferences.getFeedPlaybackSpeed(); + feedPlaybackSpeedPreference.setValue(Float.toString(speedValue)); } private void updateAutoDeleteSummary() { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java index 19e84fb19..423e8b17b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/QueueFragment.java @@ -603,7 +603,7 @@ public class QueueFragment extends Fragment { float playbackSpeed = SPEED_USE_GLOBAL; Feed feed = item.getFeed(); if (feed != null) { - playbackSpeed = feed.getPreferences().getCurrentPlaybackSpeed(); + playbackSpeed = feed.getPreferences().getFeedPlaybackSpeed(); } if (playbackSpeed == SPEED_USE_GLOBAL) { playbackSpeed = UserPreferences.getPlaybackSpeed(item.getMedia()); -- cgit v1.2.3