Aidan Follestad 9 vuotta sitten
vanhempi
commit
3c6e63a92a

+ 1 - 1
README.md

@@ -1,6 +1,6 @@
 # Material Dialogs
 
-![Screenshots](https://raw.githubusercontent.com/afollestad/material-dialogs/master/art/mdart.jpg)
+![Screenshots](https://raw.githubusercontent.com/afollestad/material-dialogs/master/art/mddemoshowcase.png)
 
 # Table of Contents (Core)
 

BIN
art/mdart.jpg


BIN
art/mddemoshowcase.png


+ 2 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialDialogPreference.java

@@ -40,7 +40,8 @@ public class MaterialDialogPreference extends DialogPreference {
 
     private void init(Context context) {
         this.context = context;
-        setLayoutResource(R.layout.md_preference_custom);
+        if (getLayoutResource() == 0)
+            setLayoutResource(R.layout.md_preference_custom);
     }
 
     @Override

+ 2 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialEditTextPreference.java

@@ -43,7 +43,8 @@ public class MaterialEditTextPreference extends EditTextPreference {
 
     public MaterialEditTextPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
-        setLayoutResource(R.layout.md_preference_custom);
+        if (getDialogLayoutResource() == 0)
+            setLayoutResource(R.layout.md_preference_custom);
 
         int fallback;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP)

+ 2 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialListPreference.java

@@ -40,7 +40,8 @@ public class MaterialListPreference extends ListPreference {
 
     private void init(Context context) {
         this.context = context;
-        setLayoutResource(R.layout.md_preference_custom);
+        if (getDialogLayoutResource() == 0)
+            setLayoutResource(R.layout.md_preference_custom);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
             setWidgetLayoutResource(0);
     }

+ 2 - 1
commons/src/main/java/com/afollestad/materialdialogs/prefs/MaterialMultiSelectListPreference.java

@@ -53,7 +53,8 @@ public class MaterialMultiSelectListPreference extends MultiSelectListPreference
 
     private void init(Context context) {
         this.context = context;
-        setLayoutResource(R.layout.md_preference_custom);
+        if (getDialogLayoutResource() == 0)
+            setLayoutResource(R.layout.md_preference_custom);
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1)
             setWidgetLayoutResource(0);
     }

+ 1 - 0
sample/src/main/res/xml-v11/preferences.xml

@@ -6,6 +6,7 @@
         android:dialogMessage="@string/preference_dialog_message"
         android:dialogTitle="@string/preference_dialog_title"
         android:key="unused_key00"
+        android:layout="@layout/md_stub_colorchooser_grid"
         android:negativeButtonText="@android:string/cancel"
         android:positiveButtonText="@android:string/ok"
         android:summary="@string/material_dialog_pref_summary"