增加androidx的支持

Author: wanglu1209

README.md

@@ -90,6 +90,12 @@ PhotoViewer
 
 ## 更新日志
 
+
+### 0.48
+
+增加androidx的支持
+
+
 ### 0.47
 
 修复了在下拉退出时双指放大图片导致图片不会回弹的bug

build.gradle

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.51'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -9,6 +9,8 @@
 
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m
 
 # When configured, Gradle will run in incubating parallel mode.

photoviewer/build.gradle

@@ -5,17 +5,17 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='wanglu1209'
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
 
 
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -31,11 +31,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    compileOnly 'com.android.support:appcompat-v7:27.1.1'
-    compileOnly 'com.android.support:support-v4:27.1.1'
-    compileOnly 'com.android.support:appcompat-v7:27.1.1'
+    compileOnly 'androidx.appcompat:appcompat:1.0.2'
+    compileOnly 'androidx.legacy:legacy-support-v4:1.0.0'
+    compileOnly 'androidx.appcompat:appcompat:1.0.2'
     compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    compileOnly 'com.android.support:recyclerview-v7:27.1.1'
+    compileOnly 'androidx.recyclerview:recyclerview:1.0.0'
 }
 repositories {
     mavenCentral()

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/BaseLazyFragment.kt

@@ -1,8 +1,8 @@
 package com.wanglu.photoviewerlibrary
 
 import android.os.Bundle
-import android.support.annotation.UiThread
-import android.support.v4.app.Fragment
+import androidx.annotation.UiThread
+import androidx.fragment.app.Fragment
 
 abstract class BaseLazyFragment : Fragment() {
     /**

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/PhotoViewer.kt

@@ -3,31 +3,18 @@ package com.wanglu.photoviewerlibrary
 import android.animation.LayoutTransition
 import android.animation.ObjectAnimator
 import android.annotation.SuppressLint
-import android.app.Fragment
-import android.app.ProgressDialog.show
-import android.content.pm.ActivityInfo
 import android.graphics.Color
-import android.os.Build
-import android.os.Bundle
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.viewpager.widget.ViewPager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.*
 import android.widget.*
+import androidx.fragment.app.Fragment
 import java.lang.ref.WeakReference
 import java.util.*
 import kotlin.concurrent.timerTask
-import android.view.View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-import android.view.View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-import android.view.View.SYSTEM_UI_FLAG_FULLSCREEN
-import android.view.View.SYSTEM_UI_FLAG_LOW_PROFILE
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_STABLE
-import android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 
 
 @SuppressLint("StaticFieldLeak")
@@ -125,7 +112,7 @@ object PhotoViewer {
         return this
     }
 
-    fun setImgContainer(container: RecyclerView): PhotoViewer {
+    fun setImgContainer(container: androidx.recyclerview.widget.RecyclerView): PhotoViewer {
         this.container = WeakReference(container)
         return this
     }
@@ -139,7 +126,7 @@ object PhotoViewer {
                 val absListView = container.get() as AbsListView
                 absListView.getChildAt(currentPage - absListView.firstVisiblePosition)
             } else {
-                (container.get() as RecyclerView).layoutManager.findViewByPosition(currentPage)
+                (container.get() as androidx.recyclerview.widget.RecyclerView).layoutManager!!.findViewByPosition(currentPage)
             }
 
             var result: View? = null
@@ -185,6 +172,12 @@ object PhotoViewer {
     }
 
 
+    fun start(fragment: android.app.Fragment) {
+        val activity = fragment.activity!!
+        start(activity as AppCompatActivity)
+    }
+
+
     fun start(activity: AppCompatActivity) {
         show(activity)
     }
@@ -220,7 +213,7 @@ object PhotoViewer {
         val frameLayout = FrameLayout(activity)
 
         val photoViewLayout = LayoutInflater.from(activity).inflate(R.layout.activity_photoviewer, null)
-        val viewPager = photoViewLayout.findViewById<ViewPager>(R.id.mLookPicVP)
+        val viewPager = photoViewLayout.findViewById<androidx.viewpager.widget.ViewPager>(R.id.mLookPicVP)
 
         val fragments = mutableListOf<PhotoViewerFragment>()
         /**
@@ -275,7 +268,7 @@ object PhotoViewer {
         viewPager.adapter = adapter
         viewPager.currentItem = currentPage
         viewPager.offscreenPageLimit = 100
-        viewPager.addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
+        viewPager.addOnPageChangeListener(object : androidx.viewpager.widget.ViewPager.OnPageChangeListener {
             override fun onPageScrollStateChanged(state: Int) {
 
             }
@@ -297,12 +290,12 @@ object PhotoViewer {
                  * 如果滑到的view不在当前页面显示，那么则滑动到那个position，再获取itemView
                  */
                 if (container.get() !is AbsListView) {
-                    val layoutManager = (container.get() as RecyclerView).layoutManager
-                    if (layoutManager is LinearLayoutManager) {
+                    val layoutManager = (container.get() as androidx.recyclerview.widget.RecyclerView).layoutManager
+                    if (layoutManager is androidx.recyclerview.widget.LinearLayoutManager) {
                         if (currentPage < layoutManager.findFirstVisibleItemPosition() || currentPage > layoutManager.findLastVisibleItemPosition()) {
                             layoutManager.scrollToPosition(currentPage)
                         }
-                    } else if (layoutManager is GridLayoutManager) {
+                    } else if (layoutManager is androidx.recyclerview.widget.GridLayoutManager) {
                         if (currentPage < layoutManager.findFirstVisibleItemPosition() || currentPage > layoutManager.findLastVisibleItemPosition()) {
                             layoutManager.scrollToPosition(currentPage)
                         }

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/PhotoViewerPagerAdapter.kt

@@ -1,11 +1,7 @@
 package com.wanglu.photoviewerlibrary
 
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentManager
-import android.support.v4.app.FragmentStatePagerAdapter
-
-class PhotoViewerPagerAdapter(private var mData: MutableList<PhotoViewerFragment>, fragmentManager: FragmentManager) : FragmentStatePagerAdapter(fragmentManager) {
-    override fun getItem(position: Int): Fragment {
+class PhotoViewerPagerAdapter(private var mData: MutableList<PhotoViewerFragment>, fragmentManager: androidx.fragment.app.FragmentManager) : androidx.fragment.app.FragmentStatePagerAdapter(fragmentManager) {
+    override fun getItem(position: Int): androidx.fragment.app.Fragment {
         return mData[position]
     }
 

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/ViewPagerFixed.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
 
-class ViewPagerFixed : android.support.v4.view.ViewPager {
+class ViewPagerFixed : androidx.viewpager.widget.ViewPager {
 
     constructor(context: Context) : super(context)
 

photoviewer/src/main/java/com/wanglu/photoviewerlibrary/photoview/PhotoView.java

@@ -23,16 +23,16 @@
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.GestureDetector;
 import android.view.View;
 import android.widget.Scroller;
 
 import java.util.Timer;
 import java.util.TimerTask;
 
+import androidx.appcompat.widget.AppCompatImageView;
+
 /**
  * A zoomable ImageView. See {@link PhotoViewAttacher} for most of the details on how the zooming
  * is accomplished