Castopod
/
AntennaPod
mirror of https://github.com/AntennaPod/AntennaPod.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2300 from ByteHamster/chapter-durations 

Added duration to chapters list
This commit is contained in:
Martin Fietz 2017-04-16 20:08:40 +02:00 committed by GitHub
parent f1b04d45e4 acf065b7cd
commit 4e7402c214
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/de/danoeh/antennapod/adapter/ChaptersListAdapter.java
View File

@ -60,6 +60,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
defaultTextColor = holder.title.getTextColors().getDefaultColor(); defaultTextColor = holder.title.getTextColors().getDefaultColor();
holder.start = (TextView) convertView.findViewById(R.id.txtvStart); holder.start = (TextView) convertView.findViewById(R.id.txtvStart);
holder.link = (TextView) convertView.findViewById(R.id.txtvLink); holder.link = (TextView) convertView.findViewById(R.id.txtvLink);
holder.duration = (TextView) convertView.findViewById(R.id.txtvDuration);
holder.butPlayChapter = (ImageButton) convertView.findViewById(R.id.butPlayChapter); holder.butPlayChapter = (ImageButton) convertView.findViewById(R.id.butPlayChapter);
convertView.setTag(holder); convertView.setTag(holder);
} else { } else {
@ -70,6 +71,16 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
holder.title.setText(sc.getTitle()); holder.title.setText(sc.getTitle());
holder.start.setText(Converter.getDurationStringLong((int) sc holder.start.setText(Converter.getDurationStringLong((int) sc
.getStart())); .getStart()));
long duration;
if (position + 1 < media.getChapters().size()) {
duration = media.getChapters().get(position + 1).getStart() - sc.getStart();
} else {
duration = media.getDuration() - sc.getStart();
}
holder.duration.setText(getContext().getString(R.string.chapter_duration,
Converter.getDurationStringLong((int) duration)));
if (sc.getLink() != null) { if (sc.getLink() != null) {
holder.link.setVisibility(View.VISIBLE); holder.link.setVisibility(View.VISIBLE);
holder.link.setText(sc.getLink()); holder.link.setText(sc.getLink());
@ -155,6 +166,7 @@ public class ChaptersListAdapter extends ArrayAdapter<Chapter> {
TextView title; TextView title;
TextView start; TextView start;
TextView link; TextView link;
TextView duration;
ImageButton butPlayChapter; ImageButton butPlayChapter;
} }

10
app/src/main/res/layout/simplechapter_item.xml
View File

@ -53,6 +53,16 @@
tools:text="Link" tools:text="Link"
tools:background="@android:color/holo_green_dark" /> tools:background="@android:color/holo_green_dark" />
<TextView
android:id="@+id/txtvDuration"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="false"
android:focusableInTouchMode="false"
android:maxLines="1"
tools:text="Duration"
tools:background="@android:color/holo_green_dark" />
</LinearLayout> </LinearLayout>
<include layout="@layout/vertical_list_divider" /> <include layout="@layout/vertical_list_divider" />

1
core/src/main/res/values/strings.xml
View File

@ -72,6 +72,7 @@
<string name="refresh_label">Refresh</string> <string name="refresh_label">Refresh</string>
<string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string> <string name="external_storage_error_msg">No external storage is available. Please make sure that external storage is mounted so that the app can work properly.</string>
<string name="chapters_label">Chapters</string> <string name="chapters_label">Chapters</string>
<string name="chapter_duration">Duration: %1$s</string>
<string name="shownotes_label">Shownotes</string> <string name="shownotes_label">Shownotes</string>
<string name="description_label">Description</string> <string name="description_label">Description</string>
<string name="most_recent_prefix">Most recent episode:\u0020</string> <string name="most_recent_prefix">Most recent episode:\u0020</string>