Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chapter dividers for the progress bar #4915

Merged
merged 9 commits into from
Mar 1, 2021
Merged

Chapter dividers for the progress bar #4915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
69d31cf
Add chapter dividers within the progressbar
jonasburian Feb 1, 2021
01bfd6c
checkstyle
jonasburian Feb 1, 2021
459000c
Change margin between chapter dividers, fix some issues
jonasburian Feb 3, 2021
c9b02bf
Move setChapterDividers to updateUi, remove setHasChapters from Chapt…
jonasburian Feb 4, 2021
fbdd50e
Fix NullPointerException
jonasburian Feb 4, 2021
330c8d2
Change margin between chapters, fix bug
jonasburian Feb 4, 2021
11cc438
Draw bars manually
jonasburian Feb 11, 2021
ac5129f
Merge branch 'develop' into feature-chapter-marks
ByteHamster Mar 1, 2021
0ba6469
Fixed new import location
ByteHamster Mar 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Draw bars manually
  • Loading branch information
@jonasburian
jonasburian committed Feb 11, 2021
commit 11cc438e7fc385c5feb9a8619809b85b9a277123
6 changes: 3 additions & 3 deletions app/src/main/java/de/danoeh/antennapod/fragment/AudioPlayerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,11 +192,11 @@ private void setChapterDividers(Playable media) {

if (hasChapters) {
List<Chapter> chapters = media.getChapters();
dividerPos = new float[chapters.size() - 1];
dividerPos = new float[chapters.size()];
float duration = media.getDuration();

for (int i = 1; i < chapters.size(); i++) {
dividerPos[i - 1] = chapters.get(i).getStart() / duration;
for (int i = 0; i < chapters.size(); i++) {
dividerPos[i] = chapters.get(i).getStart() / duration;
}
}

Expand Down
80 changes: 65 additions & 15 deletions app/src/main/java/de/danoeh/antennapod/view/ChapterSeekBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,20 @@
import android.graphics.Canvas;
import android.graphics.Paint;
import android.util.AttributeSet;

import de.danoeh.antennapod.core.util.ThemeUtils;

public class ChapterSeekBar extends androidx.appcompat.widget.AppCompatSeekBar {

private float dividerMargin;
private float top;
private float width;
private float bottom;
private float density;
private float progressPrimary;
private float progressSecondary;
private float[] dividerPos;
private final Paint dividerPaint = new Paint();
private final Paint paintBackground = new Paint();
private final Paint paintProgressPrimary = new Paint();
private final Paint paintProgressSecondary = new Paint();

public ChapterSeekBar(Context context) {
super(context);
Expand All @@ -31,41 +37,85 @@ public ChapterSeekBar(Context context, AttributeSet attrs, int defStyle) {
private void init(Context context) {
setBackground(null); // Removes the thumb shadow
dividerPos = null;
dividerMargin = context.getResources().getDisplayMetrics().density;
dividerPaint.setColor(ThemeUtils.getColorFromAttr(getContext(), android.R.attr.windowBackground));
density = context.getResources().getDisplayMetrics().density;
paintBackground.setColor(ThemeUtils.getColorFromAttr(getContext(),
de.danoeh.antennapod.core.R.attr.currently_playing_background));
paintBackground.setAlpha(128);
paintProgressPrimary.setColor(ThemeUtils.getColorFromAttr(getContext(),
de.danoeh.antennapod.core.R.attr.colorPrimary));
paintProgressSecondary.setColor(ThemeUtils.getColorFromAttr(getContext(),
de.danoeh.antennapod.core.R.attr.seek_background));
}

/**
* Sets the relative positions of the chapter dividers.
* @param dividerPos of the chapter dividers relative to the duration of the media.
*/
public void setDividerPos(final float[] dividerPos) {
this.dividerPos = dividerPos;
if (dividerPos != null) {
this.dividerPos = new float[dividerPos.length + 2];
this.dividerPos[0] = 0;
System.arraycopy(dividerPos, 0, this.dividerPos, 1, dividerPos.length);
this.dividerPos[this.dividerPos.length - 1] = 1;
} else {
this.dividerPos = null;
}
}

@Override
protected synchronized void onDraw(Canvas canvas) {
drawProgress(canvas);
if (dividerPos != null) {
drawDividers(canvas);
top = getTop() + density * 7.5f;
bottom = getBottom() - density * 7.5f;
width = (float) (getRight() - getPaddingRight() - getLeft() - getPaddingLeft());
progressSecondary = getSecondaryProgress() / (float) getMax() * width;
progressPrimary = getProgress() / (float) getMax() * width;

if (dividerPos == null) {
drawProgress(canvas);
} else {
drawProgressChapters(canvas);
}
drawThumb(canvas);
}

private void drawProgress(Canvas canvas) {
final int saveCount = canvas.save();
canvas.translate(getPaddingLeft(), getPaddingTop());
getProgressDrawable().draw(canvas);
canvas.drawRect(0, top, width, bottom, paintBackground);
canvas.drawRect(0, top, progressSecondary, bottom, paintProgressSecondary);
canvas.drawRect(0, top, progressPrimary, bottom, paintProgressPrimary);
canvas.restoreToCount(saveCount);
}

private void drawDividers(Canvas canvas) {
private void drawProgressChapters(Canvas canvas) {
final int saveCount = canvas.save();
final float width = (float) (getRight() - getPaddingRight() - getLeft() - getPaddingLeft());
int currChapter = 1;
float chapterMargin = density * 0.6f;
float topExpanded = getTop() + density * 7;
float bottomExpanded = getBottom() - density * 7;

canvas.translate(getPaddingLeft(), getPaddingTop());
for (float pos : dividerPos) {
pos *= width;
canvas.drawRect(pos - dividerMargin, getTop(), pos + dividerMargin, getBottom(), dividerPaint);

for (int i = 1; i < dividerPos.length; i++) {
float right = dividerPos[i] * width - chapterMargin;
float left = dividerPos[i - 1] * width + chapterMargin;
float rightCurr = dividerPos[currChapter] * width - chapterMargin;
float leftCurr = dividerPos[currChapter - 1] * width + chapterMargin;

canvas.drawRect(left, top, right, bottom, paintBackground);

if (right < progressPrimary) {
currChapter = i + 1;
canvas.drawRect(left, top, right, bottom, paintProgressPrimary);
} else if (isPressed()) {
canvas.drawRect(leftCurr, topExpanded, rightCurr, bottomExpanded, paintBackground);
canvas.drawRect(leftCurr, topExpanded, progressPrimary, bottomExpanded, paintProgressPrimary);
} else {
if (progressSecondary > leftCurr) {
canvas.drawRect(leftCurr, top, progressSecondary, bottom, paintProgressSecondary);
}
canvas.drawRect(leftCurr, top, progressPrimary, bottom, paintProgressPrimary);
}
}
canvas.restoreToCount(saveCount);
}
Expand Down