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
checkstyle
  • Loading branch information
@jonasburian
jonasburian committed Feb 1, 2021
commit 01bfd6c4f66f4517201fe3a81cad97fabdeea837
1 change: 1 addition & 0 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 @@ -455,6 +455,7 @@ public void updatePosition(PlaybackPositionEvent event) {
if (controller == null || txtvPosition == null || txtvLength == null || sbPosition == null) {
return;
}

TimeSpeedConverter converter = new TimeSpeedConverter(controller.getCurrentPlaybackSpeedMultiplier());
int currentPosition = converter.convert(event.getPosition());
int duration = converter.convert(event.getDuration());
Expand Down
6 changes: 2 additions & 4 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 @@ -27,17 +27,15 @@ public ChapterSeekBar(Context context, AttributeSet attrs, int defStyle) {
init();
}

/**
* Initializes the ChapterSeekBar
*/
private void init() {
setBackground(null); // Removes the thumb shadow
dividerPos = null;
dividerPaint.setColor(ThemeUtils.getColorFromAttr(getContext(), android.R.attr.windowBackground));
}

/**
* @param dividerPos of the chapter dividers relative to the duration of the media
* Calculates the positions of the chapter dividers in the progress bar.
* @param dividerPos of the chapter dividers relative to the duration of the media.
*/
public void setDividerPos(final float[] dividerPos) {
if (dividerPos != null && dividerPos.length > 0) {
jonasburian marked this conversation as resolved.
Show resolved Hide resolved
Expand Down