Sfoglia il codice sorgente

Move single/multi choice assertions to the right place and dep upgrades

Aidan Follestad 6 anni fa
parent
commit
46ddfc6a68

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

@@ -46,6 +46,7 @@ import com.afollestad.materialdialogs.utils.getStringArray
   allowEmptySelection: Boolean = false,
   selection: MultiChoiceListener = null
 ): MaterialDialog {
+  assertOneSet("listItemsMultiChoice", items, res)
   val array = items ?: getStringArray(res)?.toList() ?: return this
   val adapter = getListAdapter()
 
@@ -57,7 +58,6 @@ import com.afollestad.materialdialogs.utils.getStringArray
     return this
   }
 
-  assertOneSet("listItemsMultiChoice", items, res)
   setActionButtonEnabled(POSITIVE, allowEmptySelection || initialSelection.isNotEmpty())
 
   return customListAdapter(

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

@@ -43,6 +43,7 @@ import com.afollestad.materialdialogs.utils.getStringArray
   waitForPositiveButton: Boolean = true,
   selection: SingleChoiceListener = null
 ): MaterialDialog {
+  assertOneSet("listItemsSingleChoice", items, res)
   val array = items ?: getStringArray(res)?.toList() ?: return this
   val adapter = getListAdapter()
 
@@ -54,7 +55,6 @@ import com.afollestad.materialdialogs.utils.getStringArray
     return this
   }
 
-  assertOneSet("listItemsSingleChoice", items, res)
   setActionButtonEnabled(POSITIVE, initialSelection > -1)
   return customListAdapter(
       SingleChoiceDialogAdapter(

+ 2 - 2
dependencies.gradle

@@ -8,7 +8,7 @@ ext.versions = [
 
     // Plugins
     gradlePlugin        : '3.3.2',
-    spotlessPlugin      : '3.20.0',
+    spotlessPlugin      : '3.22.0',
     versionPlugin       : '0.21.0',
     bintrayPlugin       : '0.9',
 
@@ -21,7 +21,7 @@ ext.versions = [
 
     // Kotlin
     kotlin              : '1.3.30',
-    coroutines          : '1.1.1',
+    coroutines          : '1.2.0',
 
     // afollestad
     assent              : '2.2.3',

+ 4 - 0
sample/build.gradle

@@ -14,6 +14,10 @@ android {
     versionCode versions.publishVersionCode
     versionName versions.publishVersion
   }
+
+  packagingOptions {
+    exclude 'META-INF/atomicfu.kotlin_module'
+  }
 }
 
 dependencies {