From 7aafe23b6b7eaddffedeb3f5539a5cfeb0f3e2f8 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Thu, 21 May 2015 18:45:39 -0400 Subject: [PATCH 1/4] restored alignment for progress bar in episode view. fixes AntennaPod/AntennaPod#822 --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/res/layout/new_episodes_listitem.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 97f8bbdad..9b73fd013 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index b738cf836..bf0d54b7e 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -99,8 +99,8 @@ android:layout_height="wrap_content" android:layout_marginLeft="8dp" android:layout_marginRight="8dp" - android:layout_toLeftOf="@id/txtvPublished" - android:layout_toRightOf="@id/txtvDuration" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/imgvInPlaylist" android:max="100" /> From ec156b4016b6323e817db0312a2f55d510262c71 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 22 May 2015 16:21:21 -0400 Subject: [PATCH 2/4] now display the download bar under the other windows --- .../adapter/AllEpisodesListAdapter.java | 20 +++++++++---------- .../main/res/layout/new_episodes_listitem.xml | 15 +++++++------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java index ea0c96be9..5c4946b78 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java @@ -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); diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index bf0d54b7e..18b7eaf07 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -43,7 +43,7 @@ @@ -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 @@ From d8b6943f5dccd3a7fe3f6e884ca77a34b92981b7 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 22 May 2015 16:57:43 -0400 Subject: [PATCH 3/4] removed unneeded layout margins --- app/src/main/res/layout/new_episodes_listitem.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index 18b7eaf07..96842c052 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -67,7 +67,6 @@ 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" /> @@ -77,7 +76,6 @@ 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" @@ -90,7 +88,6 @@ 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" /> From f28853b00dec8875c967ef89ecef9602049a67e7 Mon Sep 17 00:00:00 2001 From: Tom Hennen Date: Fri, 22 May 2015 17:13:31 -0400 Subject: [PATCH 4/4] renamed download progress bar to just progress --- .../adapter/AllEpisodesListAdapter.java | 18 +++++++++--------- .../main/res/layout/new_episodes_listitem.xml | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java index 5c4946b78..d96326053 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AllEpisodesListAdapter.java @@ -80,8 +80,8 @@ public class AllEpisodesListAdapter extends BaseAdapter { .findViewById(R.id.butSecondaryAction); holder.queueStatus = (ImageView) convertView .findViewById(R.id.imgvInPlaylist); - holder.downloadProgress = (ProgressBar) convertView - .findViewById(R.id.pbar_download_progress); + holder.progress = (ProgressBar) convertView + .findViewById(R.id.pbar_progress); holder.imageView = (ImageView) convertView.findViewById(R.id.imgvImage); holder.txtvDuration = (TextView) convertView.findViewById(R.id.txtvDuration); convertView.setTag(holder); @@ -111,22 +111,22 @@ public class AllEpisodesListAdapter extends BaseAdapter { FeedItem.State state = item.getState(); if (isDownloadingMedia) { - holder.downloadProgress.setVisibility(View.VISIBLE); + holder.progress.setVisibility(View.VISIBLE); // item is being downloaded - holder.downloadProgress.setProgress(itemAccess.getItemDownloadProgressPercent(item)); + holder.progress.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); + holder.progress.setProgress(progress); + holder.progress.setVisibility(View.VISIBLE); } } else { - holder.downloadProgress.setVisibility(View.GONE); + holder.progress.setVisibility(View.GONE); } } else { - holder.downloadProgress.setVisibility(View.GONE); + holder.progress.setVisibility(View.GONE); holder.txtvDuration.setVisibility(View.GONE); } @@ -164,7 +164,7 @@ public class AllEpisodesListAdapter extends BaseAdapter { View statusUnread; ImageView queueStatus; ImageView imageView; - ProgressBar downloadProgress; + ProgressBar progress; TextView txtvDuration; ImageButton butSecondary; } diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index 96842c052..ff1318fc8 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -93,7 +93,7 @@ tools:background="@android:color/holo_green_dark" />