Merge branch 'develop' into extract-queue-item-view

3 files changed, 63 insertions, 27 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
index fa18621ac..3e84e090a 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -22,6 +22,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
 
     private Playable media;
     private final Callback callback;
+    private int currentChapterIndex = -1;
 
     public ChaptersListAdapter(Context context, int textViewResourceId, Callback callback) {
         super(context, textViewResourceId);
@@ -86,8 +87,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
             }
         });
 
-        Chapter current = ChapterUtils.getCurrentChapter(media);
-        if (current == sc) {
+        if (position == currentChapterIndex) {
             int playingBackGroundColor = ThemeUtils.getColorFromAttr(getContext(), R.attr.currently_playing_background);
             holder.view.setBackgroundColor(playingBackGroundColor);
         } else {
@@ -122,6 +122,11 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
         return counter;
     }
 
+    public void notifyChapterChanged(int newChapterIndex) {
+        currentChapterIndex = newChapterIndex;
+        notifyDataSetChanged();
+    }
+
     private boolean ignoreChapter(Chapter c) {
         return media.getDuration() > 0 && media.getDuration() < c.getStart();
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
index 2df28b262..386b760b1 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/ChaptersFragment.java
@@ -11,7 +11,10 @@ import java.util.ListIterator;
 
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.adapter.ChaptersListAdapter;
+import de.danoeh.antennapod.adapter.QueueRecyclerAdapter;
+import de.danoeh.antennapod.core.event.PlaybackPositionEvent;
 import de.danoeh.antennapod.core.feed.Chapter;
+import de.danoeh.antennapod.core.service.playback.PlayerStatus;
 import de.danoeh.antennapod.core.util.playback.Playable;
 import de.danoeh.antennapod.core.util.playback.PlaybackController;
 
@@ -20,14 +23,17 @@ import io.reactivex.Maybe;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
+import org.greenrobot.eventbus.EventBus;
+import org.greenrobot.eventbus.Subscribe;
+import org.greenrobot.eventbus.ThreadMode;
 
 public class ChaptersFragment extends ListFragment {
     private static final String TAG = "ChaptersFragment";
     private ChaptersListAdapter adapter;
     private PlaybackController controller;
     private Disposable disposable;
-    private EmptyViewHandler emptyView;
-
+    private int focusedChapter = -1;
+    private Playable media;
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
@@ -38,15 +44,19 @@ public class ChaptersFragment extends ListFragment {
         final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding);
         lv.setPadding(0, vertPadding, 0, vertPadding);
 
-        emptyView = new EmptyViewHandler(getContext());
+        EmptyViewHandler emptyView = new EmptyViewHandler(getContext());
         emptyView.attachToListView(lv);
         emptyView.setIcon(R.attr.ic_bookmark);
         emptyView.setTitle(R.string.no_chapters_head_label);
         emptyView.setMessage(R.string.no_chapters_label);
 
         adapter = new ChaptersListAdapter(getActivity(), 0, pos -> {
+            if (controller.getStatus() != PlayerStatus.PLAYING) {
+                controller.playPause();
+            }
             Chapter chapter = (Chapter) getListAdapter().getItem(pos);
             controller.seekToChapter(chapter);
+            updateChapterSelection(pos);
         });
         setListAdapter(adapter);
     }
@@ -67,7 +77,7 @@ public class ChaptersFragment extends ListFragment {
             }
         };
         controller.init();
-
+        EventBus.getDefault().register(this);
         loadMediaInfo();
     }
 
@@ -85,6 +95,12 @@ public class ChaptersFragment extends ListFragment {
         super.onStop();
         controller.release();
         controller = null;
+        EventBus.getDefault().unregister(this);
+    }
+
+    @Subscribe(threadMode = ThreadMode.MAIN)
+    public void onEventMainThread(PlaybackPositionEvent event) {
+        updateChapterSelection(getCurrentChapter(media));
     }
 
     private int getCurrentChapter(Playable media) {
@@ -94,10 +110,9 @@ public class ChaptersFragment extends ListFragment {
         int currentPosition = controller.getPosition();
 
         List<Chapter> chapters = media.getChapters();
-        for (final ListIterator<Chapter> it = chapters.listIterator(); it.hasNext(); ) {
-            Chapter chapter = it.next();
-            if (chapter.getStart() > currentPosition) {
-                return it.previousIndex() - 1;
+        for (int i = 0; i < chapters.size(); i++) {
+            if (chapters.get(i).getStart() > currentPosition) {
+                return i - 1;
             }
         }
         return chapters.size() - 1;
@@ -108,27 +123,42 @@ public class ChaptersFragment extends ListFragment {
             disposable.dispose();
         }
         disposable = Maybe.create(emitter -> {
-                    Playable media = controller.getMedia();
-                    if (media != null) {
-                        emitter.onSuccess(media);
-                    } else {
-                        emitter.onComplete();
-                    }
-                })
-                .subscribeOn(Schedulers.io())
-                .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(media -> onMediaChanged((Playable) media),
-                        error -> Log.e(TAG, Log.getStackTraceString(error)));
+            Playable media = controller.getMedia();
+            if (media != null) {
+                emitter.onSuccess(media);
+            } else {
+                emitter.onComplete();
+            }
+        })
+        .subscribeOn(Schedulers.io())
+        .observeOn(AndroidSchedulers.mainThread())
+        .subscribe(media -> onMediaChanged((Playable) media),
+                error -> Log.e(TAG, Log.getStackTraceString(error)));
     }
 
     private void onMediaChanged(Playable media) {
-        if (adapter != null) {
-            adapter.setMedia(media);
-            adapter.notifyDataSetChanged();
+        this.media = media;
+        focusedChapter = -1;
+        if (adapter == null) {
+            return;
+        }
+        adapter.setMedia(media);
+        adapter.notifyDataSetChanged();
+        int positionOfCurrentChapter = getCurrentChapter(media);
+        updateChapterSelection(positionOfCurrentChapter);
+    }
+
+    private void updateChapterSelection(int position) {
+        if (adapter == null) {
+            return;
+        }
 
-            int positionOfCurrentChapter = getCurrentChapter(media);
-            if (positionOfCurrentChapter != -1) {
-                getListView().setSelection(positionOfCurrentChapter);
+        if (position != -1 && focusedChapter != position) {
+            focusedChapter = position;
+            adapter.notifyChapterChanged(focusedChapter);
+            if (getListView().getFirstVisiblePosition() >= position
+                    || getListView().getLastVisiblePosition() <= position) {
+                getListView().setSelectionFromTop(position, 100);
             }
         }
     }
diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
index 8036a7506..4f0feef47 100644
--- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/ImportExportPreferencesFragment.java
@@ -186,6 +186,7 @@ public class ImportExportPreferencesFragment extends PreferenceFragmentCompat {
             ComponentName cn = intent.getComponent();
             Intent mainIntent = Intent.makeRestartActivityTask(cn);
             startActivity(mainIntent);
+            Runtime.getRuntime().exit(0);
         });
         d.show();
     }