diff options
34 files changed, 98 insertions, 61 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/entities/ExternalMediaTest.java b/app/src/androidTest/java/de/test/antennapod/entities/ExternalMediaTest.java index 6da4e60a1..83d7a4d22 100644 --- a/app/src/androidTest/java/de/test/antennapod/entities/ExternalMediaTest.java +++ b/app/src/androidTest/java/de/test/antennapod/entities/ExternalMediaTest.java @@ -2,7 +2,7 @@ package de.test.antennapod.entities; import android.annotation.SuppressLint; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.filters.LargeTest; diff --git a/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java b/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java index 0a3a9f13a..419cf2096 100644 --- a/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java +++ b/app/src/androidTest/java/de/test/antennapod/playback/PlaybackTest.java @@ -3,7 +3,7 @@ package de.test.antennapod.playback; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.view.View; import androidx.test.filters.LargeTest; diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java index 0e38979b2..6c36da13e 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBCleanupTests.java @@ -2,7 +2,7 @@ package de.test.antennapod.storage; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import java.io.File; import java.io.IOException; diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBNullCleanupAlgorithmTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBNullCleanupAlgorithmTest.java index b76e0d1f3..d7ebf2351 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBNullCleanupAlgorithmTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBNullCleanupAlgorithmTest.java @@ -2,7 +2,7 @@ package de.test.antennapod.storage; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import java.io.File; import java.io.IOException; diff --git a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java index 9fbc5b956..d300e23e7 100644 --- a/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java +++ b/app/src/androidTest/java/de/test/antennapod/storage/DBWriterTest.java @@ -3,7 +3,7 @@ package de.test.antennapod.storage; import android.content.Context; import android.content.SharedPreferences; import android.database.Cursor; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.util.Log; import androidx.core.util.Consumer; diff --git a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java index ddce8b1e3..9bf89980c 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/PreferencesTest.java @@ -3,7 +3,7 @@ package de.test.antennapod.ui; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Resources; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.annotation.StringRes; import androidx.test.filters.LargeTest; import androidx.test.rule.ActivityTestRule; diff --git a/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java b/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java index ac5887069..5f79e935c 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/SpeedChangeTest.java @@ -3,7 +3,7 @@ package de.test.antennapod.ui; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.test.rule.ActivityTestRule; import androidx.test.ext.junit.runners.AndroidJUnit4; import de.danoeh.antennapod.R; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index eea977c2e..a53adc719 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -5,7 +5,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; 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 209e5d0e1..a82c60d6c 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/FeedSettingsFragment.java @@ -14,7 +14,7 @@ import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.Fragment; import androidx.preference.ListPreference; import androidx.preference.PreferenceFragmentCompat; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.dialog.ConfirmationDialog; import de.danoeh.antennapod.core.event.settings.SkipIntroEndingChangedEvent; @@ -322,7 +322,7 @@ public class FeedSettingsFragment extends Fragment { } private void setupKeepUpdatedPreference() { - SwitchPreference pref = findPreference("keepUpdated"); + SwitchPreferenceCompat pref = findPreference("keepUpdated"); pref.setChecked(feedPreferences.getKeepUpdated()); pref.setOnPreferenceChangeListener((preference, newValue) -> { @@ -336,7 +336,7 @@ public class FeedSettingsFragment extends Fragment { private void setupAutoDownloadGlobalPreference() { if (!UserPreferences.isEnableAutodownload()) { - SwitchPreference autodl = findPreference("autoDownload"); + SwitchPreferenceCompat autodl = findPreference("autoDownload"); autodl.setChecked(false); autodl.setEnabled(false); autodl.setSummary(R.string.auto_download_disabled_globally); @@ -345,7 +345,7 @@ public class FeedSettingsFragment extends Fragment { } private void setupAutoDownloadPreference() { - SwitchPreference pref = findPreference("autoDownload"); + SwitchPreferenceCompat pref = findPreference("autoDownload"); pref.setEnabled(UserPreferences.isEnableAutodownload()); if (UserPreferences.isEnableAutodownload()) { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java index 8ecb692a5..e8bd5a1e1 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/OnlineSearchFragment.java @@ -107,8 +107,8 @@ public class OnlineSearchFragment extends Fragment { txtvError = root.findViewById(R.id.txtvError); butRetry = root.findViewById(R.id.butRetry); txtvEmpty = root.findViewById(android.R.id.empty); - - txtvEmpty.setText(getString(R.string.search_powered_by, searchProvider.getName())); + TextView txtvPoweredBy = root.findViewById(R.id.search_powered_by); + txtvPoweredBy.setText(getString(R.string.search_powered_by, searchProvider.getName())); return root; } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java index 0409ce11b..3f1cec729 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java @@ -22,6 +22,7 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { private static final String PREF_FAQ = "prefFaq"; private static final String PREF_VIEW_FORUM = "prefViewForum"; private static final String PREF_SEND_BUG_REPORT = "prefSendBugReport"; + private static final String PREF_CATEGORY_PROJECT = "project"; private static final String STATISTICS = "statistics"; private static final String PREF_ABOUT = "prefAbout"; @@ -30,6 +31,13 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { addPreferencesFromResource(R.xml.preferences); setupMainScreen(); setupSearch(); + + // If you are writing a spin-off, please update the details on screens like "About" and "Report bug" + // and afterwards remove the following lines. + String packageName = getContext().getPackageName(); + if (!"de.danoeh.antennapod".equals(packageName) && !"de.danoeh.antennapod.debug".equals(packageName)) { + findPreference(PREF_CATEGORY_PROJECT).setVisible(false); + } } @Override diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java index 007457c24..94e60ef61 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/MasterSwitchPreference.java @@ -4,7 +4,7 @@ import android.annotation.TargetApi; import android.content.Context; import android.graphics.Typeface; import android.os.Build; -import androidx.preference.SwitchPreference; +import androidx.preference.SwitchPreferenceCompat; import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.util.TypedValue; @@ -12,7 +12,7 @@ import android.widget.TextView; import de.danoeh.antennapod.R; -public class MasterSwitchPreference extends SwitchPreference { +public class MasterSwitchPreference extends SwitchPreferenceCompat { public MasterSwitchPreference(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java index 367593131..2a157c23b 100644 --- a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceUpgrader.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.preferences; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.CrashReportWriter; diff --git a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java index 1f28b5c49..f9c10041e 100644 --- a/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java +++ b/app/src/main/java/de/danoeh/antennapod/spa/SPAUtil.java @@ -3,7 +3,7 @@ package de.danoeh.antennapod.spa; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.util.Log; import de.danoeh.antennapod.BuildConfig; diff --git a/app/src/main/res/layout/addfeed.xml b/app/src/main/res/layout/addfeed.xml index d44552bab..ff0a54bc1 100644 --- a/app/src/main/res/layout/addfeed.xml +++ b/app/src/main/res/layout/addfeed.xml @@ -91,8 +91,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawablePadding="8dp" - app:drawableStartCompat="?attr/content_new" - app:drawableLeftCompat="?attr/content_new" + app:drawableStartCompat="?attr/feed" + app:drawableLeftCompat="?attr/feed" android:paddingTop="8dp" android:paddingBottom="8dp" android:background="?android:attr/selectableItemBackground" diff --git a/app/src/main/res/layout/fragment_itunes_search.xml b/app/src/main/res/layout/fragment_itunes_search.xml index 228bfb803..d82051867 100644 --- a/app/src/main/res/layout/fragment_itunes_search.xml +++ b/app/src/main/res/layout/fragment_itunes_search.xml @@ -36,6 +36,7 @@ android:layout_height="match_parent" android:layout_centerInParent="true" android:gravity="center" + android:visibility="gone" android:text="@string/search_status_no_results" /> <ProgressBar @@ -71,4 +72,17 @@ tools:visibility="visible" tools:background="@android:color/holo_red_light" /> + <TextView + android:id="@+id/search_powered_by" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorTertiary" + android:text="@string/discover_powered_by_itunes" + android:textSize="12sp" + android:padding="4dp" + android:background="?android:attr/windowBackground" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:textAlignment="textEnd"/> </RelativeLayout> diff --git a/app/src/main/res/layout/quick_feed_discovery.xml b/app/src/main/res/layout/quick_feed_discovery.xml index a274fcdc7..b125206c1 100644 --- a/app/src/main/res/layout/quick_feed_discovery.xml +++ b/app/src/main/res/layout/quick_feed_discovery.xml @@ -62,4 +62,15 @@ android:layout_height="wrap_content"/> </RelativeLayout> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textColor="?android:attr/textColorTertiary" + android:text="@string/discover_powered_by_itunes" + android:textSize="12sp" + android:layout_gravity="right|end" + android:paddingHorizontal="4dp" + android:textAlignment="textEnd"/> + </LinearLayout> diff --git a/app/src/main/res/xml/feed_settings.xml b/app/src/main/res/xml/feed_settings.xml index 9f8392f44..a6820a4ad 100644 --- a/app/src/main/res/xml/feed_settings.xml +++ b/app/src/main/res/xml/feed_settings.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:key="feedSettingsScreen"> - <SwitchPreference + <SwitchPreferenceCompat android:key="keepUpdated" android:icon="?attr/navigation_refresh" android:title="@string/keep_updated" @@ -45,7 +45,7 @@ android:key="volumeReduction"/> <PreferenceCategory android:title="@string/auto_download_settings_label"> - <SwitchPreference + <SwitchPreferenceCompat android:key="autoDownload" android:title="@string/auto_download_label"/> <Preference diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index b69f27473..0a19a36b1 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -44,7 +44,9 @@ android:title="@string/statistics_label" android:icon="?attr/statistics" /> - <PreferenceCategory android:title="@string/project_pref"> + <PreferenceCategory + android:key="project" + android:title="@string/project_pref"> <Preference android:key="prefFaq" android:title="@string/pref_faq" diff --git a/app/src/main/res/xml/preferences_autodownload.xml b/app/src/main/res/xml/preferences_autodownload.xml index 9a2c859cd..2b541afa3 100644 --- a/app/src/main/res/xml/preferences_autodownload.xml +++ b/app/src/main/res/xml/preferences_autodownload.xml @@ -22,12 +22,12 @@ android:title="@string/pref_episode_cleanup_title" android:summary="@string/pref_episode_cleanup_summary" android:entryValues="@array/episode_cleanup_values"/> - <SwitchPreference + <SwitchPreferenceCompat android:key="prefEnableAutoDownloadOnBattery" android:title="@string/pref_automatic_download_on_battery_title" android:summary="@string/pref_automatic_download_on_battery_sum" android:defaultValue="true"/> - <SwitchPreference + <SwitchPreferenceCompat android:key="prefEnableAutoDownloadWifiFilter" android:title="@string/pref_autodl_wifi_filter_title" android:summary="@string/pref_autodl_wifi_filter_sum"/> diff --git a/app/src/main/res/xml/preferences_gpodder.xml b/app/src/main/res/xml/preferences_gpodder.xml index 5789f5f84..d8478faf2 100644 --- a/app/src/main/res/xml/preferences_gpodder.xml +++ b/app/src/main/res/xml/preferences_gpodder.xml @@ -26,7 +26,7 @@ <Preference android:key="pref_gpodnet_hostname" android:title="@string/pref_gpodnet_sethostname_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:key="pref_gpodnet_notifications" android:title="@string/pref_gpodnet_notifications_title" android:summary="@string/pref_gpodnet_notifications_sum" diff --git a/app/src/main/res/xml/preferences_network.xml b/app/src/main/res/xml/preferences_network.xml index 5d1831ef0..f51b9561e 100644 --- a/app/src/main/res/xml/preferences_network.xml +++ b/app/src/main/res/xml/preferences_network.xml @@ -29,13 +29,13 @@ numberpicker:maxValue="50" android:key="prefParallelDownloads" android:title="@string/pref_parallel_downloads_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefShowDownloadReport" android:summary="@string/pref_showDownloadReport_sum" android:title="@string/pref_showDownloadReport_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefShowAutoDownloadReport" diff --git a/app/src/main/res/xml/preferences_playback.xml b/app/src/main/res/xml/preferences_playback.xml index f8afa08ed..161332d2f 100644 --- a/app/src/main/res/xml/preferences_playback.xml +++ b/app/src/main/res/xml/preferences_playback.xml @@ -2,33 +2,33 @@ <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/interruptions"> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefPauseOnHeadsetDisconnect" android:summary="@string/pref_pauseOnDisconnect_sum" android:title="@string/pref_pauseOnHeadsetDisconnect_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:dependency="prefPauseOnHeadsetDisconnect" android:key="prefUnpauseOnHeadsetReconnect" android:summary="@string/pref_unpauseOnHeadsetReconnect_sum" android:title="@string/pref_unpauseOnHeadsetReconnect_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:dependency="prefPauseOnHeadsetDisconnect" android:key="prefUnpauseOnBluetoothReconnect" android:summary="@string/pref_unpauseOnBluetoothReconnect_sum" android:title="@string/pref_unpauseOnBluetoothReconnect_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefPauseForFocusLoss" android:summary="@string/pref_pausePlaybackForFocusLoss_sum" android:title="@string/pref_pausePlaybackForFocusLoss_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefResumeAfterCall" @@ -44,13 +44,13 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/playback_control"> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefHardwareForwardButtonSkips" android:summary="@string/pref_hardwareForwardButtonSkips_sum" android:title="@string/pref_hardwareForwardButtonSkips_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefHardwarePreviousButtonRestarts" @@ -68,12 +68,12 @@ android:key="prefPlaybackSpeedLauncher" android:summary="@string/pref_playback_speed_sum" android:title="@string/playback_speed"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="prefPlaybackTimeRespectsSpeed" android:summary="@string/pref_playback_time_respects_speed_sum" android:title="@string/pref_playback_time_respects_speed_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:key="prefStreamOverDownload" android:summary="@string/pref_stream_over_download_sum" @@ -81,7 +81,7 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/queue_label"> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefEnqueueDownloaded" @@ -93,7 +93,7 @@ android:entryValues="@array/enqueue_location_values" android:key="prefEnqueueLocation" android:title="@string/pref_enqueue_location_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefFollowQueue" @@ -106,7 +106,7 @@ android:key="prefSmartMarkAsPlayedSecs" android:summary="@string/pref_smart_mark_as_played_sum" android:title="@string/pref_smart_mark_as_played_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefSkipKeepsEpisode" @@ -125,7 +125,7 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/experimental_pref"> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefCast" diff --git a/app/src/main/res/xml/preferences_storage.xml b/app/src/main/res/xml/preferences_storage.xml index 18e2abb31..d3d570e6c 100644 --- a/app/src/main/res/xml/preferences_storage.xml +++ b/app/src/main/res/xml/preferences_storage.xml @@ -13,19 +13,19 @@ android:key="prefImageCacheSize" android:summary="@string/pref_image_cache_size_sum" android:defaultValue="100"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefAutoDelete" android:summary="@string/pref_auto_delete_sum" android:title="@string/pref_auto_delete_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefFavoriteKeepsEpisode" android:summary="@string/pref_favorite_keeps_episodes_sum" android:title="@string/pref_favorite_keeps_episodes_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefDeleteRemovesFromQueue" diff --git a/app/src/main/res/xml/preferences_user_interface.xml b/app/src/main/res/xml/preferences_user_interface.xml index 885978f26..c1db2dc1e 100644 --- a/app/src/main/res/xml/preferences_user_interface.xml +++ b/app/src/main/res/xml/preferences_user_interface.xml @@ -14,7 +14,7 @@ android:key="prefHiddenDrawerItems" android:summary="@string/pref_nav_drawer_items_sum" android:title="@string/pref_nav_drawer_items_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:title="@string/pref_episode_cover_title" android:key="prefEpisodeCover" android:summary="@string/pref_episode_cover_summary" @@ -39,13 +39,13 @@ android:summary="@string/pref_filter_feed_sum" /> </PreferenceCategory> <PreferenceCategory android:title="@string/external_elements"> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="false" android:enabled="true" android:key="prefExpandNotify" android:summary="@string/pref_expandNotify_sum" android:title="@string/pref_expandNotify_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefPersistNotify" @@ -55,7 +55,7 @@ android:key="prefCompactNotificationButtons" android:summary="@string/pref_compact_notification_buttons_sum" android:title="@string/pref_compact_notification_buttons_title"/> - <SwitchPreference + <SwitchPreferenceCompat android:defaultValue="true" android:enabled="true" android:key="prefLockscreenBackground" diff --git a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java index 10678f556..753feb3e7 100644 --- a/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java +++ b/app/src/play/java/de/danoeh/antennapod/activity/CastEnabledActivity.java @@ -3,7 +3,7 @@ package de.danoeh.antennapod.activity; import android.content.SharedPreferences; import android.media.AudioManager; import android.os.Bundle; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.Menu; diff --git a/core/build.gradle b/core/build.gradle index 4c7ef5a0a..bfaffd14f 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -76,7 +76,7 @@ dependencies { implementation "io.reactivex.rxjava2:rxandroid:$rxAndroidVersion" implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion" - implementation 'com.google.android.exoplayer:exoplayer:2.10.8' + implementation 'com.google.android.exoplayer:exoplayer:2.11.8' implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion" // Add casting features diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java index a4612d857..08ea27434 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/PlaybackPreferences.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.core.preferences; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.util.Log; import de.danoeh.antennapod.core.event.PlayerStatusEvent; diff --git a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java index 1d7972e39..bcbc041a6 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java +++ b/core/src/main/java/de/danoeh/antennapod/core/preferences/UserPreferences.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.content.res.Configuration; import android.os.Build; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.text.TextUtils; import android.util.Log; diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java index dddf442f3..71bbf2efd 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/ExoPlayerWrapper.java @@ -8,7 +8,6 @@ import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.DefaultLoadControl; import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlaybackException; -import com.google.android.exoplayer2.ExoPlayerFactory; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.PlaybackParameters; import com.google.android.exoplayer2.Player; @@ -76,9 +75,11 @@ public class ExoPlayerWrapper implements IPlayer { DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_MS, DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS); loadControl.setBackBuffer(UserPreferences.getRewindSecs() * 1000 + 500, true); - trackSelector = new DefaultTrackSelector(); - exoPlayer = ExoPlayerFactory.newSimpleInstance(context, new DefaultRenderersFactory(context), - trackSelector, loadControl.createDefaultLoadControl()); + trackSelector = new DefaultTrackSelector(context); + exoPlayer = new SimpleExoPlayer.Builder(context, new DefaultRenderersFactory(context)) + .setTrackSelector(trackSelector) + .setLoadControl(loadControl.createDefaultLoadControl()) + .build(); exoPlayer.setSeekParameters(SeekParameters.EXACT); exoPlayer.addListener(new Player.EventListener() { @Override diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java index 111e2d37c..9b373b3b9 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java @@ -19,7 +19,7 @@ import android.os.Build; import android.os.Bundle; import android.os.IBinder; import android.os.Vibrator; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.annotation.NonNull; import androidx.annotation.StringRes; import androidx.core.app.NotificationCompat; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java index aec53da4c..fecb14d25 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/AudioPlayer.java @@ -2,7 +2,7 @@ package de.danoeh.antennapod.core.util.playback; import android.content.Context; import android.content.SharedPreferences; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import android.util.Log; import android.view.SurfaceHolder; diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java index 24aabf212..c44c0f925 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/Playable.java @@ -3,7 +3,7 @@ package de.danoeh.antennapod.core.util.playback; import android.content.Context; import android.content.SharedPreferences; import android.os.Parcelable; -import android.preference.PreferenceManager; +import androidx.preference.PreferenceManager; import androidx.annotation.Nullable; import android.util.Log; diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 1059a55c1..0813d8aa5 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -715,12 +715,13 @@ <string name="search_itunes_label">Search iTunes</string> <string name="search_fyyd_label">Search fyyd</string> <string name="advanced">Advanced</string> - <string name="add_podcast_by_url">Add Podcast by URL</string> + <string name="add_podcast_by_url">Add Podcast by RSS address</string> <string name="add_podcast_by_url_hint" translatable="false">www.example.com/feed</string> <string name="browse_gpoddernet_label">Browse gpodder.net</string> <string name="discover">Discover</string> <string name="discover_more">more ยป</string> - <string name="search_powered_by">Search powered by %1$s</string> + <string name="discover_powered_by_itunes">Suggestions by iTunes</string> + <string name="search_powered_by">Results by %1$s</string> <string name="filter">Filter</string> |