From d6ba1550e931238dfd7d080bbc55d092bff7602e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 12 Feb 2015 19:49:15 +0300
Subject: reduce arrow drawable diameter

---
 .../main/java/org/fox/ttrss/ArticleImagesPagerActivity.java | 10 ++++++++--
 .../src/main/java/org/fox/ttrss/util/ArrowRight.java        |  2 +-
 org.fox.ttrss/src/main/res/layout/article_images_pager.xml  | 13 +++++++++++++
 org.fox.ttrss/src/main/res/layout/headlines_row.xml         |  2 +-
 org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml  |  2 +-
 5 files changed, 24 insertions(+), 5 deletions(-)

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

diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
index 8a011c6c..c6f76e5a 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java
@@ -53,6 +53,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
     private ArticleImagesPagerAdapter m_adapter;
     private String m_content;
     private GestureDetector m_detector;
+    private ProgressBar m_progress;
 
     @Override
     public boolean onSingleTapConfirmed(MotionEvent motionEvent) {
@@ -224,7 +225,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
                     m_adapter.notifyDataSetChanged();
                 }
 
-                setProgress(Integer.valueOf(checkedUrl[1]));
+                m_progress.setProgress(Integer.valueOf(checkedUrl[1]));
             } else {
                 cancel(true);
             }
@@ -232,7 +233,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
 
         @Override
         protected void onPostExecute(Integer result) {
-            //
+            m_progress.setVisibility(View.GONE);
         }
     }
 
@@ -249,6 +250,8 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
 
         setContentView(R.layout.article_images_pager);
 
+        m_progress = (ProgressBar) findViewById(R.id.article_images_progress);
+
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().hide();
 
@@ -287,6 +290,8 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
         }
 
         if (m_urls.size() > 1) {
+            m_progress.setProgress(0);
+            m_progress.setMax(m_urls.size());
             m_checkedUrls = new ArrayList<String>();
 
             ArrayList<String> tmp = new ArrayList<String>(m_urls);
@@ -298,6 +303,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
             ict.execute(tmp);
         } else {
             m_checkedUrls = new ArrayList<String>(m_urls);
+            m_progress.setVisibility(View.GONE);
         }
 
         setTitle(m_title);
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ArrowRight.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ArrowRight.java
index ecf55eb9..e5c563dc 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ArrowRight.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ArrowRight.java
@@ -16,7 +16,7 @@ public class ArrowRight extends View {
     private Path arrowPath;
     private int arrowColor = 0xFF888888;
     private float density;
-    private int diameter = 5, diameter_calc, radius_calc;
+    private int diameter = 2, diameter_calc, radius_calc;
 
     public ArrowRight(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
diff --git a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
index fb9d5312..7a5aab8a 100644
--- a/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_images_pager.xml
@@ -16,4 +16,17 @@
         android:layout_width="fill_parent"
         android:layout_height="fill_parent" />
 
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/article_images_progress"
+        android:progress="0"
+        android:indeterminate="false"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentRight="true"
+        android:layout_alignParentEnd="true" />
+
 </RelativeLayout>
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 8edd35b3..28dcd046 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -96,7 +96,7 @@
                     android:visibility="visible" />
 
                 <org.fox.ttrss.util.ArrowRight
-                    android:layout_marginRight="4dp"
+                    android:layout_marginRight="16dp"
                     android:id="@+id/flavorImageArrow"
                     android:layout_width="64dp"
                     android:layout_gravity="center|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 a035a1da..7add9c92 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
@@ -97,7 +97,7 @@
                     android:visibility="visible" />
 
                 <org.fox.ttrss.util.ArrowRight
-                    android:layout_marginRight="4dp"
+                    android:layout_marginRight="16dp"
                     android:id="@+id/flavorImageArrow"
                     android:layout_width="64dp"
                     android:layout_gravity="center|right"
-- 
cgit v1.2.3