Fix conflicts

1 files changed, 3 insertions, 6 deletions

diff --git a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
index cc6df81..68d1121 100644
--- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
+++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt
@@ -46,7 +46,6 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.mikepenz.fastadapter.GenericItem
 import com.mikepenz.fastadapter.adapters.ItemAdapter
-import com.mikepenz.iconics.dsl.ExperimentalIconicsDSL
 import com.mikepenz.iconics.dsl.iconicsDrawable
 import com.mikepenz.iconics.typeface.IIcon
 import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial
@@ -88,11 +87,9 @@ abstract class MediaPickerCore<T : GenericItem>(
         /**
          * Create error tile for a given item
          */
-        @ExperimentalIconicsDSL
         fun getErrorDrawable(context: Context) =
             getIconDrawable(context, GoogleMaterial.Icon.gmd_error, accentColor)
 
-        @ExperimentalIconicsDSL
         fun getIconDrawable(context: Context, iicon: IIcon, color: Int): Drawable {
             val sizePx = computeViewSize(context)
             return context.iconicsDrawable(iicon) {
@@ -159,7 +156,7 @@ abstract class MediaPickerCore<T : GenericItem>(
         }
     }
 
-    //Sort by descending date
+    // Sort by descending date
     var sortQuery = MediaStore.MediaColumns.DATE_MODIFIED + " DESC"
 
     override fun onCreateLoader(id: Int, args: Bundle?): Loader<Cursor> {
@@ -266,8 +263,8 @@ abstract class MediaPickerCore<T : GenericItem>(
         }.mapNotNull {
             DocumentsContract.getDocumentId(it).split(":").getOrNull(1)
         }.joinToString(prefix = "(", separator = ",", postfix = ")")
-        //? query replacements are done for one arg at a time
-        //since we potentially have a list of ids, we'll just format the WHERE clause ourself
+        // ? query replacements are done for one arg at a time
+        // since we potentially have a list of ids, we'll just format the WHERE clause ourself
         query(baseUri, MediaModel.projection, "${BaseColumns._ID} IN $ids", null, sortQuery)?.use(
             block
         )