summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2017-06-02 15:26:20 +0300
committerAndrew Dolgov <[email protected]>2017-06-02 15:26:20 +0300
commit522a6a6c7d5e2de61bfee25a37557951bc6d364b (patch)
treedccfbd544db1d265c0ee9ac14aec8c279b8759c0 /org.fox.ttrss/src
parent2c676e263f928b6a330fb181be7250e297eb0678 (diff)
bring back gallery circle indicator
Diffstat (limited to 'org.fox.ttrss/src')
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java9
-rw-r--r--org.fox.ttrss/src/main/res/layout/activity_gallery.xml4
2 files changed, 9 insertions, 4 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
index 32dedd1b..af60dce8 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java
@@ -27,6 +27,8 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import me.relex.circleindicator.CircleIndicator;
+
public class GalleryActivity extends CommonActivity {
private final String TAG = this.getClass().getSimpleName();
@@ -35,7 +37,7 @@ public class GalleryActivity extends CommonActivity {
private String m_title;
private ArticleImagesPagerAdapter m_adapter;
public String m_content;
- private ProgressBar m_progress;
+ //private ProgressBar m_progress;
private ViewPager m_pager;
private enum GalleryEntryType { TYPE_IMAGE, TYPE_VIDEO };
@@ -178,7 +180,7 @@ public class GalleryActivity extends CommonActivity {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
- m_progress = (ProgressBar) findViewById(R.id.article_images_progress);
+ //m_progress = (ProgressBar) findViewById(R.id.gallery_check_progress);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().hide();
@@ -290,6 +292,9 @@ public class GalleryActivity extends CommonActivity {
m_pager.setAdapter(m_adapter);
m_pager.setPageTransformer(true, new DepthPageTransformer());
+ CircleIndicator indicator = (CircleIndicator) findViewById(R.id.gallery_pager_indicator);
+ indicator.setViewPager(m_pager);
+
}
diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
index 8ae3d971..00c6849c 100644
--- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
+++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml
@@ -28,7 +28,7 @@
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:id="@+id/article_images_progress"
+ android:id="@+id/gallery_check_progress"
android:progress="0"
android:indeterminate="false"
android:visibility="gone"
@@ -47,7 +47,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
- android:visibility="invisible" />
+ android:visibility="visible" />
<include layout="@layout/toolbar" android:id="@+id/toolbar" />