Merge branch 'master' into NewDialogChangeAC

2017-01-20 16:05:04 +05:30
parent 0d28ef8f8d 88b2ccc52c
commit 6ef51445f2
15 changed files with 393 additions and 192 deletions
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical"
    android:weightSum="1">

-    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    <android.support.v7.widget.CardView
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_weight="1"
@@ -54,7 +55,7 @@
                    android:padding="10dp"
                    android:text="Category List"
                    android:textAppearance="?android:textAppearanceSmall"
-                    android:textColor="#f2711f"
+                    android:textColor="@color/colorPrimaryDark"
                    android:textStyle="bold" />
            </LinearLayout>
        </LinearLayout>