Merge pull request #22 from hamzaahmedkhan/develop

Migrate to AndroidX, Codacy workflow modified

Author: hamzaahmedkhan

.github/workflows/codacy-analysis.yml

@@ -10,9 +10,9 @@ name: Codacy Security Scan
 
 on: 
   push:
-    branches: [ "master", "main" ]
+    branches: [ "master", "main", "develop" ]
   pull_request:
-    branches: [ "master", "main" ]
+    branches: [ "master", "main", "develop" ]
 
 jobs:
   codacy-security-scan:
@@ -37,8 +37,8 @@ jobs:
           # This will handover control about PR rejection to the GitHub side
           max-allowed-issues: 2147483647
 
-      # Upload the SARIF file generated in the previous step
-      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif
+#      # Upload the SARIF file generated in the previous step
+#      - name: Upload SARIF results file
+#        uses: github/codeql-action/upload-sarif@v1
+#        with:
+#          sarif_file: results.sarif

app/build.gradle

@@ -12,7 +12,7 @@ android {
         targetSdkVersion 28
         versionCode 1
         versionName "1.2.1"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
         release {
@@ -39,11 +39,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     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.ext:junit:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     implementation project(path: ':spinnerdialog')
 
 //    implementation 'com.github.hamzaahmedkhan:SpinnerDialog:v1.2.0'

app/src/androidTest/java/com/github/hamzaahmedkhan/ExampleInstrumentedTest.kt

@@ -1,7 +1,7 @@
 package com.github.hamzaahmedkhan
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 
 import org.junit.Test
 import org.junit.runner.RunWith

app/src/main/java/com/github/hamzaahmedkhan/MainActivity.kt

@@ -1,6 +1,6 @@
 package com.github.hamzaahmedkhan
 
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.ViewGroup
 import android.widget.Toast
@@ -77,15 +77,15 @@ class MainActivity : AppCompatActivity() {
         spinnerSingleSelectDialogFragment.buttonText = "DONE"
         spinnerSingleSelectDialogFragment.themeColorResId = resources.getColor(R.color.material_pink500)
         spinnerSingleSelectDialogFragment.showSearchBar = true
-        spinnerSingleSelectDialogFragment.searchbarHint = "type here to search.."
+        spinnerSingleSelectDialogFragment.searchbarHint = "Type here to search.."
         spinnerSingleSelectDialogFragment.setDialogHeight(ViewGroup.LayoutParams.MATCH_PARENT)
 
 
         // Using optional features for multi select dialog
         spinnerMultiSelectDialogFragment.buttonText = "DONE"
         spinnerMultiSelectDialogFragment.themeColorResId = resources.getColor(R.color.material_pink500)
         spinnerMultiSelectDialogFragment.showSearchBar = true
-        spinnerMultiSelectDialogFragment.searchbarHint = "type here to search.."
+        spinnerMultiSelectDialogFragment.searchbarHint = "Type here to search.."
         spinnerSingleSelectDialogFragment.setDialogHeight(500.dp)
 
 

app/src/main/res/layout/activity_main.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -40,4 +40,4 @@
             app:layout_constraintRight_toRightOf="parent" android:layout_marginTop="8dp"
             app:layout_constraintTop_toBottomOf="@+id/txtShowSingleChoiceSpinner"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

demo/SpinnerDialog.zip

@@ -13,3 +13,5 @@ org.gradle.jvmargs=-Xmx1536m
 # org.gradle.parallel=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.useAndroidX=true
+android.enableJetifier=true

gradle.properties

@@ -12,7 +12,7 @@ android {
         versionCode 2
         versionName "1.2.2"
 
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
     }
 
@@ -31,14 +31,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.0'
 
-    implementation 'com.android.support:appcompat-v7:28.0.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'
-    implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.jcminarro:RoundKornerLayouts:0.3.1'
-    implementation 'com.jakewharton:butterknife:8.5.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.jcminarro:RoundKornerLayouts:0.4.0'
     testImplementation 'junit:junit:4.12'
 }

spinnerdialog/build.gradle

@@ -1,7 +1,7 @@
 package com.github.hamzaahmedkhan.spinnerdialog
 
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith

spinnerdialog/src/androidTest/java/com/github/hamzaahmedkhan/spinnerdialog/ExampleInstrumentedTest.kt

@@ -1,9 +1,9 @@
 package com.github.hamzaahmedkhan.spinnerdialog.ui
 
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.widget.DefaultItemAnimator
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.DialogFragment
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.LayoutInflater
@@ -25,7 +25,7 @@ import kotlin.collections.ArrayList
  * Created by khanhamza on 21-Feb-17.
  */
 
-class SpinnerDialogFragment : DialogFragment(),
+class SpinnerDialogFragment : androidx.fragment.app.DialogFragment(),
     OnSpinnerItemClickListener, View.OnClickListener, OnSpinnerItemCheckboxClickListener {
 
     private var singleSelectAdapter: SpinnerDialogSingleSelectAdapter? = null
@@ -134,9 +134,13 @@ class SpinnerDialogFragment : DialogFragment(),
     }
 
     private fun bindView() {
-        val mLayoutManager = LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
+        val mLayoutManager = androidx.recyclerview.widget.LinearLayoutManager(
+            context,
+            androidx.recyclerview.widget.LinearLayoutManager.VERTICAL,
+            false
+        )
         recyclerView.layoutManager = mLayoutManager
-        (recyclerView.itemAnimator as DefaultItemAnimator).supportsChangeAnimations = false
+        (recyclerView.itemAnimator as androidx.recyclerview.widget.DefaultItemAnimator).supportsChangeAnimations = false
         val resId =
             R.anim.layout_animation_fall_bottom
         val animation = AnimationUtils.loadLayoutAnimation(context, resId)

spinnerdialog/src/main/java/com/github/hamzaahmedkhan/spinnerdialog/ui/SpinnerDialogFragment.kt

@@ -2,7 +2,7 @@ package com.github.hamzaahmedkhan.spinnerdialog.ui.multi
 
 import android.app.Activity
 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
@@ -20,7 +20,7 @@ class SpinnerDialogMultiSelectAdapter(
     private val context: Context,
     var arrData: ArrayList<SpinnerModel>,
     private val onItemClick: OnSpinnerItemCheckboxClickListener
-) : RecyclerView.Adapter<SpinnerDialogMultiSelectAdapter.ViewHolder>() {
+) : androidx.recyclerview.widget.RecyclerView.Adapter<SpinnerDialogMultiSelectAdapter.ViewHolder>() {
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
@@ -63,7 +63,7 @@ class SpinnerDialogMultiSelectAdapter(
         return arrData.size
     }
 
-    class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+    class ViewHolder(view: View) : androidx.recyclerview.widget.RecyclerView.ViewHolder(view) {
         var checkbox: CheckBox
         var txtChoice: TextView
         var contParentLayout: LinearLayout

spinnerdialog/src/main/java/com/github/hamzaahmedkhan/spinnerdialog/ui/multi/SpinnerDialogMultiSelectAdapter.kt

@@ -2,7 +2,7 @@ package com.github.hamzaahmedkhan.spinnerdialog.ui.single
 
 import android.app.Activity
 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
@@ -21,7 +21,7 @@ class SpinnerDialogSingleSelectAdapter(
     private val context: Context,
     var arrData: ArrayList<SpinnerModel>,
     private val onItemClick: OnSpinnerItemClickListener
-) : RecyclerView.Adapter<SpinnerDialogSingleSelectAdapter.ViewHolder>() {
+) : androidx.recyclerview.widget.RecyclerView.Adapter<SpinnerDialogSingleSelectAdapter.ViewHolder>() {
     override fun onCreateViewHolder(
         parent: ViewGroup,
         viewType: Int
@@ -60,7 +60,7 @@ class SpinnerDialogSingleSelectAdapter(
     }
 
     class ViewHolder(itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
+        androidx.recyclerview.widget.RecyclerView.ViewHolder(itemView) {
         var radioButton: RadioButton
         var txtChoice: TextView
         var contParentLayout: LinearLayout

spinnerdialog/src/main/java/com/github/hamzaahmedkhan/spinnerdialog/ui/single/SpinnerDialogSingleSelectAdapter.kt

@@ -68,7 +68,7 @@
         </LinearLayout>
 
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="0dp"