Aidan Follestad 10 rokov pred
rodič
commit
499f88116e

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

@@ -96,10 +96,10 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
         content.setMovementMethod(new LinkMovementMethod());
         content.setVisibility(View.VISIBLE);
         content.setTypeface(regularFont);
-        content.setTextColor(DialogUtils.resolveColor(getContext(), R.attr.content_color));
+        content.setTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary));
         content.setLineSpacing(0f, builder.contentLineSpacingMultiplier);
         if (this.positiveColor == 0) {
-            content.setLinkTextColor(DialogUtils.resolveColor(getContext(), R.attr.button_color));
+            content.setLinkTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorPrimary));
         } else {
             content.setLinkTextColor(this.positiveColor);
         }
@@ -129,7 +129,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             if (builder.titleColor != -1) {
                 title.setTextColor(builder.titleColor);
             } else {
-                title.setTextColor(DialogUtils.resolveColor(getContext(), R.attr.title_color));
+                title.setTextColor(DialogUtils.resolveColor(getContext(), android.R.attr.textColorPrimary));
             }
             if (builder.titleAlignment == Alignment.CENTER) {
                 title.setGravity(Gravity.CENTER_HORIZONTAL);
@@ -215,7 +215,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
                     customFrame.getPaddingRight(), dialogFrameMargin);
         }
 
-        final int itemColor = DialogUtils.resolveColor(getContext(), R.attr.item_color);
+        final int itemColor = DialogUtils.resolveColor(getContext(), android.R.attr.textColorSecondary);
         for (int index = 0; index < items.length; index++) {
             View il;
             if (listCallbackSingle != null) {
@@ -685,7 +685,7 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
 
 
     private ColorStateList getActionTextStateList(int newPrimaryColor) {
-        final int buttonColor = DialogUtils.resolveColor(getContext(), R.attr.button_color);
+        final int buttonColor = DialogUtils.resolveColor(getContext(), android.R.attr.textColorPrimary);
         if (newPrimaryColor == 0) newPrimaryColor = buttonColor;
         int[][] states = new int[][]{
                 new int[]{-android.R.attr.state_enabled}, // disabled

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

@@ -2,19 +2,19 @@
 <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="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>
     </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="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>
     </style>

+ 4 - 4
library/src/main/res/values/attrs.xml

@@ -2,10 +2,10 @@
 <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="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" />
 
 </resources>

+ 6 - 8
library/src/main/res/values/colors.xml

@@ -4,14 +4,12 @@
     <color name="title_light">#000000</color>
     <color name="title_dark">#FFFFFF</color>
 
-    <color name="content_light">#5E5E5E</color>
-    <color name="content_dark">#EDEDED</color>
-
-    <color name="item_light">#535353</color>
-    <color name="item_dark">#EDEDED</color>
-
-    <color name="button_light">#3C3C3D</color>
-    <color name="button_dark">#FFFFFF</color>
+    <!--<color name="content_light">#5E5E5E</color>-->
+    <!--<color name="content_dark">#EDEDED</color>-->
+    <!--<color name="item_light">#535353</color>-->
+    <!--<color name="item_dark">#EDEDED</color>-->
+    <!--<color name="button_light">#3C3C3D</color>-->
+    <!--<color name="button_dark">#FFFFFF</color>-->
 
     <color name="divider_black">#10000000</color>
     <color name="divider_white">#10FFFFFF</color>

+ 1 - 0
library/src/main/res/values/dimens.xml

@@ -5,6 +5,7 @@
 
     <dimen name="dialog_frame_margin">24dp</dimen>
     <dimen name="title_frame_margin">16dp</dimen>
+    <dimen name="button_min_width">64dp</dimen>
 
     <!-- Above and below buttons, 36+12=48 for the height of the button frame -->
     <dimen name="button_padding_vertical">12dp</dimen>

+ 7 - 15
library/src/main/res/values/styles.xml

@@ -2,20 +2,19 @@
 <resources>
 
     <style name="Light" parent="android:Theme.Holo.Light">
-        <item name="android:actionModeStyle">@style/ActionModeStyle</item>
-        <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="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>
     </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="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>
     </style>
@@ -47,11 +46,4 @@
         <item name="android:layout_marginLeft">@dimen/button_padding_horizontal_external</item>
     </style>
 
-    <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
-        <item name="android:background">#000</item>
-        <item name="actionModeCloseDrawable">@drawable/ic_action_close</item>
-        <item name="android:actionModeCloseDrawable">@drawable/ic_action_close</item>
-    </style>
-
-    <dimen name="button_min_width">64dp</dimen>
 </resources>