From 12f64363c82274587ebb07774de1a872f54ca3ae Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Sun, 3 Feb 2019 23:53:57 +0300
Subject: android support libraries -> androidx use photoview instead of
 imageviewtouch (included because of TOP_CROP missing) remove obsolete/unused
 code

---
 .../main/java/org/fox/ttcomics2/ComicPager.java    | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java')

diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
index 08c52ce..738d810 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/ComicPager.java
@@ -6,10 +6,6 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v7.app.ActionBar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -21,10 +17,14 @@ import com.ToxicBakery.viewpager.transforms.DepthPageTransformer;
 import org.fox.ttcomics2.archive.CbrComicArchive;
 import org.fox.ttcomics2.archive.CbzComicArchive;
 import org.fox.ttcomics2.archive.ComicArchive;
-import org.fox.ttcomics2.utils.IVTViewPager;
 
 import java.io.IOException;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import icepick.State;
 
 public class ComicPager extends StateSavedFragment {
@@ -84,7 +84,7 @@ public class ComicPager extends StateSavedFragment {
 	}
 	
 	public int getPosition() {
-		IVTViewPager pager = getView().findViewById(R.id.comics_pager);
+		ViewPager pager = getView().findViewById(R.id.comics_pager);
 		
 		if (pager != null) {
 			return pager.getCurrentItem();
@@ -94,7 +94,7 @@ public class ComicPager extends StateSavedFragment {
 	}
 
 	public void setCurrentItem(int item) {
-		IVTViewPager pager = getView().findViewById(R.id.comics_pager);
+		ViewPager pager = getView().findViewById(R.id.comics_pager);
 		
 		if (pager != null) {
 			try {
@@ -120,7 +120,7 @@ public class ComicPager extends StateSavedFragment {
 	
 		m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager());
 		
-		final IVTViewPager pager = view.findViewById(R.id.comics_pager);
+		final ViewPager pager = view.findViewById(R.id.comics_pager);
 		
 		try {
 			if (m_fileName.toLowerCase().matches(".*\\.(cbz|zip)")) {									
@@ -187,7 +187,8 @@ public class ComicPager extends StateSavedFragment {
 			e.printStackTrace();
 		}
 		
-		pager.setOnPageChangeListener(new IVTViewPager.OnPageChangeListener() {
+		pager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+			@Override
 			public void onPageSelected(int position) {
 
 				m_activity.onComicSelected(m_fileName, position);
@@ -200,11 +201,13 @@ public class ComicPager extends StateSavedFragment {
 
 				hideReadingUI(true);
 			}
-			
+
+			@Override
 			public void onPageScrolled(int arg0, float arg1, int arg2) {
 				// TODO Auto-generated method stub
 			}
-			
+
+			@Override
 			public void onPageScrollStateChanged(int arg0) {
 				// TODO Auto-generated method stub
 			}
-- 
cgit v1.2.3