1
0
Aidan Follestad 10 жил өмнө
parent
commit
05a9b0c8f5

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

@@ -174,13 +174,6 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             invalidateCustomViewAssociations();
         }
 
-        if (builder.icon != null) {
-            icon.setVisibility(View.VISIBLE);
-            icon.setImageDrawable(builder.icon);
-        } else {
-            icon.setVisibility(View.GONE);
-        }
-
         boolean adapterProvided = adapter != null;
         if (items != null && items.length > 0 || adapterProvided) {
             title = (TextView) view.findViewById(R.id.titleCustomView);
@@ -216,6 +209,13 @@ public class MaterialDialog extends DialogBase implements View.OnClickListener,
             });
         }
 
+        if (builder.icon != null) {
+            icon.setVisibility(View.VISIBLE);
+            icon.setImageDrawable(builder.icon);
+        } else {
+            icon.setVisibility(View.GONE);
+        }
+
         // Title is set after it's determined whether to use first title or custom view title
         if (builder.title == null || builder.title.toString().trim().length() == 0) {
             titleFrame.setVisibility(View.GONE);

+ 1 - 0
sample/src/main/java/com/afollestad/materialdialogssample/MainActivity.java

@@ -279,6 +279,7 @@ public class MainActivity extends ActionBarActivity implements FolderSelectorDia
 
     private void showSingleChoice() {
         new MaterialDialog.Builder(this)
+                .icon(R.drawable.ic_launcher)
                 .title(R.string.socialNetworks)
                 .items(R.array.socialNetworks)
                 .itemsCallbackSingleChoice(2, new MaterialDialog.ListCallback() {