now display the download bar under the other windows

This commit is contained in:
Tom Hennen 2015-05-22 16:21:21 -04:00
parent 7aafe23b6b
commit ec156b4016
2 changed files with 18 additions and 17 deletions

View File

@ -109,22 +109,22 @@ public class AllEpisodesListAdapter extends BaseAdapter {
holder.txtvDuration.setText("");
}
FeedItem.State state = item.getState();
if (isDownloadingMedia) {
holder.downloadProgress.setVisibility(View.VISIBLE);
holder.txtvDuration.setVisibility(View.GONE);
holder.pubDate.setVisibility(View.GONE);
// item is being downloaded
holder.downloadProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
} else if (state == FeedItem.State.PLAYING
|| state == FeedItem.State.IN_PROGRESS) {
if (media.getDuration() > 0) {
int progress = (int) (100.0 * media.getPosition() / media.getDuration());
holder.downloadProgress.setProgress(progress);
holder.downloadProgress.setVisibility(View.VISIBLE);
}
} else {
holder.txtvDuration.setVisibility(View.VISIBLE);
holder.pubDate.setVisibility(View.VISIBLE);
holder.downloadProgress.setVisibility(View.GONE);
}
if (!media.isDownloaded()) {
if (isDownloadingMedia) {
// item is being downloaded
holder.downloadProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item));
}
}
} else {
holder.downloadProgress.setVisibility(View.GONE);
holder.txtvDuration.setVisibility(View.GONE);

View File

@ -43,7 +43,7 @@
<TextView
android:id="@+id/txtvTitle"
style="@style/AntennaPod.TextView.ListItemPrimaryTitle"
android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
@ -55,10 +55,10 @@
android:id="@+id/bottom_bar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@id/txtvTitle"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentRight="true"
android:layout_marginTop="16dp"
tools:background="@android:color/holo_red_light" >
<TextView
@ -67,6 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_marginBottom="0dp"
tools:text="00:42:23"
tools:background="@android:color/holo_blue_dark" />
@ -76,6 +77,7 @@
android:layout_height="@dimen/enc_icons_size"
android:layout_alignParentRight="true"
android:layout_marginLeft="8dp"
android:layout_marginBottom="0dp"
android:contentDescription="@string/in_queue_label"
android:src="?attr/stat_playlist"
tools:src="@drawable/ic_list_grey600_24dp"
@ -88,6 +90,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_toLeftOf="@id/imgvInPlaylist"
android:layout_marginBottom="0dp"
android:ellipsize="end"
tools:text="Jan 23"
tools:background="@android:color/holo_green_dark" />
@ -95,12 +98,10 @@
<ProgressBar
android:id="@+id/pbar_download_progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@id/imgvInPlaylist"
android:layout_below="@id/txtvDuration"
android:layout_marginTop="-2dp"
android:max="100" />
</RelativeLayout>