Jelajahi Sumber

Renamed the attributes to make them specific to the library.

Aidan Follestad 10 tahun lalu
induk
melakukan
4cbc05a217

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

@@ -166,7 +166,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             }
             if (canCustomViewScroll()) {
                 view.findViewById(R.id.customViewDivider).setVisibility(View.VISIBLE);
-                view.findViewById(R.id.customViewDivider).setBackgroundColor(DialogUtils.resolveColor(getContext(), R.attr.divider_color));
+                view.findViewById(R.id.customViewDivider).setBackgroundColor(DialogUtils.resolveColor(getContext(), R.attr.md_divider));
                 setMargin(view.findViewById(R.id.buttonStackedFrame), -1, 0, -1, -1);
                 setMargin(view.findViewById(R.id.buttonDefaultFrame), -1, 0, -1, -1);
             } else {
@@ -253,7 +253,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             }
             il.setTag(index + ":" + items[index]);
             il.setOnClickListener(this);
-            il.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.list_selector));
+            il.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.md_selector));
             customFrame.addView(il);
         }
     }
@@ -334,7 +334,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             this.positiveText = mContext.getString(android.R.string.ok);
         positiveButton.setText(this.positiveText);
         positiveButton.setTextColor(getActionTextStateList(this.positiveColor));
-        positiveButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.list_selector));
+        positiveButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.md_selector));
         positiveButton.setTag(POSITIVE);
         positiveButton.setOnClickListener(this);
 
@@ -344,7 +344,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         if (this.neutralText != null) {
             neutralButton.setVisibility(View.VISIBLE);
             neutralButton.setTextColor(getActionTextStateList(this.neutralColor));
-            neutralButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.list_selector));
+            neutralButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.md_selector));
             neutralButton.setText(this.neutralText);
             neutralButton.setTag(NEUTRAL);
             neutralButton.setOnClickListener(this);
@@ -358,7 +358,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         if (this.negativeText != null) {
             negativeButton.setVisibility(View.VISIBLE);
             negativeButton.setTextColor(getActionTextStateList(this.negativeColor));
-            negativeButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.list_selector));
+            negativeButton.setBackgroundResource(DialogUtils.resolveDrawable(getContext(), R.attr.md_selector));
             negativeButton.setText(this.negativeText);
             negativeButton.setTag(NEGATIVE);
             negativeButton.setOnClickListener(this);

+ 4 - 12
library/src/main/res/values-v21/styles.xml

@@ -2,21 +2,13 @@
 <resources>
 
     <style name="Light" parent="android:Theme.Material.Light.Dialog.Alert">
-        <!--<item name="title_color">@color/title_light</item>-->
-        <!--<item name="content_color">@color/content_light</item>-->
-        <!--<item name="item_color">@color/item_light</item>-->
-        <!--<item name="button_color">@color/button_light</item>-->
-        <item name="divider_color">@color/divider_black</item>
-        <item name="list_selector">?android:selectableItemBackground</item>
+        <item name="md_divider">@color/divider_black</item>
+        <item name="md_selector">?android:selectableItemBackground</item>
     </style>
 
     <style name="Dark" parent="android:Theme.Material.Dialog.Alert">
-        <!--<item name="title_color">@color/title_dark</item>-->
-        <!--<item name="content_color">@color/content_dark</item>-->
-        <!--<item name="item_color">@color/item_dark</item>-->
-        <!--<item name="button_color">@color/button_dark</item>-->
-        <item name="divider_color">@color/divider_white</item>
-        <item name="list_selector">?android:selectableItemBackground</item>
+        <item name="md_divider">@color/divider_white</item>
+        <item name="md_selector">?android:selectableItemBackground</item>
     </style>
 
 </resources>

+ 2 - 6
library/src/main/res/values/attrs.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <attr name="list_selector" format="reference" />
-    <!--<attr name="title_color" format="color" />-->
-    <!--<attr name="content_color" format="color" />-->
-    <!--<attr name="item_color" format="color" />-->
-    <!--<attr name="button_color" format="color" />-->
-    <attr name="divider_color" format="color" />
+    <attr name="md_selector" format="reference" />
+    <attr name="md_divider" format="color" />
 
 </resources>

+ 4 - 12
library/src/main/res/values/styles.xml

@@ -2,21 +2,13 @@
 <resources>
 
     <style name="Light" parent="android:Theme.Holo.Light">
-        <!--<item name="title_color">@color/title_light</item>-->
-        <!--<item name="content_color">@color/content_light</item>-->
-        <!--<item name="item_color">@color/item_light</item>-->
-        <!--<item name="button_color">@color/button_light</item>-->
-        <item name="divider_color">@color/divider_black</item>
-        <item name="list_selector">@drawable/dialog_selector</item>
+        <item name="md_divider">@color/divider_black</item>
+        <item name="md_selector">@drawable/dialog_selector</item>
     </style>
 
     <style name="Dark" parent="android:Theme.Holo">
-        <!--<item name="title_color">@color/title_dark</item>-->
-        <!--<item name="content_color">@color/content_dark</item>-->
-        <!--<item name="item_color">@color/item_dark</item>-->
-        <!--<item name="button_color">@color/button_dark</item>-->
-        <item name="divider_color">@color/divider_white</item>
-        <item name="list_selector">@drawable/dialog_selector_dark</item>
+        <item name="md_divider">@color/divider_white</item>
+        <item name="md_selector">@drawable/dialog_selector_dark</item>
     </style>
 
     <style name="ActionButtonStacked" parent="@style/ActionButton">