Migrate to AndroidX, resolves #1552

color/build.gradle

@@ -30,8 +30,9 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:recyclerview-v7:' + versions.supportLib
+  implementation 'androidx.recyclerview:recyclerview:' + versions.androidx
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
+
   implementation project(':core')
 }
 

color/src/main/java/com/afollestad/materialdialogs/color/ColorCircleView.kt

@@ -11,9 +11,9 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Paint.Style.FILL
 import android.graphics.Paint.Style.STROKE
-import android.support.annotation.ColorInt
 import android.util.AttributeSet
 import android.view.View
+import androidx.annotation.ColorInt
 import com.afollestad.materialdialogs.color.utilext.dimenPx
 
 /** @author Aidan Follestad (afollestad) */
@@ -38,15 +38,13 @@ internal class ColorCircleView(
     fillPaint.color = Color.DKGRAY
   }
 
-  @ColorInt
-  var color: Int = Color.BLACK
+  @ColorInt var color: Int = Color.BLACK
     set(value) {
       field = value
       fillPaint.color = value
       invalidate()
     }
-  @ColorInt
-  var border: Int = Color.DKGRAY
+  @ColorInt var border: Int = Color.DKGRAY
     set(value) {
       field = value
       strokePaint.color = value

color/src/main/java/com/afollestad/materialdialogs/color/ColorGridAdapter.kt

@@ -6,13 +6,13 @@
 package com.afollestad.materialdialogs.color
 
 import android.R.attr
-import android.support.annotation.ColorInt
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.widget.ImageView
+import androidx.annotation.ColorInt
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.hasActionButtons

color/src/main/java/com/afollestad/materialdialogs/color/DialogColorChooserExt.kt

@@ -6,10 +6,10 @@
 package com.afollestad.materialdialogs.color
 
 import android.annotation.SuppressLint
-import android.support.annotation.CheckResult
-import android.support.annotation.ColorInt
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.CheckResult
+import androidx.annotation.ColorInt
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled

color/src/main/java/com/afollestad/materialdialogs/color/utilext/ColorUtilExt.kt

@@ -7,13 +7,12 @@ package com.afollestad.materialdialogs.color.utilext
 
 import android.content.Context
 import android.graphics.Color
-import android.support.annotation.AttrRes
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
-@ColorInt
-internal fun getColor(
+@ColorInt internal fun getColor(
   context: Context,
   @ColorRes res: Int? = null,
   @AttrRes attr: Int? = null

color/src/main/java/com/afollestad/materialdialogs/color/utilext/ViewUtilExt.kt

@@ -5,10 +5,10 @@
  */
 package com.afollestad.materialdialogs.color.utilext
 
-import android.support.annotation.DimenRes
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import androidx.annotation.DimenRes
 
 internal fun <T : View> T.dimenPx(@DimenRes res: Int): Int {
   return context.resources.getDimensionPixelSize(res)

core/build.gradle

@@ -30,10 +30,10 @@ android {
 }
 
 dependencies {
-  api 'com.android.support:support-annotations:' + versions.supportLib
-  api 'com.android.support:appcompat-v7:' + versions.supportLib
+  api 'androidx.annotation:annotation:' + versions.androidx
+  api 'androidx.appcompat:appcompat:' + versions.androidx
 
-  implementation 'com.android.support:recyclerview-v7:' + versions.supportLib
+  implementation 'androidx.recyclerview:recyclerview:' + versions.androidx
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
 }
 

core/src/main/java/com/afollestad/materialdialogs/MaterialDialog.kt

@@ -11,12 +11,12 @@ import android.app.Dialog
 import android.content.Context
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
-import android.support.annotation.CheckResult
-import android.support.annotation.DrawableRes
-import android.support.annotation.StringRes
 import android.view.View
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.annotation.CheckResult
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
 import com.afollestad.materialdialogs.Theme.Companion.inferTheme
 import com.afollestad.materialdialogs.WhichButton.NEGATIVE
 import com.afollestad.materialdialogs.WhichButton.NEUTRAL
@@ -105,8 +105,7 @@ class MaterialDialog(
    * @param res The drawable resource to display as the drawable.
    * @param drawable The drawable to display as the drawable.
    */
-  @CheckResult
-  fun icon(
+  @CheckResult fun icon(
     @DrawableRes res: Int? = null,
     drawable: Drawable? = null
   ): MaterialDialog {
@@ -125,8 +124,7 @@ class MaterialDialog(
    * @param res The string resource to display as the title.
    * @param text The literal string to display as the title.
    */
-  @CheckResult
-  fun title(
+  @CheckResult fun title(
     @StringRes res: Int? = null,
     text: String? = null
   ): MaterialDialog {
@@ -147,8 +145,7 @@ class MaterialDialog(
    * @param res The string resource to display as the message.
    * @param text The literal string to display as the message.
    */
-  @CheckResult
-  fun message(
+  @CheckResult fun message(
     @StringRes res: Int? = null,
     text: CharSequence? = null
   ): MaterialDialog {
@@ -167,8 +164,7 @@ class MaterialDialog(
    * @param text The literal string to display on the button.
    * @param click A listener to invoke when the button is pressed.
    */
-  @CheckResult
-  fun positiveButton(
+  @CheckResult fun positiveButton(
     @StringRes res: Int? = null,
     text: CharSequence? = null,
     click: DialogCallback? = null
@@ -202,8 +198,7 @@ class MaterialDialog(
    * @param text The literal string to display on the button.
    * @param click A listener to invoke when the button is pressed.
    */
-  @CheckResult
-  fun negativeButton(
+  @CheckResult fun negativeButton(
     @StringRes res: Int? = null,
     text: CharSequence? = null,
     click: DialogCallback? = null
@@ -263,15 +258,13 @@ class MaterialDialog(
    * Turns off auto dismiss. Action button and list item clicks won't dismiss the dialog on their
    * own. You have to handle dismissing the dialog manually with the [dismiss] method.
    */
-  @CheckResult
-  fun noAutoDismiss(): MaterialDialog {
+  @CheckResult fun noAutoDismiss(): MaterialDialog {
     this.autoDismissEnabled = false
     return this
   }
 
   /** Turns debug mode on or off. Draws spec guides over dialog views. */
-  @CheckResult
-  fun debugMode(debugMode: Boolean = true): MaterialDialog {
+  @CheckResult fun debugMode(debugMode: Boolean = true): MaterialDialog {
     this.view.debugMode = debugMode
     return this
   }

core/src/main/java/com/afollestad/materialdialogs/Theme.kt

@@ -7,13 +7,11 @@ package com.afollestad.materialdialogs
 
 import android.R.attr
 import android.content.Context
-import android.support.annotation.StyleRes
+import androidx.annotation.StyleRes
 import com.afollestad.materialdialogs.utils.getColor
 import com.afollestad.materialdialogs.utils.isColorDark
 
-internal enum class Theme(
-  @StyleRes val styleRes: Int
-) {
+internal enum class Theme(@StyleRes val styleRes: Int) {
   LIGHT(R.style.MD_Light),
   DARK(R.style.MD_Dark);
 

core/src/main/java/com/afollestad/materialdialogs/actions/DialogActionExt.kt

@@ -5,7 +5,7 @@
  */
 package com.afollestad.materialdialogs.actions
 
-import android.support.v7.widget.AppCompatButton
+import androidx.appcompat.widget.AppCompatButton
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton
 

core/src/main/java/com/afollestad/materialdialogs/checkbox/DialogCheckboxExt.kt

@@ -7,10 +7,10 @@
 
 package com.afollestad.materialdialogs.checkbox
 
-import android.support.annotation.CheckResult
-import android.support.annotation.StringRes
 import android.view.View
 import android.widget.CheckBox
+import androidx.annotation.CheckResult
+import androidx.annotation.StringRes
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.assertOneSet
@@ -19,13 +19,11 @@ import com.afollestad.materialdialogs.utils.maybeSetTextColor
 
 typealias BooleanCallback = ((Boolean) -> Unit)?
 
-@CheckResult
-fun MaterialDialog.getCheckBoxPrompt(): CheckBox {
+@CheckResult fun MaterialDialog.getCheckBoxPrompt(): CheckBox {
   return view.buttonsLayout.checkBoxPrompt
 }
 
-@CheckResult
-fun MaterialDialog.isCheckPromptChecked() = getCheckBoxPrompt().isChecked
+@CheckResult fun MaterialDialog.isCheckPromptChecked() = getCheckBoxPrompt().isChecked
 
 /**
  * @param res The string resource to display for the checkbox label.
@@ -33,8 +31,7 @@ fun MaterialDialog.isCheckPromptChecked() = getCheckBoxPrompt().isChecked
  * @param isCheckedDefault Whether or not the checkbox is initially checked.
  * @param onToggle A listener invoked when the checkbox is checked or unchecked.
  */
-@CheckResult
-fun MaterialDialog.checkBoxPrompt(
+@CheckResult fun MaterialDialog.checkBoxPrompt(
   @StringRes res: Int = 0,
   text: String? = null,
   isCheckedDefault: Boolean = false,

core/src/main/java/com/afollestad/materialdialogs/customview/DialogCustomViewExt.kt

@@ -5,9 +5,9 @@
  */
 package com.afollestad.materialdialogs.customview
 
-import android.support.annotation.CheckResult
-import android.support.annotation.LayoutRes
 import android.view.View
+import androidx.annotation.CheckResult
+import androidx.annotation.LayoutRes
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.assertOneSet
@@ -20,10 +20,7 @@ import com.afollestad.materialdialogs.utils.updatePadding
 
 internal const val CUSTOM_VIEW_NO_PADDING = "md.custom_view_no_padding"
 
-@CheckResult
-fun MaterialDialog.getCustomView(): View? {
-  return contentCustomView
-}
+@CheckResult fun MaterialDialog.getCustomView() = contentCustomView
 
 /**
  * Sets a custom view to display in the dialog, below the title and above the action buttons
@@ -34,8 +31,7 @@ fun MaterialDialog.getCustomView(): View? {
  * @param scrollable Whether or not the custom view is automatically wrapped in a ScrollView.
  * @param noVerticalPadding When set to true, vertical padding is not added around your content.
  */
-@CheckResult
-fun MaterialDialog.customView(
+@CheckResult fun MaterialDialog.customView(
   @LayoutRes viewRes: Int? = null,
   view: View? = null,
   scrollable: Boolean = false,

core/src/main/java/com/afollestad/materialdialogs/internal/button/DialogActionButton.kt

@@ -6,9 +6,9 @@
 package com.afollestad.materialdialogs.internal.button
 
 import android.content.Context
-import android.support.v7.widget.AppCompatButton
 import android.util.AttributeSet
 import android.view.Gravity.CENTER
+import androidx.appcompat.widget.AppCompatButton
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.R.attr
 import com.afollestad.materialdialogs.Theme.Companion.inferTheme

core/src/main/java/com/afollestad/materialdialogs/internal/button/DialogActionButtonLayout.kt

@@ -7,13 +7,13 @@ package com.afollestad.materialdialogs.internal.button
 
 import android.content.Context
 import android.graphics.Canvas
-import android.support.v7.widget.AppCompatCheckBox
 import android.util.AttributeSet
 import android.view.View.MeasureSpec.AT_MOST
 import android.view.View.MeasureSpec.EXACTLY
 import android.view.View.MeasureSpec.UNSPECIFIED
 import android.view.View.MeasureSpec.getSize
 import android.view.View.MeasureSpec.makeMeasureSpec
+import androidx.appcompat.widget.AppCompatCheckBox
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.WhichButton
 import com.afollestad.materialdialogs.internal.main.BaseSubLayout

core/src/main/java/com/afollestad/materialdialogs/internal/list/DialogRecyclerView.kt

@@ -6,11 +6,11 @@
 package com.afollestad.materialdialogs.internal.list
 
 import android.content.Context
-import android.support.v7.widget.GridLayoutManager
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
 import android.util.AttributeSet
 import android.util.Log
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.internal.main.DialogLayout
 import com.afollestad.materialdialogs.utils.invalidateDividers

core/src/main/java/com/afollestad/materialdialogs/internal/list/MultiChoiceDialogAdapter.kt

@@ -5,12 +5,12 @@
  */
 package com.afollestad.materialdialogs.internal.list
 
-import android.support.v7.widget.AppCompatCheckBox
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatCheckBox
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.WhichButton.POSITIVE

core/src/main/java/com/afollestad/materialdialogs/internal/list/PlainListDialogAdapter.kt

@@ -5,11 +5,11 @@
  */
 package com.afollestad.materialdialogs.internal.list
 
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.actions.hasActionButtons

core/src/main/java/com/afollestad/materialdialogs/internal/list/SingleChoiceDialogAdapter.kt

@@ -5,12 +5,12 @@
  */
 package com.afollestad.materialdialogs.internal.list
 
-import android.support.v7.widget.AppCompatRadioButton
-import android.support.v7.widget.RecyclerView
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.appcompat.widget.AppCompatRadioButton
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.WhichButton.POSITIVE

core/src/main/java/com/afollestad/materialdialogs/internal/main/BaseSubLayout.kt

@@ -8,9 +8,9 @@ package com.afollestad.materialdialogs.internal.main
 import android.content.Context
 import android.graphics.Paint
 import android.graphics.Paint.Style.STROKE
-import android.support.annotation.ColorInt
 import android.util.AttributeSet
 import android.view.ViewGroup
+import androidx.annotation.ColorInt
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.R.attr
 import com.afollestad.materialdialogs.utils.dimenPx

core/src/main/java/com/afollestad/materialdialogs/internal/main/DialogLayout.kt

@@ -11,7 +11,6 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Paint.Style.FILL
 import android.graphics.Paint.Style.STROKE
-import android.support.annotation.ColorInt
 import android.util.AttributeSet
 import android.view.View
 import android.view.View.MeasureSpec.AT_MOST
@@ -20,6 +19,7 @@ import android.view.View.MeasureSpec.UNSPECIFIED
 import android.view.View.MeasureSpec.getSize
 import android.view.View.MeasureSpec.makeMeasureSpec
 import android.widget.FrameLayout
+import androidx.annotation.ColorInt
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.internal.button.DialogActionButtonLayout

core/src/main/java/com/afollestad/materialdialogs/internal/rtl/RtlTextView.kt

@@ -6,8 +6,8 @@
 package com.afollestad.materialdialogs.internal.rtl
 
 import android.content.Context
-import android.support.v7.widget.AppCompatTextView
 import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
 import com.afollestad.materialdialogs.utils.setGravityStartCompat
 
 /**

core/src/main/java/com/afollestad/materialdialogs/list/DialogListExt.kt

@@ -7,10 +7,10 @@
 
 package com.afollestad.materialdialogs.list
 
-import android.support.annotation.ArrayRes
-import android.support.annotation.CheckResult
-import android.support.v7.widget.LinearLayoutManager
-import android.support.v7.widget.RecyclerView
+import androidx.annotation.ArrayRes
+import androidx.annotation.CheckResult
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.R.attr
@@ -20,13 +20,11 @@ import com.afollestad.materialdialogs.utils.getDrawable
 import com.afollestad.materialdialogs.utils.getStringArray
 import com.afollestad.materialdialogs.utils.inflate
 
-@CheckResult
-fun MaterialDialog.getRecyclerView(): RecyclerView? {
+@CheckResult fun MaterialDialog.getRecyclerView(): RecyclerView? {
   return this.contentRecyclerView
 }
 
-@CheckResult
-fun MaterialDialog.getListAdapter(): RecyclerView.Adapter<*>? {
+@CheckResult fun MaterialDialog.getListAdapter(): RecyclerView.Adapter<*>? {
   return this.contentRecyclerView?.adapter
 }
 
@@ -35,8 +33,7 @@ fun MaterialDialog.getListAdapter(): RecyclerView.Adapter<*>? {
  *
  * Cannot be used in combination with message, input, and some other types of dialogs.
  */
-@CheckResult
-fun MaterialDialog.customListAdapter(
+@CheckResult fun MaterialDialog.customListAdapter(
   adapter: RecyclerView.Adapter<*>
 ): MaterialDialog {
   addContentRecyclerView()
@@ -53,8 +50,7 @@ fun MaterialDialog.customListAdapter(
  *    is selected and the positive action button is pressed. Defaults to true if the dialog has buttons.
  * @param selection A listener invoked when an item in the list is selected.
  */
-@CheckResult
-fun MaterialDialog.listItems(
+@CheckResult fun MaterialDialog.listItems(
   @ArrayRes res: Int? = null,
   items: List<String>? = null,
   disabledIndices: IntArray? = null,
@@ -105,7 +101,6 @@ private fun MaterialDialog.addContentRecyclerView() {
       R.layout.md_dialog_stub_recyclerview, this.view
   )
   this.contentRecyclerView!!.attach(this)
-  this.contentRecyclerView!!.layoutManager =
-      LinearLayoutManager(windowContext)
+  this.contentRecyclerView!!.layoutManager = LinearLayoutManager(windowContext)
   this.view.addView(this.contentRecyclerView, 1)
 }

core/src/main/java/com/afollestad/materialdialogs/list/DialogMultiChoiceExt.kt

@@ -7,8 +7,8 @@
 
 package com.afollestad.materialdialogs.list
 
-import android.support.annotation.ArrayRes
-import android.support.annotation.CheckResult
+import androidx.annotation.ArrayRes
+import androidx.annotation.CheckResult
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled
@@ -25,8 +25,7 @@ import com.afollestad.materialdialogs.utils.getStringArray
  *    the positive action button is pressed.
  * @param selection A listener invoked when an item in the list is selected.
  */
-@CheckResult
-fun MaterialDialog.listItemsMultiChoice(
+@CheckResult fun MaterialDialog.listItemsMultiChoice(
   @ArrayRes res: Int? = null,
   items: List<String>? = null,
   disabledIndices: IntArray? = null,

core/src/main/java/com/afollestad/materialdialogs/list/DialogSingleChoiceExt.kt

@@ -7,8 +7,8 @@
 
 package com.afollestad.materialdialogs.list
 
-import android.support.annotation.ArrayRes
-import android.support.annotation.CheckResult
+import androidx.annotation.ArrayRes
+import androidx.annotation.CheckResult
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled
@@ -25,8 +25,7 @@ import com.afollestad.materialdialogs.utils.getStringArray
  *    the positive action button is pressed. Defaults to true if the dialog has buttons.
  * @param selection A listener invoked when an item in the list is selected.
  */
-@CheckResult
-fun MaterialDialog.listItemsSingleChoice(
+@CheckResult fun MaterialDialog.listItemsSingleChoice(
   @ArrayRes res: Int? = null,
   items: List<String>? = null,
   disabledIndices: IntArray? = null,

core/src/main/java/com/afollestad/materialdialogs/utils/ColorExt.kt

@@ -7,11 +7,11 @@ package com.afollestad.materialdialogs.utils
 
 import android.content.Context
 import android.graphics.Color
-import android.support.annotation.AttrRes
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
 import android.widget.TextView
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 import com.afollestad.materialdialogs.MaterialDialog
 
 @ColorInt internal fun MaterialDialog.getColor(
@@ -19,8 +19,7 @@ import com.afollestad.materialdialogs.MaterialDialog
   @AttrRes attr: Int? = null
 ): Int = getColor(windowContext, res, attr)
 
-@ColorInt
-internal fun getColor(
+@ColorInt internal fun getColor(
   context: Context,
   @ColorRes res: Int? = null,
   @AttrRes attr: Int? = null

core/src/main/java/com/afollestad/materialdialogs/utils/DialogExt.kt

@@ -10,11 +10,6 @@ import android.graphics.Point
 import android.graphics.Typeface
 import android.graphics.drawable.Drawable
 import android.graphics.drawable.GradientDrawable
-import android.support.annotation.ColorInt
-import android.support.annotation.DrawableRes
-import android.support.annotation.RestrictTo
-import android.support.annotation.RestrictTo.Scope
-import android.support.annotation.StringRes
 import android.view.View
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
@@ -22,6 +17,11 @@ import android.view.inputmethod.InputMethodManager
 import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.DrawableRes
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
+import androidx.annotation.StringRes
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.assertOneSet

core/src/main/java/com/afollestad/materialdialogs/utils/DimensExt.kt

@@ -5,9 +5,9 @@
  */
 package com.afollestad.materialdialogs.utils
 
-import android.support.annotation.AttrRes
-import android.support.annotation.DimenRes
 import android.view.View
+import androidx.annotation.AttrRes
+import androidx.annotation.DimenRes
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
 import com.afollestad.materialdialogs.assertOneSet

core/src/main/java/com/afollestad/materialdialogs/utils/DrawableExt.kt

@@ -7,9 +7,9 @@ package com.afollestad.materialdialogs.utils
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.annotation.AttrRes
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
+import androidx.annotation.AttrRes
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 
 internal fun getDrawable(
   context: Context,

core/src/main/java/com/afollestad/materialdialogs/utils/FontExt.kt

@@ -6,15 +6,14 @@
 package com.afollestad.materialdialogs.utils
 
 import android.graphics.Typeface
-import android.support.annotation.AttrRes
-import android.support.annotation.CheckResult
-import android.support.annotation.FontRes
-import android.support.v4.content.res.ResourcesCompat
+import androidx.annotation.AttrRes
+import androidx.annotation.CheckResult
+import androidx.annotation.FontRes
+import androidx.core.content.res.ResourcesCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.assertOneSet
 
-@CheckResult
-internal fun MaterialDialog.font(
+@CheckResult internal fun MaterialDialog.font(
   @FontRes res: Int? = null,
   @AttrRes attr: Int? = null
 ): Typeface? {
@@ -22,6 +21,7 @@ internal fun MaterialDialog.font(
   if (res != null) {
     return ResourcesCompat.getFont(windowContext, res)
   }
+
   val a = windowContext.theme.obtainStyledAttributes(intArrayOf(attr!!))
   try {
     val resId = a.getResourceId(0, 0)

core/src/main/java/com/afollestad/materialdialogs/utils/StringExt.kt

@@ -5,8 +5,8 @@
  */
 package com.afollestad.materialdialogs.utils
 
-import android.support.annotation.ArrayRes
-import android.support.annotation.StringRes
+import androidx.annotation.ArrayRes
+import androidx.annotation.StringRes
 import com.afollestad.materialdialogs.MaterialDialog
 
 internal fun MaterialDialog.getString(

core/src/main/java/com/afollestad/materialdialogs/utils/ViewExt.kt

@@ -8,7 +8,6 @@ package com.afollestad.materialdialogs.utils
 import android.content.Context
 import android.os.Build.VERSION.SDK_INT
 import android.os.Build.VERSION_CODES.JELLY_BEAN_MR1
-import android.support.annotation.LayoutRes
 import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
@@ -17,6 +16,7 @@ import android.view.ViewGroup.MarginLayoutParams
 import android.view.ViewTreeObserver
 import android.widget.Button
 import android.widget.TextView
+import androidx.annotation.LayoutRes
 import com.afollestad.materialdialogs.MaterialDialog
 
 @Suppress("UNCHECKED_CAST")

dependencies.gradle

@@ -11,5 +11,5 @@ ext.versions = [
     bintrayPlugin     : '0.8.1',
 
     kotlin            : '1.2.70',
-    supportLib        : '28.0.0-rc02'
+    androidx          : '1.0.0'
 ]

files/build.gradle

@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:recyclerview-v7:' + versions.supportLib
+  implementation 'androidx.recyclerview:recyclerview:' + versions.androidx
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
 
   implementation project(':core')

files/src/main/java/com/afollestad/materialdialogs/files/DialogFileChooserExt.kt

@@ -7,10 +7,10 @@ package com.afollestad.materialdialogs.files
 
 import android.annotation.SuppressLint
 import android.os.Environment.getExternalStorageDirectory
-import android.support.annotation.CheckResult
-import android.support.annotation.StringRes
-import android.support.v7.widget.LinearLayoutManager
 import android.widget.TextView
+import androidx.annotation.CheckResult
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled

files/src/main/java/com/afollestad/materialdialogs/files/DialogFolderChooserExt.kt

@@ -7,10 +7,10 @@ package com.afollestad.materialdialogs.files
 
 import android.annotation.SuppressLint
 import android.os.Environment.getExternalStorageDirectory
-import android.support.annotation.CheckResult
-import android.support.annotation.StringRes
-import android.support.v7.widget.LinearLayoutManager
 import android.widget.TextView
+import androidx.annotation.CheckResult
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.setActionButtonEnabled

files/src/main/java/com/afollestad/materialdialogs/files/FileChooserAdapter.kt

@@ -5,14 +5,14 @@
  */
 package com.afollestad.materialdialogs.files
 
-import android.support.annotation.StringRes
-import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.View.OnClickListener
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.hasActionButtons

files/src/main/java/com/afollestad/materialdialogs/files/utilext/ColorUtilExt.kt

@@ -7,14 +7,13 @@ package com.afollestad.materialdialogs.files.utilext
 
 import android.content.Context
 import android.graphics.Color
-import android.support.annotation.AttrRes
-import android.support.annotation.ColorInt
-import android.support.annotation.ColorRes
-import android.support.v4.content.ContextCompat
 import android.widget.TextView
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+import androidx.annotation.ColorRes
+import androidx.core.content.ContextCompat
 
-@ColorInt
-internal fun getColor(
+@ColorInt internal fun getColor(
   context: Context,
   @ColorRes res: Int? = null,
   @AttrRes attr: Int? = null

files/src/main/java/com/afollestad/materialdialogs/files/utilext/DrawableUtilExt.kt

@@ -7,9 +7,9 @@ package com.afollestad.materialdialogs.files.utilext
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.annotation.AttrRes
-import android.support.annotation.DrawableRes
-import android.support.v4.content.ContextCompat
+import androidx.annotation.AttrRes
+import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 
 internal fun getDrawable(
   context: Context,

files/src/main/java/com/afollestad/materialdialogs/files/utilext/FilesUtilExt.kt

@@ -9,7 +9,7 @@ import android.Manifest.permission
 import android.content.Context
 import android.content.pm.PackageManager
 import android.os.Environment.getExternalStorageDirectory
-import android.support.v4.content.ContextCompat
+import androidx.core.content.ContextCompat
 import com.afollestad.materialdialogs.MaterialDialog
 import java.io.File
 

input/build.gradle

@@ -30,7 +30,7 @@ android {
 }
 
 dependencies {
-  implementation 'com.android.support:design:' + versions.supportLib
+  implementation 'com.google.android.material:material:' + versions.androidx
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
   implementation project(':core')
 }

input/src/main/java/com/afollestad/materialdialogs/input/DialogInputExt.kt

@@ -8,11 +8,9 @@
 package com.afollestad.materialdialogs.input
 
 import android.annotation.SuppressLint
-import android.support.annotation.CheckResult
-import android.support.annotation.StringRes
-import android.support.design.widget.TextInputLayout
 import android.text.InputType
-import android.widget.EditText
+import androidx.annotation.CheckResult
+import androidx.annotation.StringRes
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.WhichButton.POSITIVE
 import com.afollestad.materialdialogs.actions.hasActionButtons
@@ -22,18 +20,13 @@ import com.afollestad.materialdialogs.callbacks.onShow
 import com.afollestad.materialdialogs.customview.customView
 import com.afollestad.materialdialogs.customview.getCustomView
 import com.afollestad.materialdialogs.input.utilext.textChanged
+import com.google.android.material.textfield.TextInputLayout
 
 typealias InputCallback = ((MaterialDialog, CharSequence) -> Unit)?
 
-@CheckResult
-fun MaterialDialog.getInputLayout(): TextInputLayout? {
-  return this.getCustomView() as? TextInputLayout
-}
+@CheckResult fun MaterialDialog.getInputLayout() = getCustomView() as? TextInputLayout
 
-@CheckResult
-fun MaterialDialog.getInputField(): EditText? {
-  return getInputLayout()?.editText
-}
+@CheckResult fun MaterialDialog.getInputField() = getInputLayout()?.editText
 
 /**
  * Shows an input field as the content of the dialog. Can be used with a message and checkbox

input/src/main/java/com/afollestad/materialdialogs/input/utilext/ViewUtilExt.kt

@@ -5,9 +5,9 @@
  */
 package com.afollestad.materialdialogs.input.utilext
 
-import android.support.annotation.RestrictTo
-import android.support.annotation.RestrictTo.Scope
 import android.view.View
+import androidx.annotation.RestrictTo
+import androidx.annotation.RestrictTo.Scope
 
 @RestrictTo(Scope.LIBRARY_GROUP)
 inline fun <T : View> T.postApply(crossinline exec: T.() -> Unit) = this.post {

sample/build.gradle

@@ -28,9 +28,9 @@ dependencies {
 
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:' + versions.kotlin
 
-  implementation 'com.android.support:gridlayout-v7:' + versions.supportLib
-  implementation 'com.android.support:appcompat-v7:' + versions.supportLib
-  implementation 'com.android.support:recyclerview-v7:' + versions.supportLib
+  implementation 'androidx.gridlayout:gridlayout:' + versions.androidx
+  implementation 'androidx.appcompat:appcompat:' + versions.androidx
+  implementation 'androidx.recyclerview:recyclerview:' + versions.androidx
 }
 
 apply from: '../spotless.gradle'

sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.kt

@@ -12,7 +12,6 @@ import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.content.SharedPreferences
 import android.graphics.Color
 import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
 import android.text.InputType
 import android.text.method.PasswordTransformationMethod
 import android.view.Menu
@@ -20,6 +19,7 @@ import android.view.MenuItem
 import android.webkit.WebView
 import android.widget.CheckBox
 import android.widget.EditText
+import androidx.appcompat.app.AppCompatActivity
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.callbacks.onCancel
 import com.afollestad.materialdialogs.callbacks.onDismiss

sample/src/main/java/com/afollestad/materialdialogssample/Permission.kt

@@ -7,9 +7,9 @@ package com.afollestad.materialdialogssample
 
 import android.app.Activity
 import android.content.pm.PackageManager.PERMISSION_GRANTED
-import android.support.annotation.CheckResult
-import android.support.v4.app.ActivityCompat
-import android.support.v4.content.ContextCompat
+import androidx.annotation.CheckResult
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
 import java.util.Arrays
 
 typealias Callback = (Result) -> Unit
@@ -22,14 +22,12 @@ class Permission(private val activity: Activity) {
 
   private val callbacks = mutableMapOf<Array<String>, Callback>()
 
-  @CheckResult
-  fun has(permissions: String): Boolean {
+  @CheckResult fun has(permissions: String): Boolean {
     return ContextCompat.checkSelfPermission(activity, permissions) ==
         PERMISSION_GRANTED
   }
 
-  @CheckResult
-  fun hasAll(permissions: Array<String>): Boolean {
+  @CheckResult fun hasAll(permissions: Array<String>): Boolean {
     for (perm in permissions) {
       if (!has(perm)) return false
     }
@@ -67,15 +65,13 @@ class Result(
   val grantResults: IntArray
 ) {
 
-  @CheckResult
-  fun granted(permission: String): Boolean {
+  @CheckResult fun granted(permission: String): Boolean {
     val index = permissions.indexOf(permission)
     if (index == -1) return false
     return grantResults[index] == PERMISSION_GRANTED
   }
 
-  @CheckResult
-  fun allGranted(): Boolean {
+  @CheckResult fun allGranted(): Boolean {
     for (perm in permissions) {
       if (!granted(perm)) return false
     }

sample/src/main/res/layout/custom_view_webview.xml

@@ -6,12 +6,10 @@
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
     >
-
   <WebView
       android:id="@+id/web_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:scrollbars="none"
       />
-
 </FrameLayout>