summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-02-12 20:39:45 +0300
committerAndrew Dolgov <[email protected]>2015-02-12 20:39:45 +0300
commitd544ea76892f85c5501ef8c817f607872cc0ba0e (patch)
treef2694560870a67eb2cc634dbaceacdae8d4fa819 /org.fox.ttrss
parentf5b80fe39fc213d1b724ce557173717a5b95b260 (diff)
image pager: better progressbar placement
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java8
-rw-r--r--org.fox.ttrss/src/main/res/layout/article_images_pager.xml6
2 files changed, 8 insertions, 6 deletions
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 37535f30..05572272 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
@@ -205,12 +205,10 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
Bitmap bmp = ImageLoader.getInstance().loadImageSync(url, options);
- int progress = (int) ((position / (float)urls[0].size()) * 10000);
-
if (bmp != null && bmp.getWidth() > 128 && bmp.getHeight() > 128) {
- publishProgress(url, String.valueOf(progress));
+ publishProgress(url, String.valueOf(position));
} else {
- publishProgress(null, String.valueOf(progress));
+ publishProgress(null, String.valueOf(position));
}
}
}
@@ -227,6 +225,8 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
m_adapter.notifyDataSetChanged();
}
+ Log.d(TAG, "progr=" + checkedUrl[1]);
+
m_progress.setProgress(Integer.valueOf(checkedUrl[1]));
} else {
cancel(true);
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 2c213f7d..30d0289c 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
@@ -23,11 +23,13 @@
android:id="@+id/article_images_progress"
android:progress="0"
android:indeterminate="false"
+ android:layout_above="@+id/article_images_indicator"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
- android:layout_alignParentEnd="true" />
+ android:layout_alignParentEnd="true"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin" />
<me.relex.circleindicator.CircleIndicator
android:id="@+id/article_images_indicator"