From 013b4fa616b3bfa6024e6627ee4e9b76a9e8733f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Fri, 10 Jul 2015 23:59:49 +0300
Subject: progressbar updates

---
 .../src/main/res/layout/headlines_row.xml          | 27 ++++++++++++----------
 .../src/main/res/layout/headlines_row_unread.xml   | 27 ++++++++++++----------
 2 files changed, 30 insertions(+), 24 deletions(-)

(limited to 'org.fox.ttrss/src/main/res/layout')

diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
index e54731e4..d44b0792 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -28,6 +28,20 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
+                    <ProgressBar
+                        android:id="@+id/flavorImageLoadingBar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:visibility="visible"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_alignParentTop="false"
+                        android:layout_alignParentRight="false"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentLeft="true"
+                        android:max="100"
+                        android:indeterminate="false" />
+
                     <org.fox.ttrss.util.EnlargingImageView
                         android:id="@+id/flavor_image"
                         android:layout_width="match_parent"
@@ -48,17 +62,6 @@
                         android:background="?headlineHeaderBackground"
                         android:padding="16dp">
 
-                        <ProgressBar
-                            android:id="@+id/flavorImageLoadingBar"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:visibility="visible"
-                            android:layout_alignParentTop="false"
-                            android:layout_alignParentRight="false"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true" />
-
                         <TextView
                             android:id="@+id/title"
                             android:layout_width="match_parent"
@@ -112,7 +115,7 @@
                 </RelativeLayout>
 
                 <ImageView
-                    android:id="@+id/flavor_video_play"
+                    android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|right"
diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
index 58691aeb..dd991872 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml
@@ -29,6 +29,20 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content">
 
+                    <ProgressBar
+                        android:id="@+id/flavorImageLoadingBar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:visibility="visible"
+                        style="?android:attr/progressBarStyleHorizontal"
+                        android:layout_alignParentTop="false"
+                        android:layout_alignParentRight="false"
+                        android:layout_alignParentEnd="true"
+                        android:layout_alignParentLeft="true"
+                        android:max="100"
+                        android:indeterminate="false" />
+
                     <org.fox.ttrss.util.EnlargingImageView
                         android:id="@+id/flavor_image"
                         android:layout_width="match_parent"
@@ -49,17 +63,6 @@
                         android:background="?headlineHeaderBackground"
                         android:padding="16dp">
 
-                        <ProgressBar
-                            android:id="@+id/flavorImageLoadingBar"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:visibility="visible"
-                            android:layout_alignParentTop="false"
-                            android:layout_alignParentRight="false"
-                            android:layout_alignParentEnd="true"
-                            android:layout_centerVertical="true" />
-
                         <TextView
                             android:id="@+id/title"
                             android:layout_width="match_parent"
@@ -113,7 +116,7 @@
                 </RelativeLayout>
 
                 <ImageView
-                    android:id="@+id/flavor_video_play"
+                    android:id="@+id/flavor_video_kind"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|right"
-- 
cgit v1.2.3