renamed download progress bar to just progress

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" />
 
             <ProgressBar
-                android:id="@+id/pbar_download_progress"
+                android:id="@+id/pbar_progress"
                 style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"