summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-02-12 19:34:40 +0300
committerAndrew Dolgov <[email protected]>2015-02-12 19:34:40 +0300
commit69974964491f1d5e9fe571a9f3b3a2cc82148cf7 (patch)
tree578e88baf295cc0199f13eabe25d97268a6ee395 /org.fox.ttrss/src
parent4afee6e0d3b5557af596ead283b896b6bd25f1c2 (diff)
remove viewpager indicator
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticleImagesPagerActivity.java4
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java7
-rw-r--r--org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java7
-rw-r--r--org.fox.ttrss/src/main/res/layout/article_images_pager.xml7
-rw-r--r--org.fox.ttrss/src/main/res/layout/article_pager.xml10
5 files changed, 4 insertions, 31 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 7912233c..8a011c6c 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
@@ -33,7 +33,6 @@ import com.nostra13.universalimageloader.core.ImageLoader;
import com.nostra13.universalimageloader.core.assist.FailReason;
import com.nostra13.universalimageloader.core.display.FadeInBitmapDisplayer;
import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-import com.viewpagerindicator.UnderlinePageIndicator;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
@@ -308,9 +307,6 @@ public class ArticleImagesPagerActivity extends CommonActivity implements Gestur
ViewPager pager = (ViewPager) findViewById(R.id.article_images_pager);
pager.setAdapter(m_adapter);
pager.setPageTransformer(true, new DepthPageTransformer());
-
- UnderlinePageIndicator indicator = (UnderlinePageIndicator)findViewById(R.id.article_images_indicator);
- indicator.setViewPager(pager);
}
@SuppressLint("NewApi")
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
index 8e3ffbc0..00d0e536 100755
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java
@@ -16,7 +16,6 @@ import android.view.View;
import android.view.ViewGroup;
import com.google.gson.JsonElement;
-import com.viewpagerindicator.UnderlinePageIndicator;
import org.fox.ttrss.types.Article;
import org.fox.ttrss.types.ArticleList;
@@ -93,12 +92,8 @@ public class ArticlePager extends Fragment {
pager.setAdapter(m_adapter);
- UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_titles);
- indicator.setViewPager(pager);
-
pager.setCurrentItem(position);
-
- indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+ pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrollStateChanged(int arg0) {
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
index 37b6f8b5..7b842432 100644
--- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
+++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticlePager.java
@@ -15,8 +15,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import com.viewpagerindicator.UnderlinePageIndicator;
-
import org.fox.ttrss.R;
public class OfflineArticlePager extends Fragment {
@@ -170,11 +168,8 @@ public class OfflineArticlePager extends Fragment {
pager.setAdapter(m_adapter);
- UnderlinePageIndicator indicator = (UnderlinePageIndicator)view.findViewById(R.id.article_titles);
- indicator.setViewPager(pager);
-
pager.setCurrentItem(position);
- indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+ pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
@Override
public void onPageScrollStateChanged(int arg0) {
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 52791932..fb9d5312 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,11 +16,4 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent" />
- <com.viewpagerindicator.UnderlinePageIndicator
- android:id="@+id/article_images_indicator"
- android:layout_width="fill_parent"
- android:layout_height="2dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true" />
-
</RelativeLayout>
diff --git a/org.fox.ttrss/src/main/res/layout/article_pager.xml b/org.fox.ttrss/src/main/res/layout/article_pager.xml
index 679fb36b..c85eb8c8 100644
--- a/org.fox.ttrss/src/main/res/layout/article_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml
@@ -8,14 +8,8 @@
android:id="@+id/article_pager"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:layout_alignParentTop="true">
+ android:layout_alignParentTop="true"
+ android:layout_alignParentBottom="true">
</android.support.v4.view.ViewPager>
- <com.viewpagerindicator.UnderlinePageIndicator
- android:id="@+id/article_titles"
- android:layout_width="fill_parent"
- android:layout_height="2dp"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true" />
-
</RelativeLayout> \ No newline at end of file