upgraded version to 21 and added toolbar

Author: saulmm

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 'android-L'
+    compileSdkVersion 21
     buildToolsVersion "20.0.0"
 
     defaultConfig {
         applicationId "com.saulmm.material.myapplication"
-        minSdkVersion 'L'
-        targetSdkVersion 'L'
+        minSdkVersion 21
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }
@@ -21,5 +21,6 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:support-v4:20.0.0'
-}
+    compile 'com.android.support:appcompat-v7:21.0.+'
+
+}

app/src/main/java/com/saulmm/material/Utils.java

@@ -24,6 +24,5 @@ public static void configureFab (View fabButton) {
 
         Outline fabOutLine = new Outline();
         fabOutLine.setOval(0, 0, fabSize, fabSize);
-        fabButton.setOutline(fabOutLine);
     }
 }

app/src/main/res/layout/activity_my.xml

@@ -10,14 +10,14 @@
         android:id="@+id/holder_view"
         android:layout_width="match_parent"
         android:layout_height="144dp"
-        android:viewName="holder1"
+        android:transitionName="holder1"
         android:background="?android:colorPrimary"
         />
 
     <Button
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/fab_button"
-        android:viewName="fab"
+        android:transitionName="fab"
         android:layout_width="@dimen/fab_size"
         android:layout_height="@dimen/fab_size"
         android:layout_marginRight="@dimen/activity_horizontal_margin"

app/src/main/res/layout/activity_my2.xml

@@ -2,35 +2,24 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+
     android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context=".MyActivity"
     >
 
-    <View
-        android:id="@+id/holder_view"
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:viewName="holder2"
-        android:background="?android:colorPrimary"/>
-
-    <Button
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/fab_button"
-        android:layout_width="@dimen/fab_size"
-        android:viewName="fab"
-        android:layout_height="@dimen/fab_size"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:background="@drawable/ripple_round"
-        android:stateListAnimator="@anim/fab_anim"
-        android:elevation="5dp"
-        android:layout_centerHorizontal="true"
-        android:layout_alignParentBottom="true"/>
+        android:background="?android:colorPrimary"
+        android:minHeight="?attr/actionBarSize"/>
 
     <LinearLayout
         android:id="@+id/row_container2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/holder_view"
+        android:layout_below="@id/toolbar"
         android:orientation="vertical"
         android:layout_centerHorizontal="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"
@@ -61,10 +50,19 @@
         <include
             android:id="@+id/sample_row6"
             layout="@layout/view_sample_row"/>
-
-
     </LinearLayout>
 
+    <Button
+        android:id="@+id/fab_button"
+        android:layout_width="@dimen/fab_size"
 
+        android:transitionName="fab"
+        android:layout_height="@dimen/fab_size"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:background="@drawable/ripple_round"
+        android:stateListAnimator="@anim/fab_anim"
+        android:elevation="5dp"
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"/>
 
 </RelativeLayout>

app/src/main/res/layout/view_fab_button.xml

@@ -11,7 +11,6 @@
     android:layout_marginBottom="16dp"
     android:background="@drawable/ripple_round"
     android:stateListAnimator="@anim/fab_anim"
-    android:src="@drawable/ic_action_add"
     android:elevation="1dp"
     />
 

app/src/main/res/values-v21/styles.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="android:Theme.Material.NoActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat">
 
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>