1 files changed, 20 insertions, 2 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 002147071..4fa8acc43 100644
--- a/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
+++ b/app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
@@ -22,12 +22,14 @@ import de.danoeh.antennapod.core.util.EmbeddedChapterImage;
 import de.danoeh.antennapod.core.util.IntentUtils;
 import de.danoeh.antennapod.core.util.ThemeUtils;
 import de.danoeh.antennapod.core.util.playback.Playable;
+import de.danoeh.antennapod.view.CircularProgressBar;
 
 public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapter.ChapterHolder> {
     private Playable media;
     private final Callback callback;
     private final Context context;
     private int currentChapterIndex = -1;
+    private long currentChapterPosition = -1;
     private boolean hasImages = false;
 
     public ChaptersListAdapter(Context context, Callback callback) {
@@ -48,7 +50,6 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
         notifyDataSetChanged();
     }
 
-
     @Override
     public void onBindViewHolder(@NonNull ChapterHolder holder, int position) {
         Chapter sc = getItem(position);
@@ -65,7 +66,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
         holder.duration.setText(context.getString(R.string.chapter_duration,
                 Converter.getDurationStringLocalized(context, (int) duration)));
 
-        if (sc.getLink() == null) {
+        if (TextUtils.isEmpty(sc.getLink())) {
             holder.link.setVisibility(View.GONE);
         } else {
             holder.link.setVisibility(View.VISIBLE);
@@ -73,6 +74,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
             holder.link.setOnClickListener(v -> IntentUtils.openInBrowser(context, sc.getLink()));
         }
         holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_play));
+        holder.secondaryActionButton.setContentDescription(context.getString(R.string.play_chapter));
         holder.secondaryActionButton.setOnClickListener(v -> {
             if (callback != null) {
                 callback.onPlayChapterButtonClicked(position);
@@ -82,8 +84,14 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
         if (position == currentChapterIndex) {
             int playingBackGroundColor = ThemeUtils.getColorFromAttr(context, R.attr.currently_playing_background);
             holder.itemView.setBackgroundColor(playingBackGroundColor);
+            float progress = ((float) (currentChapterPosition - sc.getStart())) / duration;
+            progress = Math.max(progress, CircularProgressBar.MINIMUM_PERCENTAGE);
+            progress = Math.min(progress, CircularProgressBar.MAXIMUM_PERCENTAGE);
+            holder.progressBar.setPercentage(progress, position);
+            holder.secondaryActionIcon.setImageResource(ThemeUtils.getDrawableFromAttr(context, R.attr.av_replay));
         } else {
             holder.itemView.setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent));
+            holder.progressBar.setPercentage(0, null);
         }
 
         if (hasImages) {
@@ -135,6 +143,7 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
         final ImageView image;
         final View secondaryActionButton;
         final ImageView secondaryActionIcon;
+        final CircularProgressBar progressBar;
 
         public ChapterHolder(@NonNull View itemView) {
             super(itemView);
@@ -145,14 +154,23 @@ public class ChaptersListAdapter extends RecyclerView.Adapter<ChaptersListAdapte
             duration = itemView.findViewById(R.id.txtvDuration);
             secondaryActionButton = itemView.findViewById(R.id.secondaryActionButton);
             secondaryActionIcon = itemView.findViewById(R.id.secondaryActionIcon);
+            progressBar = itemView.findViewById(R.id.secondaryActionProgress);
         }
     }
 
     public void notifyChapterChanged(int newChapterIndex) {
         currentChapterIndex = newChapterIndex;
+        currentChapterPosition = getItem(newChapterIndex).getStart();
         notifyDataSetChanged();
     }
 
+    public void notifyTimeChanged(long timeMs) {
+        currentChapterPosition = timeMs;
+        // Passing an argument prevents flickering.
+        // See EpisodeItemListAdapter.notifyItemChangedCompat.
+        notifyItemChanged(currentChapterIndex, "foo");
+    }
+
     private boolean ignoreChapter(Chapter c) {
         return media.getDuration() > 0 && media.getDuration() < c.getStart();
     }