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(); ArrayList tmp = new ArrayList(m_urls); @@ -298,6 +303,7 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur ict.execute(tmp); } else { m_checkedUrls = new ArrayList(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" /> + + 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" />