Audio player redesign

Sleep timer and audio effects (e.g. balance) accessible from actionbar, fragment pager

4 files changed, 169 insertions, 204 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
new file mode 100644
index 000000000..abc9f3d22
--- /dev/null
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -0,0 +1,68 @@
+package de.danoeh.antennapod.fragment;
+
+import android.os.Bundle;
+import android.support.v4.app.ListFragment;
+import android.view.View;
+import android.widget.ListView;
+
+import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment;
+import de.danoeh.antennapod.adapter.ChaptersListAdapter;
+import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.core.util.playback.PlaybackController;
+
+
+public class ChaptersFragment extends ListFragment implements AudioplayerContentFragment {
+
+    private Playable media;
+    private PlaybackController controller;
+
+    private ChaptersListAdapter adapter;
+
+    public static ChaptersFragment newInstance(Playable media, PlaybackController controller) {
+        ChaptersFragment f = new ChaptersFragment();
+        f.media = media;
+        f.controller = controller;
+        return f;
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        // add padding
+        final ListView lv = getListView();
+        lv.setClipToPadding(false);
+        final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding);
+        lv.setPadding(0, vertPadding, 0, vertPadding);
+
+        adapter = new ChaptersListAdapter(getActivity(), 0, pos -> {
+            Chapter chapter = (Chapter) getListAdapter().getItem(pos);
+            controller.seekToChapter(chapter);
+        });
+        setListAdapter(adapter);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        adapter.setMedia(media);
+        adapter.notifyDataSetChanged();
+        if(media == null || media.getChapters() == null) {
+            setEmptyText(getString(R.string.no_chapters_label));
+        } else {
+            setEmptyText(null);
+        }
+    }
+
+    @Override
+    public void onDataSetChanged(Playable media) {
+        adapter.setMedia(media);
+        adapter.notifyDataSetChanged();
+        if(media.getChapters() == null) {
+            setEmptyText(getString(R.string.no_items_label));
+        } else {
+            setEmptyText(null);
+        }
+    }
+}
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
index a1667cce0..60a607179 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/CoverFragment.java
@@ -1,21 +1,21 @@
 package de.danoeh.antennapod.fragment;
 
-import android.app.Activity;
-import android.content.Context;
+import android.graphics.Bitmap;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.support.v7.graphics.Palette;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.BitmapImageViewTarget;
 
-import de.danoeh.antennapod.BuildConfig;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.activity.AudioplayerActivity;
 import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
 import de.danoeh.antennapod.core.util.playback.Playable;
@@ -30,10 +30,11 @@ public class CoverFragment extends Fragment implements
 
     private Playable media;
 
+    private View root;
+    private TextView txtvPodcastTitle;
+    private TextView txtvEpisodeTitle;
     private ImageView imgvCover;
 
-    private boolean viewCreated = false;
-
     public static CoverFragment newInstance(Playable item) {
         CoverFragment f = new CoverFragment();
         if (item != null) {
@@ -59,38 +60,45 @@ public class CoverFragment extends Fragment implements
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        View root = inflater.inflate(R.layout.cover_fragment, container, false);
+        root = inflater.inflate(R.layout.cover_fragment, container, false);
+        txtvPodcastTitle = (TextView) root.findViewById(R.id.txtvPodcastTitle);
+        txtvEpisodeTitle = (TextView) root.findViewById(R.id.txtvEpisodeTitle);
         imgvCover = (ImageView) root.findViewById(R.id.imgvCover);
-        imgvCover.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Activity activity = getActivity();
-                if (activity != null && activity instanceof AudioplayerActivity) {
-                    ((AudioplayerActivity)activity).switchToLastFragment();
-                }
-            }
-        });
-        viewCreated = true;
         return root;
     }
 
     private void loadMediaInfo() {
+        if(imgvCover == null) {
+            return;
+        }
         if (media != null) {
-            imgvCover.post(new Runnable() {
-
-                @Override
-                public void run() {
-                    Context c = getActivity();
-                    if (c != null) {
-                        Glide.with(c)
-                                .load(media.getImageUri())
-                                .placeholder(R.color.light_gray)
-                                .error(R.color.light_gray)
-                                .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
-                                .dontAnimate()
-                                .into(imgvCover);
-                    }
-                }
+            Log.d(TAG, "feed title: " + media.getFeedTitle());
+            Log.d(TAG, "episode title: " + media.getEpisodeTitle());
+            txtvPodcastTitle.setText(media.getFeedTitle());
+            txtvEpisodeTitle.setText(media.getEpisodeTitle());
+            imgvCover.post(() -> {
+                Glide.with(this)
+                        .load(media.getImageUri())
+                        .asBitmap()
+                        .placeholder(R.color.light_gray)
+                        .error(R.color.light_gray)
+                        .diskCacheStrategy(ApGlideSettings.AP_DISK_CACHE_STRATEGY)
+                        .dontAnimate()
+                        .into(new BitmapImageViewTarget(imgvCover) {
+                            @Override
+                            public void onResourceReady(Bitmap bitmap, GlideAnimation anim) {
+                                super.onResourceReady(bitmap, anim);
+                                Palette.Builder builder = new Palette.Builder(bitmap);
+                                builder.generate(palette -> {
+                                    Palette.Swatch swatch = palette.getMutedSwatch();
+                                    if(swatch != null) {
+                                        root.setBackgroundColor(swatch.getRgb());
+                                        txtvPodcastTitle.setTextColor(swatch.getTitleTextColor());
+                                        txtvEpisodeTitle.setTextColor(swatch.getBodyTextColor());
+                                    }
+                                });
+                            }
+                        });
             });
         } else {
             Log.w(TAG, "loadMediaInfo was called while media was null");
@@ -99,12 +107,10 @@ public class CoverFragment extends Fragment implements
 
     @Override
     public void onStart() {
-        if (BuildConfig.DEBUG)
-            Log.d(TAG, "On Start");
+        Log.d(TAG, "On Start");
         super.onStart();
         if (media != null) {
-            if (BuildConfig.DEBUG)
-                Log.d(TAG, "Loading media info");
+            Log.d(TAG, "Loading media info");
             loadMediaInfo();
         } else {
             Log.w(TAG, "Unable to load media info: media was null");
@@ -114,10 +120,7 @@ public class CoverFragment extends Fragment implements
     @Override
     public void onDataSetChanged(Playable media) {
         this.media = media;
-        if (viewCreated) {
-            loadMediaInfo();
-        }
-
+        loadMediaInfo();
     }
 
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
index 888684313..80a9bf0b3 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ExternalPlayerFragment.java
@@ -13,7 +13,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.core.glide.ApGlideSettings;
@@ -80,50 +79,15 @@ public class ExternalPlayerFragment extends Fragment {
         return new PlaybackController(getActivity(), true) {
 
             @Override
-            public void setupGUI() {
-            }
-
-            @Override
             public void onPositionObserverUpdate() {
                 ExternalPlayerFragment.this.onPositionObserverUpdate();
             }
 
             @Override
-            public void onReloadNotification(int code) {
-            }
-
-            @Override
-            public void onBufferStart() {
-            }
-
-            @Override
-            public void onBufferEnd() {
-            }
-
-            @Override
-            public void onBufferUpdate(float progress) {
-            }
-
-            @Override
-            public void onSleepTimerUpdate() {
-            }
-
-            @Override
-            public void handleError(int code) {
-            }
-
-            @Override
             public ImageButton getPlayButton() {
                 return butPlay;
             }
 
-            @Override
-            public void postStatusMsg(int msg) {
-            }
-
-            @Override
-            public void clearStatusMsg() {
-            }
 
             @Override
             public boolean loadMediaInfo() {
@@ -136,14 +100,6 @@ public class ExternalPlayerFragment extends Fragment {
             }
 
             @Override
-            public void onAwaitingVideoSurface() {
-            }
-
-            @Override
-            public void onServiceQueried() {
-            }
-
-            @Override
             public void onShutdownNotification() {
                 playbackDone();
             }
@@ -152,10 +108,6 @@ public class ExternalPlayerFragment extends Fragment {
             public void onPlaybackEnd() {
                 playbackDone();
             }
-
-            @Override
-            public void onPlaybackSpeedChange() {
-            }
         };
     }
 
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 faa4413bb..6c9473176 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.net.Uri;
-import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -26,6 +25,8 @@ import android.webkit.WebViewClient;
 import android.widget.Toast;
 
 import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.activity.AudioplayerActivity;
+import de.danoeh.antennapod.activity.AudioplayerActivity.AudioplayerContentFragment;
 import de.danoeh.antennapod.core.feed.FeedItem;
 import de.danoeh.antennapod.core.preferences.UserPreferences;
 import de.danoeh.antennapod.core.storage.DBReader;
@@ -36,11 +37,15 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 import de.danoeh.antennapod.core.util.playback.Timeline;
+import rx.Observable;
+import rx.Subscription;
+import rx.android.schedulers.AndroidSchedulers;
+import rx.schedulers.Schedulers;
 
 /**
  * Displays the description of a Playable object in a Webview.
  */
-public class ItemDescriptionFragment extends Fragment {
+public class ItemDescriptionFragment extends Fragment implements AudioplayerContentFragment {
 
     private static final String TAG = "ItemDescriptionFragment";
 
@@ -55,12 +60,13 @@ public class ItemDescriptionFragment extends Fragment {
     private static final String ARG_HIGHLIGHT_TIMECODES = "arg.highlightTimecodes";
 
     private WebView webvDescription;
+    private String webvData;
 
     private ShownotesProvider shownotesProvider;
     private Playable media;
 
 
-    private AsyncTask<Void, Void, Void> webViewLoader;
+    private Subscription webViewLoader;
 
     /**
      * URL that was selected via long-press.
@@ -111,12 +117,10 @@ public class ItemDescriptionFragment extends Fragment {
                     && Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
                 webvDescription.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
             }
-            webvDescription.setBackgroundColor(getResources().getColor(
-                    R.color.black));
+            webvDescription.setBackgroundColor(getResources().getColor(R.color.black));
         }
         webvDescription.getSettings().setUseWideViewPort(false);
-        webvDescription.getSettings().setLayoutAlgorithm(
-                LayoutAlgorithm.NARROW_COLUMNS);
+        webvDescription.getSettings().setLayoutAlgorithm(LayoutAlgorithm.SINGLE_COLUMN);
         webvDescription.getSettings().setLoadWithOverviewMode(true);
         webvDescription.setOnLongClickListener(webViewLongClickListener);
         webvDescription.setWebViewClient(new WebViewClient() {
@@ -142,14 +146,7 @@ public class ItemDescriptionFragment extends Fragment {
                 super.onPageFinished(view, url);
                 Log.d(TAG, "Page finished");
                 // Restoring the scroll position might not always work
-                view.postDelayed(new Runnable() {
-
-                    @Override
-                    public void run() {
-                        restoreFromPreference();
-                    }
-
-                }, 50);
+                view.postDelayed(() -> restoreFromPreference(), 50);
             }
 
         });
@@ -159,26 +156,11 @@ public class ItemDescriptionFragment extends Fragment {
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        Log.d(TAG, "Fragment attached");
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        Log.d(TAG, "Fragment detached");
-        if (webViewLoader != null) {
-            webViewLoader.cancel(true);
-        }
-    }
-
-    @Override
     public void onDestroy() {
         super.onDestroy();
         Log.d(TAG, "Fragment destroyed");
         if (webViewLoader != null) {
-            webViewLoader.cancel(true);
+            webViewLoader.unsubscribe();
         }
         if (webvDescription != null) {
             webvDescription.removeAllViews();
@@ -194,7 +176,6 @@ public class ItemDescriptionFragment extends Fragment {
         Bundle args = getArguments();
         saveState = args.getBoolean(ARG_SAVE_STATE, false);
         highlightTimecodes = args.getBoolean(ARG_HIGHLIGHT_TIMECODES, false);
-
     }
 
     @Override
@@ -204,46 +185,21 @@ public class ItemDescriptionFragment extends Fragment {
         if (args.containsKey(ARG_PLAYABLE)) {
             media = args.getParcelable(ARG_PLAYABLE);
             shownotesProvider = media;
-            startLoader();
+            load();
         } else if (args.containsKey(ARG_FEEDITEM_ID)) {
-            AsyncTask<Void, Void, FeedItem> itemLoadTask = new AsyncTask<Void, Void, FeedItem>() {
-
-                @Override
-                protected FeedItem doInBackground(Void... voids) {
-                    return DBReader.getFeedItem(getArguments().getLong(ARG_FEEDITEM_ID));
-                }
-
-                @Override
-                protected void onPostExecute(FeedItem feedItem) {
-                    super.onPostExecute(feedItem);
-                    shownotesProvider = feedItem;
-                    startLoader();
-                }
-            };
-            if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-                itemLoadTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-            } else {
-                itemLoadTask.execute();
-            }
+            long id = getArguments().getLong(ARG_FEEDITEM_ID);
+            Observable.defer(() -> Observable.just(DBReader.getFeedItem(id)))
+                    .subscribeOn(Schedulers.newThread())
+                    .observeOn(AndroidSchedulers.mainThread())
+                    .subscribe(feedItem -> {
+                        shownotesProvider = feedItem;
+                        load();
+                    }, error -> {
+                        Log.e(TAG, Log.getStackTraceString(error));
+                    });
         }
-
-
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
-    }
-
-    @SuppressLint("NewApi")
-    private void startLoader() {
-        webViewLoader = createLoader();
-        if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.GINGERBREAD_MR1) {
-            webViewLoader.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
-        } else {
-            webViewLoader.execute();
-        }
-    }
 
     private View.OnLongClickListener webViewLongClickListener = new View.OnLongClickListener() {
 
@@ -338,49 +294,31 @@ public class ItemDescriptionFragment extends Fragment {
         }
     }
 
-    private AsyncTask<Void, Void, Void> createLoader() {
-        return new AsyncTask<Void, Void, Void>() {
-            @Override
-            protected void onCancelled() {
-                super.onCancelled();
-                webViewLoader = null;
-            }
-
-            String data;
-
-            @Override
-            protected void onPostExecute(Void result) {
-                super.onPostExecute(result);
-                // /webvDescription.loadData(url, "text/html", "utf-8");
-                webvDescription.loadDataWithBaseURL(null, data, "text/html",
-                        "utf-8", "about:blank");
-                Log.d(TAG, "Webview loaded");
-                webViewLoader = null;
-            }
-
-            @Override
-            protected void onPreExecute() {
-                super.onPreExecute();
-            }
-
-            @Override
-            protected Void doInBackground(Void... params) {
-                Log.d(TAG, "Loading Webview");
-                try {
-                    Activity activity = getActivity();
-                    if (activity != null) {
-                        Timeline timeline = new Timeline(activity, shownotesProvider);
-                        data = timeline.processShownotes(highlightTimecodes);
-                    } else {
-                        cancel(true);
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-                return null;
-            }
+    private void load() {
+        Log.d(TAG, "load()");
+        if(webViewLoader != null) {
+            webViewLoader.unsubscribe();
+        }
+        if(shownotesProvider == null) {
+            return;
+        }
+        webViewLoader = Observable.defer(() -> Observable.just(loadData()))
+                .subscribeOn(Schedulers.newThread())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe(data -> {
+                    webvData = data;
+                    webvDescription.loadDataWithBaseURL(null, data, "text/html",
+                            "utf-8", "about:blank");
+                    Log.d(TAG, "Webview loaded");
+                }, error -> {
+                    Log.e(TAG, Log.getStackTraceString(error));
+                });
+    }
 
-        };
+    private String loadData() {
+        Timeline timeline = new Timeline(getActivity(), shownotesProvider);
+        String data = timeline.processShownotes(highlightTimecodes);
+        return data;
     }
 
     @Override
@@ -410,7 +348,7 @@ public class ItemDescriptionFragment extends Fragment {
     }
 
     private boolean restoreFromPreference() {
-        if (saveState) {
+        if (!saveState) {
             Log.d(TAG, "Restoring from preferences");
             Activity activity = getActivity();
             if (activity != null) {
@@ -433,15 +371,19 @@ public class ItemDescriptionFragment extends Fragment {
 
     private void onTimecodeLinkSelected(String link) {
         int time = Timeline.getTimecodeLinkTime(link);
-        if (getActivity() != null && getActivity() instanceof ItemDescriptionFragmentCallback) {
-            PlaybackController pc = ((ItemDescriptionFragmentCallback) getActivity()).getPlaybackController();
+        if (getActivity() != null && getActivity() instanceof AudioplayerActivity) {
+            PlaybackController pc = ((AudioplayerActivity) getActivity()).getPlaybackController();
             if (pc != null) {
                 pc.seekTo(time);
             }
         }
     }
 
-    public interface ItemDescriptionFragmentCallback {
-        public PlaybackController getPlaybackController();
+    @Override
+    public void onDataSetChanged(Playable media) {
+        this.media = media;
+        this.shownotesProvider = media;
+        load();
     }
+
 }