Merge branch 'master' into develop

2 files changed, 16 insertions, 5 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
index 530d87e7f..e93db2d2a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
@@ -183,10 +183,6 @@ public class AudioPlayerFragment extends Fragment implements
         sbPosition.setDividerPos(dividerPos);
     }
 
-    public View getExternalPlayerHolder() {
-        return getView().findViewById(R.id.playerFragment);
-    }
-
     private void setupControlButtons() {
         butRev.setOnClickListener(v -> {
             if (controller != null) {
@@ -528,6 +524,16 @@ public class AudioPlayerFragment extends Fragment implements
         return false;
     }
 
+    public void fadePlayerToToolbar(float slideOffset) {
+        float playerFadeProgress = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.2f)) / 0.2f;
+        View player = getView().findViewById(R.id.playerFragment);
+        player.setAlpha(1 - playerFadeProgress);
+        player.setVisibility(playerFadeProgress > 0.99f ? View.GONE : View.VISIBLE);
+        float toolbarFadeProgress = Math.max(0.0f, Math.min(0.2f, slideOffset - 0.6f)) / 0.2f;
+        toolbar.setAlpha(toolbarFadeProgress);
+        toolbar.setVisibility(toolbarFadeProgress < 0.01f ? View.INVISIBLE : View.VISIBLE);
+    }
+
     private static class AudioPlayerPagerAdapter extends FragmentStateAdapter {
         private static final String TAG = "AudioPlayerPagerAdapter";
 
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 8a7d2432a..c5a8b6f2a 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -1,6 +1,7 @@
 package de.danoeh.antennapod.fragment;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.util.Log;
@@ -86,6 +87,10 @@ public class ItemDescriptionFragment extends Fragment {
         if (webViewLoader != null) {
             webViewLoader.dispose();
         }
+        Context context = getContext();
+        if (context == null) {
+            return;
+        }
         webViewLoader = Maybe.<String>create(emitter -> {
             Playable media = controller.getMedia();
             if (media == null) {
@@ -100,7 +105,7 @@ public class ItemDescriptionFragment extends Fragment {
                 DBReader.loadDescriptionOfFeedItem(feedMedia.getItem());
             }
             ShownotesCleaner shownotesCleaner = new ShownotesCleaner(
-                    getActivity(), media.getDescription(), media.getDuration());
+                    context, media.getDescription(), media.getDuration());
             emitter.onSuccess(shownotesCleaner.processShownotes());
         })
                 .subscribeOn(Schedulers.io())