1
0
Эх сурвалжийг харах

Fixed list item selectors, made selectors customizable via methods and global theming.

Aidan Follestad 10 жил өмнө
parent
commit
c26f5c505c

+ 10 - 3
library/src/main/java/com/afollestad/materialdialogs/MaterialDialog.java

@@ -643,9 +643,13 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
 
     private Drawable getButtonSelector() {
         if (isStacked) {
+            if (mBuilder.selector != null)
+                return mBuilder.selector;
             Drawable custom = DialogUtils.resolveDrawable(mBuilder.context, R.attr.md_selector);
             if (custom != null) return custom;
         } else {
+            if (mBuilder.btnSelector != null)
+                return mBuilder.btnSelector;
             Drawable custom = DialogUtils.resolveDrawable(mBuilder.context, R.attr.md_btn_selector);
             if (custom != null) return custom;
         }
@@ -1569,9 +1573,12 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener {
             setTypeface(tv, mBuilder.regularFont);
             view.setTag(index + ":" + mBuilder.items[index]);
 
-            Drawable d = DialogUtils.resolveDrawable(mBuilder.context, R.attr.md_selector);
-            if (d == null)
-                d = DialogUtils.resolveDrawable(getContext(), R.attr.md_selector);
+            Drawable d = mBuilder.selector;
+            if (d == null) {
+                d = DialogUtils.resolveDrawable(mBuilder.context, R.attr.md_selector);
+                if (d == null)
+                    d = DialogUtils.resolveDrawable(getContext(), R.attr.md_selector);
+            }
             setBackgroundCompat(view, d);
             return view;
         }

+ 0 - 5
sample/src/main/res/values/styles.xml

@@ -5,11 +5,6 @@
         <item name="colorPrimary">@color/material_indigo_500</item>
         <item name="colorPrimaryDark">@color/material_indigo_600</item>
         <item name="colorAccent">@color/material_pink_500</item>
-
-        <!--<item name="md_divider_color">@color/material_pink_500</item>-->
-        <!--<item name="md_background_color">@color/material_blue_grey_800</item>-->
-        <!--<item name="md_dark_theme">true</item>-->
-
     </style>
 
 </resources>