remove viewpagerindicator

5 files changed, 20 insertions, 48 deletions

diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle
index 5eda4c64..4a23cd3e 100755
--- a/org.fox.ttrss/build.gradle
+++ b/org.fox.ttrss/build.gradle
@@ -66,7 +66,6 @@ dependencies {
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.ToxicBakery.viewpager.transforms:view-pager-transforms:1.2.32@aar'
     implementation 'me.relex:circleindicator:1.2.2@aar'
-    implementation 'com.viewpagerindicator:library:2.4.1'
     implementation 'com.nineoldandroids:library:2.4.0'
     implementation 'com.amulyakhare:com.amulyakhare.textdrawable:1.0.1'
     implementation 'frankiesardo:icepick:3.2.0'
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml
index 282cb770..e30eeafa 100755
--- a/org.fox.ttrss/src/main/AndroidManifest.xml
+++ b/org.fox.ttrss/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fox.ttrss"
-    android:versionCode="525"
-    android:versionName="1.291">
+    android:versionCode="526"
+    android:versionName="1.292">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
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) {
 			}
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 5144f823..62b3fea4 100755
--- a/org.fox.ttrss/src/main/res/layout/article_pager.xml
+++ b/org.fox.ttrss/src/main/res/layout/article_pager.xml
@@ -1,23 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/article_pager_container"
+<androidx.viewpager.widget.ViewPager
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/article_pager"
     android:background="?android:colorBackground"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-
-    <androidx.viewpager.widget.ViewPager
-        android:id="@+id/article_pager"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_above="@+id/article_pager_indicator"
-        android:layout_alignParentTop="true"/>
-
-    <com.viewpagerindicator.UnderlinePageIndicator
-        android:id="@+id/article_pager_indicator"
-        android:layout_width="fill_parent"
-        android:layout_height="2dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true" />
-
-
-</RelativeLayout>
\ No newline at end of file
+    android:layout_height="fill_parent"/>