diff options
| author | asdoi <asdoi@t-online.de> | 2020-09-03 14:07:57 +0200 |
|---|---|---|
| committer | asdoi <asdoi@t-online.de> | 2020-09-03 14:07:57 +0200 |
| commit | 75be61ff6de87c7c1012c52258739a0be5fea1d2 (patch) | |
| tree | be7a9d6f2f1b139a5b3ab8dbab921bd76ead2eb2 /app/src/main | |
| parent | bd0d0b5008fe2735b335df03ffe16bdae73785d0 (diff) | |
| download | AntennaPod-75be61ff6de87c7c1012c52258739a0be5fea1d2.zip | |
fix FeedSortDialog
Diffstat (limited to 'app/src/main')
4 files changed, 17 insertions, 15 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java index e05cb034f..96d1b9b67 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedSortDialog.java @@ -6,6 +6,9 @@ import androidx.appcompat.app.AlertDialog; import org.greenrobot.eventbus.EventBus; +import java.util.Arrays; +import java.util.List; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.event.UnreadItemsUpdateEvent; import de.danoeh.antennapod.core.preferences.UserPreferences; @@ -16,20 +19,15 @@ public class FeedSortDialog { dialog.setTitle(context.getString(R.string.pref_nav_drawer_feed_order_title)); dialog.setNegativeButton(android.R.string.cancel, (d, listener) -> d.dismiss()); - int selectedIndexTemp = 0; int selected = UserPreferences.getFeedOrder(); - String[] entryValues = context.getResources().getStringArray(R.array.nav_drawer_feed_order_values); - for (int i = 0; i < entryValues.length; i++) { - if (Integer.parseInt(entryValues[i]) == selected) { - selectedIndexTemp = i; - } - } + List<String> entryValues = + Arrays.asList(context.getResources().getStringArray(R.array.nav_drawer_feed_order_values)); + final int selectedIndex = entryValues.indexOf("" + selected); - final int selectedIndex = selectedIndexTemp; String[] items = context.getResources().getStringArray(R.array.nav_drawer_feed_order_options); dialog.setSingleChoiceItems(items, selectedIndex, (d, which) -> { if (selectedIndex != which) { - UserPreferences.setFeedOrder(entryValues[which]); + UserPreferences.setFeedOrder(entryValues.get(which)); //Update subscriptions EventBus.getDefault().post(new UnreadItemsUpdateEvent()); } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java index 4596fc90e..12be76ba7 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/UserInterfacePreferencesFragment.java @@ -13,6 +13,7 @@ import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.activity.PreferenceActivity; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.dialog.FeedFilterDialog; +import de.danoeh.antennapod.dialog.FeedSortDialog; import de.danoeh.antennapod.fragment.NavDrawerFragment; import org.apache.commons.lang3.ArrayUtils; @@ -82,6 +83,12 @@ public class UserInterfacePreferencesFragment extends PreferenceFragmentCompat { return true; })); + findPreference(UserPreferences.PREF_DRAWER_FEED_ORDER) + .setOnPreferenceClickListener((preference -> { + FeedSortDialog.showDialog(requireContext()); + return true; + })); + if (Build.VERSION.SDK_INT >= 26) { findPreference(UserPreferences.PREF_EXPANDED_NOTIFICATION).setVisible(false); } diff --git a/app/src/main/res/menu/subscriptions.xml b/app/src/main/res/menu/subscriptions.xml index f732592ae..b7dc95299 100644 --- a/app/src/main/res/menu/subscriptions.xml +++ b/app/src/main/res/menu/subscriptions.xml @@ -16,7 +16,7 @@ custom:showAsAction="never" /> <item android:id="@+id/subscriptions_sort" - android:title="@string/sort_order" + android:title="@string/sort" custom:showAsAction="never" /> <item android:id="@+id/subscription_num_columns" diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index adcbf5569..1563abe04 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -29,13 +29,10 @@ android:key="prefDrawerFeedOrder" android:summary="@string/pref_nav_drawer_feed_order_sum" android:defaultValue="0"/> - <ListPreference - android:entryValues="@array/nav_drawer_feed_counter_values" - android:entries="@array/nav_drawer_feed_counter_options" + <Preference android:title="@string/pref_nav_drawer_feed_counter_title" android:key="prefDrawerFeedIndicator" - android:summary="@string/pref_nav_drawer_feed_counter_sum" - android:defaultValue="1"/> + android:summary="@string/pref_nav_drawer_feed_counter_sum" /> <Preference android:title="@string/pref_filter_feed_title" android:key="prefFeedFilter" |