update support libraries to android X

2018-10-05 15:28:26 +02:00 · 2018-10-05 15:28:26 +02:00 · b50f3c4764
commit b50f3c4764
parent f9dc4967ce
47 changed files with 98 additions and 102 deletions
--- a/build.gradle
+++ b/build.gradle
@ -7,9 +7,8 @@ buildscript {
        propMinSdkVersion = 16
        propTargetSdkVersion = propCompileSdkVersion
        propVersionCode = 1
-        propVersionName = '4.8.8'
+        propVersionName = '4.9.0'
        kotlin_version = '1.2.71'
-        support_libs = '27.1.1'
    }

    repositories {
--- a/commons/build.gradle
+++ b/commons/build.gradle
@ -28,8 +28,8 @@ android {
 }

 dependencies {
-    compile "com.android.support:design:$support_libs"
-    compile "com.android.support:appcompat-v7:$support_libs"
+    compile 'com.google.android.material:material:1.0.0'
+    compile 'androidx.appcompat:appcompat:1.0.0'
    implementation 'com.github.bumptech.glide:glide:4.8.0'
    implementation 'com.booking:rtlviewpager:1.0.1'
    implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSimpleActivity.kt
@ -12,11 +12,11 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.provider.DocumentsContract
-import android.support.v4.app.ActivityCompat
-import android.support.v4.util.Pair
-import android.support.v7.app.AppCompatActivity
 import android.view.MenuItem
 import android.view.WindowManager
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.util.Pair
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.asynctasks.CopyMoveTask
 import com.simplemobiletools.commons.dialogs.ConfirmationDialog
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/activities/BaseSplashActivity.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.activities

 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.AppCompatActivity
 import com.simplemobiletools.commons.extensions.baseConfig
 import com.simplemobiletools.commons.extensions.getSharedTheme
 import com.simplemobiletools.commons.extensions.isThankYouInstalled
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/MyRecyclerViewAdapter.kt
@ -1,17 +1,16 @@
 package com.simplemobiletools.commons.adapters

-import android.support.v7.view.ActionMode
-import android.support.v7.widget.DividerItemDecoration
-import android.support.v7.widget.RecyclerView
 import android.util.SparseArray
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.view.ActionMode
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.RecyclerView
 import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
 import com.bignerdranch.android.multiselector.MultiSelector
-import com.bignerdranch.android.multiselector.SwappingHolder
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.baseConfig
@ -303,7 +302,7 @@ abstract class MyRecyclerViewAdapter(val activity: BaseSimpleActivity, val recyc

    open class ViewHolder(view: View, val adapterListener: MyAdapterListener? = null, val activity: BaseSimpleActivity? = null,
                          val multiSelectorCallback: ModalMultiSelectorCallback? = null, val multiSelector: MultiSelector,
-                          val positionOffset: Int = 0, val itemClick: ((Any) -> (Unit))? = null) : SwappingHolder(view, multiSelector) {
+                          val positionOffset: Int = 0, val itemClick: ((Any) -> (Unit))? = null) : RecyclerView.ViewHolder(view) {
        fun bindView(any: Any, allowSingleClick: Boolean, allowLongClick: Boolean, callback: (itemView: View, adapterPosition: Int) -> Unit): View {
            return itemView.apply {
                callback(this, adapterPosition)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/adapters/PasswordTypesAdapter.kt
@ -1,11 +1,11 @@
 package com.simplemobiletools.commons.adapters

 import android.content.Context
-import android.support.v4.view.PagerAdapter
 import android.util.SparseArray
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.viewpager.widget.PagerAdapter
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.isFingerPrintSensorAvailable
 import com.simplemobiletools.commons.interfaces.HashListener
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/asynctasks/CopyMoveTask.kt
@ -7,9 +7,9 @@ import android.content.Context
 import android.os.AsyncTask
 import android.os.Handler
 import android.provider.MediaStore
-import android.support.v4.app.NotificationCompat
-import android.support.v4.provider.DocumentFile
-import android.support.v4.util.Pair
+import androidx.core.app.NotificationCompat
+import androidx.core.util.Pair
+import androidx.documentfile.provider.DocumentFile
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
@ -172,8 +172,8 @@ class CopyMoveTask(val activity: BaseSimpleActivity, val copyOnly: Boolean = fal
                }

                val oldPath = "${source.path}/${child.name}"
-                val oldFileDirItem = FileDirItem(oldPath, child.name, child.isDirectory, 0, child.length())
-                val newFileDirItem = FileDirItem(newPath, child.name, child.isDirectory)
+                val oldFileDirItem = FileDirItem(oldPath, child.name!!, child.isDirectory, 0, child.length())
+                val newFileDirItem = FileDirItem(newPath, child.name!!, child.isDirectory)
                copy(oldFileDirItem, newFileDirItem)
            }
            mTransferredFiles.add(source)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ColorPickerDialog.kt
@ -2,7 +2,7 @@ package com.simplemobiletools.commons.dialogs

 import android.app.Activity
 import android.graphics.Color
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.MotionEvent
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationAdvancedDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import kotlinx.android.synthetic.main.dialog_message.view.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/ConfirmationDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.setupDialogStuff
 import kotlinx.android.synthetic.main.dialog_message.view.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/CreateNewFolderDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/CreateNewFolderDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

-import android.support.v7.app.AlertDialog
 import android.view.View
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/CustomIntervalPickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/CustomIntervalPickerDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.ViewGroup
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/DonateDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/DonateDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FileConflictDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.R.id.conflict_dialog_radio_merge
 import com.simplemobiletools.commons.R.id.conflict_dialog_radio_skip
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FilePickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/FilePickerDialog.kt
@ -2,9 +2,9 @@ package com.simplemobiletools.commons.dialogs

 import android.os.Environment
 import android.os.Parcelable
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
 import android.view.KeyEvent
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.adapters.FilepickerItemsAdapter
@ -134,7 +134,7 @@ class FilePickerDialog(val activity: BaseSimpleActivity,
        adapter.addVerticalDividers(true)

        val layoutManager = mDialogView.filepicker_list.layoutManager as LinearLayoutManager
-        mScrollStates[mPrevPath.trimEnd('/')] = layoutManager.onSaveInstanceState()
+        mScrollStates[mPrevPath.trimEnd('/')] = layoutManager.onSaveInstanceState()!!

        mDialogView.apply {
            filepicker_list.adapter = adapter
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/LineColorPickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/LineColorPickerDialog.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.dialogs

-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.view.WindowManager
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/NewAppDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/NewAppDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PropertiesDialog.kt
@ -4,7 +4,7 @@ import android.app.Activity
 import android.content.res.Resources
 import android.media.ExifInterface
 import android.provider.MediaStore
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PurchaseThankYouDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/PurchaseThankYouDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.text.Html
 import android.text.method.LinkMovementMethod
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RadioGroupDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RadioGroupDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.View
 import android.view.ViewGroup
 import android.widget.RadioButton
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/RenameItemDialog.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.dialogs

-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.extensions.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SecurityDialog.kt
@ -1,10 +1,10 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.design.widget.TabLayout
-import android.support.v4.view.ViewPager
-import android.support.v7.app.AlertDialog
 import android.view.LayoutInflater
+import androidx.appcompat.app.AlertDialog
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.tabs.TabLayout
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.adapters.PasswordTypesAdapter
 import com.simplemobiletools.commons.extensions.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/SelectAlarmSoundDialog.kt
@ -5,9 +5,9 @@ import android.content.Intent
 import android.media.MediaPlayer
 import android.net.Uri
 import android.os.Build
-import android.support.v7.app.AlertDialog
 import android.view.ViewGroup
 import android.widget.RadioGroup
+import androidx.appcompat.app.AlertDialog
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/StoragePickerDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/StoragePickerDialog.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.dialogs

-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import android.widget.RadioButton
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/WhatsNewDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/WhatsNewDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.setupDialogStuff
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/WritePermissionDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/dialogs/WritePermissionDialog.kt
@ -1,7 +1,7 @@
 package com.simplemobiletools.commons.dialogs

 import android.app.Activity
-import android.support.v7.app.AlertDialog
+import androidx.appcompat.app.AlertDialog
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions
 import com.simplemobiletools.commons.R
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Activity.kt
@ -12,9 +12,6 @@ import android.os.Looper
 import android.os.TransactionTooLargeException
 import android.provider.DocumentsContract
 import android.provider.MediaStore
-import android.support.v4.provider.DocumentFile
-import android.support.v7.app.AlertDialog
-import android.support.v7.app.AppCompatActivity
 import android.text.Html
 import android.view.View
 import android.view.ViewGroup
@ -24,6 +21,9 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.documentfile.provider.DocumentFile
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.activities.BaseSimpleActivity
 import com.simplemobiletools.commons.dialogs.*
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/AlertDialog.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/AlertDialog.kt
@ -1,8 +1,8 @@
 package com.simplemobiletools.commons.extensions

-import android.support.v7.app.AlertDialog
 import android.view.WindowManager
 import android.widget.EditText
+import androidx.appcompat.app.AlertDialog

 fun AlertDialog.showKeyboard(editText: EditText) {
    window!!.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context-storage.kt
@ -9,9 +9,9 @@ import android.net.Uri
 import android.os.Environment
 import android.provider.DocumentsContract
 import android.provider.MediaStore
-import android.support.v4.content.FileProvider
-import android.support.v4.provider.DocumentFile
 import android.text.TextUtils
+import androidx.core.content.FileProvider
+import androidx.documentfile.provider.DocumentFile
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.helpers.OTG_PATH
 import com.simplemobiletools.commons.helpers.isLollipopPlus
@ -342,18 +342,18 @@ fun Context.getOTGItems(path: String, shouldShowHidden: Boolean, getProperFileSi
            continue
        }

-        val file = rootUri.findFile(part)
+        val file = rootUri!!.findFile(part)
        if (file != null) {
            rootUri = file
        }
    }

-    val files = rootUri.listFiles().filter { it.exists() }
+    val files = rootUri!!.listFiles().filter { it.exists() }

    val basePath = "${baseConfig.OTGTreeUri}/document/${baseConfig.OTGPartition}%3A"
    for (file in files) {
        val name = file.name
-        if (!shouldShowHidden && name.startsWith(".")) {
+        if (!shouldShowHidden && name!!.startsWith(".")) {
            continue
        }

@ -367,12 +367,12 @@ fun Context.getOTGItems(path: String, shouldShowHidden: Boolean, getProperFileSi
        }

        val childrenCount = if (isDirectory) {
-            file.listFiles()?.size ?: 0
+            file.listFiles().size
        } else {
            0
        }

-        val fileDirItem = FileDirItem(decodedPath, name, isDirectory, childrenCount, fileSize)
+        val fileDirItem = FileDirItem(decodedPath, name!!, isDirectory, childrenCount, fileSize)
        items.add(fileDirItem)
    }

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/Context.kt
@ -18,13 +18,13 @@ import android.provider.BaseColumns
 import android.provider.DocumentsContract
 import android.provider.MediaStore
 import android.provider.OpenableColumns
-import android.support.annotation.RequiresApi
-import android.support.v4.content.ContextCompat
-import android.support.v4.content.CursorLoader
-import android.support.v4.content.FileProvider
 import android.view.View
 import android.view.ViewGroup
 import android.widget.Toast
+import androidx.annotation.RequiresApi
+import androidx.core.content.ContextCompat
+import androidx.core.content.FileProvider
+import androidx.loader.content.CursorLoader
 import com.github.ajalt.reprint.core.Reprint
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/DocumentFile.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/DocumentFile.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.extensions

-import android.support.v4.provider.DocumentFile
+import androidx.documentfile.provider.DocumentFile

 fun DocumentFile.getItemSize(countHiddenItems: Boolean): Long {
    return if (isDirectory) {
@ -14,14 +14,12 @@ private fun getDirectorySize(dir: DocumentFile, countHiddenItems: Boolean): Long
    var size = 0L
    if (dir.exists()) {
        val files = dir.listFiles()
-        if (files != null) {
-            for (i in files.indices) {
-                val file = files[i]
-                if (file.isDirectory) {
-                    size += getDirectorySize(file, countHiddenItems)
-                } else if (!file.name.startsWith(".") || countHiddenItems) {
-                    size += file.length()
-                }
+        for (i in files.indices) {
+            val file = files[i]
+            if (file.isDirectory) {
+                size += getDirectorySize(file, countHiddenItems)
+            } else if (!file.name!!.startsWith(".") || countHiddenItems) {
+                size += file.length()
            }
        }
    }
@ -40,15 +38,13 @@ private fun getDirectoryFileCount(dir: DocumentFile, countHiddenItems: Boolean):
    var count = 0
    if (dir.exists()) {
        val files = dir.listFiles()
-        if (files != null) {
-            for (i in files.indices) {
-                val file = files[i]
-                if (file.isDirectory) {
-                    count++
-                    count += getDirectoryFileCount(file, countHiddenItems)
-                } else if (!file.name.startsWith(".") || countHiddenItems) {
-                    count++
-                }
+        for (i in files.indices) {
+            val file = files[i]
+            if (file.isDirectory) {
+                count++
+                count += getDirectoryFileCount(file, countHiddenItems)
+            } else if (!file.name!!.startsWith(".") || countHiddenItems) {
+                count++
            }
        }
    }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/TabLayout.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/TabLayout.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.extensions

-import android.support.design.widget.TabLayout
+import com.google.android.material.tabs.TabLayout

 fun TabLayout.onTabSelectionChanged(tabUnselectedAction: (inactiveTab: TabLayout.Tab) -> Unit, tabSelectedAction: (activeTab: TabLayout.Tab) -> Unit) =
        setOnTabSelectedListener(object : TabLayout.OnTabSelectedListener {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ViewPager.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/extensions/ViewPager.kt
@ -1,6 +1,6 @@
 package com.simplemobiletools.commons.extensions

-import android.support.v4.view.ViewPager
+import androidx.viewpager.widget.ViewPager

 fun ViewPager.onPageChangeListener(pageChangedAction: (newPosition: Int) -> Unit) =
        addOnPageChangeListener(object : ViewPager.OnPageChangeListener {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/models/FileDirItem.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/models/FileDirItem.kt
@ -73,7 +73,7 @@ data class FileDirItem(val path: String, val name: String = "", var isDirectory:

    fun getDirectChildrenCount(context: Context, countHiddenItems: Boolean): Int {
        return if (path.startsWith(OTG_PATH)) {
-            context.getDocumentFile(path)?.listFiles()?.filter { if (countHiddenItems) true else !it.name.startsWith(".") }?.size ?: 0
+            context.getDocumentFile(path)?.listFiles()?.filter { if (countHiddenItems) true else !it.name!!.startsWith(".") }?.size ?: 0
        } else {
            File(path).getDirectChildrenCount(countHiddenItems)
        }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/FastScroller.kt
@ -3,14 +3,14 @@ package com.simplemobiletools.commons.views
 import android.content.Context
 import android.graphics.drawable.GradientDrawable
 import android.os.Handler
-import android.support.v4.widget.SwipeRefreshLayout
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
 import android.widget.FrameLayout
 import android.widget.TextView
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.baseConfig
@ -116,7 +116,7 @@ class FastScroller : FrameLayout {
        if (!wasRecyclerViewContentSizeSet) {
            val adapter = recyclerView!!.adapter
            val spanCount = ((recyclerView!!.layoutManager as? GridLayoutManager)?.spanCount ?: 1)
-            val otherDimension = Math.floor((adapter.itemCount - 1) / spanCount.toDouble()) + 1
+            val otherDimension = Math.floor((adapter!!.itemCount - 1) / spanCount.toDouble()) + 1
            val size = recyclerView!!.getChildAt(measureItemIndex)?.height ?: 0
            if (isHorizontal) {
                recyclerViewContentWidth = (otherDimension * size).toInt()
@ -309,7 +309,7 @@ class FastScroller : FrameLayout {
                recyclerView!!.scrollBy(0, diff)
            }

-            val itemCount = recyclerView!!.adapter.itemCount
+            val itemCount = recyclerView!!.adapter!!.itemCount
            val targetPos = getValueInRange(0, itemCount - 1, targetProportion * itemCount).toInt()
            fastScrollCallback?.invoke(targetPos)
        }
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatCheckbox.kt
@ -2,7 +2,7 @@ package com.simplemobiletools.commons.views

 import android.content.Context
 import android.content.res.ColorStateList
-import android.support.v7.widget.AppCompatCheckBox
+import androidx.appcompat.widget.AppCompatCheckBox
 import android.util.AttributeSet
 import com.simplemobiletools.commons.R

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatSpinner.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyAppCompatSpinner.kt
@ -1,11 +1,11 @@
 package com.simplemobiletools.commons.views

 import android.content.Context
-import android.support.v7.widget.AppCompatSpinner
 import android.util.AttributeSet
 import android.view.View
 import android.widget.AdapterView
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatSpinner
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.adapters.MyArrayAdapter
 import com.simplemobiletools.commons.extensions.applyColorFilter
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyCompatRadioButton.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyCompatRadioButton.kt
@ -2,7 +2,7 @@ package com.simplemobiletools.commons.views

 import android.content.Context
 import android.content.res.ColorStateList
-import android.support.v7.widget.AppCompatRadioButton
+import androidx.appcompat.widget.AppCompatRadioButton
 import android.util.AttributeSet
 import com.simplemobiletools.commons.R

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyDialogViewPager.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyDialogViewPager.kt
@ -1,10 +1,10 @@
 package com.simplemobiletools.commons.views

 import android.content.Context
-import android.support.v4.view.ViewPager
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.View
+import androidx.viewpager.widget.ViewPager

 class MyDialogViewPager : ViewPager {
    var allowSwiping = true
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyFloatingActionButton.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyFloatingActionButton.kt
@ -2,8 +2,8 @@ package com.simplemobiletools.commons.views

 import android.content.Context
 import android.content.res.ColorStateList
-import android.support.design.widget.FloatingActionButton
 import android.util.AttributeSet
+import com.google.android.material.floatingactionbutton.FloatingActionButton
 import com.simplemobiletools.commons.extensions.applyColorFilter
 import com.simplemobiletools.commons.extensions.getContrastColor

--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyGridLayoutManager.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyGridLayoutManager.kt
@ -1,8 +1,8 @@
 package com.simplemobiletools.commons.views

 import android.content.Context
-import android.support.v7.widget.GridLayoutManager
 import android.util.AttributeSet
+import androidx.recyclerview.widget.GridLayoutManager

 class MyGridLayoutManager : GridLayoutManager {
    constructor(context: Context, spanCount: Int) : super(context, spanCount)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyLinearLayoutManager.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyLinearLayoutManager.kt
@ -1,8 +1,8 @@
 package com.simplemobiletools.commons.views

 import android.content.Context
-import android.support.v7.widget.LinearLayoutManager
 import android.util.AttributeSet
+import androidx.recyclerview.widget.LinearLayoutManager

 class MyLinearLayoutManager : LinearLayoutManager {
    constructor(context: Context) : super(context)
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyRecyclerView.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MyRecyclerView.kt
@ -2,11 +2,11 @@ package com.simplemobiletools.commons.views

 import android.content.Context
 import android.os.Handler
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.ScaleGestureDetector
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.interfaces.RecyclerScrollCallback

@ -236,7 +236,7 @@ open class MyRecyclerView : RecyclerView {
        super.onScrollStateChanged(state)
        if (endlessScrollListener != null) {
            if (totalItemCount == 0) {
-                totalItemCount = adapter.itemCount
+                totalItemCount = adapter!!.itemCount
            }

            if (state == SCROLL_STATE_IDLE) {
--- a/commons/src/main/kotlin/com/simplemobiletools/commons/views/MySwitchCompat.kt
+++ b/commons/src/main/kotlin/com/simplemobiletools/commons/views/MySwitchCompat.kt
@ -2,8 +2,8 @@ package com.simplemobiletools.commons.views

 import android.content.Context
 import android.content.res.ColorStateList
-import android.support.v4.graphics.drawable.DrawableCompat
-import android.support.v7.widget.SwitchCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.appcompat.widget.SwitchCompat
 import android.util.AttributeSet
 import com.simplemobiletools.commons.R
 import com.simplemobiletools.commons.extensions.adjustAlpha
--- a/commons/src/main/res/layout/dialog_filepicker.xml
+++ b/commons/src/main/res/layout/dialog_filepicker.xml
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/filepicker_coordinator"
@ -53,4 +53,4 @@
        android:src="@drawable/ic_plus"
        android:visibility="gone"/>

-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/commons/src/main/res/layout/dialog_security.xml
+++ b/commons/src/main/res/layout/dialog_security.xml
@ -10,30 +10,30 @@
        android:layout_width="wrap_content"
        android:layout_height="wrap_content">

-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
            android:id="@+id/dialog_tab_layout"
            android:layout_width="match_parent"
            android:layout_height="wrap_content">

-            <android.support.design.widget.TabItem
+            <com.google.android.material.tabs.TabItem
                android:id="@+id/dialog_tab_pattern"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/pattern"/>

-            <android.support.design.widget.TabItem
+            <com.google.android.material.tabs.TabItem
                android:id="@+id/dialog_tab_pin"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/pin"/>

-            <android.support.design.widget.TabItem
+            <com.google.android.material.tabs.TabItem
                android:id="@+id/dialog_tab_fingerprint"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:text="@string/fingerprint"/>

-        </android.support.design.widget.TabLayout>
+        </com.google.android.material.tabs.TabLayout>

        <com.simplemobiletools.commons.views.MyDialogViewPager
            android:id="@+id/dialog_tab_view_pager"
--- 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.