修复自定义drawable设置

shaoshuai904 · Aug 11, 2020 · 6aa5771 · 6aa5771
1 parent b5be627
commit 6aa5771
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/maple/iosdialog/MainActivity.kt b/app/src/main/java/com/maple/iosdialog/MainActivity.kt
@@ -3,6 +3,7 @@ package com.maple.iosdialog
 import android.app.Activity
 import android.graphics.Color
 import android.os.Bundle
+import android.support.v4.content.ContextCompat
 import android.view.Gravity
 import android.view.View
 import android.widget.NumberPicker
@@ -146,7 +147,13 @@ class MainActivity : Activity() {
     fun asrBigDataList(view: View?) {
         if (ar2 == null) {
             val items = getSingleSelectItemTestData(20)
-            ar2 = ActionSheetRecyclerDialog(this).apply {
+            ar2 = ActionSheetRecyclerDialog(this, ActionSheetRecyclerDialog.Config(this).apply {
+                titleTextSizeSp = 18f
+                closeDraw = ContextCompat.getDrawable(context, android.R.drawable.ic_delete)
+                isShowMark = true
+                selectMark = ContextCompat.getDrawable(context, android.R.drawable.ic_media_next)
+                itemTextSelectedColor = Color.RED
+            }).apply {
                 setTitle("选择条目")
                 addSheetItems(items)
                 setMaxScaleHeight(0.65)

diff --git a/msdialog/src/main/java/com/maple/msdialog/ActionSheetRecyclerDialog.kt b/msdialog/src/main/java/com/maple/msdialog/ActionSheetRecyclerDialog.kt
@@ -50,7 +50,7 @@ class ActionSheetRecyclerDialog(
         binding.apply {
             root.minimumWidth = mContext.screenInfo().x
             rlTitleBar.visibility = View.GONE
-            ivClose.background = config.closeDraw
+            ivClose.setImageDrawable(config.closeDraw)
             ivClose.setOnClickListener { dismiss() }
         }
 
@@ -98,7 +98,7 @@ class ActionSheetRecyclerDialog(
     // 设置顶部条【关闭】按钮图标
     fun setCloseIcon(bg: Drawable? = config.closeDraw): ActionSheetRecyclerDialog {
         binding.ivClose.let {
-            it.background = bg
+            it.setImageDrawable(bg)
             it.visibility = View.VISIBLE
         }
         return this

diff --git a/msdialog/src/main/java/com/maple/msdialog/adapter/SingleSelectItemListAdapter.kt b/msdialog/src/main/java/com/maple/msdialog/adapter/SingleSelectItemListAdapter.kt
@@ -55,7 +55,7 @@ class SingleSelectItemListAdapter(
                 tvName.textSize = config.itemTextSizeSp
                 if (item.isSelected) {
                     tvName.setTextColor(config.itemTextSelectedColor)
-                    ivMark.background = config.selectMark
+                    ivMark.setImageDrawable(config.selectMark)
                     ivMark.visibility = if (config.isShowMark) View.VISIBLE else View.GONE
                 } else {
                     tvName.setTextColor(config.itemTextColor)