Migrate to AndroidX & Glide version upgrade & Kotlin version upgrade

WrathChaos · Aug 8, 2019 · 46fec0a · 46fec0a
1 parent 4e04b04
commit 46fec0a
Show file tree

Hide file tree

Showing 22 changed files with 108 additions and 106 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         android.defaultConfig.vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
@@ -25,15 +25,15 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-media-compat:28.0.0'
-    implementation 'com.android.support:animated-vector-drawable:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.media:media:1.0.1'
+    implementation 'androidx.vectordrawable:vectordrawable-animated:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     // MediaPickerLib
     implementation project (":mediapickerlib")
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 }
diff --git a/app/src/androidTest/java/com/coursion/mediapickerlib/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/coursion/mediapickerlib/ExampleInstrumentedTest.kt
@@ -1,7 +1,7 @@
 package com.coursion.mediapickerlib
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith

diff --git a/app/src/main/java/com/coursion/mediapickerlib/MainActivity.kt b/app/src/main/java/com/coursion/mediapickerlib/MainActivity.kt
@@ -3,17 +3,17 @@ package com.coursion.mediapickerlib
 import android.Manifest
 import android.content.Intent
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import kotlinx.android.synthetic.main.activity_main.*
 import android.app.Activity
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import android.graphics.BitmapFactory
 import android.net.Uri
 import android.os.Build
-import android.support.design.widget.FloatingActionButton
-import android.support.v4.content.ContextCompat
-import android.support.v4.view.ViewCompat
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import androidx.core.content.ContextCompat
+import androidx.core.view.ViewCompat
 import android.util.Log
 import com.coursion.freakycoder.mediapicker.galleries.Gallery
 import kotlinx.android.synthetic.main.content_main.*

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#F2F2F2"
     tools:context="com.coursion.mediapickerlib.MainActivity">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay" />
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <include layout="@layout/content_main" />
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
         app:srcCompat="@drawable/ic_camera" />
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -19,4 +19,4 @@
         app:srcCompat="@drawable/default_image"
         />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.1'
+        classpath 'com.android.tools.build:gradle:3.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/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.

diff --git a/mediapickerlib/build.gradle b/mediapickerlib/build.gradle
@@ -3,13 +3,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
     defaultConfig {
         minSdkVersion 19
-        targetSdkVersion 28
+        targetSdkVersion 29
         versionCode 2
         versionName "1.2"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -27,15 +27,15 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:design:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.squareup.picasso:picasso:2.5.2'
-    implementation 'com.github.bumptech.glide:glide:4.7.1'
+    implementation 'com.github.bumptech.glide:glide:4.9.0'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 }
 repositories {

diff --git a/...ib/src/androidTest/java/com/coursion/freakycoder/mediapicker/ExampleInstrumentedTest.java b/...ib/src/androidTest/java/com/coursion/freakycoder/mediapicker/ExampleInstrumentedTest.java
@@ -1,8 +1,8 @@
 package com.coursion.freakycoder.mediapicker;
 
 import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/adapters/BucketsAdapter.kt b/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/adapters/BucketsAdapter.kt
@@ -2,7 +2,7 @@ package com.coursion.freakycoder.mediapicker.adapters
 
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
@@ -18,7 +18,7 @@ import com.coursion.mediapickerlib.R
 class BucketsAdapter(private val bucketNames: List<String>,
                      private val bitmapList: List<String>,
                      private val context: Context) :
-        RecyclerView.Adapter<BucketsAdapter.MyViewHolder>() {
+        androidx.recyclerview.widget.RecyclerView.Adapter<BucketsAdapter.MyViewHolder>() {
 
     private val inflater: LayoutInflater
 
@@ -56,7 +56,7 @@ class BucketsAdapter(private val bucketNames: List<String>,
         return bucketNames.size
     }
 
-    inner class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    inner class MyViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
         var title: TextView
         var thumbnail: ImageView
         var sl: SquareLayout

diff --git a/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/adapters/MediaAdapter.kt b/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/adapters/MediaAdapter.kt
@@ -2,7 +2,7 @@ package com.coursion.freakycoder.mediapicker.adapters
 
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -16,7 +16,7 @@ import com.coursion.mediapickerlib.R
 class MediaAdapter(private val bitmapList: List<String>,
                    private val selected: List<Boolean>,
                    private val context: Context):
-        RecyclerView.Adapter<MediaAdapter.MyViewHolder>() {
+        androidx.recyclerview.widget.RecyclerView.Adapter<MediaAdapter.MyViewHolder>() {
 
     private val inflater: LayoutInflater
 
@@ -51,7 +51,7 @@ class MediaAdapter(private val bitmapList: List<String>,
         return bitmapList.size
     }
 
-    inner class MyViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    inner class MyViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
         var thumbnail: ImageView
         var check: ImageView
 

diff --git a/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/fragments/ImageFragment.kt b/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/fragments/ImageFragment.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.provider.MediaStore
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.GestureDetector
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -20,14 +20,14 @@ import java.io.File
 import java.util.ArrayList
 import java.util.HashSet
 
-class ImageFragment : Fragment() {
+class ImageFragment : androidx.fragment.app.Fragment() {
 
     companion object {
         var imagesList: MutableList<String> = ArrayList()
         var selected: MutableList<Boolean> = ArrayList()
     }
 
-    private lateinit var recyclerView: RecyclerView
+    private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
     private var mAdapter: BucketsAdapter? = null
     private val projection = arrayOf(MediaStore.Images.Media.BUCKET_DISPLAY_NAME, MediaStore.Images.Media.DATA)
     private val projection2 = arrayOf(MediaStore.Images.Media.DISPLAY_NAME, MediaStore.Images.Media.DATA)
@@ -53,10 +53,10 @@ class ImageFragment : Fragment() {
     }
 
     private fun populateRecyclerView() {
-        val mLayoutManager = GridLayoutManager(this.context!!, 3)
+        val mLayoutManager = androidx.recyclerview.widget.GridLayoutManager(this.context!!, 3)
         recyclerView.layoutManager = mLayoutManager
         mAdapter = BucketsAdapter(bucketNames, bitmapList, this.context!!)
-        recyclerView.itemAnimator = DefaultItemAnimator()
+        recyclerView.itemAnimator = androidx.recyclerview.widget.DefaultItemAnimator()
         recyclerView.adapter = mAdapter
         recyclerView.addOnItemTouchListener(RecyclerTouchListener(this.context!!, recyclerView, object : ClickListener {
             override fun onClick(view: View, position: Int) {
@@ -142,9 +142,9 @@ class ImageFragment : Fragment() {
         fun onLongClick(view: View?, position: Int)
     }
 
-    class RecyclerTouchListener(context: Context, recyclerView: RecyclerView,
+    class RecyclerTouchListener(context: Context, recyclerView: androidx.recyclerview.widget.RecyclerView,
                                 private val clickListener: ImageFragment.ClickListener?) :
-            RecyclerView.OnItemTouchListener {
+            androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
         private val gestureDetector: GestureDetector
 
         init {
@@ -164,15 +164,15 @@ class ImageFragment : Fragment() {
                     })
         }
 
-        override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+        override fun onInterceptTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
             val child = rv.findChildViewUnder(e.x, e.y)
             if (child != null && clickListener != null && gestureDetector.onTouchEvent(e)) {
                 clickListener.onClick(child, rv.getChildAdapterPosition(child))
             }
             return false
         }
 
-        override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {}
+        override fun onTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {}
 
         override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {
 

diff --git a/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/fragments/VideoFragment.kt b/mediapickerlib/src/main/java/com/coursion/freakycoder/mediapicker/fragments/VideoFragment.kt
@@ -4,10 +4,10 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.provider.MediaStore
-import android.support.v4.app.Fragment
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import android.view.GestureDetector
 import android.view.LayoutInflater
 import android.view.MotionEvent
@@ -22,13 +22,13 @@ import java.io.File
 import java.util.ArrayList
 import java.util.HashSet
 
-class VideoFragment : Fragment() {
+class VideoFragment : androidx.fragment.app.Fragment() {
 
     companion object {
         var videosList: MutableList<String> = ArrayList()
         var selected: MutableList<Boolean> = ArrayList()
     }
-    private lateinit var recyclerView: RecyclerView
+    private lateinit var recyclerView: androidx.recyclerview.widget.RecyclerView
     private var mAdapter: BucketsAdapter? = null
     private var bucketNames: MutableList<String> = ArrayList()
     private val bitmapList = ArrayList<String>()
@@ -55,9 +55,9 @@ class VideoFragment : Fragment() {
 
     private fun populateRecyclerView() {
         mAdapter = BucketsAdapter(bucketNames, bitmapList, context!!)
-        val mLayoutManager = GridLayoutManager(context, 3)
+        val mLayoutManager = androidx.recyclerview.widget.GridLayoutManager(context, 3)
         recyclerView.layoutManager = mLayoutManager
-        recyclerView.itemAnimator = DefaultItemAnimator()
+        recyclerView.itemAnimator = androidx.recyclerview.widget.DefaultItemAnimator()
         recyclerView.adapter = mAdapter
         recyclerView.addOnItemTouchListener(RecyclerTouchListener(context!!, recyclerView,
                 object : ClickListener {
@@ -146,9 +146,9 @@ class VideoFragment : Fragment() {
         fun onLongClick(view: View?, position: Int)
     }
 
-    class RecyclerTouchListener(context: Context, recyclerView: RecyclerView,
+    class RecyclerTouchListener(context: Context, recyclerView: androidx.recyclerview.widget.RecyclerView,
                                 private val clickListener: VideoFragment.ClickListener?) :
-            RecyclerView.OnItemTouchListener {
+            androidx.recyclerview.widget.RecyclerView.OnItemTouchListener {
         private val gestureDetector: GestureDetector
 
         init {
@@ -167,15 +167,15 @@ class VideoFragment : Fragment() {
             })
         }
 
-        override fun onInterceptTouchEvent(rv: RecyclerView, e: MotionEvent): Boolean {
+        override fun onInterceptTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent): Boolean {
             val child = rv.findChildViewUnder(e.x, e.y)
             if (child != null && clickListener != null && gestureDetector.onTouchEvent(e)) {
                 clickListener.onClick(child, rv.getChildAdapterPosition(child))
             }
             return false
         }
 
-        override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {}
+        override fun onTouchEvent(rv: androidx.recyclerview.widget.RecyclerView, e: MotionEvent) {}
 
         override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
     }