made an xml for toolbar common to all activities and added drop shadow to toolbar to add material design features...removed onClick=true from cardviews in templateActivity because listView was not getting touch as cardView was consuming it..Ripple is working fine as before now also

ashishg656 · ashishg656 · commit cf86e02c2341 · 2015-12-26T01:07:50.000+05:30
diff --git a/source-code/app/src/main/res/layout-sw600dp/item_template_right.xml b/source-code/app/src/main/res/layout-sw600dp/item_template_right.xml
@@ -5,7 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="@dimen/cardview_template_height"
-    android:clickable="true"
     android:foreground="?attr/selectableItemBackground"
     card_view:cardCornerRadius="@dimen/cardview_default_radius"
     card_view:cardElevation="@dimen/cardview_default_elevation">
diff --git a/source-code/app/src/main/res/layout/activity_about_buildm_learn.xml b/source-code/app/src/main/res/layout/activity_about_buildm_learn.xml
@@ -1,15 +1,11 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              tools:context="$activity">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar.Buildmlearn"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"/>
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context="$activity">
+
+    <include layout="@layout/toolbar_layout" />
 
     <ScrollView
         android:id="@+id/scrollView"
@@ -34,7 +30,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
                     android:padding="5dp"
-                    android:src="@drawable/logo_bg_dark"/>
+                    android:src="@drawable/logo_bg_dark" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"
@@ -48,21 +44,21 @@
                         android:layout_height="wrap_content"
                         android:text="@string/main_title"
                         android:textColor="@color/black_secondary_text"
-                        android:textSize="@dimen/headline"/>
+                        android:textSize="@dimen/headline" />
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/main_subtitle"
                         android:textColor="@color/black_secondary_text"
-                        android:textSize="@dimen/title"/>
+                        android:textSize="@dimen/title" />
 
                     <TextView
                         android:id="@+id/app_version"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:textColor="@color/black_secondary_text"
-                        android:textSize="@dimen/caption"/>
+                        android:textSize="@dimen/caption" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -72,7 +68,7 @@
                 android:layout_height="2dp"
                 android:layout_marginBottom="8dp"
                 android:layout_marginTop="8dp"
-                android:background="@color/black_hint_text_disabled"/>
+                android:background="@color/black_hint_text_disabled" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -81,7 +77,7 @@
                 android:layout_marginTop="8dp"
                 android:text="@string/about_para_1"
                 android:textColor="@color/black_secondary_text"
-                android:textSize="@dimen/body"/>
+                android:textSize="@dimen/body" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -91,7 +87,7 @@
                 android:autoLink="web"
                 android:text="@string/about_para_2"
                 android:textColor="@color/black_secondary_text"
-                android:textSize="@dimen/body"/>
+                android:textSize="@dimen/body" />
 
             <TextView
                 android:layout_width="match_parent"
@@ -101,7 +97,7 @@
                 android:autoLink="email"
                 android:text="@string/about_para_3"
                 android:textColor="@color/black_secondary_text"
-                android:textSize="@dimen/body"/>
+                android:textSize="@dimen/body" />
 
 
         </LinearLayout>
diff --git a/source-code/app/src/main/res/layout/activity_home.xml b/source-code/app/src/main/res/layout/activity_home.xml
@@ -14,11 +14,7 @@
         android:background="@color/color_primary"
         android:orientation="vertical">
 
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar.Buildmlearn"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize" />
+        <include layout="@layout/toolbar_layout" />
 
         <FrameLayout
             android:background="@android:color/white"
diff --git a/source-code/app/src/main/res/layout/activity_template_grid.xml b/source-code/app/src/main/res/layout/activity_template_grid.xml
@@ -5,11 +5,7 @@
     android:layout_height="match_parent"
     tools:context="org.buildmlearn.toolkit.fragment.TestFragment">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar.Buildmlearn"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize" />
+    <include layout="@layout/toolbar_layout"/>
 
     <GridView
         android:id="@android:id/list"
diff --git a/source-code/app/src/main/res/layout/activity_template_list.xml b/source-code/app/src/main/res/layout/activity_template_list.xml
@@ -5,11 +5,7 @@
     android:layout_height="match_parent"
     tools:context="org.buildmlearn.toolkit.fragment.TestFragment">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar.Buildmlearn"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize" />
+    <include layout="@layout/toolbar_layout"/>
 
     <ListView
         android:id="@android:id/list"
diff --git a/source-code/app/src/main/res/layout/item_template_left.xml b/source-code/app/src/main/res/layout/item_template_left.xml
@@ -4,7 +4,6 @@
     android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="@dimen/cardview_template_height"
     card_view:cardCornerRadius="@dimen/cardview_default_radius"
diff --git a/source-code/app/src/main/res/layout/item_template_right.xml b/source-code/app/src/main/res/layout/item_template_right.xml
@@ -4,7 +4,6 @@
     android:id="@+id/card_view"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:clickable="true"
     android:foreground="?attr/selectableItemBackground"
     android:minHeight="@dimen/cardview_template_height"
     card_view:cardCornerRadius="@dimen/cardview_default_radius"
diff --git a/source-code/app/src/main/res/layout/toolbar_layout.xml b/source-code/app/src/main/res/layout/toolbar_layout.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/appbarlayout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        style="@style/Toolbar.Buildmlearn"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize" />
+
+</android.support.design.widget.AppBarLayout>
