Aidan Follestad 6 years ago
parent
commit
4d6e3010f3

+ 1 - 2
core/src/main/java/com/afollestad/materialdialogs/list/DialogListExt.kt

@@ -29,7 +29,6 @@ import androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP
 import androidx.recyclerview.widget.RecyclerView
 import com.afollestad.materialdialogs.MaterialDialog
 import com.afollestad.materialdialogs.R
-import com.afollestad.materialdialogs.R.attr
 import com.afollestad.materialdialogs.assertOneSet
 import com.afollestad.materialdialogs.internal.list.MultiChoiceDialogAdapter
 import com.afollestad.materialdialogs.internal.list.PlainListDialogAdapter
@@ -155,7 +154,7 @@ fun MaterialDialog.updateListItems(
 /** @author Aidan Follestad (@afollestad) */
 @RestrictTo(LIBRARY_GROUP)
 fun MaterialDialog.getItemSelector(): Drawable? {
-  val drawable = resolveDrawable(context = context, attr = attr.md_item_selector)
+  val drawable = resolveDrawable(context = context, attr = R.attr.md_item_selector)
   if (SDK_INT >= LOLLIPOP && drawable is RippleDrawable) {
     resolveColor(attr = R.attr.md_ripple_color).ifNotZero {
       drawable.setColor(valueOf(it))

+ 1 - 0
core/src/main/java/com/afollestad/materialdialogs/list/DialogMultiChoiceExt.kt

@@ -48,6 +48,7 @@ import com.afollestad.materialdialogs.utils.getStringArray
 ): MaterialDialog {
   assertOneSet("listItemsMultiChoice", items, res)
   val array = items ?: getStringArray(res)?.toList() ?: return this
+
   if (getListAdapter() != null) {
     return updateListItems(
         res = res,

+ 4 - 0
core/src/main/java/com/afollestad/materialdialogs/list/DialogSingleChoiceExt.kt

@@ -45,6 +45,10 @@ import com.afollestad.materialdialogs.utils.getStringArray
 ): MaterialDialog {
   assertOneSet("listItemsSingleChoice", items, res)
   val array = items ?: getStringArray(res)?.toList() ?: return this
+  require(initialSelection >= -1 || initialSelection < array.size) {
+    "Initial selection $initialSelection must be between -1 and " +
+        "the size of your items array ${array.size}"
+  }
 
   if (getListAdapter() != null) {
     return updateListItems(