diff options
| author | Allan Wang <me@allanwang.ca> | 2019-06-13 00:51:31 -0700 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2019-06-13 00:51:31 -0700 |
| commit | 423cad016753a795e9cb75534d172f562e4326c1 (patch) | |
| tree | ecd4ffcaec76683534b06845fe7b10eb973ee2de /mediapicker | |
| parent | 6163bd66050ef22921b21a9a528bd090986795d6 (diff) | |
| download | kau-423cad016753a795e9cb75534d172f562e4326c1.tar.gz kau-423cad016753a795e9cb75534d172f562e4326c1.tar.bz2 kau-423cad016753a795e9cb75534d172f562e4326c1.zip | |
Update iconics to 4.x.x
Diffstat (limited to 'mediapicker')
| -rw-r--r-- | mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt | 13 |
1 files changed, 10 insertions, 3 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 fe7a3b1..ae1d9d6 100644 --- a/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt +++ b/mediapicker/src/main/kotlin/ca/allanwang/kau/mediapicker/MediaPickerCore.kt @@ -46,9 +46,16 @@ import com.bumptech.glide.Glide import com.bumptech.glide.RequestManager import com.mikepenz.fastadapter.IItem import com.mikepenz.fastadapter.adapters.ItemAdapter -import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial +import com.mikepenz.iconics.IconicsColor import com.mikepenz.iconics.IconicsDrawable +import com.mikepenz.iconics.IconicsSize +import com.mikepenz.iconics.colorInt +import com.mikepenz.iconics.paddingPx +import com.mikepenz.iconics.sizePx import com.mikepenz.iconics.typeface.IIcon +import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial +import com.mikepenz.iconics.utils.toIconicsColor +import com.mikepenz.iconics.utils.toIconicsSizePx import kotlinx.coroutines.CancellationException import java.io.File @@ -93,9 +100,9 @@ abstract class MediaPickerCore<T : IItem<*, *>>( val sizePx = MediaPickerCore.computeViewSize(context) return IconicsDrawable(context, iicon) .sizePx(sizePx) - .backgroundColor(color) + .backgroundColor(color.toIconicsColor()) .paddingPx(sizePx / 3) - .color(Color.WHITE) + .colorInt(Color.WHITE) } var accentColor: Int = 0xff666666.toInt() |