summaryrefslogtreecommitdiff
path: root/app/src/main/java/de/danoeh
diff options
context:
space:
mode:
authorByteHamster <info@bytehamster.com>2020-02-01 18:02:19 +0100
committerByteHamster <info@bytehamster.com>2020-02-01 18:02:19 +0100
commit8356226e975f9be5dc0b082ebe5ece9585cc95ea (patch)
treed0b002fdea3f30b131f4c06531caf8926cd7512f /app/src/main/java/de/danoeh
parent5af5f30bb6d8a26407dc5647c829857f70000814 (diff)
downloadAntennaPod-8356226e975f9be5dc0b082ebe5ece9585cc95ea.zip
Always allow clicking timecodes
Diffstat (limited to 'app/src/main/java/de/danoeh')
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java2
-rw-r--r--app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java19
-rw-r--r--app/src/main/java/de/danoeh/antennapod/view/ShownotesWebView.java6
3 files changed, 15 insertions, 12 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
index 112e0bcb7..256615199 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -85,7 +85,7 @@ public class ItemDescriptionFragment extends Fragment {
@NonNull
private String loadData() {
Timeline timeline = new Timeline(getActivity(), controller.getMedia());
- return timeline.processShownotes(true);
+ return timeline.processShownotes();
}
@Override
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
index 6c273e414..e1202704a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemFragment.java
@@ -24,6 +24,7 @@ import androidx.annotation.StringRes;
import androidx.fragment.app.Fragment;
import com.bumptech.glide.Glide;
import com.bumptech.glide.request.RequestOptions;
+import com.google.android.material.snackbar.Snackbar;
import de.danoeh.antennapod.R;
import de.danoeh.antennapod.activity.MainActivity;
import de.danoeh.antennapod.adapter.actionbutton.ItemActionButton;
@@ -42,6 +43,7 @@ import de.danoeh.antennapod.core.storage.DBWriter;
import de.danoeh.antennapod.core.storage.DownloadRequester;
import de.danoeh.antennapod.core.util.Converter;
import de.danoeh.antennapod.core.util.DateUtils;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
import de.danoeh.antennapod.core.util.playback.Timeline;
import de.danoeh.antennapod.view.ShownotesWebView;
import io.reactivex.Observable;
@@ -96,6 +98,7 @@ public class ItemFragment extends Fragment {
private Button butAction2;
private Disposable disposable;
+ private PlaybackController controller;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -124,12 +127,11 @@ public class ItemFragment extends Fragment {
}
webvDescription = layout.findViewById(R.id.webvDescription);
webvDescription.setTimecodeSelectedListener(time -> {
- /*if (getActivity() != null && getActivity() instanceof MainActivity) {
- PlaybackController pc = ((MainActivity) getActivity()).getPlaybackController();
- if (pc != null) {
- pc.seekTo(time);
- }
- }*/
+ if (controller != null && item.getMedia().getIdentifier().equals(controller.getMedia().getIdentifier())) {
+ controller.seekTo(time);
+ } else {
+ Snackbar.make(getView(), R.string.play_this_to_seek_position, Snackbar.LENGTH_LONG).show();
+ }
});
registerForContextMenu(webvDescription);
@@ -191,6 +193,8 @@ public class ItemFragment extends Fragment {
public void onStart() {
super.onStart();
EventBus.getDefault().register(this);
+ controller = new PlaybackController(getActivity(), false);
+ controller.init();
}
@Override
@@ -206,6 +210,7 @@ public class ItemFragment extends Fragment {
public void onStop() {
super.onStop();
EventBus.getDefault().unregister(this);
+ controller.release();
}
@Override
@@ -389,7 +394,7 @@ public class ItemFragment extends Fragment {
Context context = getContext();
if (feedItem != null && context != null) {
Timeline t = new Timeline(context, feedItem);
- webviewData = t.processShownotes(false);
+ webviewData = t.processShownotes();
}
return feedItem;
}
diff --git a/app/src/main/java/de/danoeh/antennapod/view/ShownotesWebView.java b/app/src/main/java/de/danoeh/antennapod/view/ShownotesWebView.java
index 6c290e3da..3ea57eb5e 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/ShownotesWebView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/ShownotesWebView.java
@@ -3,6 +3,7 @@ package de.danoeh.antennapod.view;
import android.content.ClipData;
import android.content.Context;
import android.content.Intent;
+import android.graphics.Color;
import android.net.Uri;
import android.os.Build;
import android.util.AttributeSet;
@@ -51,10 +52,7 @@ public class ShownotesWebView extends WebView implements View.OnLongClickListene
}
private void setup() {
- if (UserPreferences.getTheme() == R.style.Theme_AntennaPod_Dark
- || UserPreferences.getTheme() == R.style.Theme_AntennaPod_TrueBlack) {
- setBackgroundColor(ContextCompat.getColor(getContext(), R.color.black));
- }
+ setBackgroundColor(Color.TRANSPARENT);
if (!NetworkUtils.networkAvailable()) {
getSettings().setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
// Use cached resources, even if they have expired