Juha Kuitunen 10 gadi atpakaļ
vecāks
revīzija
e441fa789c

+ 1 - 1
library/src/main/java/com/afollestad/materialdialogs/DialogInit.java

@@ -272,7 +272,7 @@ class DialogInit {
             dialog.setInverseBackgroundForced(true);
             if (!builder.titleColorSet)
                 dialog.title.setTextColor(Color.BLACK);
-            if (!builder.contentColorSet)
+            if (!builder.contentColorSet && dialog.content != null)
                 dialog.content.setTextColor(Color.BLACK);
         }
     }

+ 1 - 0
sample/build.gradle

@@ -19,4 +19,5 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
+    compile 'com.android.support:gridlayout-v7:21.0.0'
 }

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

@@ -15,7 +15,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.widget.FrameLayout;
-import android.widget.GridLayout;
+import android.support.v7.widget.GridLayout;
 
 import com.afollestad.materialdialogs.MaterialDialog;
 

+ 6 - 5
sample/src/main/res/layout/dialog_color_chooser.xml

@@ -1,4 +1,5 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -6,13 +7,13 @@
     android:gravity="center_horizontal"
     tools:ignore="ContentDescription">
 
-    <GridLayout
+    <android.support.v7.widget.GridLayout
         android:id="@+id/grid"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:columnCount="4"
-        android:rowCount="5"
-        android:orientation="vertical"
+        app:columnCount="4"
+        app:rowCount="5"
+        app:orientation="vertical"
         tools:ignore="UselessParent"
         android:paddingBottom="20dp"
         android:clipToPadding="false">
@@ -297,6 +298,6 @@
 
         </FrameLayout>
 
-    </GridLayout>
+    </android.support.v7.widget.GridLayout>
 
 </LinearLayout>