summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
Diffstat (limited to 'core')
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java11
-rw-r--r--core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java5
-rw-r--r--core/src/main/res/values/arrays.xml4
-rw-r--r--core/src/main/res/values/attrs.xml1
-rw-r--r--core/src/main/res/values/colors.xml2
-rw-r--r--core/src/main/res/values/strings.xml5
-rw-r--r--core/src/main/res/values/styles.xml2
7 files changed, 19 insertions, 11 deletions
diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
index 5af05b6d2..65bd8afe4 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/service/PlayerWidgetJobService.java
@@ -107,7 +107,6 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
RemoteViews views;
views = new RemoteViews(getPackageName(), R.layout.player_widget);
- boolean nothingPlaying = false;
Playable media;
PlayerStatus status;
if (playbackService != null) {
@@ -169,11 +168,13 @@ public class PlayerWidgetJobService extends SafeJobIntentService {
createMediaButtonIntent(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
views.setOnClickPendingIntent(R.id.butPlayExtended,
createMediaButtonIntent(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE));
+ views.setOnClickPendingIntent(R.id.butRew,
+ createMediaButtonIntent(KeyEvent.KEYCODE_MEDIA_REWIND));
+ views.setOnClickPendingIntent(R.id.butFastForward,
+ createMediaButtonIntent(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD));
+ views.setOnClickPendingIntent(R.id.butSkip,
+ createMediaButtonIntent(KeyEvent.KEYCODE_MEDIA_NEXT));
} else {
- nothingPlaying = true;
- }
-
- if (nothingPlaying) {
// start the app if they click anything
views.setOnClickPendingIntent(R.id.layout_left, startMediaPlayer);
views.setOnClickPendingIntent(R.id.butPlay, startMediaPlayer);
diff --git a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
index 1e069a1f0..c57d6a5d1 100644
--- a/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
+++ b/core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSITunes.java
@@ -3,6 +3,8 @@ package de.danoeh.antennapod.core.syndication.namespace;
import android.text.TextUtils;
import android.util.Log;
+import androidx.core.text.HtmlCompat;
+
import org.xml.sax.Attributes;
import de.danoeh.antennapod.core.feed.FeedItem;
@@ -62,7 +64,8 @@ public class NSITunes extends Namespace {
private void parseAuthor(HandlerState state) {
if (state.getFeed() != null) {
String author = state.getContentBuf().toString();
- state.getFeed().setAuthor(author);
+ state.getFeed().setAuthor(HtmlCompat.fromHtml(author,
+ HtmlCompat.FROM_HTML_MODE_LEGACY).toString());
}
}
diff --git a/core/src/main/res/values/arrays.xml b/core/src/main/res/values/arrays.xml
index 1ab44d847..79ffb10ce 100644
--- a/core/src/main/res/values/arrays.xml
+++ b/core/src/main/res/values/arrays.xml
@@ -234,15 +234,15 @@
</string-array>
<string-array name="media_player_options">
+ <item>@string/media_player_exoplayer_recommended</item>
<item>@string/media_player_builtin</item>
<item>@string/media_player_sonic</item>
- <item>@string/media_player_exoplayer_recommended</item>
</string-array>
<string-array name="media_player_values">
+ <item>exoplayer</item>
<item>builtin</item>
<item>sonic</item>
- <item>exoplayer</item>
</string-array>
<!-- sort for podcast screen, not for queue -->
diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml
index a6879b006..cceacf99e 100644
--- a/core/src/main/res/values/attrs.xml
+++ b/core/src/main/res/values/attrs.xml
@@ -62,6 +62,7 @@
<attr name="filter_dialog_clear" format="color"/>
<attr name="filter_dialog_button_background" format="reference"/>
<attr name="ic_notifications" format="reference"/>
+ <attr name="seek_background" format="color" />
<attr name="ic_share" format="reference"/>
<declare-styleable name="SquareImageView">
diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml
index feee88bb4..fc2409e11 100644
--- a/core/src/main/res/values/colors.xml
+++ b/core/src/main/res/values/colors.xml
@@ -22,6 +22,8 @@
<color name="highlight_dark">#43707070</color>
<color name="highlight_trueblack">#43707070</color>
<color name="non_square_icon_background">#22777777</color>
+ <color name="seek_background_light">#90000000</color>
+ <color name="seek_background_dark">#905B5B5B</color>
<color name="accent_light">#0078C2</color>
<color name="accent_dark">#3D8BFF</color>
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 0c87394b4..a52b30512 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -95,7 +95,6 @@
<string name="description_label">Description</string>
<string name="episodes_suffix">\u0020episodes</string>
<string name="processing_label">Processing</string>
- <string name="save_username_password_label">Save username and password</string>
<string name="close_label">Close</string>
<string name="retry_label">Retry</string>
<string name="auto_download_label">Include in auto downloads</string>
@@ -506,8 +505,8 @@
<string name="pref_cast_message_free_flavor">Chromecast requires third party proprietary libraries that are disabled in this version of AntennaPod</string>
<string name="pref_enqueue_downloaded_title">Enqueue Downloaded</string>
<string name="pref_enqueue_downloaded_summary">Add downloaded episodes to the queue</string>
- <string name="media_player_builtin">Built-in Android player</string>
- <string name="media_player_sonic" translatable="false">Sonic Media Player</string>
+ <string name="media_player_builtin">Built-in Android player (deprecated) </string>
+ <string name="media_player_sonic">Sonic Media Player (deprecated) </string>
<string name="media_player_exoplayer_recommended">ExoPlayer (recommended)</string>
<string name="media_player_switch_to_exoplayer">Switch to ExoPlayer</string>
<string name="media_player_switched_to_exoplayer">Switched to ExoPlayer.</string>
diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml
index 43e3823c5..533fa8420 100644
--- a/core/src/main/res/values/styles.xml
+++ b/core/src/main/res/values/styles.xml
@@ -21,6 +21,7 @@
<item name="drawer_activated_color">@color/highlight_light</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColorHint">@color/grey600</item>
+ <item name="seek_background">@color/seek_background_light</item>
<item name="storage">@drawable/ic_storage_black</item>
<item name="ic_network">@drawable/ic_network_black</item>
@@ -102,6 +103,7 @@
<item name="action_icon_color">@color/white</item>
<item name="android:textAllCaps">false</item>
<item name="android:textColorHint">@color/medium_gray</item>
+ <item name="seek_background">@color/seek_background_dark</item>
<item name="storage">@drawable/ic_storage_white</item>
<item name="ic_network">@drawable/ic_network_white</item>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 22:37:54 +0000