mirror/AntennaPod
3
0
Fork 0
mirror of https://github.com/AntennaPod/AntennaPod.git synced 2025-12-01 12:31:45 +00:00
Code Issues Projects Releases Wiki Activity

Remove "inbox and unplayed" feed counter option (#6033)

Browse Source
This commit is contained in:
Erik Johnson
2022-09-10 05:06:32 -05:00
committed by GitHub
parent a63948ec6d
commit 539d0c928d
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java
View File

@ -109,5 +109,13 @@ public class PreferenceUpgrader {
if (oldVersion < 2050000) { if (oldVersion < 2050000) {
prefs.edit().putBoolean(UserPreferences.PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, true).apply(); prefs.edit().putBoolean(UserPreferences.PREF_PAUSE_PLAYBACK_FOR_FOCUS_LOSS, true).apply();
} }
if (oldVersion < 2080000) {
// Migrate drawer feed counter setting to reflect removal of
// "unplayed and in inbox" (0), by changing it to "unplayed" (2)
String feedCounterSetting = prefs.getString(UserPreferences.PREF_DRAWER_FEED_COUNTER, "1");
if (feedCounterSetting.equals("0")) {
prefs.edit().putString(UserPreferences.PREF_DRAWER_FEED_COUNTER, "2").apply();
}
}
} }
} }

2
core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java
View File

@ -52,7 +52,7 @@ public class UserPreferences {
public static final String PREF_THEME = "prefTheme"; public static final String PREF_THEME = "prefTheme";
public static final String PREF_HIDDEN_DRAWER_ITEMS = "prefHiddenDrawerItems"; public static final String PREF_HIDDEN_DRAWER_ITEMS = "prefHiddenDrawerItems";
public static final String PREF_DRAWER_FEED_ORDER = "prefDrawerFeedOrder"; public static final String PREF_DRAWER_FEED_ORDER = "prefDrawerFeedOrder";
private static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator"; public static final String PREF_DRAWER_FEED_COUNTER = "prefDrawerFeedIndicator";
public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify"; public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify";
public static final String PREF_USE_EPISODE_COVER = "prefEpisodeCover"; public static final String PREF_USE_EPISODE_COVER = "prefEpisodeCover";
public static final String PREF_SHOW_TIME_LEFT = "showTimeLeft"; public static final String PREF_SHOW_TIME_LEFT = "showTimeLeft";

2
core/src/main/res/values/arrays.xml
View File

@ -175,14 +175,12 @@
</string-array> </string-array>
<string-array name="nav_drawer_feed_counter_options"> <string-array name="nav_drawer_feed_counter_options">
<item>@string/drawer_feed_counter_inbox_unplayed</item>
<item>@string/drawer_feed_counter_inbox</item> <item>@string/drawer_feed_counter_inbox</item>
<item>@string/drawer_feed_counter_unplayed</item> <item>@string/drawer_feed_counter_unplayed</item>
<item>@string/drawer_feed_counter_downloaded</item> <item>@string/drawer_feed_counter_downloaded</item>
<item>@string/drawer_feed_counter_none</item> <item>@string/drawer_feed_counter_none</item>
</string-array> </string-array>
<string-array name="nav_drawer_feed_counter_values"> <string-array name="nav_drawer_feed_counter_values">
<item>0</item>
<item>1</item> <item>1</item>
<item>2</item> <item>2</item>
<item>4</item> <item>4</item>

1
model/src/main/java/de/danoeh/antennapod/model/feed/FeedCounter.java
View File

@ -1,7 +1,6 @@
package de.danoeh.antennapod.model.feed; package de.danoeh.antennapod.model.feed;
public enum FeedCounter { public enum FeedCounter {
SHOW_NEW_UNPLAYED_SUM(0),
SHOW_NEW(1), SHOW_NEW(1),
SHOW_UNPLAYED(2), SHOW_UNPLAYED(2),
SHOW_NONE(3), SHOW_NONE(3),

7
storage/database/src/main/java/de/danoeh/antennapod/storage/database/PodDBAdapter.java
View File

@ -1271,15 +1271,12 @@ public class PodDBAdapter {
public final Map<Long, Integer> getFeedCounters(FeedCounter setting, long... feedIds) { public final Map<Long, Integer> getFeedCounters(FeedCounter setting, long... feedIds) {
String whereRead; String whereRead;
switch (setting) { switch (setting) {
case SHOW_NEW_UNPLAYED_SUM:
whereRead = "(" + KEY_READ + "=" + FeedItem.NEW +
" OR " + KEY_READ + "=" + FeedItem.UNPLAYED + ")";
break;
case SHOW_NEW: case SHOW_NEW:
whereRead = KEY_READ + "=" + FeedItem.NEW; whereRead = KEY_READ + "=" + FeedItem.NEW;
break; break;
case SHOW_UNPLAYED: case SHOW_UNPLAYED:
whereRead = KEY_READ + "=" + FeedItem.UNPLAYED; whereRead = "(" + KEY_READ + "=" + FeedItem.NEW
+ " OR " + KEY_READ + "=" + FeedItem.UNPLAYED + ")";
break; break;
case SHOW_DOWNLOADED: case SHOW_DOWNLOADED:
whereRead = KEY_DOWNLOADED + "=1"; whereRead = KEY_DOWNLOADED + "=1";

1
ui/i18n/src/main/res/values/strings.xml
View File

@ -73,7 +73,6 @@
<string name="drawer_feed_order_alphabetical">Sort alphabetically</string> <string name="drawer_feed_order_alphabetical">Sort alphabetically</string>
<string name="drawer_feed_order_last_update">Sort by publication date</string> <string name="drawer_feed_order_last_update">Sort by publication date</string>
<string name="drawer_feed_order_most_played">Sort by number of played episodes</string> <string name="drawer_feed_order_most_played">Sort by number of played episodes</string>
<string name="drawer_feed_counter_inbox_unplayed">Number of unplayed episodes and episodes in the inbox</string>
<string name="drawer_feed_counter_inbox">Number of episodes in the inbox</string> <string name="drawer_feed_counter_inbox">Number of episodes in the inbox</string>
<string name="drawer_feed_counter_unplayed">Number of unplayed episodes</string> <string name="drawer_feed_counter_unplayed">Number of unplayed episodes</string>
<string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string> <string name="drawer_feed_counter_downloaded">Number of downloaded episodes</string>