From 37b6f1be510e475df3b9dfdc6efbe819553a1ec1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 8 Oct 2020 11:48:20 +0300
Subject: remove viewpagerindicator

---
 .../src/main/java/org/fox/ttrss/ArticlePager.java  | 26 +++++++++-------------
 .../org/fox/ttrss/offline/OfflineArticlePager.java | 13 +++--------
 2 files changed, 14 insertions(+), 25 deletions(-)

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

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 e08934bd..e32d5ad1 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
@@ -20,7 +20,6 @@ import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.snackbar.Snackbar;
 import com.google.gson.JsonElement;
-import com.viewpagerindicator.UnderlinePageIndicator;
 
 import org.fox.ttrss.types.Article;
 import org.fox.ttrss.types.ArticleList;
@@ -139,27 +138,19 @@ public class ArticlePager extends StateSavedFragment {
 
 		pager.setAdapter(m_adapter);
 
-        UnderlinePageIndicator indicator = view.findViewById(R.id.article_pager_indicator);
-        indicator.setViewPager(pager);
-
 		pager.setCurrentItem(position);
-
-		indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
+		pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 			@Override
-			public void onPageScrollStateChanged(int arg0) {
-			}
+			public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
 
-			@Override
-			public void onPageScrolled(int arg0, float arg1, int arg2) {
 			}
 
 			@Override
 			public void onPageSelected(int position) {
-                Log.d(TAG, "onPageSelected: " + position);
+				Log.d(TAG, "onPageSelected: " + position);
 
 				final Article article = m_articles.get(position);
-				
+
 				if (article != null) {
 					m_article = article;
 
@@ -171,7 +162,7 @@ public class ArticlePager extends StateSavedFragment {
 					}, 250);
 
 					//Log.d(TAG, "Page #" + position + "/" + m_adapter.getCount());
-					
+
 					if (!m_refreshInProgress && !m_lazyLoadDisabled && (m_activity.isSmallScreen() || m_activity.isPortrait()) && position >= m_adapter.getCount() - 5) {
 						Log.d(TAG, "loading more articles...");
 
@@ -184,8 +175,13 @@ public class ArticlePager extends StateSavedFragment {
 					}
 				}
 			}
+
+			@Override
+			public void onPageScrollStateChanged(int state) {
+
+			}
 		});
-	
+
 		return view;
 	}
 	
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 4957b0b7..20c2fd0c 100755
--- 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
@@ -12,15 +12,13 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.viewpagerindicator.UnderlinePageIndicator;
-
-import org.fox.ttrss.R;
-
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentStatePagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 
+import org.fox.ttrss.R;
+
 public class OfflineArticlePager extends Fragment {
 	private final String TAG = this.getClass().getSimpleName();
 
@@ -184,13 +182,8 @@ public class OfflineArticlePager extends Fragment {
 		
 		pager.setAdapter(m_adapter);
 
-        UnderlinePageIndicator indicator = view.findViewById(R.id.article_pager_indicator);
-        indicator.setViewPager(pager);
-
         pager.setCurrentItem(position);
-
-		indicator.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
-
+		pager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
 			@Override
 			public void onPageScrollStateChanged(int arg0) {
 			}
-- 
cgit v1.2.3