From 94da13db7d78ff56bb58815a56ed57913aa6c8b8 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 16 Oct 2014 23:41:09 +0200
Subject: [PATCH 01/35] Added circular propagation example

---
 .../java/com/saulmm/material/MyActivity.java  | 12 ++++-
 .../java/com/saulmm/material/MyActivity2.java |  7 +++
 app/src/main/res/layout/activity_my.xml       | 49 ++++++++++++++++++-
 3 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/saulmm/material/MyActivity.java b/app/src/main/java/com/saulmm/material/MyActivity.java
index 65c57af..f30b64d 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity.java
@@ -5,6 +5,7 @@
 import android.content.Intent;
 import android.graphics.Outline;
 import android.os.Bundle;
+import android.transition.CircularPropagation;
 import android.transition.Explode;
 import android.transition.Scene;
 import android.transition.Slide;
@@ -30,13 +31,19 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my);
 
+        Explode ex = new Explode();
+        ex.setPropagation(new CircularPropagation());
+
+        getWindow().setExitTransition(ex);
+        getWindow().setEnterTransition(ex);
+
         // Fab Button
         int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
         Outline fabOutLine = new Outline();
         fabOutLine.setOval(0, 0, fabSize, fabSize);
 
         // Fragment container
-         frameContainer = (FrameLayout) findViewById(R.id.container);
+        frameContainer = (FrameLayout) findViewById(R.id.container);
 
         holderView = findViewById(R.id.holder_view);
 
@@ -54,8 +61,9 @@ public void onClick(View view) {
                     Pair.create(holderView, "holder2"),
                     Pair.create(fabButton, "fab"));
 
+
             Intent i  = new Intent (MyActivity.this, MyActivity2.class);
-            startActivity(i, options.toBundle());
+            startActivity(i);
         }
     };
 }
diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/MyActivity2.java
index 282fb98..7f3be50 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity2.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity2.java
@@ -5,6 +5,7 @@
 import android.graphics.Outline;
 import android.os.Bundle;
 import android.transition.ChangeBounds;
+import android.transition.CircularPropagation;
 import android.transition.Explode;
 import android.transition.Scene;
 import android.transition.Slide;
@@ -27,6 +28,12 @@ protected void onCreate(Bundle savedInstanceState) {
         // Fab Button
         int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
         Outline fabOutLine = new Outline();
+
+        Explode ex = new Explode();
+        ex.setPropagation(new CircularPropagation());
+
+        getWindow().setExitTransition(ex);
+        getWindow().setEnterTransition(ex);
         fabOutLine.setOval(0, 0, fabSize, fabSize);
     }
 
diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_my.xml
index e0a627d..57f862a 100644
--- a/app/src/main/res/layout/activity_my.xml
+++ b/app/src/main/res/layout/activity_my.xml
@@ -3,7 +3,6 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
-
     tools:context=".MyActivity"
     >
 
@@ -30,4 +29,52 @@
         android:layout_alignParentEnd="true"
         />
 
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_horizontal_margin"
+        android:layout_below="@id/holder_view">
+
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:text=""
+            android:id="@+id/button"
+            android:layout_below="@+id/button4"
+            android:layout_toStartOf="@+id/button5"
+            android:layout_marginTop="44dp" />
+
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:text=""
+            android:id="@+id/button2"
+            android:layout_below="@+id/button"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="54dp" />
+
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:id="@+id/button3"
+            android:layout_alignParentBottom="true"
+            android:layout_toStartOf="@+id/button2" />
+
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:id="@+id/button4"
+            android:layout_alignParentStart="true" />
+
+        <Button
+            android:layout_width="150dp"
+            android:layout_height="60dp"
+            android:id="@+id/button5"
+            android:layout_alignParentBottom="true"
+            android:layout_toEndOf="@+id/button2" />
+
+    </RelativeLayout>
+
 </RelativeLayout>

From a74b19eba4d62413238799e055ff46ceaa0284ed Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 16 Oct 2014 23:48:36 +0200
Subject: [PATCH 02/35] Refactored explode transition & removed unused code

---
 .../java/com/saulmm/material/MyActivity.java  | 14 +++--------
 .../java/com/saulmm/material/MyActivity2.java |  5 +---
 .../main/java/com/saulmm/material/Utils.java  | 24 +++++++++++++++++++
 3 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/Utils.java

diff --git a/app/src/main/java/com/saulmm/material/MyActivity.java b/app/src/main/java/com/saulmm/material/MyActivity.java
index f30b64d..7dd3d97 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity.java
@@ -31,11 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my);
 
-        Explode ex = new Explode();
-        ex.setPropagation(new CircularPropagation());
-
-        getWindow().setExitTransition(ex);
-        getWindow().setEnterTransition(ex);
+        Utils.configureWindowEnterExitTransition(getWindow());;
 
         // Fab Button
         int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
@@ -57,13 +53,9 @@ protected void onCreate(Bundle savedInstanceState) {
     View.OnClickListener fabClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View view) {
-            ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(MyActivity.this,
-                    Pair.create(holderView, "holder2"),
-                    Pair.create(fabButton, "fab"));
-
 
-            Intent i  = new Intent (MyActivity.this, MyActivity2.class);
-            startActivity(i);
+        Intent i  = new Intent (MyActivity.this, MyActivity2.class);
+        startActivity(i);
         }
     };
 }
diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/MyActivity2.java
index 7f3be50..3db9121 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity2.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity2.java
@@ -29,11 +29,8 @@ protected void onCreate(Bundle savedInstanceState) {
         int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
         Outline fabOutLine = new Outline();
 
-        Explode ex = new Explode();
-        ex.setPropagation(new CircularPropagation());
+        Utils.configureWindowEnterExitTransition(getWindow());
 
-        getWindow().setExitTransition(ex);
-        getWindow().setEnterTransition(ex);
         fabOutLine.setOval(0, 0, fabSize, fabSize);
     }
 
diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java
new file mode 100644
index 0000000..7c54699
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/Utils.java
@@ -0,0 +1,24 @@
+package com.saulmm.material;
+
+import android.transition.CircularPropagation;
+import android.transition.Explode;
+import android.view.Window;
+
+/**
+ * Created by saulmm on 16/10/14.
+ */
+public class Utils {
+
+    public static void configureWindowEnterExitTransition (Window w) {
+
+        Explode ex = new Explode();
+
+        CircularPropagation c = new CircularPropagation();
+        c.setPropagationSpeed(2f);
+
+        ex.setPropagation(c);
+
+        w.setExitTransition(ex);
+        w.setEnterTransition(ex);
+    }
+}

From 901d62c65bbe70f55d944b718b8e6c6c2c69839d Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Fri, 17 Oct 2014 02:47:11 +0200
Subject: [PATCH 03/35] Added appeal and unnappear effect on the second layout

---
 .../com/saulmm/material/AnimListener.java     | 25 +++++
 .../java/com/saulmm/material/MyActivity.java  | 35 ++-----
 .../java/com/saulmm/material/MyActivity2.java | 69 +++++++++++--
 .../main/java/com/saulmm/material/Utils.java  | 23 +++--
 .../layout/activity_hierarchical_timing.xml   | 97 +++++++++++++++++++
 app/src/main/res/layout/activity_my2.xml      | 50 ++++++++--
 .../main/res/layout/activity_my_activity2.xml | 22 -----
 app/src/main/res/layout/view_sample_row.xml   |  4 +-
 .../main/res/transition/circular_reveal.xml   |  3 +
 .../main/res/transition/move_resize_image.xml |  4 +
 app/src/main/res/values-v21/styles.xml        |  4 -
 app/src/main/res/values/colors.xml            |  2 +-
 12 files changed, 254 insertions(+), 84 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/AnimListener.java
 create mode 100644 app/src/main/res/layout/activity_hierarchical_timing.xml
 create mode 100644 app/src/main/res/transition/circular_reveal.xml
 create mode 100644 app/src/main/res/transition/move_resize_image.xml

diff --git a/app/src/main/java/com/saulmm/material/AnimListener.java b/app/src/main/java/com/saulmm/material/AnimListener.java
new file mode 100644
index 0000000..c8e83b1
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/AnimListener.java
@@ -0,0 +1,25 @@
+package com.saulmm.material;
+
+import android.animation.Animator;
+
+public class AnimListener implements Animator.AnimatorListener {
+    @Override
+    public void onAnimationStart(Animator animator) {
+
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animator) {
+
+    }
+
+    @Override
+    public void onAnimationCancel(Animator animator) {
+
+    }
+
+    @Override
+    public void onAnimationRepeat(Animator animator) {
+
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/MyActivity.java b/app/src/main/java/com/saulmm/material/MyActivity.java
index 7dd3d97..ce8885e 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity.java
@@ -3,26 +3,12 @@
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.content.Intent;
-import android.graphics.Outline;
 import android.os.Bundle;
-import android.transition.CircularPropagation;
-import android.transition.Explode;
-import android.transition.Scene;
-import android.transition.Slide;
-import android.transition.TransitionManager;
 import android.util.Pair;
-import android.view.Menu;
 import android.view.View;
-import android.widget.FrameLayout;
-import android.widget.Toast;
-
-import com.saulmm.material.R;
-
 
 public class MyActivity extends Activity {
 
-    private FrameLayout frameContainer;
-    private View holderView;
     private View fabButton;
 
     @Override
@@ -31,22 +17,13 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_my);
 
-        Utils.configureWindowEnterExitTransition(getWindow());;
+        // Set explode animation when enter and exit the activity
+        Utils.configureWindowEnterExitTransition(getWindow());
 
         // Fab Button
-        int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
-        Outline fabOutLine = new Outline();
-        fabOutLine.setOval(0, 0, fabSize, fabSize);
-
-        // Fragment container
-        frameContainer = (FrameLayout) findViewById(R.id.container);
-
-        holderView = findViewById(R.id.holder_view);
-
-        // FabView
         fabButton = findViewById(R.id.fab_button);
         fabButton.setOnClickListener(fabClickListener);
-        fabButton.setOutline(fabOutLine);
+        Utils.configureFab(fabButton);
     }
 
 
@@ -55,7 +32,11 @@ protected void onCreate(Bundle savedInstanceState) {
         public void onClick(View view) {
 
         Intent i  = new Intent (MyActivity.this, MyActivity2.class);
-        startActivity(i);
+
+        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(MyActivity.this,
+                Pair.create(fabButton, "fab"));
+
+        startActivity(i, transitionActivityOptions.toBundle());
         }
     };
 }
diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/MyActivity2.java
index 3db9121..8bbff7f 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity2.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity2.java
@@ -1,5 +1,7 @@
 package com.saulmm.material;
 
+import android.animation.Animator;
+import android.animation.LayoutTransition;
 import android.app.Activity;
 import android.app.Fragment;
 import android.graphics.Outline;
@@ -9,39 +11,86 @@
 import android.transition.Explode;
 import android.transition.Scene;
 import android.transition.Slide;
+import android.transition.Transition;
 import android.transition.TransitionManager;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
 import android.widget.FrameLayout;
+import android.widget.LinearLayout;
 
 import com.saulmm.material.R;
 
 public class MyActivity2 extends Activity {
 
-    private FrameLayout frameContainer;
+    private static final int NUM_VIEWS = 5;
+    private static final int SCALE_ITEM_ANIMATION_DELAY = 30;
+    private LinearLayout rowContainer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
         setContentView(R.layout.activity_my2);
 
-        // Fab Button
-        int fabSize = getResources().getDimensionPixelSize(R.dimen.fab_size);
-        Outline fabOutLine = new Outline();
+        rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
         Utils.configureWindowEnterExitTransition(getWindow());
 
-        fabOutLine.setOval(0, 0, fabSize, fabSize);
+        getWindow().getEnterTransition().addListener(new Transition.TransitionListener() {
+            @Override
+            public void onTransitionStart(Transition transition) {}
+
+            @Override
+            public void onTransitionCancel(Transition transition) {}
+
+            @Override
+            public void onTransitionPause(Transition transition) {}
+
+            @Override
+            public void onTransitionResume(Transition transition) {}
+
+            @Override
+            public void onTransitionEnd(Transition transition) {
+                getWindow().getEnterTransition().removeListener(this);
+
+                for (int i = 0; i < rowContainer.getChildCount(); i++) {
+
+                    View rowView = rowContainer.getChildAt(i);
+                    rowView.animate().setStartDelay(i * SCALE_ITEM_ANIMATION_DELAY)
+                            .scaleX(1).scaleY(1);
+                }
+            }
+        });
     }
 
     @Override
-    protected void onResume() {
+    public void onBackPressed() {
+
+        for (int i = 0; i < rowContainer.getChildCount(); i++) {
+
+            View rowView = rowContainer.getChildAt(i);
+            ViewPropertyAnimator propertyAnimator = rowView.animate().setStartDelay(i * SCALE_ITEM_ANIMATION_DELAY)
+                .scaleX(0).scaleY(0);
+
+            propertyAnimator.setListener(new Animator.AnimatorListener() {
+                @Override
+                public void onAnimationStart(Animator animator) {}
+
+                @Override
+                public void onAnimationEnd(Animator animator) {
 
-        super.onResume();
+                    finishAfterTransition();
+                }
 
-        frameContainer = (FrameLayout) findViewById(R.id.container);
+                @Override
+                public void onAnimationCancel(Animator animator) {}
 
-        Scene scene1 = Scene.getSceneForLayout(frameContainer, R.layout.activity_my_activity2, this);
-        TransitionManager.go(scene1, new Explode());
+                @Override
+                public void onAnimationRepeat(Animator animator) {}
+            });
+        }
     }
 }
diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java
index 7c54699..0149dfe 100644
--- a/app/src/main/java/com/saulmm/material/Utils.java
+++ b/app/src/main/java/com/saulmm/material/Utils.java
@@ -1,24 +1,29 @@
 package com.saulmm.material;
 
-import android.transition.CircularPropagation;
+import android.graphics.Outline;
 import android.transition.Explode;
+import android.transition.Slide;
+import android.view.View;
 import android.view.Window;
+import android.view.animation.PathInterpolator;
 
-/**
- * Created by saulmm on 16/10/14.
- */
 public class Utils {
 
     public static void configureWindowEnterExitTransition (Window w) {
 
         Explode ex = new Explode();
+        ex.setInterpolator(new PathInterpolator(0.4f, 0, 1, 1));
+        w.setExitTransition(ex);
+        w.setEnterTransition(ex);
+    }
 
-        CircularPropagation c = new CircularPropagation();
-        c.setPropagationSpeed(2f);
+    public static void configureFab (View fabButton) {
 
-        ex.setPropagation(c);
+        int fabSize = fabButton.getContext().getResources()
+            .getDimensionPixelSize(R.dimen.fab_size);
 
-        w.setExitTransition(ex);
-        w.setEnterTransition(ex);
+        Outline fabOutLine = new Outline();
+        fabOutLine.setOval(0, 0, fabSize, fabSize);
+        fabButton.setOutline(fabOutLine);
     }
 }
diff --git a/app/src/main/res/layout/activity_hierarchical_timing.xml b/app/src/main/res/layout/activity_hierarchical_timing.xml
new file mode 100644
index 0000000..33015c7
--- /dev/null
+++ b/app/src/main/res/layout/activity_hierarchical_timing.xml
@@ -0,0 +1,97 @@
+<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:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              android:orientation="vertical"
+              tools:context="emmaguy.l.timing.HierarchicalTimingActivity">
+
+    <LinearLayout
+        android:id="@+id/row_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_1"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_2"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_3"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_4"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_5"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_6"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_7"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+        <View
+            android:layout_width="match_parent"
+            android:layout_marginTop="5dp"
+            android:layout_height="64dp"
+            android:id="@+id/view_8"
+            android:scaleX="0"
+            android:scaleY="0"
+            android:background="@color/accent"/>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_my2.xml b/app/src/main/res/layout/activity_my2.xml
index 3059b30..4482e53 100644
--- a/app/src/main/res/layout/activity_my2.xml
+++ b/app/src/main/res/layout/activity_my2.xml
@@ -3,14 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:paddingBottom="@dimen/activity_vertical_margin"
-
     tools:context=".MyActivity"
     >
 
     <View
         android:id="@+id/holder_view"
         android:layout_width="match_parent"
-        android:layout_height="250dp"
+        android:layout_height="?android:attr/actionBarSize"
         android:viewName="holder2"
         android:background="?android:colorPrimary"/>
 
@@ -23,18 +22,49 @@
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:background="@drawable/ripple_round"
         android:stateListAnimator="@anim/fab_anim"
-        android:src="@drawable/ic_action_add"
         android:elevation="5dp"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_alignParentBottom="true"/>
 
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_below="@id/holder_view"
+    <LinearLayout
+        android:id="@+id/row_container2"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:layout_below="@id/holder_view"
+        android:orientation="vertical"
+        android:layout_centerHorizontal="true"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin">
+
+        <include
+            android:id="@+id/sample_row1"
+            layout="@layout/view_sample_row"/>
+
+        <include
+            android:id="@+id/sample_row2"
+            layout="@layout/view_sample_row"/>
+
+        <include
+            android:id="@+id/sample_row3"
+            layout="@layout/view_sample_row"/>
+
+        <include
+            android:id="@+id/sample_row4"
+            layout="@layout/view_sample_row"/>
+
+        <include
+            android:id="@+id/sample_row5"
+            layout="@layout/view_sample_row"/>
+
+        <include
+            android:id="@+id/sample_row6"
+            layout="@layout/view_sample_row"/>
+
+
+    </LinearLayout>
 
 
-    </FrameLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_my_activity2.xml b/app/src/main/res/layout/activity_my_activity2.xml
index 8b01e38..ada0660 100644
--- a/app/src/main/res/layout/activity_my_activity2.xml
+++ b/app/src/main/res/layout/activity_my_activity2.xml
@@ -5,29 +5,7 @@
     android:orientation="vertical"
     tools:context="com.saulmm.material.MyActivity2">
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:paddingLeft="@dimen/activity_horizontal_margin"
-        android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin"
-        android:paddingBottom="@dimen/activity_vertical_margin">
 
-        <include layout="@layout/view_sample_row"/>
-
-        <include layout="@layout/view_sample_row"/>
-
-        <include layout="@layout/view_sample_row"/>
-
-        <include layout="@layout/view_sample_row"/>
-
-        <include layout="@layout/view_sample_row"/>
-
-        <include layout="@layout/view_sample_row"/>
-
-
-    </LinearLayout>
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/view_sample_row.xml b/app/src/main/res/layout/view_sample_row.xml
index b4af4fc..b4f4373 100644
--- a/app/src/main/res/layout/view_sample_row.xml
+++ b/app/src/main/res/layout/view_sample_row.xml
@@ -3,8 +3,10 @@
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="55dp"
-    android:background="#ff515252"
+    android:background="@color/gray_row_color"
     android:layout_marginTop="10dp"
+    android:scaleX="0"
+    android:scaleY="0"
     >
 
 </View>
\ No newline at end of file
diff --git a/app/src/main/res/transition/circular_reveal.xml b/app/src/main/res/transition/circular_reveal.xml
new file mode 100644
index 0000000..b80d24b
--- /dev/null
+++ b/app/src/main/res/transition/circular_reveal.xml
@@ -0,0 +1,3 @@
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+    <explode/>
+</transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/transition/move_resize_image.xml b/app/src/main/res/transition/move_resize_image.xml
new file mode 100644
index 0000000..e2df150
--- /dev/null
+++ b/app/src/main/res/transition/move_resize_image.xml
@@ -0,0 +1,4 @@
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+    <moveImage/>
+    <changeBounds/>
+</transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 5333630..60d7441 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -3,15 +3,11 @@
 
     <style name="AppTheme" parent="android:Theme.Material.NoActionBar">
 
-
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
         <item name="android:statusBarColor">@color/theme_default_primary</item>
         <item name="android:colorAccent">@color/accent</item>
-
         <item name="android:windowContentTransitions">true</item>
-        <item name="android:windowAllowEnterTransitionOverlap">true</item>
-        <item name="android:windowAllowExitTransitionOverlap">true</item>
     </style>
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7af9704..db35435 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,5 +6,5 @@
     <color name="theme_default_primary_dark">#0097A7</color>
     <color name="theme_window_background">#2A2A2A</color>
     <color name="accent">#EEFF41</color>
-
+    <color name="gray_row_color">#ff515252</color>
 </resources>
\ No newline at end of file

From 277be8d4e28481451eaf693b3612e952f4490848 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Fri, 17 Oct 2014 03:06:43 +0200
Subject: [PATCH 04/35] some refactorizations & added Readme

---
 README.md                                     | 11 ++++++++++
 .../java/com/saulmm/material/MyActivity2.java | 21 +++----------------
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index e69de29..48235c2 100644
--- a/README.md
+++ b/README.md
@@ -0,0 +1,11 @@
+### Working with shared elements
+
+Commit - **8872619**
+
+![](https://lh4.googleusercontent.com/-dmDFoF7c5UY/VD77NsFK8kI/AAAAAAAAuLM/MtSqP8JoQco/w282-h499-no/2014-10-16%2B00_51_34.gif)
+
+### Working with shared elements, explode transition, and animations
+
+Commit - **901d62c**
+
+![](https://lh6.googleusercontent.com/-ecoWQejLmFE/VEBoRo3Qs_I/AAAAAAAAuTU/YZ7855GmOfw/w276-h498-no/appear.gif)
\ No newline at end of file
diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/MyActivity2.java
index 8bbff7f..062d75c 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity2.java
+++ b/app/src/main/java/com/saulmm/material/MyActivity2.java
@@ -1,32 +1,17 @@
 package com.saulmm.material;
 
 import android.animation.Animator;
-import android.animation.LayoutTransition;
 import android.app.Activity;
-import android.app.Fragment;
-import android.graphics.Outline;
 import android.os.Bundle;
-import android.transition.ChangeBounds;
-import android.transition.CircularPropagation;
-import android.transition.Explode;
-import android.transition.Scene;
-import android.transition.Slide;
 import android.transition.Transition;
-import android.transition.TransitionManager;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
 import android.view.ViewPropertyAnimator;
-import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import com.saulmm.material.R;
-
 public class MyActivity2 extends Activity {
 
     private static final int NUM_VIEWS = 5;
-    private static final int SCALE_ITEM_ANIMATION_DELAY = 30;
+    private static final int SCALE_DELAY = 30;
     private LinearLayout rowContainer;
 
     @Override
@@ -59,7 +44,7 @@ public void onTransitionEnd(Transition transition) {
                 for (int i = 0; i < rowContainer.getChildCount(); i++) {
 
                     View rowView = rowContainer.getChildAt(i);
-                    rowView.animate().setStartDelay(i * SCALE_ITEM_ANIMATION_DELAY)
+                    rowView.animate().setStartDelay(i * SCALE_DELAY)
                             .scaleX(1).scaleY(1);
                 }
             }
@@ -72,7 +57,7 @@ public void onBackPressed() {
         for (int i = 0; i < rowContainer.getChildCount(); i++) {
 
             View rowView = rowContainer.getChildAt(i);
-            ViewPropertyAnimator propertyAnimator = rowView.animate().setStartDelay(i * SCALE_ITEM_ANIMATION_DELAY)
+            ViewPropertyAnimator propertyAnimator = rowView.animate().setStartDelay(i * SCALE_DELAY)
                 .scaleX(0).scaleY(0);
 
             propertyAnimator.setListener(new Animator.AnimatorListener() {

From 11c6796d071596c4c9c4ca46c4f786af1e958e97 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 19 Oct 2014 17:52:39 +0200
Subject: [PATCH 05/35] upgraded version to 21 and added toolbar

---
 app/build.gradle                              | 11 ++---
 .../main/java/com/saulmm/material/Utils.java  |  1 -
 app/src/main/res/layout/activity_my.xml       |  4 +-
 app/src/main/res/layout/activity_my2.xml      | 40 +++++++++----------
 app/src/main/res/layout/view_fab_button.xml   |  1 -
 app/src/main/res/values-v21/styles.xml        |  2 +-
 6 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 0d34007..cae5360 100644
--- a/app/build.gradle
+++ b/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.+'
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java
index 0149dfe..c2e9ef5 100644
--- a/app/src/main/java/com/saulmm/material/Utils.java
+++ b/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);
     }
 }
diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_my.xml
index 57f862a..fe15993 100644
--- a/app/src/main/res/layout/activity_my.xml
+++ b/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"
diff --git a/app/src/main/res/layout/activity_my2.xml b/app/src/main/res/layout/activity_my2.xml
index 4482e53..5b8310a 100644
--- a/app/src/main/res/layout/activity_my2.xml
+++ b/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>
diff --git a/app/src/main/res/layout/view_fab_button.xml b/app/src/main/res/layout/view_fab_button.xml
index cdabffa..82daf4a 100644
--- a/app/src/main/res/layout/view_fab_button.xml
+++ b/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"
     />
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 60d7441..3a434b8 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/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>

From 44c45c0d223f5cfdfba0264e23b63977a4626977 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 19 Oct 2014 18:36:40 +0200
Subject: [PATCH 06/35] Refactorizations

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../com/saulmm/material/AnimListener.java     | 25 -----
 .../{MyActivity.java => FirstActivity.java}   |  8 +-
 .../{MyActivity2.java => SecondActivity.java} |  4 +-
 .../{activity_my.xml => activity_first.xml}   |  0
 .../layout/activity_hierarchical_timing.xml   | 97 -------------------
 .../main/res/layout/activity_my_activity2.xml | 11 ---
 .../{activity_my2.xml => activity_second.xml} |  0
 app/src/main/res/menu/my_activity2.xml        |  2 +-
 9 files changed, 9 insertions(+), 142 deletions(-)
 delete mode 100644 app/src/main/java/com/saulmm/material/AnimListener.java
 rename app/src/main/java/com/saulmm/material/{MyActivity.java => FirstActivity.java} (81%)
 rename app/src/main/java/com/saulmm/material/{MyActivity2.java => SecondActivity.java} (96%)
 rename app/src/main/res/layout/{activity_my.xml => activity_first.xml} (100%)
 delete mode 100644 app/src/main/res/layout/activity_hierarchical_timing.xml
 delete mode 100644 app/src/main/res/layout/activity_my_activity2.xml
 rename app/src/main/res/layout/{activity_my2.xml => activity_second.xml} (100%)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a096cfd..597d772 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:label=""
         android:theme="@style/AppTheme" >
         <activity
-            android:name=".MyActivity"
+            android:name=".FirstActivity"
             android:label="" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -17,7 +17,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".MyActivity2"
+            android:name=".SecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
     </application>
diff --git a/app/src/main/java/com/saulmm/material/AnimListener.java b/app/src/main/java/com/saulmm/material/AnimListener.java
deleted file mode 100644
index c8e83b1..0000000
--- a/app/src/main/java/com/saulmm/material/AnimListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.saulmm.material;
-
-import android.animation.Animator;
-
-public class AnimListener implements Animator.AnimatorListener {
-    @Override
-    public void onAnimationStart(Animator animator) {
-
-    }
-
-    @Override
-    public void onAnimationEnd(Animator animator) {
-
-    }
-
-    @Override
-    public void onAnimationCancel(Animator animator) {
-
-    }
-
-    @Override
-    public void onAnimationRepeat(Animator animator) {
-
-    }
-}
diff --git a/app/src/main/java/com/saulmm/material/MyActivity.java b/app/src/main/java/com/saulmm/material/FirstActivity.java
similarity index 81%
rename from app/src/main/java/com/saulmm/material/MyActivity.java
rename to app/src/main/java/com/saulmm/material/FirstActivity.java
index ce8885e..a2e531a 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity.java
+++ b/app/src/main/java/com/saulmm/material/FirstActivity.java
@@ -7,7 +7,7 @@
 import android.util.Pair;
 import android.view.View;
 
-public class MyActivity extends Activity {
+public class FirstActivity extends Activity {
 
     private View fabButton;
 
@@ -15,7 +15,7 @@ public class MyActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_my);
+        setContentView(R.layout.activity_first);
 
         // Set explode animation when enter and exit the activity
         Utils.configureWindowEnterExitTransition(getWindow());
@@ -31,9 +31,9 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onClick(View view) {
 
-        Intent i  = new Intent (MyActivity.this, MyActivity2.class);
+        Intent i  = new Intent (FirstActivity.this, SecondActivity.class);
 
-        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(MyActivity.this,
+        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(FirstActivity.this,
                 Pair.create(fabButton, "fab"));
 
         startActivity(i, transitionActivityOptions.toBundle());
diff --git a/app/src/main/java/com/saulmm/material/MyActivity2.java b/app/src/main/java/com/saulmm/material/SecondActivity.java
similarity index 96%
rename from app/src/main/java/com/saulmm/material/MyActivity2.java
rename to app/src/main/java/com/saulmm/material/SecondActivity.java
index 062d75c..5f6fe75 100644
--- a/app/src/main/java/com/saulmm/material/MyActivity2.java
+++ b/app/src/main/java/com/saulmm/material/SecondActivity.java
@@ -8,7 +8,7 @@
 import android.view.ViewPropertyAnimator;
 import android.widget.LinearLayout;
 
-public class MyActivity2 extends Activity {
+public class SecondActivity extends Activity {
 
     private static final int NUM_VIEWS = 5;
     private static final int SCALE_DELAY = 30;
@@ -18,7 +18,7 @@ public class MyActivity2 extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_my2);
+        setContentView(R.layout.activity_second);
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
diff --git a/app/src/main/res/layout/activity_my.xml b/app/src/main/res/layout/activity_first.xml
similarity index 100%
rename from app/src/main/res/layout/activity_my.xml
rename to app/src/main/res/layout/activity_first.xml
diff --git a/app/src/main/res/layout/activity_hierarchical_timing.xml b/app/src/main/res/layout/activity_hierarchical_timing.xml
deleted file mode 100644
index 33015c7..0000000
--- a/app/src/main/res/layout/activity_hierarchical_timing.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<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:paddingLeft="@dimen/activity_horizontal_margin"
-              android:paddingRight="@dimen/activity_horizontal_margin"
-              android:paddingTop="@dimen/activity_vertical_margin"
-              android:paddingBottom="@dimen/activity_vertical_margin"
-              android:orientation="vertical"
-              tools:context="emmaguy.l.timing.HierarchicalTimingActivity">
-
-    <LinearLayout
-        android:id="@+id/row_container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_1"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_2"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_3"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_4"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_5"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_6"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_7"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-        <View
-            android:layout_width="match_parent"
-            android:layout_marginTop="5dp"
-            android:layout_height="64dp"
-            android:id="@+id/view_8"
-            android:scaleX="0"
-            android:scaleY="0"
-            android:background="@color/accent"/>
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_my_activity2.xml b/app/src/main/res/layout/activity_my_activity2.xml
deleted file mode 100644
index ada0660..0000000
--- a/app/src/main/res/layout/activity_my_activity2.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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="com.saulmm.material.MyActivity2">
-
-
-
-</LinearLayout>
-
diff --git a/app/src/main/res/layout/activity_my2.xml b/app/src/main/res/layout/activity_second.xml
similarity index 100%
rename from app/src/main/res/layout/activity_my2.xml
rename to app/src/main/res/layout/activity_second.xml
diff --git a/app/src/main/res/menu/my_activity2.xml b/app/src/main/res/menu/my_activity2.xml
index 7ef86c1..c9a28ba 100644
--- a/app/src/main/res/menu/my_activity2.xml
+++ b/app/src/main/res/menu/my_activity2.xml
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.saulmm.material.MyActivity2" >
+    tools:context="com.saulmm.material.SecondActivity" >
     <item android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:orderInCategory="100"

From ead8adaafb482bd29a9ef86568a08afebeffd043 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 19 Oct 2014 18:58:49 +0200
Subject: [PATCH 07/35] added menu-arrow animation

---
 app/build.gradle                              |   4 +-
 app/src/main/AndroidManifest.xml              |  13 +-
 .../saulmm/material/NavDrawerActivity.java    | 118 ++++++++
 .../material/NavigationDrawerFragment.java    | 281 ++++++++++++++++++
 .../res/drawable-hdpi/drawer_shadow.9.png     | Bin 0 -> 161 bytes
 app/src/main/res/drawable-hdpi/ic_drawer.png  | Bin 0 -> 2829 bytes
 .../res/drawable-mdpi/drawer_shadow.9.png     | Bin 0 -> 142 bytes
 app/src/main/res/drawable-mdpi/ic_drawer.png  | Bin 0 -> 2820 bytes
 .../res/drawable-xhdpi/drawer_shadow.9.png    | Bin 0 -> 174 bytes
 app/src/main/res/drawable-xhdpi/ic_drawer.png | Bin 0 -> 2836 bytes
 .../res/drawable-xxhdpi/drawer_shadow.9.png   | Bin 0 -> 208 bytes
 .../main/res/drawable-xxhdpi/ic_drawer.png    | Bin 0 -> 202 bytes
 .../main/res/layout/activity_nav_drawer.xml   |  31 ++
 .../main/res/layout/fragment_nav_drawer.xml   |  16 +
 .../res/layout/fragment_navigation_drawer.xml |   9 +
 app/src/main/res/menu/nav_drawer.xml          |  11 +
 app/src/main/res/values-v21/styles.xml        |   9 +-
 app/src/main/res/values/strings.xml           |   6 +
 18 files changed, 492 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/NavDrawerActivity.java
 create mode 100644 app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
 create mode 100644 app/src/main/res/drawable-hdpi/drawer_shadow.9.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_drawer.png
 create mode 100644 app/src/main/res/drawable-mdpi/drawer_shadow.9.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_drawer.png
 create mode 100644 app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_drawer.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_drawer.png
 create mode 100644 app/src/main/res/layout/activity_nav_drawer.xml
 create mode 100644 app/src/main/res/layout/fragment_nav_drawer.xml
 create mode 100644 app/src/main/res/layout/fragment_navigation_drawer.xml
 create mode 100644 app/src/main/res/menu/nav_drawer.xml

diff --git a/app/build.gradle b/app/build.gradle
index cae5360..352f047 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,8 +19,10 @@ android {
     }
 }
 
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:21.0.+'
 
+    compile 'com.android.support:appcompat-v7:21.0.0'
+    compile 'com.android.support:support-v4:21.0.0'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 597d772..3a5b998 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,16 +10,21 @@
         <activity
             android:name=".FirstActivity"
             android:label="" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".SecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
+        <activity
+            android:name=".NavDrawerActivity"
+            android:label="@string/title_activity_nav_drawer" >
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/NavDrawerActivity.java b/app/src/main/java/com/saulmm/material/NavDrawerActivity.java
new file mode 100644
index 0000000..1dc095c
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/NavDrawerActivity.java
@@ -0,0 +1,118 @@
+package com.saulmm.material;
+
+import android.app.Activity;
+
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.content.Context;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.support.v4.widget.DrawerLayout;
+import android.widget.ArrayAdapter;
+import android.widget.TextView;
+import com.saulmm.material.R;
+
+public class NavDrawerActivity extends Activity
+        implements NavigationDrawerFragment.NavigationDrawerCallbacks {
+
+    /**
+     * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
+     */
+    private NavigationDrawerFragment mNavigationDrawerFragment;
+
+    /**
+     * Used to store the last screen title. For use in {@link #restoreActionBar()}.
+     */
+    private CharSequence mTitle;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_nav_drawer);
+
+        mNavigationDrawerFragment = (NavigationDrawerFragment)
+                getFragmentManager().findFragmentById(R.id.navigation_drawer);
+        mTitle = getTitle();
+
+        // Set up the drawer.
+        mNavigationDrawerFragment.setUp(
+                R.id.navigation_drawer,
+                (DrawerLayout) findViewById(R.id.drawer_layout));
+    }
+
+    @Override
+    public void onNavigationDrawerItemSelected(int position) {
+        // update the main content by replacing fragments
+        FragmentManager fragmentManager = getFragmentManager();
+        fragmentManager.beginTransaction()
+                .replace(R.id.container, PlaceholderFragment.newInstance(position + 1))
+                .commit();
+    }
+
+
+
+    public void restoreActionBar() {
+        ActionBar actionBar = getActionBar();
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        actionBar.setDisplayShowTitleEnabled(true);
+        actionBar.setTitle(mTitle);
+    }
+
+
+
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * A placeholder fragment containing a simple view.
+     */
+    public static class PlaceholderFragment extends Fragment {
+        /**
+         * The fragment argument representing the section number for this
+         * fragment.
+         */
+        private static final String ARG_SECTION_NUMBER = "section_number";
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        public static PlaceholderFragment newInstance(int sectionNumber) {
+            PlaceholderFragment fragment = new PlaceholderFragment();
+            Bundle args = new Bundle();
+            args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        public PlaceholderFragment() {
+        }
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View rootView = inflater.inflate(R.layout.fragment_nav_drawer, container, false);
+            return rootView;
+        }
+
+
+    }
+
+}
diff --git a/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java b/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
new file mode 100644
index 0000000..0c19675
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
@@ -0,0 +1,281 @@
+package com.saulmm.material;
+
+
+import android.app.Activity;
+import android.app.ActionBar;
+import android.app.Fragment;
+import android.support.v4.view.GravityCompat;
+import android.support.v4.widget.DrawerLayout;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.Toast;
+
+/**
+ * Fragment used for managing interactions for and presentation of a navigation drawer.
+ * See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction">
+ * design guidelines</a> for a complete explanation of the behaviors implemented here.
+ */
+public class NavigationDrawerFragment extends Fragment {
+
+    /**
+     * Remember the position of the selected item.
+     */
+    private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
+
+    /**
+     * Per the design guidelines, you should show the drawer on launch until the user manually
+     * expands it. This shared preference tracks this.
+     */
+    private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned";
+
+    /**
+     * A pointer to the current callbacks instance (the Activity).
+     */
+    private NavigationDrawerCallbacks mCallbacks;
+
+    /**
+     * Helper component that ties the action bar to the navigation drawer.
+     */
+    private ActionBarDrawerToggle mDrawerToggle;
+
+    private DrawerLayout mDrawerLayout;
+    private ListView mDrawerListView;
+    private View mFragmentContainerView;
+
+    private int mCurrentSelectedPosition = 0;
+    private boolean mFromSavedInstanceState;
+    private boolean mUserLearnedDrawer;
+
+    public NavigationDrawerFragment() {
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Read in the flag indicating whether or not the user has demonstrated awareness of the
+        // drawer. See PREF_USER_LEARNED_DRAWER for details.
+        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
+        mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false);
+
+        if (savedInstanceState != null) {
+            mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
+            mFromSavedInstanceState = true;
+        }
+
+        // Select either the default item (0) or the last selected item.
+        selectItem(mCurrentSelectedPosition);
+    }
+
+    @Override
+    public void onActivityCreated (Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        // Indicate that this fragment would like to influence the set of actions in the action bar.
+        setHasOptionsMenu(true);
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        mDrawerListView = (ListView) inflater.inflate(
+                R.layout.fragment_navigation_drawer, container, false);
+        mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+            @Override
+            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+                selectItem(position);
+            }
+        });
+        mDrawerListView.setAdapter(new ArrayAdapter<String>(
+                getActionBar().getThemedContext(),
+                android.R.layout.simple_list_item_activated_1,
+                android.R.id.text1,
+                new String[]{
+                        getString(R.string.title_section1),
+                        getString(R.string.title_section2),
+                        getString(R.string.title_section3),
+                }));
+        mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
+        return mDrawerListView;
+    }
+
+    public boolean isDrawerOpen() {
+        return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView);
+    }
+
+    /**
+     * Users of this fragment must call this method to set up the navigation drawer interactions.
+     *
+     * @param fragmentId   The android:id of this fragment in its activity's layout.
+     * @param drawerLayout The DrawerLayout containing this fragment's UI.
+     */
+    public void setUp(int fragmentId, DrawerLayout drawerLayout) {
+        mFragmentContainerView = getActivity().findViewById(fragmentId);
+        mDrawerLayout = drawerLayout;
+
+        // set a custom shadow that overlays the main content when the drawer opens
+        mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
+        // set up the drawer's list view with items and click listener
+
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayHomeAsUpEnabled(true);
+        actionBar.setHomeButtonEnabled(true);
+
+        // ActionBarDrawerToggle ties together the the proper interactions
+        // between the navigation drawer and the action bar app icon.
+        mDrawerToggle = new ActionBarDrawerToggle(
+                getActivity(),                    /* host Activity */
+                mDrawerLayout,                    /* DrawerLayout object */
+                R.string.navigation_drawer_open,  /* "open drawer" description for accessibility */
+                R.string.navigation_drawer_close  /* "close drawer" description for accessibility */
+        ) {
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                if (!isAdded()) {
+                    return;
+                }
+
+                getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
+            }
+
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                if (!isAdded()) {
+                    return;
+                }
+
+                if (!mUserLearnedDrawer) {
+                    // The user manually opened the drawer; store this flag to prevent auto-showing
+                    // the navigation drawer automatically in the future.
+                    mUserLearnedDrawer = true;
+                    SharedPreferences sp = PreferenceManager
+                            .getDefaultSharedPreferences(getActivity());
+                    sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply();
+                }
+
+                getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
+            }
+        };
+
+        // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer,
+        // per the navigation drawer design guidelines.
+        if (!mUserLearnedDrawer && !mFromSavedInstanceState) {
+            mDrawerLayout.openDrawer(mFragmentContainerView);
+        }
+
+        // Defer code dependent on restoration of previous instance state.
+        mDrawerLayout.post(new Runnable() {
+            @Override
+            public void run() {
+                mDrawerToggle.syncState();
+            }
+        });
+
+        mDrawerLayout.setDrawerListener(mDrawerToggle);
+    }
+
+    private void selectItem(int position) {
+        mCurrentSelectedPosition = position;
+        if (mDrawerListView != null) {
+            mDrawerListView.setItemChecked(position, true);
+        }
+        if (mDrawerLayout != null) {
+            mDrawerLayout.closeDrawer(mFragmentContainerView);
+        }
+        if (mCallbacks != null) {
+            mCallbacks.onNavigationDrawerItemSelected(position);
+        }
+    }
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        try {
+            mCallbacks = (NavigationDrawerCallbacks) activity;
+        } catch (ClassCastException e) {
+            throw new ClassCastException("Activity must implement NavigationDrawerCallbacks.");
+        }
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        mCallbacks = null;
+    }
+
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition);
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        // Forward the new configuration the drawer toggle component.
+        mDrawerToggle.onConfigurationChanged(newConfig);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        // If the drawer is open, show the global app actions in the action bar. See also
+        // showGlobalContextActionBar, which controls the top-left area of the action bar.
+        if (mDrawerLayout != null && isDrawerOpen()) {
+            inflater.inflate(R.menu.global, menu);
+            showGlobalContextActionBar();
+        }
+        super.onCreateOptionsMenu(menu, inflater);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (mDrawerToggle.onOptionsItemSelected(item)) {
+            return true;
+        }
+
+        if (item.getItemId() == R.id.action_example) {
+            Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show();
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    /**
+     * Per the navigation drawer design guidelines, updates the action bar to show the global app
+     * 'context', rather than just what's in the current screen.
+     */
+    private void showGlobalContextActionBar() {
+        ActionBar actionBar = getActionBar();
+        actionBar.setDisplayShowTitleEnabled(true);
+        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
+        actionBar.setTitle(R.string.app_name);
+    }
+
+    private ActionBar getActionBar() {
+        return getActivity().getActionBar();
+    }
+
+    /**
+     * Callbacks interface that all activities using this fragment must implement.
+     */
+    public static interface NavigationDrawerCallbacks {
+        /**
+         * Called when an item in the navigation drawer is selected.
+         */
+        void onNavigationDrawerItemSelected(int position);
+    }
+}
diff --git a/app/src/main/res/drawable-hdpi/drawer_shadow.9.png b/app/src/main/res/drawable-hdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..236bff558af07faa3921ba35e2515edf62d04bb9
GIT binary patch
literal 161
zcmeAS@N?(olHy`uVBq!ia0vp^JV0#3!3HEVSgovp6icy_X9x!n)NrJ90QsB+9+AZi
z4BVX{%xHe{^je^xv!{z=h{y5dAOHW`Gf#YA@1xt%!<wY8u#F*!S791MlAJ=C({+~Q
zo-B#02CEW74zFkn<XtS~X4)gdd%^8;eUgEPF2nk)2F-U{Cp-ii$KdJe=d#Wzp$Pz&
C=q+CW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_drawer.png b/app/src/main/res/drawable-hdpi/ic_drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..c59f601ca31dae344d0dc95912713ce54a8fbefe
GIT binary patch
literal 2829
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/drawer_shadow.9.png b/app/src/main/res/drawable-mdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffe3a28d77c72094021013c6442560803b3d344c
GIT binary patch
literal 142
zcmeAS@N?(olHy`uVBq!ia0vp^96+qZ!3HFgEN0vWQY^(zo*^7SP{WbZ0pxQQctjR6
zFmQK*Fr)d&(`$i(2A(dCAr_~TfBgS%&&>BhUX5L;x$y=|hic;t)=0q~!&M0(2Uj#r
iT+R^X@#lD(V-Z7IzK5^$<X3h;y$qhNelF{r5}E)8ASbo}

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_drawer.png b/app/src/main/res/drawable-mdpi/ic_drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..1ed2c56ee4239ff2987568d4fdae10166650b120
GIT binary patch
literal 2820
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
W<h@@biNGcR0000<MNUMnLSTXz*F3fW

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xhdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..fabe9d96563785c7d6b008bb3d8da25e816c343c
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^{6Or)!3HEd1bTh|DVAa<&kznEsNqQI0P;BtJR*x3
z7`Qt@n9=;?>9s(?08bak5Rc<;uP@|nU=UzFz%6x@#ly{E6Z5RU$2Hhw*i>Gs`(~~C
zr~2_>(e4Ka`gpa)&de}Ks*u{@U5E@m-v9X3<$3NT3r3p*`<7|@n1Ecw;OXk;vd$@?
F2>^8yH@N@+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_drawer.png b/app/src/main/res/drawable-xhdpi/ic_drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5fa74def4b40d7eb6826da05bd5e12b836cb999
GIT binary patch
literal 2836
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/app/src/main/res/drawable-xxhdpi/drawer_shadow.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..b91e9d7f285e8110ba3ba4e72cc6f0416eb3a30a
GIT binary patch
literal 208
zcmeAS@N?(olHy`uVBq!ia0vp^VnCe4!3HEl*p=S^DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MMa)2jv*QM-d<4Ta$*#5x!8O#VbcvCx78OjjCM19-`|n`
zlcQ;yJWqK-!X?h+v^9}Es?F+hJ07=b>sdT*QRcgm+^%b8|A7C`|A*gYPjm3$2miRv
cpZdzQt0C%<%j~>EK-(ESUHx3vIVCg!0CP)0sQ>@~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_drawer.png b/app/src/main/res/drawable-xxhdpi/ic_drawer.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c4685d6e046ce6c450c19426dce627a88718bfc
GIT binary patch
literal 202
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC&H|6fVg?3oVGw3ym^DWND5#L^
z5#-Cjkf+YTP`sXjk!=$LL!~YQgWnqlM%L3n1JW26goK+9UQq_B4e)ev49U3n_PU`U
zg8>io#t-TVJM=pEGT)onF!&ZOd;8}O149hcq!N%?hK6(oZAK7-f#HS|n9?%@Qw{w*
cAUc7wfPvd9>y+w~O{pNhr>mdKI;Vst074Kf@&Et;

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_nav_drawer.xml b/app/src/main/res/layout/activity_nav_drawer.xml
new file mode 100644
index 0000000..407b497
--- /dev/null
+++ b/app/src/main/res/layout/activity_nav_drawer.xml
@@ -0,0 +1,31 @@
+<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
+<android.support.v4.widget.DrawerLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawer_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.saulmm.material.NavDrawerActivity">
+
+    <!-- As the main content view, the view below consumes the entire
+         space available using match_parent in both dimensions. -->
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <!-- android:layout_gravity="start" tells DrawerLayout to treat
+         this as a sliding drawer on the left side for left-to-right
+         languages and on the right side for right-to-left languages.
+         If you're not building against API 17 or higher, use
+         android:layout_gravity="left" instead. -->
+    <!-- The drawer is given a fixed width in dp and extends the full height of
+         the container. -->
+    <fragment android:id="@+id/navigation_drawer"
+        android:layout_width="@dimen/navigation_drawer_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:name="com.saulmm.material.NavigationDrawerFragment"
+        tools:layout="@layout/fragment_navigation_drawer" />
+
+</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/fragment_nav_drawer.xml b/app/src/main/res/layout/fragment_nav_drawer.xml
new file mode 100644
index 0000000..187eb2d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_nav_drawer.xml
@@ -0,0 +1,16 @@
+<RelativeLayout 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:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="com.saulmm.material.NavDrawerActivity$PlaceholderFragment">
+
+    <TextView
+        android:id="@+id/section_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
new file mode 100644
index 0000000..efa407d
--- /dev/null
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -0,0 +1,9 @@
+<ListView 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:choiceMode="singleChoice"
+    android:divider="@android:color/transparent"
+    android:dividerHeight="0dp"
+    android:background="#cc161616"
+    tools:context="com.saulmm.material.NavigationDrawerFragment" />
diff --git a/app/src/main/res/menu/nav_drawer.xml b/app/src/main/res/menu/nav_drawer.xml
new file mode 100644
index 0000000..d565754
--- /dev/null
+++ b/app/src/main/res/menu/nav_drawer.xml
@@ -0,0 +1,11 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.saulmm.material.NavDrawerActivity" >
+    <item android:id="@+id/action_example"
+        android:title="@string/action_example"
+        android:showAsAction="withText|ifRoom" />
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 3a434b8..a1a5bd9 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat">
+    <style name="AppTheme" parent="android:Theme.Material">
 
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
         <item name="android:statusBarColor">@color/theme_default_primary</item>
         <item name="android:colorAccent">@color/accent</item>
         <item name="android:windowContentTransitions">true</item>
+        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
 
+    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
+        <item name="spinBars">true</item>
+        <item name="color">@android:color/white</item>
+    </style>
+
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 29405a1..71a0799 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,5 +6,11 @@
     <string name="title_activity_my_activity2">MyActivity2</string>
     <string name="action_example">Example action</string>
     <string name="hello_world">Hello world!</string>
+    <string name="title_activity_nav_drawer">NavDrawerActivity</string>
+    <string name="title_section1">Section 1</string>
+    <string name="title_section2">Section 2</string>
+    <string name="title_section3">Section 3</string>
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+    <string name="navigation_drawer_close">Close navigation drawer</string>
 
 </resources>

From 3eb9b82d1dce4f480620f264ac67d7a64ed64996 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Mon, 20 Oct 2014 17:47:56 +0200
Subject: [PATCH 08/35] Updated readme

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 48235c2..23321b3 100644
--- a/README.md
+++ b/README.md
@@ -8,4 +8,10 @@ Commit - **8872619**
 
 Commit - **901d62c**
 
-![](https://lh6.googleusercontent.com/-ecoWQejLmFE/VEBoRo3Qs_I/AAAAAAAAuTU/YZ7855GmOfw/w276-h498-no/appear.gif)
\ No newline at end of file
+![](https://lh6.googleusercontent.com/-ecoWQejLmFE/VEBoRo3Qs_I/AAAAAAAAuTU/YZ7855GmOfw/w276-h498-no/appear.gif)
+
+## Playing with the new menu-to arrow toggle animattion added in the Support Library
+
+Commit - **ead8ada**
+
+![](https://0b53cc8370cd7638a6bca2ead36937afe31044d3.googledrive.com/host/0B62SZ3WRM2R2aVA4TDVRV04walU/gif-arrow.gif)

From f90a45a892bd9de68b3fcee3f5951061e68fb108 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 23 Oct 2014 13:37:53 +0200
Subject: [PATCH 09/35] Added SliddingTabs implementation by Google

---
 app/src/main/AndroidManifest.xml              |   9 +-
 .../material/slidingtabs/MainActivity.java    |  50 +++
 .../slidingtabs/SlidingTabsBasicFragment.java | 158 +++++++++
 .../slidingtabs/views/SlidingTabLayout.java   | 314 ++++++++++++++++++
 .../slidingtabs/views/SlidingTabStrip.java    | 208 ++++++++++++
 app/src/main/res/layout/activity_main.xml     |  35 ++
 app/src/main/res/layout/fragment_sample.xml   |  19 ++
 app/src/main/res/layout/pager_item.xml        |  22 ++
 8 files changed, 814 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
 create mode 100755 app/src/main/res/layout/activity_main.xml
 create mode 100644 app/src/main/res/layout/fragment_sample.xml
 create mode 100644 app/src/main/res/layout/pager_item.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a5b998..081b51c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,24 +7,31 @@
         android:icon="@drawable/ic_launcher"
         android:label=""
         android:theme="@style/AppTheme" >
+
         <activity
             android:name=".FirstActivity"
             android:label="" >
-
         </activity>
+
         <activity
             android:name=".SecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
+
         <activity
             android:name=".NavDrawerActivity"
             android:label="@string/title_activity_nav_drawer" >
+        </activity>
+
+        <activity android:name=".slidingtabs.MainActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
         </activity>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
new file mode 100644
index 0000000..e0480a9
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
@@ -0,0 +1,50 @@
+/*
+* Copyright 2013 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.saulmm.material.slidingtabs;
+
+import android.app.Activity;
+import android.app.FragmentTransaction;
+import android.os.Bundle;
+import com.saulmm.material.R;
+
+/**
+ * A simple launcher activity containing a summary sample description, sample log and a custom
+ * {@link android.support.v4.app.Fragment} which can display a view.
+ * <p>
+ * For devices with displays with a width of 720dp or greater, the sample log is always visible,
+ * on other devices it's visibility is controlled by an item on the Action Bar.
+ */
+public class MainActivity extends Activity {
+
+    public static final String TAG = "MainActivity";
+
+    // Whether the Log Fragment is currently shown
+    private boolean mLogShown;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        if (savedInstanceState == null) {
+            FragmentTransaction transaction = getFragmentManager().beginTransaction();
+            SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
+            transaction.replace(R.id.sample_content_fragment, fragment);
+            transaction.commit();
+        }
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java b/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
new file mode 100644
index 0000000..511fdb5
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.saulmm.material.slidingtabs;
+
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
+
+
+public class SlidingTabsBasicFragment extends Fragment {
+
+    static final String LOG_TAG = "SlidingTabsBasicFragment";
+
+    /**
+     * A custom {@link ViewPager} title strip which looks much like Tabs present in Android v4.0 and
+     * above, but is designed to give continuous feedback to the user when scrolling.
+     */
+    private SlidingTabLayout mSlidingTabLayout;
+
+    /**
+     * A {@link ViewPager} which will be used in conjunction with the {@link SlidingTabLayout} above.
+     */
+    private ViewPager mViewPager;
+
+    /**
+     * Inflates the {@link View} which will be displayed by this {@link Fragment}, from the app's
+     * resources.
+     */
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_sample, container, false);
+    }
+
+    // BEGIN_INCLUDE (fragment_onviewcreated)
+    /**
+     * This is called after the {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} has finished.
+     * Here we can pick out the {@link View}s we need to configure from the content view.
+     *
+     * We set the {@link ViewPager}'s adapter to be an instance of {@link SamplePagerAdapter}. The
+     * {@link SlidingTabLayout} is then given the {@link ViewPager} so that it can populate itself.
+     *
+     * @param view View created in {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}
+     */
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        // BEGIN_INCLUDE (setup_viewpager)
+        // Get the ViewPager and set it's PagerAdapter so that it can display items
+        mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
+        mViewPager.setAdapter(new SamplePagerAdapter());
+        // END_INCLUDE (setup_viewpager)
+
+        // BEGIN_INCLUDE (setup_slidingtablayout)
+        // Give the SlidingTabLayout the ViewPager, this must be done AFTER the ViewPager has had
+        // it's PagerAdapter set.
+        mSlidingTabLayout = (SlidingTabLayout) view.findViewById(R.id.sliding_tabs);
+        mSlidingTabLayout.setViewPager(mViewPager);
+        // END_INCLUDE (setup_slidingtablayout)
+    }
+    // END_INCLUDE (fragment_onviewcreated)
+
+    /**
+     * The {@link android.support.v4.view.PagerAdapter} used to display pages in this sample.
+     * The individual pages are simple and just display two lines of text. The important section of
+     * this class is the {@link #getPageTitle(int)} method which controls what is displayed in the
+     * {@link SlidingTabLayout}.
+     */
+    class SamplePagerAdapter extends PagerAdapter {
+
+        /**
+         * @return the number of pages to display
+         */
+        @Override
+        public int getCount() {
+            return 10;
+        }
+
+        /**
+         * @return true if the value returned from {@link #instantiateItem(ViewGroup, int)} is the
+         * same object as the {@link View} added to the {@link ViewPager}.
+         */
+        @Override
+        public boolean isViewFromObject(View view, Object o) {
+            return o == view;
+        }
+
+        // BEGIN_INCLUDE (pageradapter_getpagetitle)
+        /**
+         * Return the title of the item at {@code position}. This is important as what this method
+         * returns is what is displayed in the {@link SlidingTabLayout}.
+         * <p>
+         * Here we construct one using the position value, but for real application the title should
+         * refer to the item's contents.
+         */
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return "Item " + (position + 1);
+        }
+        // END_INCLUDE (pageradapter_getpagetitle)
+
+        /**
+         * Instantiate the {@link View} which should be displayed at {@code position}. Here we
+         * inflate a layout from the apps resources and then change the text view to signify the position.
+         */
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+            // Inflate a new layout from our resources
+            View view = getActivity().getLayoutInflater().inflate(R.layout.pager_item,
+                    container, false);
+            // Add the newly created View to the ViewPager
+            container.addView(view);
+
+            // Retrieve a TextView from the inflated View, and update it's text
+            TextView title = (TextView) view.findViewById(R.id.item_title);
+            title.setText(String.valueOf(position + 1));
+
+            Log.i(LOG_TAG, "instantiateItem() [position: " + position + "]");
+
+            // Return the View
+            return view;
+        }
+
+        /**
+         * Destroy the item from the {@link ViewPager}. In our case this is simply removing the
+         * {@link View}.
+         */
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+            Log.i(LOG_TAG, "destroyItem() [position: " + position + "]");
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
new file mode 100644
index 0000000..4cce346
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.saulmm.material.slidingtabs.views;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.os.Build;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.HorizontalScrollView;
+import android.widget.TextView;
+
+/**
+ * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
+ * the user's scroll progress.
+ * <p>
+ * To use the component, simply add it to your view hierarchy. Then in your
+ * {@link android.app.Activity} or {@link android.support.v4.app.Fragment} call
+ * {@link #setViewPager(android.support.v4.view.ViewPager)} providing it the ViewPager this layout is being used for.
+ * <p>
+ * The colors can be customized in two ways. The first and simplest is to provide an array of colors
+ * via {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)}. The
+ * alternative is via the {@link SlidingTabLayout.TabColorizer} interface which provides you complete control over
+ * which color is used for any individual position.
+ * <p>
+ * The views used as tabs can be customized by calling {@link #setCustomTabView(int, int)},
+ * providing the layout ID of your custom layout.
+ */
+public class SlidingTabLayout extends HorizontalScrollView {
+
+    /**
+     * Allows complete control over the colors drawn in the tab layout. Set with
+     * {@link #setCustomTabColorizer(SlidingTabLayout.TabColorizer)}.
+     */
+    public interface TabColorizer {
+
+        /**
+         * @return return the color of the indicator used when {@code position} is selected.
+         */
+        int getIndicatorColor(int position);
+
+        /**
+         * @return return the color of the divider drawn to the right of {@code position}.
+         */
+        int getDividerColor(int position);
+
+    }
+
+    private static final int TITLE_OFFSET_DIPS = 24;
+    private static final int TAB_VIEW_PADDING_DIPS = 16;
+    private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
+
+    private int mTitleOffset;
+
+    private int mTabViewLayoutId;
+    private int mTabViewTextViewId;
+
+    private ViewPager mViewPager;
+    private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
+
+    private final SlidingTabStrip mTabStrip;
+
+    public SlidingTabLayout(Context context) {
+        this(context, null);
+    }
+
+    public SlidingTabLayout(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public SlidingTabLayout(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+
+        // Disable the Scroll Bar
+        setHorizontalScrollBarEnabled(false);
+        // Make sure that the Tab Strips fills this View
+        setFillViewport(true);
+
+        mTitleOffset = (int) (TITLE_OFFSET_DIPS * getResources().getDisplayMetrics().density);
+
+        mTabStrip = new SlidingTabStrip(context);
+        addView(mTabStrip, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+    }
+
+    /**
+     * Set the custom {@link SlidingTabLayout.TabColorizer} to be used.
+     *
+     * If you only require simple custmisation then you can use
+     * {@link #setSelectedIndicatorColors(int...)} and {@link #setDividerColors(int...)} to achieve
+     * similar effects.
+     */
+    public void setCustomTabColorizer(TabColorizer tabColorizer) {
+        mTabStrip.setCustomTabColorizer(tabColorizer);
+    }
+
+    /**
+     * Sets the colors to be used for indicating the selected tab. These colors are treated as a
+     * circular array. Providing one color will mean that all tabs are indicated with the same color.
+     */
+    public void setSelectedIndicatorColors(int... colors) {
+        mTabStrip.setSelectedIndicatorColors(colors);
+    }
+
+    /**
+     * Sets the colors to be used for tab dividers. These colors are treated as a circular array.
+     * Providing one color will mean that all tabs are indicated with the same color.
+     */
+    public void setDividerColors(int... colors) {
+        mTabStrip.setDividerColors(colors);
+    }
+
+    /**
+     * Set the {@link android.support.v4.view.ViewPager.OnPageChangeListener}. When using {@link SlidingTabLayout} you are
+     * required to set any {@link android.support.v4.view.ViewPager.OnPageChangeListener} through this method. This is so
+     * that the layout can update it's scroll position correctly.
+     *
+     * @see android.support.v4.view.ViewPager#setOnPageChangeListener(android.support.v4.view.ViewPager.OnPageChangeListener)
+     */
+    public void setOnPageChangeListener(ViewPager.OnPageChangeListener listener) {
+        mViewPagerPageChangeListener = listener;
+    }
+
+    /**
+     * Set the custom layout to be inflated for the tab views.
+     *
+     * @param layoutResId Layout id to be inflated
+     * @param textViewId id of the {@link android.widget.TextView} in the inflated view
+     */
+    public void setCustomTabView(int layoutResId, int textViewId) {
+        mTabViewLayoutId = layoutResId;
+        mTabViewTextViewId = textViewId;
+    }
+
+    /**
+     * Sets the associated view pager. Note that the assumption here is that the pager content
+     * (number of tabs and tab titles) does not change after this call has been made.
+     */
+    public void setViewPager(ViewPager viewPager) {
+        mTabStrip.removeAllViews();
+
+        mViewPager = viewPager;
+        if (viewPager != null) {
+            viewPager.setOnPageChangeListener(new InternalViewPagerListener());
+            populateTabStrip();
+        }
+    }
+
+    /**
+     * Create a default view to be used for tabs. This is called if a custom tab view is not set via
+     * {@link #setCustomTabView(int, int)}.
+     */
+    protected TextView createDefaultTabView(Context context) {
+        TextView textView = new TextView(context);
+        textView.setGravity(Gravity.CENTER);
+        textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
+        textView.setTypeface(Typeface.DEFAULT_BOLD);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            // If we're running on Honeycomb or newer, then we can use the Theme's
+            // selectableItemBackground to ensure that the View has a pressed state
+            TypedValue outValue = new TypedValue();
+            getContext().getTheme().resolveAttribute(android.R.attr.selectableItemBackground,
+                    outValue, true);
+            textView.setBackgroundResource(outValue.resourceId);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
+            // If we're running on ICS or newer, enable all-caps to match the Action Bar tab style
+            textView.setAllCaps(true);
+        }
+
+        int padding = (int) (TAB_VIEW_PADDING_DIPS * getResources().getDisplayMetrics().density);
+        textView.setPadding(padding, padding, padding, padding);
+
+        return textView;
+    }
+
+    private void populateTabStrip() {
+        final PagerAdapter adapter = mViewPager.getAdapter();
+        final OnClickListener tabClickListener = new TabClickListener();
+
+        for (int i = 0; i < adapter.getCount(); i++) {
+            View tabView = null;
+            TextView tabTitleView = null;
+
+            if (mTabViewLayoutId != 0) {
+                // If there is a custom tab view layout id set, try and inflate it
+                tabView = LayoutInflater.from(getContext()).inflate(mTabViewLayoutId, mTabStrip,
+                        false);
+                tabTitleView = (TextView) tabView.findViewById(mTabViewTextViewId);
+            }
+
+            if (tabView == null) {
+                tabView = createDefaultTabView(getContext());
+            }
+
+            if (tabTitleView == null && TextView.class.isInstance(tabView)) {
+                tabTitleView = (TextView) tabView;
+            }
+
+            tabTitleView.setText(adapter.getPageTitle(i));
+            tabView.setOnClickListener(tabClickListener);
+
+            mTabStrip.addView(tabView);
+        }
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        if (mViewPager != null) {
+            scrollToTab(mViewPager.getCurrentItem(), 0);
+        }
+    }
+
+    private void scrollToTab(int tabIndex, int positionOffset) {
+        final int tabStripChildCount = mTabStrip.getChildCount();
+        if (tabStripChildCount == 0 || tabIndex < 0 || tabIndex >= tabStripChildCount) {
+            return;
+        }
+
+        View selectedChild = mTabStrip.getChildAt(tabIndex);
+        if (selectedChild != null) {
+            int targetScrollX = selectedChild.getLeft() + positionOffset;
+
+            if (tabIndex > 0 || positionOffset > 0) {
+                // If we're not at the first child and are mid-scroll, make sure we obey the offset
+                targetScrollX -= mTitleOffset;
+            }
+
+            scrollTo(targetScrollX, 0);
+        }
+    }
+
+    private class InternalViewPagerListener implements ViewPager.OnPageChangeListener {
+        private int mScrollState;
+
+        @Override
+        public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+            int tabStripChildCount = mTabStrip.getChildCount();
+            if ((tabStripChildCount == 0) || (position < 0) || (position >= tabStripChildCount)) {
+                return;
+            }
+
+            mTabStrip.onViewPagerPageChanged(position, positionOffset);
+
+            View selectedTitle = mTabStrip.getChildAt(position);
+            int extraOffset = (selectedTitle != null)
+                    ? (int) (positionOffset * selectedTitle.getWidth())
+                    : 0;
+            scrollToTab(position, extraOffset);
+
+            if (mViewPagerPageChangeListener != null) {
+                mViewPagerPageChangeListener.onPageScrolled(position, positionOffset,
+                        positionOffsetPixels);
+            }
+        }
+
+        @Override
+        public void onPageScrollStateChanged(int state) {
+            mScrollState = state;
+
+            if (mViewPagerPageChangeListener != null) {
+                mViewPagerPageChangeListener.onPageScrollStateChanged(state);
+            }
+        }
+
+        @Override
+        public void onPageSelected(int position) {
+            if (mScrollState == ViewPager.SCROLL_STATE_IDLE) {
+                mTabStrip.onViewPagerPageChanged(position, 0f);
+                scrollToTab(position, 0);
+            }
+
+            if (mViewPagerPageChangeListener != null) {
+                mViewPagerPageChangeListener.onPageSelected(position);
+            }
+        }
+
+    }
+
+    private class TabClickListener implements OnClickListener {
+        @Override
+        public void onClick(View v) {
+            for (int i = 0; i < mTabStrip.getChildCount(); i++) {
+                if (v == mTabStrip.getChildAt(i)) {
+                    mViewPager.setCurrentItem(i);
+                    return;
+                }
+            }
+        }
+    }
+
+}
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
new file mode 100644
index 0000000..752d5ba
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.saulmm.material.slidingtabs.views;
+
+import android.R;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.View;
+import android.widget.LinearLayout;
+
+class SlidingTabStrip extends LinearLayout {
+
+    private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
+    private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
+    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 8;
+    private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
+
+    private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
+    private static final byte DEFAULT_DIVIDER_COLOR_ALPHA = 0x20;
+    private static final float DEFAULT_DIVIDER_HEIGHT = 0.5f;
+
+    private final int mBottomBorderThickness;
+    private final Paint mBottomBorderPaint;
+
+    private final int mSelectedIndicatorThickness;
+    private final Paint mSelectedIndicatorPaint;
+
+    private final int mDefaultBottomBorderColor;
+
+    private final Paint mDividerPaint;
+    private final float mDividerHeight;
+
+    private int mSelectedPosition;
+    private float mSelectionOffset;
+
+    private SlidingTabLayout.TabColorizer mCustomTabColorizer;
+    private final SimpleTabColorizer mDefaultTabColorizer;
+
+    SlidingTabStrip(Context context) {
+        this(context, null);
+    }
+
+    SlidingTabStrip(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        setWillNotDraw(false);
+
+        final float density = getResources().getDisplayMetrics().density;
+
+        TypedValue outValue = new TypedValue();
+        context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
+        final int themeForegroundColor =  outValue.data;
+
+        mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
+                DEFAULT_BOTTOM_BORDER_COLOR_ALPHA);
+
+        mDefaultTabColorizer = new SimpleTabColorizer();
+        mDefaultTabColorizer.setIndicatorColors(DEFAULT_SELECTED_INDICATOR_COLOR);
+        mDefaultTabColorizer.setDividerColors(setColorAlpha(themeForegroundColor,
+                DEFAULT_DIVIDER_COLOR_ALPHA));
+
+        mBottomBorderThickness = (int) (DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS * density);
+        mBottomBorderPaint = new Paint();
+        mBottomBorderPaint.setColor(mDefaultBottomBorderColor);
+
+        mSelectedIndicatorThickness = (int) (SELECTED_INDICATOR_THICKNESS_DIPS * density);
+        mSelectedIndicatorPaint = new Paint();
+
+        mDividerHeight = DEFAULT_DIVIDER_HEIGHT;
+        mDividerPaint = new Paint();
+        mDividerPaint.setStrokeWidth((int) (DEFAULT_DIVIDER_THICKNESS_DIPS * density));
+    }
+
+    void setCustomTabColorizer(SlidingTabLayout.TabColorizer customTabColorizer) {
+        mCustomTabColorizer = customTabColorizer;
+        invalidate();
+    }
+
+    void setSelectedIndicatorColors(int... colors) {
+        // Make sure that the custom colorizer is removed
+        mCustomTabColorizer = null;
+        mDefaultTabColorizer.setIndicatorColors(colors);
+        invalidate();
+    }
+
+    void setDividerColors(int... colors) {
+        // Make sure that the custom colorizer is removed
+        mCustomTabColorizer = null;
+        mDefaultTabColorizer.setDividerColors(colors);
+        invalidate();
+    }
+
+    void onViewPagerPageChanged(int position, float positionOffset) {
+        mSelectedPosition = position;
+        mSelectionOffset = positionOffset;
+        invalidate();
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        final int height = getHeight();
+        final int childCount = getChildCount();
+        final int dividerHeightPx = (int) (Math.min(Math.max(0f, mDividerHeight), 1f) * height);
+        final SlidingTabLayout.TabColorizer tabColorizer = mCustomTabColorizer != null
+                ? mCustomTabColorizer
+                : mDefaultTabColorizer;
+
+        // Thick colored underline below the current selection
+        if (childCount > 0) {
+            View selectedTitle = getChildAt(mSelectedPosition);
+            int left = selectedTitle.getLeft();
+            int right = selectedTitle.getRight();
+            int color = tabColorizer.getIndicatorColor(mSelectedPosition);
+
+            if (mSelectionOffset > 0f && mSelectedPosition < (getChildCount() - 1)) {
+                int nextColor = tabColorizer.getIndicatorColor(mSelectedPosition + 1);
+                if (color != nextColor) {
+                    color = blendColors(nextColor, color, mSelectionOffset);
+                }
+
+                // Draw the selection partway between the tabs
+                View nextTitle = getChildAt(mSelectedPosition + 1);
+                left = (int) (mSelectionOffset * nextTitle.getLeft() +
+                        (1.0f - mSelectionOffset) * left);
+                right = (int) (mSelectionOffset * nextTitle.getRight() +
+                        (1.0f - mSelectionOffset) * right);
+            }
+
+            mSelectedIndicatorPaint.setColor(color);
+
+            canvas.drawRect(left, height - mSelectedIndicatorThickness, right,
+                    height, mSelectedIndicatorPaint);
+        }
+
+        // Thin underline along the entire bottom edge
+        canvas.drawRect(0, height - mBottomBorderThickness, getWidth(), height, mBottomBorderPaint);
+
+        // Vertical separators between the titles
+        int separatorTop = (height - dividerHeightPx) / 2;
+        for (int i = 0; i < childCount - 1; i++) {
+            View child = getChildAt(i);
+            mDividerPaint.setColor(tabColorizer.getDividerColor(i));
+            canvas.drawLine(child.getRight(), separatorTop, child.getRight(),
+                    separatorTop + dividerHeightPx, mDividerPaint);
+        }
+    }
+
+    /**
+     * Set the alpha value of the {@code color} to be the given {@code alpha} value.
+     */
+    private static int setColorAlpha(int color, byte alpha) {
+        return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color));
+    }
+
+    /**
+     * Blend {@code color1} and {@code color2} using the given ratio.
+     *
+     * @param ratio of which to blend. 1.0 will return {@code color1}, 0.5 will give an even blend,
+     *              0.0 will return {@code color2}.
+     */
+    private static int blendColors(int color1, int color2, float ratio) {
+        final float inverseRation = 1f - ratio;
+        float r = (Color.red(color1) * ratio) + (Color.red(color2) * inverseRation);
+        float g = (Color.green(color1) * ratio) + (Color.green(color2) * inverseRation);
+        float b = (Color.blue(color1) * ratio) + (Color.blue(color2) * inverseRation);
+        return Color.rgb((int) r, (int) g, (int) b);
+    }
+
+    private static class SimpleTabColorizer implements SlidingTabLayout.TabColorizer {
+        private int[] mIndicatorColors;
+        private int[] mDividerColors;
+
+        @Override
+        public final int getIndicatorColor(int position) {
+            return mIndicatorColors[position % mIndicatorColors.length];
+        }
+
+        @Override
+        public final int getDividerColor(int position) {
+            return mDividerColors[position % mDividerColors.length];
+        }
+
+        void setIndicatorColors(int... colors) {
+            mIndicatorColors = colors;
+        }
+
+        void setDividerColors(int... colors) {
+            mDividerColors = colors;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100755
index 0000000..5143476
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,35 @@
+<!--
+  Copyright 2013 The Android Open Source Project
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  -->
+<LinearLayout
+      xmlns:android="http://schemas.android.com/apk/res/android"
+      android:orientation="vertical"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:id="@+id/sample_main_layout">
+
+    <View
+          android:layout_width="match_parent"
+          android:layout_height="1dp"
+          android:background="@android:color/darker_gray" />
+
+    <FrameLayout
+          android:id="@+id/sample_content_fragment"
+          android:layout_weight="2"
+          android:layout_width="match_parent"
+          android:layout_height="0px" />
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml
new file mode 100644
index 0000000..9cf7754
--- /dev/null
+++ b/app/src/main/res/layout/fragment_sample.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical">
+
+    <com.saulmm.material.slidingtabs.views.SlidingTabLayout
+          android:id="@+id/sliding_tabs"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content" />
+
+    <android.support.v4.view.ViewPager
+          android:id="@+id/viewpager"
+          android:layout_width="match_parent"
+          android:layout_height="0px"
+          android:layout_weight="1"
+          android:background="@android:color/white"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
new file mode 100644
index 0000000..ce4413f
--- /dev/null
+++ b/app/src/main/res/layout/pager_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      android:gravity="center">
+
+    <TextView
+          android:id="@+id/item_subtitle"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textAppearance="?android:attr/textAppearanceLarge"
+          android:text="Page:"/>
+
+    <TextView
+          android:id="@+id/item_title"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:textSize="80sp" />
+
+</LinearLayout>
\ No newline at end of file

From 760b68c85bfc3db7dbd8578466ce4603755582a8 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 23 Oct 2014 14:01:42 +0200
Subject: [PATCH 10/35] Added some adjustments to fit material design

---
 .../slidingtabs/views/SlidingTabStrip.java    | 16 ++++++++++++---
 app/src/main/res/layout/activity_main.xml     | 20 -------------------
 app/src/main/res/layout/fragment_sample.xml   |  7 +++++++
 app/src/main/res/values-v21/styles.xml        |  2 +-
 4 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
index 752d5ba..4a6c246 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
@@ -30,7 +30,7 @@ class SlidingTabStrip extends LinearLayout {
 
     private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
     private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
-    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 8;
+    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 2;
     private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
 
     private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
@@ -68,11 +68,19 @@ class SlidingTabStrip extends LinearLayout {
         context.getTheme().resolveAttribute(R.attr.colorForeground, outValue, true);
         final int themeForegroundColor =  outValue.data;
 
+        TypedValue backgroundValue = new TypedValue();
+        context.getTheme().resolveAttribute(R.attr.colorPrimary, outValue, true);
+        final int themeBackground =  outValue.data;
+
+        TypedValue accentValue = new TypedValue();
+        context.getTheme().resolveAttribute(R.attr.colorAccent, outValue, true);
+        final int accentColor =  outValue.data;
+
         mDefaultBottomBorderColor = setColorAlpha(themeForegroundColor,
                 DEFAULT_BOTTOM_BORDER_COLOR_ALPHA);
 
         mDefaultTabColorizer = new SimpleTabColorizer();
-        mDefaultTabColorizer.setIndicatorColors(DEFAULT_SELECTED_INDICATOR_COLOR);
+        mDefaultTabColorizer.setIndicatorColors(accentColor);
         mDefaultTabColorizer.setDividerColors(setColorAlpha(themeForegroundColor,
                 DEFAULT_DIVIDER_COLOR_ALPHA));
 
@@ -85,7 +93,9 @@ class SlidingTabStrip extends LinearLayout {
 
         mDividerHeight = DEFAULT_DIVIDER_HEIGHT;
         mDividerPaint = new Paint();
-        mDividerPaint.setStrokeWidth((int) (DEFAULT_DIVIDER_THICKNESS_DIPS * density));
+        mDividerPaint.setStrokeWidth((int) (0));
+
+        setBackgroundColor(themeBackground);
     }
 
     void setCustomTabColorizer(SlidingTabLayout.TabColorizer customTabColorizer) {
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5143476..1ca4c12 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,18 +1,3 @@
-<!--
-  Copyright 2013 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
 <LinearLayout
       xmlns:android="http://schemas.android.com/apk/res/android"
       android:orientation="vertical"
@@ -20,11 +5,6 @@
       android:layout_height="match_parent"
       android:id="@+id/sample_main_layout">
 
-    <View
-          android:layout_width="match_parent"
-          android:layout_height="1dp"
-          android:background="@android:color/darker_gray" />
-
     <FrameLayout
           android:id="@+id/sample_content_fragment"
           android:layout_weight="2"
diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml
index 9cf7754..a552d5f 100644
--- a/app/src/main/res/layout/fragment_sample.xml
+++ b/app/src/main/res/layout/fragment_sample.xml
@@ -4,6 +4,13 @@
       android:layout_height="match_parent"
       android:orientation="vertical">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="?android:colorPrimary"
+        android:minHeight="?attr/actionBarSize"/>
+
     <com.saulmm.material.slidingtabs.views.SlidingTabLayout
           android:id="@+id/sliding_tabs"
           android:layout_width="match_parent"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index a1a5bd9..ea62fce 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/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">
+    <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>

From 581e4fc84a878a2448223414945acad7e5b375d9 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 25 Oct 2014 17:30:15 +0200
Subject: [PATCH 11/35] Adjusted slidingtablayout and added toolbar

---
 .../material/slidingtabs/MainActivity.java    | 10 ++++-
 .../slidingtabs/SlidingTabsBasicFragment.java | 13 +++----
 .../slidingtabs/views/SlidingTabLayout.java   |  5 ++-
 .../slidingtabs/views/SlidingTabStrip.java    |  2 +-
 app/src/main/res/layout/activity_main.xml     |  7 ++++
 app/src/main/res/layout/fragment_sample.xml   | 36 +++++++++---------
 app/src/main/res/layout/pager_item.xml        | 38 +++++++++++++------
 app/src/main/res/values-v21/styles.xml        | 12 +++++-
 app/src/main/res/values/colors.xml            |  4 +-
 9 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
index e0480a9..e9f82be 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
@@ -19,6 +19,8 @@
 import android.app.Activity;
 import android.app.FragmentTransaction;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import com.saulmm.material.R;
 
 /**
@@ -28,7 +30,7 @@
  * For devices with displays with a width of 720dp or greater, the sample log is always visible,
  * on other devices it's visibility is controlled by an item on the Action Bar.
  */
-public class MainActivity extends Activity {
+public class MainActivity extends ActionBarActivity {
 
     public static final String TAG = "MainActivity";
 
@@ -46,5 +48,11 @@ protected void onCreate(Bundle savedInstanceState) {
             transaction.replace(R.id.sample_content_fragment, fragment);
             transaction.commit();
         }
+
+        // Configure toolbar
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar);
+        setSupportActionBar(mainToolbar);
+        getSupportActionBar().setTitle("Sliding");
+
     }
 }
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java b/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
index 511fdb5..3067c69 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
@@ -25,6 +25,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.TextView;
 
 import com.saulmm.material.R;
@@ -90,13 +91,14 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
      * {@link SlidingTabLayout}.
      */
     class SamplePagerAdapter extends PagerAdapter {
+        final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
 
         /**
          * @return the number of pages to display
          */
         @Override
         public int getCount() {
-            return 10;
+            return 5;
         }
 
         /**
@@ -118,7 +120,7 @@ public boolean isViewFromObject(View view, Object o) {
          */
         @Override
         public CharSequence getPageTitle(int position) {
-            return "Item " + (position + 1);
+            return TITLES[position];
         }
         // END_INCLUDE (pageradapter_getpagetitle)
 
@@ -132,13 +134,10 @@ public Object instantiateItem(ViewGroup container, int position) {
             View view = getActivity().getLayoutInflater().inflate(R.layout.pager_item,
                     container, false);
             // Add the newly created View to the ViewPager
-            container.addView(view);
 
-            // Retrieve a TextView from the inflated View, and update it's text
-            TextView title = (TextView) view.findViewById(R.id.item_title);
-            title.setText(String.valueOf(position + 1));
 
-            Log.i(LOG_TAG, "instantiateItem() [position: " + position + "]");
+            container.addView(view);
+
 
             // Return the View
             return view;
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
index 4cce346..51a72bd 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
@@ -29,6 +29,8 @@
 import android.widget.HorizontalScrollView;
 import android.widget.TextView;
 
+import com.saulmm.material.R;
+
 /**
  * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
  * the user's scroll progress.
@@ -67,7 +69,7 @@ public interface TabColorizer {
 
     private static final int TITLE_OFFSET_DIPS = 24;
     private static final int TAB_VIEW_PADDING_DIPS = 16;
-    private static final int TAB_VIEW_TEXT_SIZE_SP = 12;
+    private static final int TAB_VIEW_TEXT_SIZE_SP = 14;
 
     private int mTitleOffset;
 
@@ -173,6 +175,7 @@ protected TextView createDefaultTabView(Context context) {
         textView.setGravity(Gravity.CENTER);
         textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, TAB_VIEW_TEXT_SIZE_SP);
         textView.setTypeface(Typeface.DEFAULT_BOLD);
+        textView.setTextAppearance(context, R.style.SlidingTextViewStyle);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
             // If we're running on Honeycomb or newer, then we can use the Theme's
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
index 4a6c246..cdcb25f 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
@@ -30,7 +30,7 @@ class SlidingTabStrip extends LinearLayout {
 
     private static final int DEFAULT_BOTTOM_BORDER_THICKNESS_DIPS = 2;
     private static final byte DEFAULT_BOTTOM_BORDER_COLOR_ALPHA = 0x26;
-    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 2;
+    private static final int SELECTED_INDICATOR_THICKNESS_DIPS = 3;
     private static final int DEFAULT_SELECTED_INDICATOR_COLOR = 0xFF33B5E5;
 
     private static final int DEFAULT_DIVIDER_THICKNESS_DIPS = 1;
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ca4c12..6580d72 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,13 @@
       android:layout_height="match_parent"
       android:id="@+id/sample_main_layout">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="?android:colorPrimary"
+        android:minHeight="?attr/actionBarSize"/>
+
     <FrameLayout
           android:id="@+id/sample_content_fragment"
           android:layout_weight="2"
diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sample.xml
index a552d5f..232c674 100644
--- a/app/src/main/res/layout/fragment_sample.xml
+++ b/app/src/main/res/layout/fragment_sample.xml
@@ -1,26 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#FFF"
+    android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
-        android:layout_height="wrap_content"
+    <com.saulmm.material.slidingtabs.views.SlidingTabLayout
+        android:id="@+id/sliding_tabs"
         android:layout_width="match_parent"
-        android:background="?android:colorPrimary"
-        android:minHeight="?attr/actionBarSize"/>
+        android:layout_height="wrap_content"
+        android:elevation="10dp"/>
 
-    <com.saulmm.material.slidingtabs.views.SlidingTabLayout
-          android:id="@+id/sliding_tabs"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@color/theme_default_primary"
+        android:elevation="10dp"/>
 
     <android.support.v4.view.ViewPager
-          android:id="@+id/viewpager"
-          android:layout_width="match_parent"
-          android:layout_height="0px"
-          android:layout_weight="1"
-          android:background="@android:color/white"/>
+        android:id="@+id/viewpager"
+        android:layout_width="match_parent"
+        android:layout_height="0px"
+        android:layout_weight="1"
+        android:layout_marginBottom="10dp"
+        android:background="@android:color/white"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
index ce4413f..48bffe8 100644
--- a/app/src/main/res/layout/pager_item.xml
+++ b/app/src/main/res/layout/pager_item.xml
@@ -6,17 +6,31 @@
       android:orientation="vertical"
       android:gravity="center">
 
-    <TextView
-          android:id="@+id/item_subtitle"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:textAppearance="?android:attr/textAppearanceLarge"
-          android:text="Page:"/>
-
-    <TextView
-          android:id="@+id/item_title"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:textSize="80sp" />
+    <LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/sample_main_layout">
+
+
+        <FrameLayout
+            android:id="@+id/sample_content_fragment"
+            android:layout_weight="2"
+            android:layout_width="match_parent"
+            android:layout_height="0px">
+
+                <LinearLayout
+                    android:layout_width="150dp"
+                    android:layout_height="150dp"
+                    android:layout_gravity="center"
+                    android:background="#FFF000"
+                    android:id="@+id/b1"
+                    android:elevation="10dp"/>
+
+        </FrameLayout>
+
+    </LinearLayout>
+
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index ea62fce..a086a77 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat">
+    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
 
+        <!-- android theme colors -->
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
-        <item name="android:statusBarColor">@color/theme_default_primary</item>
+        <item name="android:statusBarColor">@color/theme_default_primary_dark</item>
         <item name="android:colorAccent">@color/accent</item>
+
+        <!-- android transitions -->
         <item name="android:windowContentTransitions">true</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
@@ -16,5 +19,10 @@
         <item name="color">@android:color/white</item>
     </style>
 
+    <style name="SlidingTextViewStyle" parent="@android:style/Widget.TextView">
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textColor">#FFF</item>
+    </style>
+
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index db35435..9fd4a8c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,8 +2,8 @@
 <resources>
 
     <!-- Theme colors -->
-    <color name="theme_default_primary">#00BCD4</color>
-    <color name="theme_default_primary_dark">#0097A7</color>
+    <color name="theme_default_primary">#EC407A</color>
+    <color name="theme_default_primary_dark">#E91E63</color>
     <color name="theme_window_background">#2A2A2A</color>
     <color name="accent">#EEFF41</color>
     <color name="gray_row_color">#ff515252</color>

From 0ffc02906840a3ced8603aac3689378ac85571e3 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 25 Oct 2014 18:06:12 +0200
Subject: [PATCH 12/35] Added navigation drawer

---
 .../saulmm/material/NavDrawerActivity.java    | 118 --------
 .../material/NavigationDrawerFragment.java    | 281 ------------------
 .../saulmm/material/NavigationFragment.java   |  18 ++
 .../material/slidingtabs/MainActivity.java    |  81 ++++-
 app/src/main/res/layout/activity_main.xml     |  31 +-
 .../main/res/layout/activity_nav_drawer.xml   |   2 +-
 app/src/main/res/layout/activity_second.xml   |   2 -
 .../main/res/layout/fragment_nav_drawer.xml   |  16 -
 .../res/layout/fragment_navigation_drawer.xml |   7 +-
 app/src/main/res/values/colors.xml            |   1 +
 app/src/main/res/values/strings.xml           |   2 +
 11 files changed, 121 insertions(+), 438 deletions(-)
 delete mode 100644 app/src/main/java/com/saulmm/material/NavDrawerActivity.java
 delete mode 100644 app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
 create mode 100644 app/src/main/java/com/saulmm/material/NavigationFragment.java
 delete mode 100644 app/src/main/res/layout/fragment_nav_drawer.xml

diff --git a/app/src/main/java/com/saulmm/material/NavDrawerActivity.java b/app/src/main/java/com/saulmm/material/NavDrawerActivity.java
deleted file mode 100644
index 1dc095c..0000000
--- a/app/src/main/java/com/saulmm/material/NavDrawerActivity.java
+++ /dev/null
@@ -1,118 +0,0 @@
-package com.saulmm.material;
-
-import android.app.Activity;
-
-import android.app.ActionBar;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.content.Context;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.support.v4.widget.DrawerLayout;
-import android.widget.ArrayAdapter;
-import android.widget.TextView;
-import com.saulmm.material.R;
-
-public class NavDrawerActivity extends Activity
-        implements NavigationDrawerFragment.NavigationDrawerCallbacks {
-
-    /**
-     * Fragment managing the behaviors, interactions and presentation of the navigation drawer.
-     */
-    private NavigationDrawerFragment mNavigationDrawerFragment;
-
-    /**
-     * Used to store the last screen title. For use in {@link #restoreActionBar()}.
-     */
-    private CharSequence mTitle;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_nav_drawer);
-
-        mNavigationDrawerFragment = (NavigationDrawerFragment)
-                getFragmentManager().findFragmentById(R.id.navigation_drawer);
-        mTitle = getTitle();
-
-        // Set up the drawer.
-        mNavigationDrawerFragment.setUp(
-                R.id.navigation_drawer,
-                (DrawerLayout) findViewById(R.id.drawer_layout));
-    }
-
-    @Override
-    public void onNavigationDrawerItemSelected(int position) {
-        // update the main content by replacing fragments
-        FragmentManager fragmentManager = getFragmentManager();
-        fragmentManager.beginTransaction()
-                .replace(R.id.container, PlaceholderFragment.newInstance(position + 1))
-                .commit();
-    }
-
-
-
-    public void restoreActionBar() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-        actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setTitle(mTitle);
-    }
-
-
-
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        int id = item.getItemId();
-        if (id == R.id.action_settings) {
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * A placeholder fragment containing a simple view.
-     */
-    public static class PlaceholderFragment extends Fragment {
-        /**
-         * The fragment argument representing the section number for this
-         * fragment.
-         */
-        private static final String ARG_SECTION_NUMBER = "section_number";
-
-        /**
-         * Returns a new instance of this fragment for the given section
-         * number.
-         */
-        public static PlaceholderFragment newInstance(int sectionNumber) {
-            PlaceholderFragment fragment = new PlaceholderFragment();
-            Bundle args = new Bundle();
-            args.putInt(ARG_SECTION_NUMBER, sectionNumber);
-            fragment.setArguments(args);
-            return fragment;
-        }
-
-        public PlaceholderFragment() {
-        }
-
-        @Override
-        public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                Bundle savedInstanceState) {
-            View rootView = inflater.inflate(R.layout.fragment_nav_drawer, container, false);
-            return rootView;
-        }
-
-
-    }
-
-}
diff --git a/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java b/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
deleted file mode 100644
index 0c19675..0000000
--- a/app/src/main/java/com/saulmm/material/NavigationDrawerFragment.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package com.saulmm.material;
-
-
-import android.app.Activity;
-import android.app.ActionBar;
-import android.app.Fragment;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.widget.DrawerLayout;
-import android.content.SharedPreferences;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Toast;
-
-/**
- * Fragment used for managing interactions for and presentation of a navigation drawer.
- * See the <a href="https://developer.android.com/design/patterns/navigation-drawer.html#Interaction">
- * design guidelines</a> for a complete explanation of the behaviors implemented here.
- */
-public class NavigationDrawerFragment extends Fragment {
-
-    /**
-     * Remember the position of the selected item.
-     */
-    private static final String STATE_SELECTED_POSITION = "selected_navigation_drawer_position";
-
-    /**
-     * Per the design guidelines, you should show the drawer on launch until the user manually
-     * expands it. This shared preference tracks this.
-     */
-    private static final String PREF_USER_LEARNED_DRAWER = "navigation_drawer_learned";
-
-    /**
-     * A pointer to the current callbacks instance (the Activity).
-     */
-    private NavigationDrawerCallbacks mCallbacks;
-
-    /**
-     * Helper component that ties the action bar to the navigation drawer.
-     */
-    private ActionBarDrawerToggle mDrawerToggle;
-
-    private DrawerLayout mDrawerLayout;
-    private ListView mDrawerListView;
-    private View mFragmentContainerView;
-
-    private int mCurrentSelectedPosition = 0;
-    private boolean mFromSavedInstanceState;
-    private boolean mUserLearnedDrawer;
-
-    public NavigationDrawerFragment() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Read in the flag indicating whether or not the user has demonstrated awareness of the
-        // drawer. See PREF_USER_LEARNED_DRAWER for details.
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        mUserLearnedDrawer = sp.getBoolean(PREF_USER_LEARNED_DRAWER, false);
-
-        if (savedInstanceState != null) {
-            mCurrentSelectedPosition = savedInstanceState.getInt(STATE_SELECTED_POSITION);
-            mFromSavedInstanceState = true;
-        }
-
-        // Select either the default item (0) or the last selected item.
-        selectItem(mCurrentSelectedPosition);
-    }
-
-    @Override
-    public void onActivityCreated (Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-        // Indicate that this fragment would like to influence the set of actions in the action bar.
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        mDrawerListView = (ListView) inflater.inflate(
-                R.layout.fragment_navigation_drawer, container, false);
-        mDrawerListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                selectItem(position);
-            }
-        });
-        mDrawerListView.setAdapter(new ArrayAdapter<String>(
-                getActionBar().getThemedContext(),
-                android.R.layout.simple_list_item_activated_1,
-                android.R.id.text1,
-                new String[]{
-                        getString(R.string.title_section1),
-                        getString(R.string.title_section2),
-                        getString(R.string.title_section3),
-                }));
-        mDrawerListView.setItemChecked(mCurrentSelectedPosition, true);
-        return mDrawerListView;
-    }
-
-    public boolean isDrawerOpen() {
-        return mDrawerLayout != null && mDrawerLayout.isDrawerOpen(mFragmentContainerView);
-    }
-
-    /**
-     * Users of this fragment must call this method to set up the navigation drawer interactions.
-     *
-     * @param fragmentId   The android:id of this fragment in its activity's layout.
-     * @param drawerLayout The DrawerLayout containing this fragment's UI.
-     */
-    public void setUp(int fragmentId, DrawerLayout drawerLayout) {
-        mFragmentContainerView = getActivity().findViewById(fragmentId);
-        mDrawerLayout = drawerLayout;
-
-        // set a custom shadow that overlays the main content when the drawer opens
-        mDrawerLayout.setDrawerShadow(R.drawable.drawer_shadow, GravityCompat.START);
-        // set up the drawer's list view with items and click listener
-
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-        actionBar.setHomeButtonEnabled(true);
-
-        // ActionBarDrawerToggle ties together the the proper interactions
-        // between the navigation drawer and the action bar app icon.
-        mDrawerToggle = new ActionBarDrawerToggle(
-                getActivity(),                    /* host Activity */
-                mDrawerLayout,                    /* DrawerLayout object */
-                R.string.navigation_drawer_open,  /* "open drawer" description for accessibility */
-                R.string.navigation_drawer_close  /* "close drawer" description for accessibility */
-        ) {
-            @Override
-            public void onDrawerClosed(View drawerView) {
-                super.onDrawerClosed(drawerView);
-                if (!isAdded()) {
-                    return;
-                }
-
-                getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
-            }
-
-            @Override
-            public void onDrawerOpened(View drawerView) {
-                super.onDrawerOpened(drawerView);
-                if (!isAdded()) {
-                    return;
-                }
-
-                if (!mUserLearnedDrawer) {
-                    // The user manually opened the drawer; store this flag to prevent auto-showing
-                    // the navigation drawer automatically in the future.
-                    mUserLearnedDrawer = true;
-                    SharedPreferences sp = PreferenceManager
-                            .getDefaultSharedPreferences(getActivity());
-                    sp.edit().putBoolean(PREF_USER_LEARNED_DRAWER, true).apply();
-                }
-
-                getActivity().invalidateOptionsMenu(); // calls onPrepareOptionsMenu()
-            }
-        };
-
-        // If the user hasn't 'learned' about the drawer, open it to introduce them to the drawer,
-        // per the navigation drawer design guidelines.
-        if (!mUserLearnedDrawer && !mFromSavedInstanceState) {
-            mDrawerLayout.openDrawer(mFragmentContainerView);
-        }
-
-        // Defer code dependent on restoration of previous instance state.
-        mDrawerLayout.post(new Runnable() {
-            @Override
-            public void run() {
-                mDrawerToggle.syncState();
-            }
-        });
-
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-    }
-
-    private void selectItem(int position) {
-        mCurrentSelectedPosition = position;
-        if (mDrawerListView != null) {
-            mDrawerListView.setItemChecked(position, true);
-        }
-        if (mDrawerLayout != null) {
-            mDrawerLayout.closeDrawer(mFragmentContainerView);
-        }
-        if (mCallbacks != null) {
-            mCallbacks.onNavigationDrawerItemSelected(position);
-        }
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-        try {
-            mCallbacks = (NavigationDrawerCallbacks) activity;
-        } catch (ClassCastException e) {
-            throw new ClassCastException("Activity must implement NavigationDrawerCallbacks.");
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mCallbacks = null;
-    }
-
-    @Override
-    public void onSaveInstanceState(Bundle outState) {
-        super.onSaveInstanceState(outState);
-        outState.putInt(STATE_SELECTED_POSITION, mCurrentSelectedPosition);
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        // Forward the new configuration the drawer toggle component.
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        // If the drawer is open, show the global app actions in the action bar. See also
-        // showGlobalContextActionBar, which controls the top-left area of the action bar.
-        if (mDrawerLayout != null && isDrawerOpen()) {
-            inflater.inflate(R.menu.global, menu);
-            showGlobalContextActionBar();
-        }
-        super.onCreateOptionsMenu(menu, inflater);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
-
-        if (item.getItemId() == R.id.action_example) {
-            Toast.makeText(getActivity(), "Example action.", Toast.LENGTH_SHORT).show();
-            return true;
-        }
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    /**
-     * Per the navigation drawer design guidelines, updates the action bar to show the global app
-     * 'context', rather than just what's in the current screen.
-     */
-    private void showGlobalContextActionBar() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayShowTitleEnabled(true);
-        actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_STANDARD);
-        actionBar.setTitle(R.string.app_name);
-    }
-
-    private ActionBar getActionBar() {
-        return getActivity().getActionBar();
-    }
-
-    /**
-     * Callbacks interface that all activities using this fragment must implement.
-     */
-    public static interface NavigationDrawerCallbacks {
-        /**
-         * Called when an item in the navigation drawer is selected.
-         */
-        void onNavigationDrawerItemSelected(int position);
-    }
-}
diff --git a/app/src/main/java/com/saulmm/material/NavigationFragment.java b/app/src/main/java/com/saulmm/material/NavigationFragment.java
new file mode 100644
index 0000000..2856190
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/NavigationFragment.java
@@ -0,0 +1,18 @@
+package com.saulmm.material;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+
+public class NavigationFragment extends Fragment {
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
index e9f82be..390219f 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
@@ -16,26 +16,26 @@
 
 package com.saulmm.material.slidingtabs;
 
-import android.app.Activity;
 import android.app.FragmentTransaction;
+import android.content.res.Configuration;
 import android.os.Bundle;
+import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
+import android.view.Gravity;
+import android.view.MenuItem;
+import android.view.View;
+
+import com.saulmm.material.NavigationFragment;
 import com.saulmm.material.R;
 
-/**
- * A simple launcher activity containing a summary sample description, sample log and a custom
- * {@link android.support.v4.app.Fragment} which can display a view.
- * <p>
- * For devices with displays with a width of 720dp or greater, the sample log is always visible,
- * on other devices it's visibility is controlled by an item on the Action Bar.
- */
 public class MainActivity extends ActionBarActivity {
 
     public static final String TAG = "MainActivity";
 
-    // Whether the Log Fragment is currently shown
-    private boolean mLogShown;
+    private DrawerLayout mDrawerLayout;
+    private ActionBarDrawerToggle mDrawerToggle;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -49,10 +49,69 @@ protected void onCreate(Bundle savedInstanceState) {
             transaction.commit();
         }
 
-        // Configure toolbar
+        configureToolbar();
+        configureDrawer();
+    }
+
+    private void configureToolbar() {
         Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setTitle("Sliding");
 
+        mainToolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (mDrawerLayout.isDrawerOpen(Gravity.START)) {
+                    mDrawerLayout.closeDrawer(Gravity.START);
+
+                } else {
+                    mDrawerLayout.openDrawer(Gravity.START);
+                }
+            }
+        });
+    }
+
+    private void configureDrawer() {
+        // Configure drawer
+        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
+
+        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout,
+                R.string.drawer_open,
+                R.string.drawer_closed) {
+
+            public void onDrawerClosed(View view) {
+                supportInvalidateOptionsMenu();
+            }
+
+            public void onDrawerOpened(View drawerView) {
+                supportInvalidateOptionsMenu(); // creates call to onPrepareOptionsMenu()
+            }
+        };
+
+        mDrawerLayout.setDrawerListener(mDrawerToggle);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+
+        if (mDrawerToggle.onOptionsItemSelected(item)) {
+            return true;
+        }
+
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onPostCreate(Bundle savedInstanceState) {
+        super.onPostCreate(savedInstanceState);
+        // Sync the toggle state after onRestoreInstanceState has occurred.
+        mDrawerToggle.syncState();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        mDrawerToggle.onConfigurationChanged(newConfig);
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6580d72..cb7822e 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,11 +12,32 @@
         android:background="?android:colorPrimary"
         android:minHeight="?attr/actionBarSize"/>
 
-    <FrameLayout
-          android:id="@+id/sample_content_fragment"
-          android:layout_weight="2"
-          android:layout_width="match_parent"
-          android:layout_height="0px" />
+
+
+    <android.support.v4.widget.DrawerLayout
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <FrameLayout
+            android:id="@+id/sample_content_fragment"
+            android:layout_weight="2"
+            android:layout_width="match_parent"
+            android:layout_height="0px" />
+
+        <FrameLayout
+            android:id="@+id/container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+        <fragment android:id="@+id/navigation_drawer"
+            android:layout_width="@dimen/navigation_drawer_width"
+            android:layout_height="match_parent"
+            android:layout_gravity="start"
+            android:name="com.saulmm.material.NavigationFragment"/>
+
+    </android.support.v4.widget.DrawerLayout>
+
 
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_nav_drawer.xml b/app/src/main/res/layout/activity_nav_drawer.xml
index 407b497..8caa5c6 100644
--- a/app/src/main/res/layout/activity_nav_drawer.xml
+++ b/app/src/main/res/layout/activity_nav_drawer.xml
@@ -25,7 +25,7 @@
         android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:name="com.saulmm.material.NavigationDrawerFragment"
+        android:name="com.saulmm.material.NavigationFragment"
         tools:layout="@layout/fragment_navigation_drawer" />
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_second.xml
index 5b8310a..33591e4 100644
--- a/app/src/main/res/layout/activity_second.xml
+++ b/app/src/main/res/layout/activity_second.xml
@@ -2,8 +2,6 @@
     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"
     >
diff --git a/app/src/main/res/layout/fragment_nav_drawer.xml b/app/src/main/res/layout/fragment_nav_drawer.xml
deleted file mode 100644
index 187eb2d..0000000
--- a/app/src/main/res/layout/fragment_nav_drawer.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<RelativeLayout 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:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.saulmm.material.NavDrawerActivity$PlaceholderFragment">
-
-    <TextView
-        android:id="@+id/section_label"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-
-</RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index efa407d..2612cdc 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -1,9 +1,8 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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:choiceMode="singleChoice"
     android:divider="@android:color/transparent"
     android:dividerHeight="0dp"
-    android:background="#cc161616"
-    tools:context="com.saulmm.material.NavigationDrawerFragment" />
+    android:background="@color/theme_light"
+    tools:context="com.saulmm.material.NavigationFragment" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9fd4a8c..0288e74 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,6 +2,7 @@
 <resources>
 
     <!-- Theme colors -->
+    <color name="theme_light">#F48FB1</color>
     <color name="theme_default_primary">#EC407A</color>
     <color name="theme_default_primary_dark">#E91E63</color>
     <color name="theme_window_background">#2A2A2A</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 71a0799..3fb6af0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,5 +12,7 @@
     <string name="title_section3">Section 3</string>
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
+    <string name="drawer_open">Drawer Open</string>
+    <string name="drawer_closed">Drawer Closed</string>
 
 </resources>

From f5023057d1e088cc69849c9c7f60d32279604214 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 25 Oct 2014 18:14:37 +0200
Subject: [PATCH 13/35] Refactor

---
 app/src/main/AndroidManifest.xml              |  6 ++--
 .../SlidingActivity.java}                     | 11 +++---
 .../TransitionFirstActivity.java}             | 13 ++++---
 .../TransitionSecondActivity.java}            |  9 +++--
 .../{ => fragments}/NavigationFragment.java   |  4 ++-
 .../SlidingTabsBasicFragment.java             |  8 ++---
 .../main/res/layout/activity_nav_drawer.xml   | 31 ----------------
 ...activity_main.xml => activity_sliding.xml} |  2 +-
 ...irst.xml => activity_transition_first.xml} |  0
 ...ond.xml => activity_transition_second.xml} |  0
 .../res/layout/fragment_navigation_drawer.xml |  2 +-
 ...agment_sample.xml => fragment_sliding.xml} |  0
 .../main/res/layout/item_sliding_pager.xml    | 17 +++++++++
 app/src/main/res/layout/pager_item.xml        | 36 -------------------
 app/src/main/res/menu/my_activity2.xml        |  2 +-
 15 files changed, 47 insertions(+), 94 deletions(-)
 rename app/src/main/java/com/saulmm/material/{slidingtabs/MainActivity.java => activities/SlidingActivity.java} (91%)
 rename app/src/main/java/com/saulmm/material/{FirstActivity.java => activities/TransitionFirstActivity.java} (71%)
 rename app/src/main/java/com/saulmm/material/{SecondActivity.java => activities/TransitionSecondActivity.java} (91%)
 rename app/src/main/java/com/saulmm/material/{ => fragments}/NavigationFragment.java (86%)
 rename app/src/main/java/com/saulmm/material/slidingtabs/{ => fragments}/SlidingTabsBasicFragment.java (96%)
 delete mode 100644 app/src/main/res/layout/activity_nav_drawer.xml
 rename app/src/main/res/layout/{activity_main.xml => activity_sliding.xml} (94%)
 rename app/src/main/res/layout/{activity_first.xml => activity_transition_first.xml} (100%)
 rename app/src/main/res/layout/{activity_second.xml => activity_transition_second.xml} (100%)
 rename app/src/main/res/layout/{fragment_sample.xml => fragment_sliding.xml} (100%)
 create mode 100644 app/src/main/res/layout/item_sliding_pager.xml
 delete mode 100644 app/src/main/res/layout/pager_item.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 081b51c..2c48610 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,12 +9,12 @@
         android:theme="@style/AppTheme" >
 
         <activity
-            android:name=".FirstActivity"
+            android:name=".activities.TransitionFirstActivity"
             android:label="" >
         </activity>
 
         <activity
-            android:name=".SecondActivity"
+            android:name=".activities.TransitionSecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
 
@@ -23,7 +23,7 @@
             android:label="@string/title_activity_nav_drawer" >
         </activity>
 
-        <activity android:name=".slidingtabs.MainActivity">
+        <activity android:name=".activities.SlidingActivity">
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
similarity index 91%
rename from app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
rename to app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
index 390219f..a828757 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/MainActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -14,7 +14,7 @@
 * limitations under the License.
 */
 
-package com.saulmm.material.slidingtabs;
+package com.saulmm.material.activities;
 
 import android.app.FragmentTransaction;
 import android.content.res.Configuration;
@@ -27,12 +27,10 @@
 import android.view.MenuItem;
 import android.view.View;
 
-import com.saulmm.material.NavigationFragment;
 import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasicFragment;
 
-public class MainActivity extends ActionBarActivity {
-
-    public static final String TAG = "MainActivity";
+public class SlidingActivity extends ActionBarActivity {
 
     private DrawerLayout mDrawerLayout;
     private ActionBarDrawerToggle mDrawerToggle;
@@ -40,7 +38,7 @@ public class MainActivity extends ActionBarActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
+        setContentView(R.layout.activity_sliding);
 
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getFragmentManager().beginTransaction();
@@ -105,7 +103,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
         mDrawerToggle.syncState();
     }
 
diff --git a/app/src/main/java/com/saulmm/material/FirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
similarity index 71%
rename from app/src/main/java/com/saulmm/material/FirstActivity.java
rename to app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index a2e531a..f2ff2d9 100644
--- a/app/src/main/java/com/saulmm/material/FirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.activities;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
@@ -7,7 +7,10 @@
 import android.util.Pair;
 import android.view.View;
 
-public class FirstActivity extends Activity {
+import com.saulmm.material.R;
+import com.saulmm.material.Utils;
+
+public class TransitionFirstActivity extends Activity {
 
     private View fabButton;
 
@@ -15,7 +18,7 @@ public class FirstActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
 
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_first);
+        setContentView(R.layout.activity_transition_first);
 
         // Set explode animation when enter and exit the activity
         Utils.configureWindowEnterExitTransition(getWindow());
@@ -31,9 +34,9 @@ protected void onCreate(Bundle savedInstanceState) {
         @Override
         public void onClick(View view) {
 
-        Intent i  = new Intent (FirstActivity.this, SecondActivity.class);
+        Intent i  = new Intent (TransitionFirstActivity.this, TransitionSecondActivity.class);
 
-        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(FirstActivity.this,
+        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(TransitionFirstActivity.this,
                 Pair.create(fabButton, "fab"));
 
         startActivity(i, transitionActivityOptions.toBundle());
diff --git a/app/src/main/java/com/saulmm/material/SecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
similarity index 91%
rename from app/src/main/java/com/saulmm/material/SecondActivity.java
rename to app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index 5f6fe75..a106442 100644
--- a/app/src/main/java/com/saulmm/material/SecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.activities;
 
 import android.animation.Animator;
 import android.app.Activity;
@@ -8,7 +8,10 @@
 import android.view.ViewPropertyAnimator;
 import android.widget.LinearLayout;
 
-public class SecondActivity extends Activity {
+import com.saulmm.material.R;
+import com.saulmm.material.Utils;
+
+public class TransitionSecondActivity extends Activity {
 
     private static final int NUM_VIEWS = 5;
     private static final int SCALE_DELAY = 30;
@@ -18,7 +21,7 @@ public class SecondActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setContentView(R.layout.activity_second);
+        setContentView(R.layout.activity_transition_second);
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
diff --git a/app/src/main/java/com/saulmm/material/NavigationFragment.java b/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
similarity index 86%
rename from app/src/main/java/com/saulmm/material/NavigationFragment.java
rename to app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
index 2856190..afb27e5 100644
--- a/app/src/main/java/com/saulmm/material/NavigationFragment.java
+++ b/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -6,6 +6,8 @@
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.saulmm.material.R;
+
 
 public class NavigationFragment extends Fragment {
 
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
similarity index 96%
rename from app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
rename to app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
index 3067c69..7952a0d 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/SlidingTabsBasicFragment.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.saulmm.material.slidingtabs;
+package com.saulmm.material.slidingtabs.fragments;
 
 
 import android.app.Fragment;
@@ -25,8 +25,6 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.TextView;
 
 import com.saulmm.material.R;
 import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
@@ -54,7 +52,7 @@ public class SlidingTabsBasicFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
             Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_sample, container, false);
+        return inflater.inflate(R.layout.fragment_sliding, container, false);
     }
 
     // BEGIN_INCLUDE (fragment_onviewcreated)
@@ -131,7 +129,7 @@ public CharSequence getPageTitle(int position) {
         @Override
         public Object instantiateItem(ViewGroup container, int position) {
             // Inflate a new layout from our resources
-            View view = getActivity().getLayoutInflater().inflate(R.layout.pager_item,
+            View view = getActivity().getLayoutInflater().inflate(R.layout.item_sliding_pager,
                     container, false);
             // Add the newly created View to the ViewPager
 
diff --git a/app/src/main/res/layout/activity_nav_drawer.xml b/app/src/main/res/layout/activity_nav_drawer.xml
deleted file mode 100644
index 8caa5c6..0000000
--- a/app/src/main/res/layout/activity_nav_drawer.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!-- A DrawerLayout is intended to be used as the top-level content view using match_parent for both width and height to consume the full space available. -->
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="com.saulmm.material.NavDrawerActivity">
-
-    <!-- As the main content view, the view below consumes the entire
-         space available using match_parent in both dimensions. -->
-    <FrameLayout
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <!-- android:layout_gravity="start" tells DrawerLayout to treat
-         this as a sliding drawer on the left side for left-to-right
-         languages and on the right side for right-to-left languages.
-         If you're not building against API 17 or higher, use
-         android:layout_gravity="left" instead. -->
-    <!-- The drawer is given a fixed width in dp and extends the full height of
-         the container. -->
-    <fragment android:id="@+id/navigation_drawer"
-        android:layout_width="@dimen/navigation_drawer_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:name="com.saulmm.material.NavigationFragment"
-        tools:layout="@layout/fragment_navigation_drawer" />
-
-</android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_sliding.xml
similarity index 94%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout/activity_sliding.xml
index cb7822e..25d4a1a 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_sliding.xml
@@ -34,7 +34,7 @@
             android:layout_width="@dimen/navigation_drawer_width"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:name="com.saulmm.material.NavigationFragment"/>
+            android:name="com.saulmm.material.fragments.NavigationFragment"/>
 
     </android.support.v4.widget.DrawerLayout>
 
diff --git a/app/src/main/res/layout/activity_first.xml b/app/src/main/res/layout/activity_transition_first.xml
similarity index 100%
rename from app/src/main/res/layout/activity_first.xml
rename to app/src/main/res/layout/activity_transition_first.xml
diff --git a/app/src/main/res/layout/activity_second.xml b/app/src/main/res/layout/activity_transition_second.xml
similarity index 100%
rename from app/src/main/res/layout/activity_second.xml
rename to app/src/main/res/layout/activity_transition_second.xml
diff --git a/app/src/main/res/layout/fragment_navigation_drawer.xml b/app/src/main/res/layout/fragment_navigation_drawer.xml
index 2612cdc..cd17273 100644
--- a/app/src/main/res/layout/fragment_navigation_drawer.xml
+++ b/app/src/main/res/layout/fragment_navigation_drawer.xml
@@ -5,4 +5,4 @@
     android:divider="@android:color/transparent"
     android:dividerHeight="0dp"
     android:background="@color/theme_light"
-    tools:context="com.saulmm.material.NavigationFragment" />
+    tools:context="com.saulmm.material.fragments.NavigationFragment" />
diff --git a/app/src/main/res/layout/fragment_sample.xml b/app/src/main/res/layout/fragment_sliding.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_sample.xml
rename to app/src/main/res/layout/fragment_sliding.xml
diff --git a/app/src/main/res/layout/item_sliding_pager.xml b/app/src/main/res/layout/item_sliding_pager.xml
new file mode 100644
index 0000000..3c39efb
--- /dev/null
+++ b/app/src/main/res/layout/item_sliding_pager.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+      android:layout_width="match_parent"
+      android:layout_height="match_parent"
+      android:orientation="vertical"
+      android:gravity="center">
+
+    <View
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center"
+        android:background="#FFF000"
+        android:id="@+id/b1"
+        android:elevation="10dp"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
deleted file mode 100644
index 48bffe8..0000000
--- a/app/src/main/res/layout/pager_item.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical"
-      android:gravity="center">
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/sample_main_layout">
-
-
-        <FrameLayout
-            android:id="@+id/sample_content_fragment"
-            android:layout_weight="2"
-            android:layout_width="match_parent"
-            android:layout_height="0px">
-
-                <LinearLayout
-                    android:layout_width="150dp"
-                    android:layout_height="150dp"
-                    android:layout_gravity="center"
-                    android:background="#FFF000"
-                    android:id="@+id/b1"
-                    android:elevation="10dp"/>
-
-        </FrameLayout>
-
-    </LinearLayout>
-
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/my_activity2.xml b/app/src/main/res/menu/my_activity2.xml
index c9a28ba..84b1d89 100644
--- a/app/src/main/res/menu/my_activity2.xml
+++ b/app/src/main/res/menu/my_activity2.xml
@@ -1,6 +1,6 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="com.saulmm.material.SecondActivity" >
+    tools:context="com.saulmm.material.activities.TransitionSecondActivity" >
     <item android:id="@+id/action_settings"
         android:title="@string/action_settings"
         android:orderInCategory="100"

From ff0627f4407c9f9ff3b59ec605969ea29177a19d Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 25 Oct 2014 18:37:05 +0200
Subject: [PATCH 14/35] Updated readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 23321b3..ad5b86b 100644
--- a/README.md
+++ b/README.md
@@ -15,3 +15,9 @@ Commit - **901d62c**
 Commit - **ead8ada**
 
 ![](https://0b53cc8370cd7638a6bca2ead36937afe31044d3.googledrive.com/host/0B62SZ3WRM2R2aVA4TDVRV04walU/gif-arrow.gif)
+
+## Reusing an example to build a pretty effect like the tab slide of google play app
+
+Commit - **f502305**
+
+![](https://lh5.googleusercontent.com/-N-0aREntDdM/VEvP4I5kxrI/AAAAAAAAvQA/3CRH8pH5Vq4/s1006-no/sliding.gif)
\ No newline at end of file

From 53c60e0ed0fb5e4ae546c67419f888701ba7fa36 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Tue, 28 Oct 2014 21:22:05 +0100
Subject: [PATCH 15/35] Added color activity

---
 app/src/main/AndroidManifest.xml              |  11 +-
 .../material/activities/ColorActivity.java    | 142 +++++++++++++++++
 .../activities/TransitionFirstActivity.java   |   3 +
 app/src/main/res/drawable/color1.xml          |  12 ++
 app/src/main/res/drawable/color2.xml          |  12 ++
 app/src/main/res/drawable/color3.xml          |  12 ++
 app/src/main/res/drawable/color4.xml          |  12 ++
 app/src/main/res/layout/activity_color.xml    | 144 ++++++++++++++++++
 app/src/main/res/layout/activity_sliding.xml  |   2 -
 app/src/main/res/layout/view_circle.xml       |   9 ++
 app/src/main/res/menu/color.xml               |   8 +
 app/src/main/res/values-v21/styles.xml        |  46 +++++-
 app/src/main/res/values/colors.xml            |  19 +++
 app/src/main/res/values/strings.xml           |   1 +
 14 files changed, 425 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/activities/ColorActivity.java
 create mode 100644 app/src/main/res/drawable/color1.xml
 create mode 100644 app/src/main/res/drawable/color2.xml
 create mode 100644 app/src/main/res/drawable/color3.xml
 create mode 100644 app/src/main/res/drawable/color4.xml
 create mode 100644 app/src/main/res/layout/activity_color.xml
 create mode 100644 app/src/main/res/layout/view_circle.xml
 create mode 100644 app/src/main/res/menu/color.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2c48610..9036efc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,31 +7,32 @@
         android:icon="@drawable/ic_launcher"
         android:label=""
         android:theme="@style/AppTheme" >
-
         <activity
             android:name=".activities.TransitionFirstActivity"
             android:label="" >
         </activity>
-
         <activity
             android:name=".activities.TransitionSecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
-
         <activity
             android:name=".NavDrawerActivity"
             android:label="@string/title_activity_nav_drawer" >
         </activity>
+        <activity android:name=".activities.SlidingActivity" >
 
-        <activity android:name=".activities.SlidingActivity">
+        </activity>
+        <activity
+            android:name=".activities.ColorActivity"
+            android:label="@string/title_activity_color" >
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
         </activity>
-
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
new file mode 100644
index 0000000..aa0d532
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
@@ -0,0 +1,142 @@
+package com.saulmm.material.activities;
+
+import android.animation.Animator;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.util.DisplayMetrics;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+
+import com.saulmm.material.R;
+
+public class ColorActivity extends Activity {
+
+    private SharedPreferences sharedpreferences;
+    private View revealView;
+    private View circleHolder;
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        sharedpreferences = getSharedPreferences("test", Context.MODE_PRIVATE);
+        setTheme(sharedpreferences.getInt("theme", R.style.AppTheme));
+
+        setContentView(R.layout.activity_color);
+
+        Switch themeSwitch = (Switch) findViewById(R.id.theme_switch);
+        themeSwitch.setChecked(sharedpreferences.getBoolean("switch", false));
+        revealView = findViewById(R.id.reveal_view);
+
+        circleHolder = findViewById(R.id.circle_holder);
+
+        themeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+
+            SharedPreferences.Editor ed = sharedpreferences.edit();
+            ed.putInt("theme", (isChecked) ? R.style.Base_Theme_AppCompat : R.style.Base_Theme_AppCompat_Light);
+
+            ed.putBoolean("switch", isChecked);
+            ed.apply();
+            }
+        });
+
+
+        super.onCreate(savedInstanceState);
+
+    }
+
+    public void showRevealEffect(View v, int primaryColor) {
+        revealView.setVisibility(View.VISIBLE);
+
+
+        int [] location = new int[2];
+        revealView.setBackgroundColor(primaryColor);
+        v.getLocationOnScreen(location);
+
+        int cx = (location[0] + (v.getWidth() / 2));
+        int cy = location[1];
+
+        int height = revealView.getHeight();
+
+
+        Animator anim = ViewAnimationUtils.createCircularReveal(
+                revealView, cx, cy, 0, height);
+
+
+        anim.addListener(revealAnimationListener);
+                anim.start();
+    }
+
+    Animator.AnimatorListener revealAnimationListener = new Animator.AnimatorListener() {
+        @Override
+        public void onAnimationStart(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationEnd(Animator animation) {
+            revealView.setVisibility(View.INVISIBLE);
+
+            Intent i = new Intent(ColorActivity.this, ColorActivity.class);
+            i.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            startActivity(i);
+            overridePendingTransition(0, 0);
+            finish();
+
+        }
+
+        @Override
+        public void onAnimationCancel(Animator animation) {
+
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animation) {
+
+        }
+    };
+
+
+    public void view(View view) {
+        int selectedTheme = 0;
+        int primaryColor = 0;
+
+        switch (view.getId()) {
+
+            case R.id.circle1:
+                selectedTheme = R.style.theme1;
+                primaryColor = getResources().getColor(R.color.color_set_1_primary);
+                break;
+
+            case R.id.circle2:
+                selectedTheme = R.style.theme2;
+                primaryColor = getResources().getColor(R.color.color_set_2_primary);
+                break;
+
+            case R.id.circle3:
+                selectedTheme = R.style.theme3;
+                primaryColor = getResources().getColor(R.color.color_set_3_primary);
+                break;
+
+            case R.id.circle4:
+                selectedTheme = R.style.theme4;
+                primaryColor = getResources().getColor(R.color.color_set_4_primary);
+                break;
+        }
+
+
+        showRevealEffect(view, primaryColor);
+
+        SharedPreferences.Editor ed = sharedpreferences.edit();
+        ed.putInt("theme", selectedTheme);
+        ed.apply();
+//
+//
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index f2ff2d9..d99c524 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -4,6 +4,7 @@
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
+import android.transition.Scene;
 import android.util.Pair;
 import android.view.View;
 
@@ -39,6 +40,8 @@ public void onClick(View view) {
         ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(TransitionFirstActivity.this,
                 Pair.create(fabButton, "fab"));
 
+
+
         startActivity(i, transitionActivityOptions.toBundle());
         }
     };
diff --git a/app/src/main/res/drawable/color1.xml b/app/src/main/res/drawable/color1.xml
new file mode 100644
index 0000000..b336be9
--- /dev/null
+++ b/app/src/main/res/drawable/color1.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_set_1_accent"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/color_set_1_primary"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color2.xml b/app/src/main/res/drawable/color2.xml
new file mode 100644
index 0000000..12e117e
--- /dev/null
+++ b/app/src/main/res/drawable/color2.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_set_2_accent"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/color_set_2_primary"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color3.xml b/app/src/main/res/drawable/color3.xml
new file mode 100644
index 0000000..c0cf05c
--- /dev/null
+++ b/app/src/main/res/drawable/color3.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_set_3_accent"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/color_set_3_primary"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color4.xml b/app/src/main/res/drawable/color4.xml
new file mode 100644
index 0000000..445b2ca
--- /dev/null
+++ b/app/src/main/res/drawable/color4.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/color_set_4_accent"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/color_set_4_primary"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
new file mode 100644
index 0000000..36e500f
--- /dev/null
+++ b/app/src/main/res/layout/activity_color.xml
@@ -0,0 +1,144 @@
+<RelativeLayout 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"
+    tools:context="com.saulmm.material.activities.ColorActivity">
+
+    <View
+        android:id="@+id/reveal_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorAccent"
+        android:elevation="5dp"
+        android:visibility="invisible"/>
+
+    <View
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:background="?android:colorPrimary"
+        android:layout_height="?attr/actionBarSize"/>
+
+
+        <RelativeLayout
+            android:id="@+id/holder_view"
+            android:layout_width="match_parent"
+            android:layout_height="168dp"
+            android:paddingLeft="72dp"
+            android:paddingRight="16dp"
+            android:transitionName="holder1"
+            android:layout_below="@id/toolbar"
+            android:background="?android:colorPrimary">
+
+        <TextView
+            android:id="@+id/title_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:colorAccent"
+            android:text="Title"/>
+
+        
+        <EditText
+            android:layout_below="@id/title_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="34sp"
+            android:fontFamily="sans-serif-medium"
+            tools:text="Amazing text"/>
+        
+        </RelativeLayout>
+        
+       
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
+        android:orientation="vertical"
+        android:layout_below="@id/holder_view">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:text="Controls"
+            android:textColor="?android:colorAccent"
+            android:gravity="center_vertical"/>
+        
+        
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal">
+
+            <Switch
+                android:id="@+id/theme_switch"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Awesome"
+                android:layout_marginLeft="16dp"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/circle_holder"
+            android:layout_width="wrap_content"
+            android:layout_height="96dp"
+            android:layout_marginTop="8dp"
+            android:layout_gravity="center_horizontal"
+            android:orientation="horizontal">
+
+            <View
+                android:id="@+id/circle1"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginRight="16dp"
+                android:layout_gravity="center_vertical"
+                android:onClick="view"
+                android:clickable="true"
+                android:background="@drawable/color1"/>
+
+            <View
+                android:id="@+id/circle2"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginRight="16dp"
+                android:layout_gravity="center_vertical"
+                android:clickable="true"
+                android:onClick="view"
+                android:background="@drawable/color2"/>
+
+            <View
+                android:id="@+id/circle3"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_marginRight="16dp"
+                android:layout_gravity="center_vertical"
+                android:clickable="true"
+                android:onClick="view"
+                android:background="@drawable/color3"/>
+
+            <View
+                android:id="@+id/circle4"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="center_vertical"
+                android:clickable="true"
+                android:onClick="view"
+                android:background="@drawable/color4"/>
+
+
+        </LinearLayout>
+        
+
+
+
+
+    </LinearLayout>
+
+</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_sliding.xml b/app/src/main/res/layout/activity_sliding.xml
index 25d4a1a..d3f7062 100755
--- a/app/src/main/res/layout/activity_sliding.xml
+++ b/app/src/main/res/layout/activity_sliding.xml
@@ -12,8 +12,6 @@
         android:background="?android:colorPrimary"
         android:minHeight="?attr/actionBarSize"/>
 
-
-
     <android.support.v4.widget.DrawerLayout
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/view_circle.xml b/app/src/main/res/layout/view_circle.xml
new file mode 100644
index 0000000..26b0e02
--- /dev/null
+++ b/app/src/main/res/layout/view_circle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="48dp"
+    android:layout_height="48dp"
+    android:layout_marginRight="16dp"
+    android:layout_gravity="center_vertical"
+    android:clickable="true"
+    />
\ No newline at end of file
diff --git a/app/src/main/res/menu/color.xml b/app/src/main/res/menu/color.xml
new file mode 100644
index 0000000..3428565
--- /dev/null
+++ b/app/src/main/res/menu/color.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.saulmm.material.activities.ColorActivity" >
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never" />
+</menu>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index a086a77..e8cf0b7 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
         <!-- android theme colors -->
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
         <item name="android:statusBarColor">@color/theme_default_primary_dark</item>
+        <item name="android:colorControlActivated">@color/accent</item>
         <item name="android:colorAccent">@color/accent</item>
 
         <!-- android transitions -->
@@ -14,6 +16,44 @@
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
 
+
+    <style name="theme1" parent="AppTheme">
+        <item name="android:colorPrimary">@color/color_set_1_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_set_1_primary_dark</item>
+        <item name="android:statusBarColor">@color/color_set_1_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_set_1_primary</item>
+        <item name="android:colorControlActivated">@color/color_set_1_accent</item>
+        <item name="android:colorAccent">@color/color_set_1_accent</item>
+    </style>
+
+    <style name="theme2" parent="AppTheme">
+        <item name="android:colorPrimary">@color/color_set_2_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_set_2_primary_dark</item>
+        <item name="android:statusBarColor">@color/color_set_2_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_set_2_primary</item>
+        <item name="android:colorControlActivated">@color/color_set_2_accent</item>
+        <item name="android:colorAccent">@color/color_set_2_accent</item>
+    </style>
+
+    <style name="theme3" parent="AppTheme">
+        <item name="android:colorPrimary">@color/color_set_3_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_set_3_primary_dark</item>
+        <item name="android:statusBarColor">@color/color_set_3_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_set_3_primary</item>
+        <item name="android:colorControlActivated">@color/color_set_3_accent</item>
+        <item name="android:colorAccent">@color/color_set_3_accent</item>
+    </style>
+
+    <style name="theme4" parent="AppTheme">
+        <item name="android:colorPrimary">@color/color_set_4_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_set_4_primary_dark</item>
+        <item name="android:statusBarColor">@color/color_set_4_primary_dark</item>
+        <item name="android:navigationBarColor">@color/color_set_4_primary</item>
+        <item name="android:colorControlActivated">@color/color_set_4_accent</item>
+        <item name="android:colorAccent">@color/color_set_4_accent</item>
+    </style>
+
+
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">true</item>
         <item name="color">@android:color/white</item>
@@ -24,5 +64,9 @@
         <item name="android:textColor">#FFF</item>
     </style>
 
+    <style name="AppTheme2" parent="Theme.AppCompat.Light.NoActionBar">
+        </style>
+
+
 
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0288e74..223c096 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,4 +8,23 @@
     <color name="theme_window_background">#2A2A2A</color>
     <color name="accent">#EEFF41</color>
     <color name="gray_row_color">#ff515252</color>
+
+    <color name="color_set_1_primary">#E91E63</color>
+    <color name="color_set_1_primary_dark">#C2185B</color>
+    <color name="color_set_1_accent">#00AEF9</color>
+
+    <color name="color_set_2_primary">#00bcd4</color>
+    <color name="color_set_2_primary_dark">#00acc1</color>
+    <color name="color_set_2_accent">#673AB7</color>
+
+    <color name="color_set_3_primary">#259b24</color>
+    <color name="color_set_3_primary_dark">#0a8f08</color>
+    <color name="color_set_3_accent">#E91E63</color>
+
+    <color name="color_set_4_primary">#ff9800</color>
+    <color name="color_set_4_primary_dark">#fb8c00</color>
+    <color name="color_set_4_accent">#FF5722</color>
+
+
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3fb6af0..d00d5e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,5 +14,6 @@
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="drawer_open">Drawer Open</string>
     <string name="drawer_closed">Drawer Closed</string>
+    <string name="title_activity_color">ColorActivity</string>
 
 </resources>

From a574fe5581aada2515d190cefcda06b636b27707 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Wed, 29 Oct 2014 16:13:57 +0100
Subject: [PATCH 16/35] Reached reveal effect as transition of an activity

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../main/java/com/saulmm/material/Utils.java  | 17 +++-
 .../material/activities/ColorActivity.java    | 86 +++++++++++++++++--
 .../activities/TransitionFirstActivity.java   |  5 +-
 .../activities/TransitionSecondActivity.java  |  2 +-
 app/src/main/res/layout/activity_color.xml    | 20 +++--
 app/src/main/res/values-v21/styles.xml        | 14 ++-
 7 files changed, 119 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9036efc..7f50c59 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,9 @@
         <activity
             android:name=".activities.TransitionFirstActivity"
             android:label="" >
+
+
+
         </activity>
         <activity
             android:name=".activities.TransitionSecondActivity"
@@ -28,7 +31,6 @@
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java
index c2e9ef5..9b4318b 100644
--- a/app/src/main/java/com/saulmm/material/Utils.java
+++ b/app/src/main/java/com/saulmm/material/Utils.java
@@ -1,7 +1,9 @@
 package com.saulmm.material;
 
+import android.content.Context;
 import android.graphics.Outline;
 import android.transition.Explode;
+import android.transition.Fade;
 import android.transition.Slide;
 import android.view.View;
 import android.view.Window;
@@ -9,10 +11,11 @@
 
 public class Utils {
 
-    public static void configureWindowEnterExitTransition (Window w) {
+    public static void configureWindowEnterExitExplodeTransition(Window w) {
 
-        Explode ex = new Explode();
+        Fade ex = new Fade();
         ex.setInterpolator(new PathInterpolator(0.4f, 0, 1, 1));
+        ex.setDuration(5000);
         w.setExitTransition(ex);
         w.setEnterTransition(ex);
     }
@@ -25,4 +28,14 @@ public static void configureFab (View fabButton) {
         Outline fabOutLine = new Outline();
         fabOutLine.setOval(0, 0, fabSize, fabSize);
     }
+
+    public static int getStatusBarHeight(Context c) {
+
+        int result = 0;
+        int resourceId = c.getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = c.getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
 }
diff --git a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
index aa0d532..7651c23 100644
--- a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
@@ -1,69 +1,108 @@
 package com.saulmm.material.activities;
 
 import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
+import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.transition.Slide;
+import android.transition.Transition;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.Pair;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import com.saulmm.material.R;
+import com.saulmm.material.Utils;
 
 public class ColorActivity extends Activity {
 
     private SharedPreferences sharedpreferences;
     private View revealView;
     private View circleHolder;
+    private View fabButton;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+
+        // Set the saved theme
         sharedpreferences = getSharedPreferences("test", Context.MODE_PRIVATE);
+//        sharedpreferences.edit().clear().apply();
         setTheme(sharedpreferences.getInt("theme", R.style.AppTheme));
 
         setContentView(R.layout.activity_color);
 
+        // Views
         Switch themeSwitch = (Switch) findViewById(R.id.theme_switch);
         themeSwitch.setChecked(sharedpreferences.getBoolean("switch", false));
         revealView = findViewById(R.id.reveal_view);
-
+        fabButton = findViewById(R.id.fab_button);
         circleHolder = findViewById(R.id.circle_holder);
 
         themeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 
+            // Save the state of the switch
             SharedPreferences.Editor ed = sharedpreferences.edit();
             ed.putInt("theme", (isChecked) ? R.style.Base_Theme_AppCompat : R.style.Base_Theme_AppCompat_Light);
-
             ed.putBoolean("switch", isChecked);
             ed.apply();
             }
         });
 
+        // Show the unreveal effect
+        final int cx = sharedpreferences.getInt("x", 0);
+        final int cy = sharedpreferences.getInt("y", 0);
 
-        super.onCreate(savedInstanceState);
+        if (cx != 0 && cy != 0) {
+
+            // Show the unreveal effect when the view is attached to the window
+            revealView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View v) {
+
+                    // Get the accent color
+                    TypedValue outValue = new TypedValue();
+                    getTheme().resolveAttribute(android.R.attr.colorPrimary, outValue, true);
+                    revealView.setBackgroundColor(outValue.data);
+
+                    hideRevealEffect(cx, cy);
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View v) {}
+            });
+        }
 
     }
 
     public void showRevealEffect(View v, int primaryColor) {
         revealView.setVisibility(View.VISIBLE);
 
-
         int [] location = new int[2];
         revealView.setBackgroundColor(primaryColor);
         v.getLocationOnScreen(location);
 
         int cx = (location[0] + (v.getWidth() / 2));
-        int cy = location[1];
+        int cy = location[1] + (Utils.getStatusBarHeight(this) / 2);
 
-        int height = revealView.getHeight();
 
+        SharedPreferences.Editor ed = sharedpreferences.edit();
+        ed.putInt("x", cx);
+        ed.putInt("y", cy);
+        ed.apply();
+
+        int height = revealView.getHeight();
 
         Animator anim = ViewAnimationUtils.createCircularReveal(
                 revealView, cx, cy, 0, height);
@@ -71,6 +110,39 @@ public void showRevealEffect(View v, int primaryColor) {
 
         anim.addListener(revealAnimationListener);
                 anim.start();
+
+        hideNavigationStatus();
+    }
+
+
+    public void hideRevealEffect (int x, int y) {
+
+        revealView.setVisibility(View.VISIBLE);
+        int initialRadius = 1920;
+
+        // create the animation (the final radius is zero)
+        Animator anim = ViewAnimationUtils.createCircularReveal(
+                revealView, x, y, 1080, 0);
+
+        Log.d("WTF", "X: "+x+" Y: "+y+" - "+initialRadius);
+
+        // make the view invisible when the animation is done
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+            super.onAnimationEnd(animation);
+            revealView.setVisibility(View.INVISIBLE);
+            }
+        });
+
+        anim.start();
+    }
+
+    private void hideNavigationStatus() {
+        View decorView = getWindow().getDecorView();
+
+        int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
+        decorView.setSystemUiVisibility(uiOptions);
     }
 
     Animator.AnimatorListener revealAnimationListener = new Animator.AnimatorListener() {
@@ -81,7 +153,6 @@ public void onAnimationStart(Animator animation) {
 
         @Override
         public void onAnimationEnd(Animator animation) {
-            revealView.setVisibility(View.INVISIBLE);
 
             Intent i = new Intent(ColorActivity.this, ColorActivity.class);
             i.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
@@ -99,6 +170,7 @@ public void onAnimationCancel(Animator animation) {
         @Override
         public void onAnimationRepeat(Animator animation) {
 
+
         }
     };
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index d99c524..71fbcde 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -4,7 +4,6 @@
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
-import android.transition.Scene;
 import android.util.Pair;
 import android.view.View;
 
@@ -22,7 +21,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_transition_first);
 
         // Set explode animation when enter and exit the activity
-        Utils.configureWindowEnterExitTransition(getWindow());
+        Utils.configureWindowEnterExitExplodeTransition(getWindow());
 
         // Fab Button
         fabButton = findViewById(R.id.fab_button);
@@ -40,8 +39,6 @@ public void onClick(View view) {
         ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(TransitionFirstActivity.this,
                 Pair.create(fabButton, "fab"));
 
-
-
         startActivity(i, transitionActivityOptions.toBundle());
         }
     };
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index a106442..a09ceaf 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
-        Utils.configureWindowEnterExitTransition(getWindow());
+        Utils.configureWindowEnterExitExplodeTransition(getWindow());
 
         getWindow().getEnterTransition().addListener(new Transition.TransitionListener() {
             @Override
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index 36e500f..e3e7484 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -134,11 +134,21 @@
 
 
         </LinearLayout>
-        
-
-
-
-
     </LinearLayout>
 
+    <Button
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/fab_button"
+        android:transitionName="fab"
+        android:layout_width="@dimen/fab_size"
+        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="4dp"
+        android:layout_below="@+id/holder_view"
+        android:layout_marginTop="-26dp"
+        android:layout_alignParentEnd="true"
+        />
+
 </RelativeLayout>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index e8cf0b7..c33eee8 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -7,12 +7,16 @@
         <!-- android theme colors -->
         <item name="android:colorPrimary">@color/theme_default_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
-        <item name="android:statusBarColor">@color/theme_default_primary_dark</item>
+        <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:colorControlActivated">@color/accent</item>
         <item name="android:colorAccent">@color/accent</item>
 
         <!-- android transitions -->
         <item name="android:windowContentTransitions">true</item>
+        <item name="android:windowAllowEnterTransitionOverlap">true</item>
+        <item name="android:windowAllowReturnTransitionOverlap">true</item>
+
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
 
@@ -20,8 +24,6 @@
     <style name="theme1" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_1_primary</item>
         <item name="android:colorPrimaryDark">@color/color_set_1_primary_dark</item>
-        <item name="android:statusBarColor">@color/color_set_1_primary_dark</item>
-        <item name="android:navigationBarColor">@color/color_set_1_primary</item>
         <item name="android:colorControlActivated">@color/color_set_1_accent</item>
         <item name="android:colorAccent">@color/color_set_1_accent</item>
     </style>
@@ -29,8 +31,6 @@
     <style name="theme2" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_2_primary</item>
         <item name="android:colorPrimaryDark">@color/color_set_2_primary_dark</item>
-        <item name="android:statusBarColor">@color/color_set_2_primary_dark</item>
-        <item name="android:navigationBarColor">@color/color_set_2_primary</item>
         <item name="android:colorControlActivated">@color/color_set_2_accent</item>
         <item name="android:colorAccent">@color/color_set_2_accent</item>
     </style>
@@ -38,8 +38,6 @@
     <style name="theme3" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_3_primary</item>
         <item name="android:colorPrimaryDark">@color/color_set_3_primary_dark</item>
-        <item name="android:statusBarColor">@color/color_set_3_primary_dark</item>
-        <item name="android:navigationBarColor">@color/color_set_3_primary</item>
         <item name="android:colorControlActivated">@color/color_set_3_accent</item>
         <item name="android:colorAccent">@color/color_set_3_accent</item>
     </style>
@@ -47,8 +45,6 @@
     <style name="theme4" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_4_primary</item>
         <item name="android:colorPrimaryDark">@color/color_set_4_primary_dark</item>
-        <item name="android:statusBarColor">@color/color_set_4_primary_dark</item>
-        <item name="android:navigationBarColor">@color/color_set_4_primary</item>
         <item name="android:colorControlActivated">@color/color_set_4_accent</item>
         <item name="android:colorAccent">@color/color_set_4_accent</item>
     </style>

From ba9c2026bbe5fc57d6166389f60030176d065623 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Wed, 29 Oct 2014 17:14:21 +0100
Subject: [PATCH 17/35] Refactor

---
 .../main/java/com/saulmm/material/Utils.java  |  44 ++++++
 .../material/activities/ColorActivity.java    | 132 ++++++------------
 app/src/main/res/layout/activity_color.xml    |  40 +++++-
 app/src/main/res/values-v21/styles.xml        |   9 --
 app/src/main/res/values/colors.xml            |  17 +--
 5 files changed, 130 insertions(+), 112 deletions(-)

diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/Utils.java
index 9b4318b..40d7b6e 100644
--- a/app/src/main/java/com/saulmm/material/Utils.java
+++ b/app/src/main/java/com/saulmm/material/Utils.java
@@ -1,11 +1,15 @@
 package com.saulmm.material;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Outline;
 import android.transition.Explode;
 import android.transition.Fade;
 import android.transition.Slide;
 import android.view.View;
+import android.view.ViewAnimationUtils;
 import android.view.Window;
 import android.view.animation.PathInterpolator;
 
@@ -38,4 +42,44 @@ public static int getStatusBarHeight(Context c) {
         }
         return result;
     }
+
+
+    public static void hideRevealEffect (final View v, int centerX, int centerY, int initialRadius) {
+
+        v.setVisibility(View.VISIBLE);
+
+        // create the animation (the final radius is zero)
+        Animator anim = ViewAnimationUtils.createCircularReveal(
+                v, centerX, centerY, initialRadius, 0);
+
+        anim.setDuration(350);
+
+        // make the view invisible when the animation is done
+        anim.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                super.onAnimationEnd(animation);
+                v.setVisibility(View.INVISIBLE);
+            }
+        });
+
+        anim.start();
+    }
+
+    public static void showRevealEFfect (final View v, int centerX, int centerY, Animator.AnimatorListener lis) {
+
+        v.setVisibility(View.VISIBLE);
+
+        int height = v.getHeight();
+
+        Animator anim = ViewAnimationUtils.createCircularReveal(
+                v, centerX, centerY, 0, height);
+
+        anim.setDuration(350);
+
+        anim.addListener(lis);
+        anim.start();
+    }
+
+
 }
diff --git a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
index 7651c23..59a9043 100644
--- a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
@@ -16,6 +16,7 @@
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewAnimationUtils;
+import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
@@ -26,8 +27,6 @@ public class ColorActivity extends Activity {
 
     private SharedPreferences sharedpreferences;
     private View revealView;
-    private View circleHolder;
-    private View fabButton;
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
@@ -36,37 +35,32 @@ protected void onCreate(final Bundle savedInstanceState) {
 
         // Set the saved theme
         sharedpreferences = getSharedPreferences("test", Context.MODE_PRIVATE);
-//        sharedpreferences.edit().clear().apply();
         setTheme(sharedpreferences.getInt("theme", R.style.AppTheme));
 
         setContentView(R.layout.activity_color);
 
         // Views
         Switch themeSwitch = (Switch) findViewById(R.id.theme_switch);
-        themeSwitch.setChecked(sharedpreferences.getBoolean("switch", false));
-        revealView = findViewById(R.id.reveal_view);
-        fabButton = findViewById(R.id.fab_button);
-        circleHolder = findViewById(R.id.circle_holder);
+        themeSwitch.setChecked(sharedpreferences.getBoolean(themeSwitch.getId()+"", false));
+        themeSwitch.setOnCheckedChangeListener(checkedListener);
 
-        themeSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        CheckBox themeCheck = (CheckBox) findViewById(R.id.theme_check);
+        themeCheck.setChecked(sharedpreferences.getBoolean(themeCheck.getId()+"", false));
+        themeCheck.setOnCheckedChangeListener(checkedListener);
 
-            // Save the state of the switch
-            SharedPreferences.Editor ed = sharedpreferences.edit();
-            ed.putInt("theme", (isChecked) ? R.style.Base_Theme_AppCompat : R.style.Base_Theme_AppCompat_Light);
-            ed.putBoolean("switch", isChecked);
-            ed.apply();
-            }
-        });
+        revealView = findViewById(R.id.reveal_view);
 
-        // Show the unreveal effect
+        // Show the unReveal effect
         final int cx = sharedpreferences.getInt("x", 0);
         final int cy = sharedpreferences.getInt("y", 0);
 
-        if (cx != 0 && cy != 0) {
+        startHideRevealEffect(cx, cy);
+    }
 
-            // Show the unreveal effect when the view is attached to the window
+    private void startHideRevealEffect(final int cx, final int cy) {
+
+        if (cx != 0 && cy != 0) {
+            // Show the unReveal effect when the view is attached to the window
             revealView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
                 @Override
                 public void onViewAttachedToWindow(View v) {
@@ -76,80 +70,29 @@ public void onViewAttachedToWindow(View v) {
                     getTheme().resolveAttribute(android.R.attr.colorPrimary, outValue, true);
                     revealView.setBackgroundColor(outValue.data);
 
-                    hideRevealEffect(cx, cy);
+                    Utils.hideRevealEffect(revealView, cx, cy, 1920);
                 }
 
                 @Override
                 public void onViewDetachedFromWindow(View v) {}
             });
         }
-
     }
 
-    public void showRevealEffect(View v, int primaryColor) {
-        revealView.setVisibility(View.VISIBLE);
-
-        int [] location = new int[2];
-        revealView.setBackgroundColor(primaryColor);
-        v.getLocationOnScreen(location);
-
-        int cx = (location[0] + (v.getWidth() / 2));
-        int cy = location[1] + (Utils.getStatusBarHeight(this) / 2);
-
-
-        SharedPreferences.Editor ed = sharedpreferences.edit();
-        ed.putInt("x", cx);
-        ed.putInt("y", cy);
-        ed.apply();
-
-        int height = revealView.getHeight();
-
-        Animator anim = ViewAnimationUtils.createCircularReveal(
-                revealView, cx, cy, 0, height);
-
-
-        anim.addListener(revealAnimationListener);
-                anim.start();
-
-        hideNavigationStatus();
-    }
-
-
-    public void hideRevealEffect (int x, int y) {
-
-        revealView.setVisibility(View.VISIBLE);
-        int initialRadius = 1920;
-
-        // create the animation (the final radius is zero)
-        Animator anim = ViewAnimationUtils.createCircularReveal(
-                revealView, x, y, 1080, 0);
-
-        Log.d("WTF", "X: "+x+" Y: "+y+" - "+initialRadius);
-
-        // make the view invisible when the animation is done
-        anim.addListener(new AnimatorListenerAdapter() {
-            @Override
-            public void onAnimationEnd(Animator animation) {
-            super.onAnimationEnd(animation);
-            revealView.setVisibility(View.INVISIBLE);
-            }
-        });
-
-        anim.start();
-    }
 
     private void hideNavigationStatus() {
+
         View decorView = getWindow().getDecorView();
 
         int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;
         decorView.setSystemUiVisibility(uiOptions);
     }
 
+
     Animator.AnimatorListener revealAnimationListener = new Animator.AnimatorListener() {
-        @Override
-        public void onAnimationStart(Animator animation) {
 
-        }
+        @Override
+        public void onAnimationStart(Animator animation) {}
 
         @Override
         public void onAnimationEnd(Animator animation) {
@@ -159,28 +102,22 @@ public void onAnimationEnd(Animator animation) {
             startActivity(i);
             overridePendingTransition(0, 0);
             finish();
-
         }
 
         @Override
-        public void onAnimationCancel(Animator animation) {
-
-        }
+        public void onAnimationCancel(Animator animation) {}
 
         @Override
-        public void onAnimationRepeat(Animator animation) {
-
-
-        }
+        public void onAnimationRepeat(Animator animation) {}
     };
 
 
     public void view(View view) {
+
         int selectedTheme = 0;
         int primaryColor = 0;
 
         switch (view.getId()) {
-
             case R.id.circle1:
                 selectedTheme = R.style.theme1;
                 primaryColor = getResources().getColor(R.color.color_set_1_primary);
@@ -202,13 +139,32 @@ public void view(View view) {
                 break;
         }
 
+        int [] location = new int[2];
+        revealView.setBackgroundColor(primaryColor);
+        view.getLocationOnScreen(location);
 
-        showRevealEffect(view, primaryColor);
+        int cx = (location[0] + (view.getWidth() / 2));
+        int cy = location[1] + (Utils.getStatusBarHeight(this) / 2);
 
         SharedPreferences.Editor ed = sharedpreferences.edit();
+        ed.putInt("x", cx);
+        ed.putInt("y", cy);
         ed.putInt("theme", selectedTheme);
         ed.apply();
-//
-//
+
+        hideNavigationStatus();
+        Utils.showRevealEFfect(revealView, cx, cy, revealAnimationListener);
     }
+
+
+    CompoundButton.OnCheckedChangeListener checkedListener = new CompoundButton.OnCheckedChangeListener() {
+
+        @Override
+        public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+            SharedPreferences.Editor ed = sharedpreferences.edit();
+            ed.putInt("theme", (isChecked) ? R.style.Base_Theme_AppCompat : R.style.Base_Theme_AppCompat_Light);
+            ed.putBoolean(buttonView.getId()+"", isChecked);
+            ed.apply();
+        }
+    };
 }
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index e3e7484..c3fa4be 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -46,7 +46,8 @@
             tools:text="Amazing text"/>
         
         </RelativeLayout>
-        
+
+
        
     <LinearLayout
         android:layout_width="match_parent"
@@ -72,12 +73,44 @@
 
             <Switch
                 android:id="@+id/theme_switch"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="1"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"/>
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
+                android:layout_weight="7"
+                android:layout_height="wrap_content"
+                android:text="Awesome"
+                android:layout_marginLeft="16dp"
+                android:layout_gravity="center_vertical"/>
+
+        </LinearLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:text="More controls"
+            android:textColor="?android:colorAccent"
+            android:gravity="center_vertical"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal">
+
+            <CheckBox
+                android:id="@+id/theme_check"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"/>
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight="7"
                 android:layout_height="wrap_content"
                 android:text="Awesome"
                 android:layout_marginLeft="16dp"
@@ -132,7 +165,6 @@
                 android:onClick="view"
                 android:background="@drawable/color4"/>
 
-
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index c33eee8..2ef49b8 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -6,7 +6,6 @@
 
         <!-- android theme colors -->
         <item name="android:colorPrimary">@color/theme_default_primary</item>
-        <item name="android:colorPrimaryDark">@color/theme_default_primary_dark</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">true</item>
         <item name="android:colorControlActivated">@color/accent</item>
@@ -20,36 +19,30 @@
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
 
-
     <style name="theme1" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_1_primary</item>
-        <item name="android:colorPrimaryDark">@color/color_set_1_primary_dark</item>
         <item name="android:colorControlActivated">@color/color_set_1_accent</item>
         <item name="android:colorAccent">@color/color_set_1_accent</item>
     </style>
 
     <style name="theme2" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_2_primary</item>
-        <item name="android:colorPrimaryDark">@color/color_set_2_primary_dark</item>
         <item name="android:colorControlActivated">@color/color_set_2_accent</item>
         <item name="android:colorAccent">@color/color_set_2_accent</item>
     </style>
 
     <style name="theme3" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_3_primary</item>
-        <item name="android:colorPrimaryDark">@color/color_set_3_primary_dark</item>
         <item name="android:colorControlActivated">@color/color_set_3_accent</item>
         <item name="android:colorAccent">@color/color_set_3_accent</item>
     </style>
 
     <style name="theme4" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_4_primary</item>
-        <item name="android:colorPrimaryDark">@color/color_set_4_primary_dark</item>
         <item name="android:colorControlActivated">@color/color_set_4_accent</item>
         <item name="android:colorAccent">@color/color_set_4_accent</item>
     </style>
 
-
     <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
         <item name="spinBars">true</item>
         <item name="color">@android:color/white</item>
@@ -63,6 +56,4 @@
     <style name="AppTheme2" parent="Theme.AppCompat.Light.NoActionBar">
         </style>
 
-
-
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 223c096..878448e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,26 +4,21 @@
     <!-- Theme colors -->
     <color name="theme_light">#F48FB1</color>
     <color name="theme_default_primary">#EC407A</color>
-    <color name="theme_default_primary_dark">#E91E63</color>
     <color name="theme_window_background">#2A2A2A</color>
     <color name="accent">#EEFF41</color>
     <color name="gray_row_color">#ff515252</color>
 
-    <color name="color_set_1_primary">#E91E63</color>
-    <color name="color_set_1_primary_dark">#C2185B</color>
-    <color name="color_set_1_accent">#00AEF9</color>
+    <color name="color_set_1_primary">#4fc3f7</color>
+    <color name="color_set_1_accent">#009688</color>
 
-    <color name="color_set_2_primary">#00bcd4</color>
-    <color name="color_set_2_primary_dark">#00acc1</color>
+    <color name="color_set_2_primary">#42bd41</color>
     <color name="color_set_2_accent">#673AB7</color>
 
-    <color name="color_set_3_primary">#259b24</color>
-    <color name="color_set_3_primary_dark">#0a8f08</color>
+    <color name="color_set_3_primary">#ffb74d</color>
     <color name="color_set_3_accent">#E91E63</color>
 
-    <color name="color_set_4_primary">#ff9800</color>
-    <color name="color_set_4_primary_dark">#fb8c00</color>
-    <color name="color_set_4_accent">#FF5722</color>
+    <color name="color_set_4_primary">#ff8a65</color>
+    <color name="color_set_4_accent">#d500f9</color>
 
 
 

From 72bec6779eb530e9c8dac4ce89a0109c589a4dd2 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Wed, 29 Oct 2014 17:58:41 +0100
Subject: [PATCH 18/35] Updated read

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ad5b86b..d66e878 100644
--- a/README.md
+++ b/README.md
@@ -20,4 +20,10 @@ Commit - **ead8ada**
 
 Commit - **f502305**
 
-![](https://lh5.googleusercontent.com/-N-0aREntDdM/VEvP4I5kxrI/AAAAAAAAvQA/3CRH8pH5Vq4/s1006-no/sliding.gif)
\ No newline at end of file
+![](https://lh5.googleusercontent.com/-N-0aREntDdM/VEvP4I5kxrI/AAAAAAAAvQA/3CRH8pH5Vq4/s1006-no/sliding.gif)
+
+## Using CircularReveal to show a pretty effect between activities
+
+Commit - **ba9c202**
+
+![](https://lh3.googleusercontent.com/-eQoRYLME7-0/VFEZ9qNaR7I/AAAAAAAAvqg/xk6U4UT_FUY/w420-h747-no/reveal.gif)
\ No newline at end of file

From 3dd7a119a1d4c321625e9d05ef1329a45a28044c Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 2 Nov 2014 14:12:45 +0100
Subject: [PATCH 19/35] Updated grade plugin

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 9b8abe4..b75798f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.2'
+        classpath 'com.android.tools.build:gradle:0.14.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

From b4439eb1a5e169d7ffc034cf27c5a1e3007f3534 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 2 Nov 2014 14:13:46 +0100
Subject: [PATCH 20/35] Renamed basic sliding fragment class to avoid a Dex
 error

---
 .../fragments/SlidingTabsBasic.java           |  91 ++++++++++
 .../fragments/SlidingTabsBasicFragment.java   | 155 ------------------
 2 files changed, 91 insertions(+), 155 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
 delete mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java

diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
new file mode 100644
index 0000000..057df88
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.saulmm.material.slidingtabs.fragments;
+
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
+
+
+public class SlidingTabsBasic extends Fragment {
+
+    static final String LOG_TAG = "SlidingTabsBasicFragment";
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+            Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_sliding, container, false);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        ViewPager mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
+        mViewPager.setAdapter(new SamplePagerAdapter());
+
+        SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) view.findViewById(R.id.sliding_tabs);
+        mSlidingTabLayout.setViewPager(mViewPager);
+
+    }
+
+    class SamplePagerAdapter extends PagerAdapter {
+        final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
+
+        @Override
+        public int getCount() {
+            return 5;
+        }
+
+
+        @Override
+        public boolean isViewFromObject(View view, Object o) {
+            return o == view;
+        }
+
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            return TITLES[position];
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position) {
+
+            View view = getActivity().getLayoutInflater().inflate(R.layout.item_sliding_pager,
+                    container, false);
+
+            container.addView(view);
+
+            return view;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object object) {
+            container.removeView((View) object);
+            Log.i(LOG_TAG, "destroyItem() [position: " + position + "]");
+        }
+
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
deleted file mode 100644
index 7952a0d..0000000
--- a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasicFragment.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright (C) 2013 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.saulmm.material.slidingtabs.fragments;
-
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
-
-
-public class SlidingTabsBasicFragment extends Fragment {
-
-    static final String LOG_TAG = "SlidingTabsBasicFragment";
-
-    /**
-     * A custom {@link ViewPager} title strip which looks much like Tabs present in Android v4.0 and
-     * above, but is designed to give continuous feedback to the user when scrolling.
-     */
-    private SlidingTabLayout mSlidingTabLayout;
-
-    /**
-     * A {@link ViewPager} which will be used in conjunction with the {@link SlidingTabLayout} above.
-     */
-    private ViewPager mViewPager;
-
-    /**
-     * Inflates the {@link View} which will be displayed by this {@link Fragment}, from the app's
-     * resources.
-     */
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_sliding, container, false);
-    }
-
-    // BEGIN_INCLUDE (fragment_onviewcreated)
-    /**
-     * This is called after the {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)} has finished.
-     * Here we can pick out the {@link View}s we need to configure from the content view.
-     *
-     * We set the {@link ViewPager}'s adapter to be an instance of {@link SamplePagerAdapter}. The
-     * {@link SlidingTabLayout} is then given the {@link ViewPager} so that it can populate itself.
-     *
-     * @param view View created in {@link #onCreateView(LayoutInflater, ViewGroup, Bundle)}
-     */
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        // BEGIN_INCLUDE (setup_viewpager)
-        // Get the ViewPager and set it's PagerAdapter so that it can display items
-        mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
-        mViewPager.setAdapter(new SamplePagerAdapter());
-        // END_INCLUDE (setup_viewpager)
-
-        // BEGIN_INCLUDE (setup_slidingtablayout)
-        // Give the SlidingTabLayout the ViewPager, this must be done AFTER the ViewPager has had
-        // it's PagerAdapter set.
-        mSlidingTabLayout = (SlidingTabLayout) view.findViewById(R.id.sliding_tabs);
-        mSlidingTabLayout.setViewPager(mViewPager);
-        // END_INCLUDE (setup_slidingtablayout)
-    }
-    // END_INCLUDE (fragment_onviewcreated)
-
-    /**
-     * The {@link android.support.v4.view.PagerAdapter} used to display pages in this sample.
-     * The individual pages are simple and just display two lines of text. The important section of
-     * this class is the {@link #getPageTitle(int)} method which controls what is displayed in the
-     * {@link SlidingTabLayout}.
-     */
-    class SamplePagerAdapter extends PagerAdapter {
-        final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
-
-        /**
-         * @return the number of pages to display
-         */
-        @Override
-        public int getCount() {
-            return 5;
-        }
-
-        /**
-         * @return true if the value returned from {@link #instantiateItem(ViewGroup, int)} is the
-         * same object as the {@link View} added to the {@link ViewPager}.
-         */
-        @Override
-        public boolean isViewFromObject(View view, Object o) {
-            return o == view;
-        }
-
-        // BEGIN_INCLUDE (pageradapter_getpagetitle)
-        /**
-         * Return the title of the item at {@code position}. This is important as what this method
-         * returns is what is displayed in the {@link SlidingTabLayout}.
-         * <p>
-         * Here we construct one using the position value, but for real application the title should
-         * refer to the item's contents.
-         */
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return TITLES[position];
-        }
-        // END_INCLUDE (pageradapter_getpagetitle)
-
-        /**
-         * Instantiate the {@link View} which should be displayed at {@code position}. Here we
-         * inflate a layout from the apps resources and then change the text view to signify the position.
-         */
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-            // Inflate a new layout from our resources
-            View view = getActivity().getLayoutInflater().inflate(R.layout.item_sliding_pager,
-                    container, false);
-            // Add the newly created View to the ViewPager
-
-
-            container.addView(view);
-
-
-            // Return the View
-            return view;
-        }
-
-        /**
-         * Destroy the item from the {@link ViewPager}. In our case this is simply removing the
-         * {@link View}.
-         */
-        @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            container.removeView((View) object);
-            Log.i(LOG_TAG, "destroyItem() [position: " + position + "]");
-        }
-
-    }
-}

From 8e9da9168de12640ea338596f2e55ca1a3894805 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 2 Nov 2014 14:15:14 +0100
Subject: [PATCH 21/35] Refactor

---
 .../java/com/saulmm/material/activities/SlidingActivity.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
index a828757..646dd1f 100644
--- a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -28,7 +28,7 @@
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasicFragment;
+import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasic;
 
 public class SlidingActivity extends ActionBarActivity {
 
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getFragmentManager().beginTransaction();
-            SlidingTabsBasicFragment fragment = new SlidingTabsBasicFragment();
+            SlidingTabsBasic fragment = new SlidingTabsBasic();
             transaction.replace(R.id.sample_content_fragment, fragment);
             transaction.commit();
         }

From b648102cb56960b1136c1a9596edd23b3a4d98b8 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 2 Nov 2014 14:26:30 +0100
Subject: [PATCH 22/35] Refactored sliding adapter

---
 .../adapter/SamplePagerAdapter.java           | 54 +++++++++++++++++++
 .../fragments/SlidingTabsBasic.java           | 43 +--------------
 2 files changed, 56 insertions(+), 41 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java

diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java b/app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java
new file mode 100644
index 0000000..d0c2ecd
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java
@@ -0,0 +1,54 @@
+package com.saulmm.material.slidingtabs.adapter;
+
+import android.content.Context;
+import android.support.v4.view.PagerAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.saulmm.material.R;
+
+@SuppressWarnings("FieldCanBeLocal")
+public class SamplePagerAdapter extends PagerAdapter {
+
+    private final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
+    private final int FRAGMENT_COUNT = 5;
+    private Context context;
+
+    public SamplePagerAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return FRAGMENT_COUNT;
+    }
+
+
+    @Override
+    public boolean isViewFromObject(View view, Object o) {
+        return o == view;
+    }
+
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return TITLES[position];
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+
+        View view = LayoutInflater.from(context).inflate(R.layout.item_sliding_pager,
+                container, false);
+
+        container.addView(view);
+
+        return view;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View) object);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
index 057df88..79195d4 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
@@ -27,6 +27,7 @@
 import android.view.ViewGroup;
 
 import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
 import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
 
 
@@ -43,49 +44,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         ViewPager mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
-        mViewPager.setAdapter(new SamplePagerAdapter());
+        mViewPager.setAdapter(new SamplePagerAdapter(getActivity()));
 
         SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) view.findViewById(R.id.sliding_tabs);
         mSlidingTabLayout.setViewPager(mViewPager);
-
-    }
-
-    class SamplePagerAdapter extends PagerAdapter {
-        final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
-
-        @Override
-        public int getCount() {
-            return 5;
-        }
-
-
-        @Override
-        public boolean isViewFromObject(View view, Object o) {
-            return o == view;
-        }
-
-
-        @Override
-        public CharSequence getPageTitle(int position) {
-            return TITLES[position];
-        }
-
-        @Override
-        public Object instantiateItem(ViewGroup container, int position) {
-
-            View view = getActivity().getLayoutInflater().inflate(R.layout.item_sliding_pager,
-                    container, false);
-
-            container.addView(view);
-
-            return view;
-        }
-
-        @Override
-        public void destroyItem(ViewGroup container, int position, Object object) {
-            container.removeView((View) object);
-            Log.i(LOG_TAG, "destroyItem() [position: " + position + "]");
-        }
-
     }
 }

From d4a285a64c3faa836415154919e0de582725cfdd Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sun, 2 Nov 2014 14:35:50 +0100
Subject: [PATCH 23/35] Added sliding to the dialer activity

---
 .../activities/DialerSampleActivity.java      | 58 +++++++++++++++++++
 .../material/activities/SlidingActivity.java  |  6 +-
 ...TabsBasic.java => SlidingTabFragment.java} |  3 +-
 app/src/main/res/layout/activity_dialer.xml   | 44 ++++++++++++++
 .../res/layout/activity_transition_second.xml |  4 +-
 5 files changed, 109 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
 rename app/src/main/java/com/saulmm/material/slidingtabs/fragments/{SlidingTabsBasic.java => SlidingTabFragment.java} (97%)
 create mode 100755 app/src/main/res/layout/activity_dialer.xml

diff --git a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
new file mode 100644
index 0000000..3dd8c3f
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
@@ -0,0 +1,58 @@
+/*
+* Copyright 2013 The Android Open Source Project
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package com.saulmm.material.activities;
+
+import android.os.Bundle;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.Toolbar;
+
+import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
+import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
+
+public class DialerSampleActivity extends ActionBarActivity {
+
+    private ActionBarDrawerToggle mDrawerToggle;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_dialer);
+
+        configureToolbar();
+        configurePager();
+    }
+
+    private void configureToolbar() {
+
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.activity_dialer_toolbar);
+        setSupportActionBar(mainToolbar);
+        getSupportActionBar().setTitle("Sliding");
+    }
+
+    private void configurePager() {
+
+        ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
+        mViewPager.setAdapter(new SamplePagerAdapter(this));
+
+        SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
+        mSlidingTabLayout.setViewPager(mViewPager);
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
index 646dd1f..18b6b3c 100644
--- a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -28,7 +28,7 @@
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.fragments.SlidingTabsBasic;
+import com.saulmm.material.slidingtabs.fragments.SlidingTabFragment;
 
 public class SlidingActivity extends ActionBarActivity {
 
@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getFragmentManager().beginTransaction();
-            SlidingTabsBasic fragment = new SlidingTabsBasic();
+            SlidingTabFragment fragment = new SlidingTabFragment();
             transaction.replace(R.id.sample_content_fragment, fragment);
             transaction.commit();
         }
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void configureToolbar() {
-        Toolbar mainToolbar = (Toolbar) findViewById(R.id.toolbar);
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.dialer_toolbar);
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setTitle("Sliding");
 
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java
similarity index 97%
rename from app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
rename to app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java
index 79195d4..6ba66a3 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabsBasic.java
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java
@@ -31,7 +31,7 @@
 import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
 
 
-public class SlidingTabsBasic extends Fragment {
+public class SlidingTabFragment extends Fragment {
 
     static final String LOG_TAG = "SlidingTabsBasicFragment";
 
@@ -43,6 +43,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
+
         ViewPager mViewPager = (ViewPager) view.findViewById(R.id.viewpager);
         mViewPager.setAdapter(new SamplePagerAdapter(getActivity()));
 
diff --git a/app/src/main/res/layout/activity_dialer.xml b/app/src/main/res/layout/activity_dialer.xml
new file mode 100755
index 0000000..1471cd7
--- /dev/null
+++ b/app/src/main/res/layout/activity_dialer.xml
@@ -0,0 +1,44 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:id="@+id/sample_main_layout">
+
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/activity_dialer_toolbar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="?android:colorPrimary"
+        android:minHeight="?attr/actionBarSize"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="#FFF"
+        android:orientation="vertical">
+
+        <com.saulmm.material.slidingtabs.views.SlidingTabLayout
+            android:id="@+id/activity_dialer_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:elevation="10dp"/>
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1dp"
+            android:background="@color/theme_default_primary"
+            android:elevation="10dp"/>
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/activity_dialer_pager"
+            android:layout_width="match_parent"
+            android:layout_height="0px"
+            android:layout_weight="1"
+            android:layout_marginBottom="10dp"
+            android:background="@android:color/white"/>
+
+    </LinearLayout>
+
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/activity_transition_second.xml b/app/src/main/res/layout/activity_transition_second.xml
index 33591e4..543ff63 100644
--- a/app/src/main/res/layout/activity_transition_second.xml
+++ b/app/src/main/res/layout/activity_transition_second.xml
@@ -7,7 +7,7 @@
     >
 
     <android.support.v7.widget.Toolbar
-        android:id="@+id/toolbar"
+        android:id="@+id/dialer_toolbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:background="?android:colorPrimary"
@@ -17,7 +17,7 @@
         android:id="@+id/row_container2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
+        android:layout_below="@id/dialer_toolbar"
         android:orientation="vertical"
         android:layout_centerHorizontal="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"

From bafdbe10b099439dd91e12b26c59608c2568e579 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Mon, 3 Nov 2014 18:00:41 +0100
Subject: [PATCH 24/35] Redefined style of the diaper activity

---
 app/src/main/AndroidManifest.xml              | 24 ++++-----
 .../activities/DialerSampleActivity.java      |  6 +--
 .../slidingtabs/adapter/DialerAdapter.java    | 53 +++++++++++++++++++
 app/src/main/res/layout/activity_color.xml    |  4 +-
 app/src/main/res/layout/activity_dialer.xml   |  3 +-
 app/src/main/res/layout/activity_sliding.xml  |  2 -
 app/src/main/res/values-v21/styles.xml        | 14 ++---
 app/src/main/res/values/colors.xml            |  6 +++
 8 files changed, 79 insertions(+), 33 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f50c59..a654348 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,34 +7,30 @@
         android:icon="@drawable/ic_launcher"
         android:label=""
         android:theme="@style/AppTheme" >
-        <activity
-            android:name=".activities.TransitionFirstActivity"
-            android:label="" >
-
-
 
+        <activity
+            android:name=".activities.TransitionFirstActivity">
         </activity>
+
         <activity
             android:name=".activities.TransitionSecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
-        <activity
-            android:name=".NavDrawerActivity"
-            android:label="@string/title_activity_nav_drawer" >
-        </activity>
-        <activity android:name=".activities.SlidingActivity" >
 
-        </activity>
         <activity
-            android:name=".activities.ColorActivity"
-            android:label="@string/title_activity_color" >
+            android:name=".activities.SlidingActivity" >
+        </activity>
 
+        <activity android:name=".activities.DialerSampleActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity>
 
+        <activity
+            android:name=".activities.ColorActivity"
+            android:label="@string/title_activity_color" >
         </activity>
     </application>
-
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
index 3dd8c3f..63ada7a 100644
--- a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
@@ -23,13 +23,12 @@
 import android.support.v7.widget.Toolbar;
 
 import com.saulmm.material.R;
+import com.saulmm.material.slidingtabs.adapter.DialerAdapter;
 import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
 import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
 
 public class DialerSampleActivity extends ActionBarActivity {
 
-    private ActionBarDrawerToggle mDrawerToggle;
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -43,6 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
     private void configureToolbar() {
 
         Toolbar mainToolbar = (Toolbar) findViewById(R.id.activity_dialer_toolbar);
+        mainToolbar.setTitleTextColor(getResources().getColor(R.color.theme_dialer_accent));
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setTitle("Sliding");
     }
@@ -50,7 +50,7 @@ private void configureToolbar() {
     private void configurePager() {
 
         ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
-        mViewPager.setAdapter(new SamplePagerAdapter(this));
+        mViewPager.setAdapter(new DialerAdapter(this));
 
         SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
         mSlidingTabLayout.setViewPager(mViewPager);
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java b/app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java
new file mode 100644
index 0000000..3d2d8a2
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java
@@ -0,0 +1,53 @@
+package com.saulmm.material.slidingtabs.adapter;
+
+import android.content.Context;
+import android.support.v4.view.PagerAdapter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.saulmm.material.R;
+
+@SuppressWarnings("FieldCanBeLocal")
+public class DialerAdapter extends PagerAdapter {
+
+    private final String [] TITLES = {"SPEED DIAL", "RECENTS", "CONTACTS"};
+    private Context context;
+
+    public DialerAdapter(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public int getCount() {
+        return TITLES.length;
+    }
+
+
+    @Override
+    public boolean isViewFromObject(View view, Object o) {
+        return o == view;
+    }
+
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        return TITLES[position];
+    }
+
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+
+        View view = LayoutInflater.from(context).inflate(R.layout.item_sliding_pager,
+                container, false);
+
+        container.addView(view);
+
+        return view;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        container.removeView((View) object);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index c3fa4be..823037c 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -13,7 +13,7 @@
         android:visibility="invisible"/>
 
     <View
-        android:id="@+id/toolbar"
+        android:id="@+id/dialer_toolbar"
         android:layout_width="match_parent"
         android:background="?android:colorPrimary"
         android:layout_height="?attr/actionBarSize"/>
@@ -26,7 +26,7 @@
             android:paddingLeft="72dp"
             android:paddingRight="16dp"
             android:transitionName="holder1"
-            android:layout_below="@id/toolbar"
+            android:layout_below="@id/dialer_toolbar"
             android:background="?android:colorPrimary">
 
         <TextView
diff --git a/app/src/main/res/layout/activity_dialer.xml b/app/src/main/res/layout/activity_dialer.xml
index 1471cd7..824e0b2 100755
--- a/app/src/main/res/layout/activity_dialer.xml
+++ b/app/src/main/res/layout/activity_dialer.xml
@@ -9,6 +9,7 @@
         android:id="@+id/activity_dialer_toolbar"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
+
         android:background="?android:colorPrimary"
         android:minHeight="?attr/actionBarSize"/>
 
@@ -27,7 +28,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@color/theme_default_primary"
+            android:background="?android:colorPrimary"
             android:elevation="10dp"/>
 
         <android.support.v4.view.ViewPager
diff --git a/app/src/main/res/layout/activity_sliding.xml b/app/src/main/res/layout/activity_sliding.xml
index d3f7062..32abd55 100755
--- a/app/src/main/res/layout/activity_sliding.xml
+++ b/app/src/main/res/layout/activity_sliding.xml
@@ -35,7 +35,5 @@
             android:name="com.saulmm.material.fragments.NavigationFragment"/>
 
     </android.support.v4.widget.DrawerLayout>
-
-
 </LinearLayout>
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 2ef49b8..716973a 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
 
         <!-- android theme colors -->
-        <item name="android:colorPrimary">@color/theme_default_primary</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-        <item name="android:colorControlActivated">@color/accent</item>
-        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:colorPrimary">@color/theme_dialer_primary</item>
+        <item name="android:colorPrimaryDark">@color/theme_dialer_high</item>
+        <item name="android:colorAccent">@color/theme_dialer_accent</item>
 
         <!-- android transitions -->
         <item name="android:windowContentTransitions">true</item>
@@ -52,8 +48,4 @@
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:textColor">#FFF</item>
     </style>
-
-    <style name="AppTheme2" parent="Theme.AppCompat.Light.NoActionBar">
-        </style>
-
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 878448e..d9115c2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,6 +8,12 @@
     <color name="accent">#EEFF41</color>
     <color name="gray_row_color">#ff515252</color>
 
+
+    <!-- Dialer theme -->
+    <color name="theme_dialer_high">#0277BD</color>
+    <color name="theme_dialer_primary">#0288D1</color>
+    <color name="theme_dialer_accent">#FFF</color>
+
     <color name="color_set_1_primary">#4fc3f7</color>
     <color name="color_set_1_accent">#009688</color>
 

From 3946376017f7cfb57ebf35ea187f04d0ef623f37 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Mon, 3 Nov 2014 18:08:21 +0100
Subject: [PATCH 25/35] Refactored the project structure

---
 .../com/saulmm/material/activities/ColorActivity.java  | 10 +---------
 .../material/activities/DialerSampleActivity.java      |  8 +++-----
 .../saulmm/material/activities/SlidingActivity.java    |  2 +-
 .../material/activities/TransitionFirstActivity.java   |  2 +-
 .../material/activities/TransitionSecondActivity.java  |  2 +-
 .../fragments/SlidingTabFragment.java                  |  8 +++-----
 .../java/com/saulmm/material/{ => utils}/Utils.java    |  4 +++-
 .../adapters/DialerPagerAdapter.java}                  |  6 +++---
 .../adapter => views/adapters}/SamplePagerAdapter.java |  2 +-
 .../views => views/widgets}/SlidingTabLayout.java      |  2 +-
 .../views => views/widgets}/SlidingTabStrip.java       |  2 +-
 app/src/main/res/layout/activity_dialer.xml            |  2 +-
 app/src/main/res/layout/fragment_sliding.xml           |  2 +-
 13 files changed, 21 insertions(+), 31 deletions(-)
 rename app/src/main/java/com/saulmm/material/{slidingtabs => }/fragments/SlidingTabFragment.java (86%)
 rename app/src/main/java/com/saulmm/material/{ => utils}/Utils.java (97%)
 rename app/src/main/java/com/saulmm/material/{slidingtabs/adapter/DialerAdapter.java => views/adapters/DialerPagerAdapter.java} (88%)
 rename app/src/main/java/com/saulmm/material/{slidingtabs/adapter => views/adapters}/SamplePagerAdapter.java (96%)
 rename app/src/main/java/com/saulmm/material/{slidingtabs/views => views/widgets}/SlidingTabLayout.java (99%)
 rename app/src/main/java/com/saulmm/material/{slidingtabs/views => views/widgets}/SlidingTabStrip.java (99%)

diff --git a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
index 59a9043..9763a76 100644
--- a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
@@ -1,27 +1,19 @@
 package com.saulmm.material.activities;
 
 import android.animation.Animator;
-import android.animation.AnimatorListenerAdapter;
 import android.app.Activity;
-import android.app.ActivityOptions;
 import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.transition.Slide;
-import android.transition.Transition;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.util.Pair;
 import android.util.TypedValue;
 import android.view.View;
-import android.view.ViewAnimationUtils;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.Switch;
 
 import com.saulmm.material.R;
-import com.saulmm.material.Utils;
+import com.saulmm.material.utils.Utils;
 
 public class ColorActivity extends Activity {
 
diff --git a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
index 63ada7a..59f151a 100644
--- a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
@@ -19,13 +19,11 @@
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
-import android.support.v7.app.ActionBarDrawerToggle;
 import android.support.v7.widget.Toolbar;
 
 import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.adapter.DialerAdapter;
-import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
-import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
+import com.saulmm.material.views.adapters.DialerPagerAdapter;
+import com.saulmm.material.views.widgets.SlidingTabLayout;
 
 public class DialerSampleActivity extends ActionBarActivity {
 
@@ -50,7 +48,7 @@ private void configureToolbar() {
     private void configurePager() {
 
         ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
-        mViewPager.setAdapter(new DialerAdapter(this));
+        mViewPager.setAdapter(new DialerPagerAdapter(this));
 
         SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
         mSlidingTabLayout.setViewPager(mViewPager);
diff --git a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
index 18b6b3c..b0e76dd 100644
--- a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -28,7 +28,7 @@
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.fragments.SlidingTabFragment;
+import com.saulmm.material.fragments.SlidingTabFragment;
 
 public class SlidingActivity extends ActionBarActivity {
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index 71fbcde..cff3eaf 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -8,7 +8,7 @@
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.Utils;
+import com.saulmm.material.utils.Utils;
 
 public class TransitionFirstActivity extends Activity {
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index a09ceaf..2070534 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -9,7 +9,7 @@
 import android.widget.LinearLayout;
 
 import com.saulmm.material.R;
-import com.saulmm.material.Utils;
+import com.saulmm.material.utils.Utils;
 
 public class TransitionSecondActivity extends Activity {
 
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java b/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
similarity index 86%
rename from app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java
rename to app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
index 6ba66a3..87cde20 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/fragments/SlidingTabFragment.java
+++ b/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-package com.saulmm.material.slidingtabs.fragments;
+package com.saulmm.material.fragments;
 
 
 import android.app.Fragment;
 import android.os.Bundle;
-import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import com.saulmm.material.R;
-import com.saulmm.material.slidingtabs.adapter.SamplePagerAdapter;
-import com.saulmm.material.slidingtabs.views.SlidingTabLayout;
+import com.saulmm.material.views.adapters.SamplePagerAdapter;
+import com.saulmm.material.views.widgets.SlidingTabLayout;
 
 
 public class SlidingTabFragment extends Fragment {
diff --git a/app/src/main/java/com/saulmm/material/Utils.java b/app/src/main/java/com/saulmm/material/utils/Utils.java
similarity index 97%
rename from app/src/main/java/com/saulmm/material/Utils.java
rename to app/src/main/java/com/saulmm/material/utils/Utils.java
index 40d7b6e..ce5a781 100644
--- a/app/src/main/java/com/saulmm/material/Utils.java
+++ b/app/src/main/java/com/saulmm/material/utils/Utils.java
@@ -1,4 +1,4 @@
-package com.saulmm.material;
+package com.saulmm.material.utils;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
@@ -13,6 +13,8 @@
 import android.view.Window;
 import android.view.animation.PathInterpolator;
 
+import com.saulmm.material.R;
+
 public class Utils {
 
     public static void configureWindowEnterExitExplodeTransition(Window w) {
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java b/app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
similarity index 88%
rename from app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java
rename to app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
index 3d2d8a2..d7be485 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/DialerAdapter.java
+++ b/app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
@@ -1,4 +1,4 @@
-package com.saulmm.material.slidingtabs.adapter;
+package com.saulmm.material.views.adapters;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
@@ -9,12 +9,12 @@
 import com.saulmm.material.R;
 
 @SuppressWarnings("FieldCanBeLocal")
-public class DialerAdapter extends PagerAdapter {
+public class DialerPagerAdapter extends PagerAdapter {
 
     private final String [] TITLES = {"SPEED DIAL", "RECENTS", "CONTACTS"};
     private Context context;
 
-    public DialerAdapter(Context context) {
+    public DialerPagerAdapter(Context context) {
         this.context = context;
     }
 
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java b/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
similarity index 96%
rename from app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java
rename to app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
index d0c2ecd..81a0345 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/adapter/SamplePagerAdapter.java
+++ b/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
@@ -1,4 +1,4 @@
-package com.saulmm.material.slidingtabs.adapter;
+package com.saulmm.material.views.adapters;
 
 import android.content.Context;
 import android.support.v4.view.PagerAdapter;
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
similarity index 99%
rename from app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
rename to app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
index 51a72bd..59ebf17 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabLayout.java
+++ b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.saulmm.material.slidingtabs.views;
+package com.saulmm.material.views.widgets;
 
 import android.content.Context;
 import android.graphics.Typeface;
diff --git a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabStrip.java
similarity index 99%
rename from app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
rename to app/src/main/java/com/saulmm/material/views/widgets/SlidingTabStrip.java
index cdcb25f..50084af 100644
--- a/app/src/main/java/com/saulmm/material/slidingtabs/views/SlidingTabStrip.java
+++ b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabStrip.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.saulmm.material.slidingtabs.views;
+package com.saulmm.material.views.widgets;
 
 import android.R;
 import android.content.Context;
diff --git a/app/src/main/res/layout/activity_dialer.xml b/app/src/main/res/layout/activity_dialer.xml
index 824e0b2..b47297b 100755
--- a/app/src/main/res/layout/activity_dialer.xml
+++ b/app/src/main/res/layout/activity_dialer.xml
@@ -19,7 +19,7 @@
         android:background="#FFF"
         android:orientation="vertical">
 
-        <com.saulmm.material.slidingtabs.views.SlidingTabLayout
+        <com.saulmm.material.views.widgets.SlidingTabLayout
             android:id="@+id/activity_dialer_tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_sliding.xml b/app/src/main/res/layout/fragment_sliding.xml
index 232c674..d0af048 100644
--- a/app/src/main/res/layout/fragment_sliding.xml
+++ b/app/src/main/res/layout/fragment_sliding.xml
@@ -5,7 +5,7 @@
     android:background="#FFF"
     android:orientation="vertical">
 
-    <com.saulmm.material.slidingtabs.views.SlidingTabLayout
+    <com.saulmm.material.views.widgets.SlidingTabLayout
         android:id="@+id/sliding_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

From eb20707d8db3aef321ae30cb80faada5e3cd7b4d Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 8 Nov 2014 16:55:36 +0100
Subject: [PATCH 26/35] ended dialer activity

---
 app/build.gradle                              |   3 +-
 app/src/main/AndroidManifest.xml              |   7 +-
 .../material/activities/ColorActivity.java    |   8 +-
 .../activities/DialerSampleActivity.java      | 150 +++++++++++++++---
 .../activities/TransitionFirstActivity.java   |   6 +-
 .../activities/TransitionSecondActivity.java  |   4 +-
 .../fragments/NavigationFragment.java         |   3 +-
 .../fragments/SamplePageFragment.java         |  22 +++
 .../fragments/SlidingTabFragment.java         |   6 +-
 .../utils/{Utils.java => GUIUtils.java}       |  25 ++-
 .../views/adapters/DialerPagerAdapter.java    |  53 -------
 .../views/adapters/SamplePagerAdapter.java    |  11 +-
 .../views/widgets/SlidingTabLayout.java       |  34 +++-
 app/src/main/res/anim/translate_down_off.xml  |  19 +++
 app/src/main/res/anim/translate_down_on.xml   |  19 +++
 .../main/res/drawable/ripple_dialer_call.xml  |  12 ++
 .../main/res/drawable/ripple_dialer_idle.xml  |  12 ++
 app/src/main/res/drawable/ripple_round.xml    |   2 +-
 app/src/main/res/layout/activity_color.xml    |  37 +++--
 app/src/main/res/layout/activity_dialer.xml   |  64 ++++++--
 ...er.xml => fragment_dialer_sample_page.xml} |  15 +-
 ...liding.xml => fragment_dialer_sliding.xml} |  12 +-
 app/src/main/res/layout/list_item_dialer.xml  |  10 ++
 app/src/main/res/layout/view_fab_button.xml   |   6 +-
 app/src/main/res/values-v21/styles.xml        |   1 +
 app/src/main/res/values/colors.xml            |   2 +
 app/src/main/res/values/strings.xml           |  26 ++-
 27 files changed, 412 insertions(+), 157 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/fragments/SamplePageFragment.java
 rename app/src/main/java/com/saulmm/material/utils/{Utils.java => GUIUtils.java} (77%)
 delete mode 100644 app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
 create mode 100644 app/src/main/res/anim/translate_down_off.xml
 create mode 100644 app/src/main/res/anim/translate_down_on.xml
 create mode 100644 app/src/main/res/drawable/ripple_dialer_call.xml
 create mode 100644 app/src/main/res/drawable/ripple_dialer_idle.xml
 rename app/src/main/res/layout/{item_sliding_pager.xml => fragment_dialer_sample_page.xml} (55%)
 rename app/src/main/res/layout/{fragment_sliding.xml => fragment_dialer_sliding.xml} (80%)
 create mode 100644 app/src/main/res/layout/list_item_dialer.xml

diff --git a/app/build.gradle b/app/build.gradle
index 352f047..9a7c46a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -19,10 +19,9 @@ android {
     }
 }
 
-
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-
+    compile 'com.android.support:cardview-v7:21.0.0'
     compile 'com.android.support:appcompat-v7:21.0.0'
     compile 'com.android.support:support-v4:21.0.0'
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a654348..f0de5bb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -21,7 +21,9 @@
             android:name=".activities.SlidingActivity" >
         </activity>
 
-        <activity android:name=".activities.DialerSampleActivity">
+        <activity android:name=".activities.DialerSampleActivity"
+            android:screenOrientation="portrait">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -30,7 +32,6 @@
 
         <activity
             android:name=".activities.ColorActivity"
-            android:label="@string/title_activity_color" >
-        </activity>
+            android:label="@string/title_activity_color" />
     </application>
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
index 9763a76..f7a1ec4 100644
--- a/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/ColorActivity.java
@@ -13,7 +13,7 @@
 import android.widget.Switch;
 
 import com.saulmm.material.R;
-import com.saulmm.material.utils.Utils;
+import com.saulmm.material.utils.GUIUtils;
 
 public class ColorActivity extends Activity {
 
@@ -62,7 +62,7 @@ public void onViewAttachedToWindow(View v) {
                     getTheme().resolveAttribute(android.R.attr.colorPrimary, outValue, true);
                     revealView.setBackgroundColor(outValue.data);
 
-                    Utils.hideRevealEffect(revealView, cx, cy, 1920);
+                    GUIUtils.hideRevealEffect(revealView, cx, cy, 1920);
                 }
 
                 @Override
@@ -136,7 +136,7 @@ public void view(View view) {
         view.getLocationOnScreen(location);
 
         int cx = (location[0] + (view.getWidth() / 2));
-        int cy = location[1] + (Utils.getStatusBarHeight(this) / 2);
+        int cy = location[1] + (GUIUtils.getStatusBarHeight(this) / 2);
 
         SharedPreferences.Editor ed = sharedpreferences.edit();
         ed.putInt("x", cx);
@@ -145,7 +145,7 @@ public void view(View view) {
         ed.apply();
 
         hideNavigationStatus();
-        Utils.showRevealEFfect(revealView, cx, cy, revealAnimationListener);
+        GUIUtils.showRevealEffect(revealView, cx, cy, revealAnimationListener);
     }
 
 
diff --git a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
index 59f151a..27a47c3 100644
--- a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
@@ -1,31 +1,32 @@
-/*
-* Copyright 2013 The Android Open Source Project
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+
 
 package com.saulmm.material.activities;
 
+import android.graphics.Point;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.Toolbar;
+import android.view.Display;
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
+import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
+import android.widget.GridView;
+import android.widget.ImageButton;
 
 import com.saulmm.material.R;
-import com.saulmm.material.views.adapters.DialerPagerAdapter;
+import com.saulmm.material.utils.GUIUtils;
+import com.saulmm.material.views.adapters.SamplePagerAdapter;
 import com.saulmm.material.views.widgets.SlidingTabLayout;
 
-public class DialerSampleActivity extends ActionBarActivity {
+public class DialerSampleActivity extends ActionBarActivity implements ViewPager.OnPageChangeListener {
+
+    private int screenWidth;
+    private ImageButton fabButton;
+    private FrameLayout dialerKeysContainer;
+    private float absolutefabPosition;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,6 +36,49 @@ protected void onCreate(Bundle savedInstanceState) {
 
         configureToolbar();
         configurePager();
+        configureFab();
+        configureDialer();
+
+        dialerKeysContainer = (FrameLayout) findViewById(R.id.activity_dialer_frame_container);
+
+        // Get the screen with
+        Display display = getWindowManager().getDefaultDisplay();
+        Point size = new Point();
+        display.getSize(size);
+        screenWidth = size.x;
+    }
+
+    private void configureFab() {
+
+        fabButton = (ImageButton) findViewById(R.id.view_fab_button);
+        fabButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+
+            absolutefabPosition = v.getX();
+            GUIUtils.hideViewByScale(fabButton);
+            dialerKeysContainer.setVisibility(View.VISIBLE);
+
+             Animation showDialerContainerAnimation = AnimationUtils.loadAnimation(DialerSampleActivity.this, R.anim.translate_down_on);
+             showDialerContainerAnimation.setAnimationListener(new Animation.AnimationListener() {
+                 @Override
+                 public void onAnimationStart(Animation animation) {}
+
+                 @Override
+                 public void onAnimationEnd(Animation animation) {
+
+                     fabButton.setBackgroundResource(R.drawable.ripple_dialer_call);
+                     fabButton.setX(screenWidth / 2 - fabButton.getWidth() / 2);
+                     GUIUtils.showViewByScale(fabButton);
+                 }
+
+                 @Override
+                 public void onAnimationRepeat(Animation animation) {}
+             });
+
+            dialerKeysContainer.startAnimation(showDialerContainerAnimation);
+            }
+        });
     }
 
     private void configureToolbar() {
@@ -42,15 +86,79 @@ private void configureToolbar() {
         Toolbar mainToolbar = (Toolbar) findViewById(R.id.activity_dialer_toolbar);
         mainToolbar.setTitleTextColor(getResources().getColor(R.color.theme_dialer_accent));
         setSupportActionBar(mainToolbar);
-        getSupportActionBar().setTitle("Sliding");
+        getSupportActionBar().setTitle("Dialer");
     }
 
     private void configurePager() {
 
-        ViewPager mViewPager = (ViewPager) findViewById(R.id.activity_dialer_pager);
-        mViewPager.setAdapter(new DialerPagerAdapter(this));
+        ViewPager tabsViewPAger = (ViewPager) findViewById(R.id.activity_dialer_pager);
+        tabsViewPAger.setAdapter(new SamplePagerAdapter(this));
+        tabsViewPAger.setCurrentItem(1);
 
         SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
-        mSlidingTabLayout.setViewPager(mViewPager);
+        mSlidingTabLayout.addPagerListener(this);
+        mSlidingTabLayout.setViewPager(tabsViewPAger);
+    }
+
+    private void configureDialer() {
+
+        GridView dialerGrid = (GridView) findViewById(R.id.activity_dialer_pad);
+        dialerGrid.setAdapter(new ArrayAdapter<String>(this, R.layout.list_item_dialer,
+                getResources().getStringArray(R.array.dialer_numbers)));
     }
+
+    @Override
+    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+
+        float fabButtonPosition = (screenWidth / 2 - fabButton.getWidth()) * positionOffset;
+
+
+        if (fabButtonPosition != 0 && position != 1) {
+
+            absolutefabPosition = fabButtonPosition + (screenWidth/2 - fabButton.getWidth()/2);
+            fabButton.setX(absolutefabPosition);
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+
+        if (dialerKeysContainer.getVisibility() == View.VISIBLE) {
+
+            Animation hideAnimation = AnimationUtils.loadAnimation(this, R.anim.translate_down_off);
+            hideAnimation.setAnimationListener(new Animation.AnimationListener() {
+                @Override
+                public void onAnimationStart(Animation animation) {
+
+                    GUIUtils.hideViewByScale(fabButton);
+                }
+
+                @Override
+                public void onAnimationEnd(Animation animation) {
+
+                    dialerKeysContainer.setVisibility(View.INVISIBLE);
+                    fabButton.setBackgroundResource(R.drawable.ripple_dialer_idle);
+                    GUIUtils.showViewByScale(fabButton);
+
+                    fabButton.setX(absolutefabPosition);
+                }
+
+                @Override
+                public void onAnimationRepeat(Animation animation) {}
+            });
+
+            dialerKeysContainer.startAnimation(hideAnimation);
+
+
+
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public void onPageSelected(int position) {}
+
+    @Override
+    public void onPageScrollStateChanged(int state) {}
 }
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index cff3eaf..26d6d4f 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -8,7 +8,7 @@
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.utils.Utils;
+import com.saulmm.material.utils.GUIUtils;
 
 public class TransitionFirstActivity extends Activity {
 
@@ -21,12 +21,12 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_transition_first);
 
         // Set explode animation when enter and exit the activity
-        Utils.configureWindowEnterExitExplodeTransition(getWindow());
+        GUIUtils.configureWindowEnterExitExplodeTransition(getWindow());
 
         // Fab Button
         fabButton = findViewById(R.id.fab_button);
         fabButton.setOnClickListener(fabClickListener);
-        Utils.configureFab(fabButton);
+        GUIUtils.configureFab(fabButton);
     }
 
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index 2070534..b47b520 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -9,7 +9,7 @@
 import android.widget.LinearLayout;
 
 import com.saulmm.material.R;
-import com.saulmm.material.utils.Utils;
+import com.saulmm.material.utils.GUIUtils;
 
 public class TransitionSecondActivity extends Activity {
 
@@ -25,7 +25,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
-        Utils.configureWindowEnterExitExplodeTransition(getWindow());
+        GUIUtils.configureWindowEnterExitExplodeTransition(getWindow());
 
         getWindow().getEnterTransition().addListener(new Transition.TransitionListener() {
             @Override
diff --git a/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java b/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
index afb27e5..2738c3f 100644
--- a/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
+++ b/app/src/main/java/com/saulmm/material/fragments/NavigationFragment.java
@@ -12,8 +12,7 @@
 public class NavigationFragment extends Fragment {
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
         return inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
     }
diff --git a/app/src/main/java/com/saulmm/material/fragments/SamplePageFragment.java b/app/src/main/java/com/saulmm/material/fragments/SamplePageFragment.java
new file mode 100644
index 0000000..5bc38e2
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/fragments/SamplePageFragment.java
@@ -0,0 +1,22 @@
+package com.saulmm.material.fragments;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.saulmm.material.R;
+
+public class SamplePageFragment extends Fragment {
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        View rootView = inflater.inflate(R.layout.fragment_dialer_sample_page, container);
+
+        return rootView;
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java b/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
index 87cde20..b50dd02 100644
--- a/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
+++ b/app/src/main/java/com/saulmm/material/fragments/SlidingTabFragment.java
@@ -34,9 +34,9 @@ public class SlidingTabFragment extends Fragment {
     static final String LOG_TAG = "SlidingTabsBasicFragment";
 
     @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.fragment_sliding, container, false);
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+
+        return inflater.inflate(R.layout.fragment_dialer_sliding, container, false);
     }
 
     @Override
diff --git a/app/src/main/java/com/saulmm/material/utils/Utils.java b/app/src/main/java/com/saulmm/material/utils/GUIUtils.java
similarity index 77%
rename from app/src/main/java/com/saulmm/material/utils/Utils.java
rename to app/src/main/java/com/saulmm/material/utils/GUIUtils.java
index ce5a781..d48da35 100644
--- a/app/src/main/java/com/saulmm/material/utils/Utils.java
+++ b/app/src/main/java/com/saulmm/material/utils/GUIUtils.java
@@ -10,12 +10,15 @@
 import android.transition.Slide;
 import android.view.View;
 import android.view.ViewAnimationUtils;
+import android.view.ViewPropertyAnimator;
 import android.view.Window;
 import android.view.animation.PathInterpolator;
 
 import com.saulmm.material.R;
 
-public class Utils {
+public class GUIUtils {
+
+    public static final int SCALE_FACTOR = 30;
 
     public static void configureWindowEnterExitExplodeTransition(Window w) {
 
@@ -68,7 +71,7 @@ public void onAnimationEnd(Animator animation) {
         anim.start();
     }
 
-    public static void showRevealEFfect (final View v, int centerX, int centerY, Animator.AnimatorListener lis) {
+    public static void showRevealEffect(final View v, int centerX, int centerY, Animator.AnimatorListener lis) {
 
         v.setVisibility(View.VISIBLE);
 
@@ -84,4 +87,22 @@ public static void showRevealEFfect (final View v, int centerX, int centerY, Ani
     }
 
 
+
+    public static void hideViewByScale(View view) {
+
+        ViewPropertyAnimator propertyAnimator = view.animate().setStartDelay(SCALE_FACTOR)
+                .scaleX(0).scaleY(0);
+
+        propertyAnimator.start();
+    }
+
+    public static void showViewByScale(View view) {
+
+        ViewPropertyAnimator propertyAnimator = view.animate().setStartDelay(SCALE_FACTOR)
+                .scaleX(1).scaleY(1);
+
+        propertyAnimator.start();
+    }
+
+
 }
diff --git a/app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java b/app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
deleted file mode 100644
index d7be485..0000000
--- a/app/src/main/java/com/saulmm/material/views/adapters/DialerPagerAdapter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.saulmm.material.views.adapters;
-
-import android.content.Context;
-import android.support.v4.view.PagerAdapter;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.saulmm.material.R;
-
-@SuppressWarnings("FieldCanBeLocal")
-public class DialerPagerAdapter extends PagerAdapter {
-
-    private final String [] TITLES = {"SPEED DIAL", "RECENTS", "CONTACTS"};
-    private Context context;
-
-    public DialerPagerAdapter(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public int getCount() {
-        return TITLES.length;
-    }
-
-
-    @Override
-    public boolean isViewFromObject(View view, Object o) {
-        return o == view;
-    }
-
-
-    @Override
-    public CharSequence getPageTitle(int position) {
-        return TITLES[position];
-    }
-
-    @Override
-    public Object instantiateItem(ViewGroup container, int position) {
-
-        View view = LayoutInflater.from(context).inflate(R.layout.item_sliding_pager,
-                container, false);
-
-        container.addView(view);
-
-        return view;
-    }
-
-    @Override
-    public void destroyItem(ViewGroup container, int position, Object object) {
-        container.removeView((View) object);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java b/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
index 81a0345..e46a832 100644
--- a/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
+++ b/app/src/main/java/com/saulmm/material/views/adapters/SamplePagerAdapter.java
@@ -11,8 +11,8 @@
 @SuppressWarnings("FieldCanBeLocal")
 public class SamplePagerAdapter extends PagerAdapter {
 
-    private final String [] TITLES = {"CATEGORIES", "HOME", "TOP SELLING", "TOP GAMES", "TOP GROSSING"};
-    private final int FRAGMENT_COUNT = 5;
+    private final String [] TITLES = {"SPEED DIAL", "RECENTS", "CONTACTS"};
+    private final int FRAGMENT_COUNT = 3;
     private Context context;
 
     public SamplePagerAdapter(Context context) {
@@ -24,7 +24,6 @@ public int getCount() {
         return FRAGMENT_COUNT;
     }
 
-
     @Override
     public boolean isViewFromObject(View view, Object o) {
         return o == view;
@@ -39,11 +38,11 @@ public CharSequence getPageTitle(int position) {
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
 
-        View view = LayoutInflater.from(context).inflate(R.layout.item_sliding_pager,
-                container, false);
+        View view = LayoutInflater.from(context).inflate(
+            R.layout.fragment_dialer_sample_page,
+            container, false);
 
         container.addView(view);
-
         return view;
     }
 
diff --git a/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
index 59ebf17..dbf48ad 100644
--- a/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
+++ b/app/src/main/java/com/saulmm/material/views/widgets/SlidingTabLayout.java
@@ -31,6 +31,8 @@
 
 import com.saulmm.material.R;
 
+import java.util.ArrayList;
+
 /**
  * To be used with ViewPager to provide a tab indicator component which give constant feedback as to
  * the user's scroll progress.
@@ -79,6 +81,8 @@ public interface TabColorizer {
     private ViewPager mViewPager;
     private ViewPager.OnPageChangeListener mViewPagerPageChangeListener;
 
+    private ArrayList<ViewPager.OnPageChangeListener> pagerListeners = new ArrayList<ViewPager.OnPageChangeListener>();
+
     private final SlidingTabStrip mTabStrip;
 
     public SlidingTabLayout(Context context) {
@@ -101,6 +105,12 @@ public SlidingTabLayout(Context context, AttributeSet attrs, int defStyle) {
 
         mTabStrip = new SlidingTabStrip(context);
         addView(mTabStrip, LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
+
+        pagerListeners.add(new InternalViewPagerListener());
+    }
+
+    public void addPagerListener (ViewPager.OnPageChangeListener listener) {
+        pagerListeners.add(listener);
     }
 
     /**
@@ -161,7 +171,29 @@ public void setViewPager(ViewPager viewPager) {
 
         mViewPager = viewPager;
         if (viewPager != null) {
-            viewPager.setOnPageChangeListener(new InternalViewPagerListener());
+            viewPager.setOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+                @Override
+                public void onPageScrolled(int i, float v, int i2) {
+
+                    for (ViewPager.OnPageChangeListener pagerListener : pagerListeners) {
+                        pagerListener.onPageScrolled(i, v, i2);
+                    }
+                }
+
+                @Override
+                public void onPageSelected(int i) {
+                    for (ViewPager.OnPageChangeListener pagerListener : pagerListeners) {
+                        pagerListener.onPageSelected(i);
+                    }
+                }
+
+                @Override
+                public void onPageScrollStateChanged(int i) {
+                    for (ViewPager.OnPageChangeListener pagerListener : pagerListeners) {
+                        pagerListener.onPageScrollStateChanged(i);
+                    }
+                }
+            });
             populateTabStrip();
         }
     }
diff --git a/app/src/main/res/anim/translate_down_off.xml b/app/src/main/res/anim/translate_down_off.xml
new file mode 100644
index 0000000..79302d0
--- /dev/null
+++ b/app/src/main/res/anim/translate_down_off.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear_out_slow_in">
+
+    <translate
+        android:duration="350"
+        android:startOffset="0"
+        android:fromXDelta="0"
+        android:fromYDelta="0"
+        android:toXDelta="0"
+        android:toYDelta="100%"
+        />
+
+</set>
+ 
+    
+
+ 
diff --git a/app/src/main/res/anim/translate_down_on.xml b/app/src/main/res/anim/translate_down_on.xml
new file mode 100644
index 0000000..b534991
--- /dev/null
+++ b/app/src/main/res/anim/translate_down_on.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:interpolator/linear_out_slow_in">
+
+    <translate
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:duration="350"
+            android:startOffset="0"
+            android:fromXDelta="0"
+            android:fromYDelta="100%"
+            android:toXDelta="0"
+            android:toYDelta="0"
+        />
+</set>
+ 
+    
+
+ 
diff --git a/app/src/main/res/drawable/ripple_dialer_call.xml b/app/src/main/res/drawable/ripple_dialer_call.xml
new file mode 100644
index 0000000..87d6c96
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_dialer_call.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorControlHighlight"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/dialer_call"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple_dialer_idle.xml b/app/src/main/res/drawable/ripple_dialer_idle.xml
new file mode 100644
index 0000000..ead7fa8
--- /dev/null
+++ b/app/src/main/res/drawable/ripple_dialer_idle.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:colorPrimary"
+    >
+
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="?android:colorPrimary"/>
+        </shape>
+    </item>
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ripple_round.xml b/app/src/main/res/drawable/ripple_round.xml
index 2524a0b..ead7fa8 100644
--- a/app/src/main/res/drawable/ripple_round.xml
+++ b/app/src/main/res/drawable/ripple_round.xml
@@ -6,7 +6,7 @@
 
     <item>
         <shape android:shape="oval">
-            <solid android:color="?android:colorAccent"/>
+            <solid android:color="?android:colorPrimary"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index 823037c..774dfee 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -10,14 +10,15 @@
         android:layout_height="match_parent"
         android:background="?android:colorAccent"
         android:elevation="5dp"
-        android:visibility="invisible"/>
+        android:visibility="invisible"
+        />
 
     <View
         android:id="@+id/dialer_toolbar"
         android:layout_width="match_parent"
         android:background="?android:colorPrimary"
-        android:layout_height="?attr/actionBarSize"/>
-
+        android:layout_height="?attr/actionBarSize"
+        />
 
         <RelativeLayout
             android:id="@+id/holder_view"
@@ -27,28 +28,28 @@
             android:paddingRight="16dp"
             android:transitionName="holder1"
             android:layout_below="@id/dialer_toolbar"
-            android:background="?android:colorPrimary">
+            android:background="?android:colorPrimary"
+            >
 
         <TextView
             android:id="@+id/title_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="?android:colorAccent"
-            android:text="Title"/>
+            android:text="Title"
+            />
 
-        
         <EditText
             android:layout_below="@id/title_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textSize="34sp"
             android:fontFamily="sans-serif-medium"
-            tools:text="Amazing text"/>
+            tools:text="Amazing text"
+            />
         
         </RelativeLayout>
 
-
-       
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -99,14 +100,16 @@
             android:layout_width="match_parent"
             android:layout_height="48dp"
             android:layout_marginTop="8dp"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            >
 
             <CheckBox
                 android:id="@+id/theme_check"
                 android:layout_width="0dp"
                 android:layout_weight="1"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"/>
+                android:layout_gravity="center_vertical"
+                />
 
             <TextView
                 android:layout_width="0dp"
@@ -134,7 +137,8 @@
                 android:layout_gravity="center_vertical"
                 android:onClick="view"
                 android:clickable="true"
-                android:background="@drawable/color1"/>
+                android:background="@drawable/color1"
+                />
 
             <View
                 android:id="@+id/circle2"
@@ -144,7 +148,8 @@
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
                 android:onClick="view"
-                android:background="@drawable/color2"/>
+                android:background="@drawable/color2"
+                />
 
             <View
                 android:id="@+id/circle3"
@@ -154,7 +159,8 @@
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
                 android:onClick="view"
-                android:background="@drawable/color3"/>
+                android:background="@drawable/color3"
+                />
 
             <View
                 android:id="@+id/circle4"
@@ -163,7 +169,8 @@
                 android:layout_gravity="center_vertical"
                 android:clickable="true"
                 android:onClick="view"
-                android:background="@drawable/color4"/>
+                android:background="@drawable/color4"
+                />
 
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_dialer.xml b/app/src/main/res/layout/activity_dialer.xml
index b47297b..e595ce6 100755
--- a/app/src/main/res/layout/activity_dialer.xml
+++ b/app/src/main/res/layout/activity_dialer.xml
@@ -1,35 +1,36 @@
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
+    android:id="@+id/sample_main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/sample_main_layout">
-
-    <android.support.v7.widget.Toolbar
-        android:id="@+id/activity_dialer_toolbar"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-
-        android:background="?android:colorPrimary"
-        android:minHeight="?attr/actionBarSize"/>
+    >
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#FFF"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        >
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/activity_dialer_toolbar"
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:background="?android:colorPrimary"
+            android:minHeight="?attr/actionBarSize"
+            />
 
         <com.saulmm.material.views.widgets.SlidingTabLayout
             android:id="@+id/activity_dialer_tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:elevation="10dp"/>
+            />
 
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:background="?android:colorPrimary"
-            android:elevation="10dp"/>
+            android:elevation="10dp"
+            />
 
         <android.support.v4.view.ViewPager
             android:id="@+id/activity_dialer_pager"
@@ -37,9 +38,38 @@
             android:layout_height="0px"
             android:layout_weight="1"
             android:layout_marginBottom="10dp"
-            android:background="@android:color/white"/>
+            android:background="#ffe2e2e2"
+            />
 
     </LinearLayout>
 
-</LinearLayout>
+    <FrameLayout
+        android:id="@+id/activity_dialer_frame_container"
+        android:layout_width="match_parent"
+        android:layout_height="400dp"
+        android:layout_alignParentBottom="true"
+        android:visibility="gone"
+        android:elevation="7dp"
+        android:padding="@dimen/activity_horizontal_margin"
+        android:background="#FFF"
+        >
+
+        <GridView
+            android:id="@+id/activity_dialer_pad"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:columnWidth="100dp"
+            android:stretchMode="columnWidth"
+            android:numColumns="auto_fit"
+            />
+
+    </FrameLayout>
+
+    <include
+        android:id="@+id/view_fab_button"
+        layout="@layout/view_fab_button"
+        />
+
+</RelativeLayout>
 
diff --git a/app/src/main/res/layout/item_sliding_pager.xml b/app/src/main/res/layout/fragment_dialer_sample_page.xml
similarity index 55%
rename from app/src/main/res/layout/item_sliding_pager.xml
rename to app/src/main/res/layout/fragment_dialer_sample_page.xml
index 3c39efb..238367c 100644
--- a/app/src/main/res/layout/item_sliding_pager.xml
+++ b/app/src/main/res/layout/fragment_dialer_sample_page.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical"
-      android:gravity="center">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:gravity="center"
+    >
 
     <View
+        android:id="@+id/yellow_button"
         android:layout_width="150dp"
         android:layout_height="150dp"
         android:layout_gravity="center"
         android:background="#FFF000"
-        android:id="@+id/b1"
-        android:elevation="10dp"/>
+        android:elevation="10dp"
+        />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_sliding.xml b/app/src/main/res/layout/fragment_dialer_sliding.xml
similarity index 80%
rename from app/src/main/res/layout/fragment_sliding.xml
rename to app/src/main/res/layout/fragment_dialer_sliding.xml
index d0af048..e38448a 100644
--- a/app/src/main/res/layout/fragment_sliding.xml
+++ b/app/src/main/res/layout/fragment_dialer_sliding.xml
@@ -3,19 +3,22 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="#FFF"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    >
 
     <com.saulmm.material.views.widgets.SlidingTabLayout
         android:id="@+id/sliding_tabs"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:elevation="10dp"/>
+        android:elevation="10dp"
+        />
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="@color/theme_default_primary"
-        android:elevation="10dp"/>
+        android:elevation="10dp"
+        />
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewpager"
@@ -23,6 +26,7 @@
         android:layout_height="0px"
         android:layout_weight="1"
         android:layout_marginBottom="10dp"
-        android:background="@android:color/white"/>
+        android:background="@android:color/white"
+        />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_dialer.xml b/app/src/main/res/layout/list_item_dialer.xml
new file mode 100644
index 0000000..bcf13aa
--- /dev/null
+++ b/app/src/main/res/layout/list_item_dialer.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="75dp"
+    android:layout_height="75dp"
+    android:textSize="30sp"
+    android:gravity="center"
+    android:textColor="?android:colorPrimary"
+    android:fontFamily="sans-serif-light"
+    />
+
diff --git a/app/src/main/res/layout/view_fab_button.xml b/app/src/main/res/layout/view_fab_button.xml
index 82daf4a..7b21d56 100644
--- a/app/src/main/res/layout/view_fab_button.xml
+++ b/app/src/main/res/layout/view_fab_button.xml
@@ -2,15 +2,15 @@
 
 <ImageButton
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_alignParentRight="true"
-    android:layout_alignParentBottom="true"
     android:layout_width="@dimen/fab_size"
     android:layout_height="@dimen/fab_size"
+    android:layout_alignParentRight="true"
+    android:layout_alignParentBottom="true"
     android:layout_gravity="bottom|right"
     android:layout_marginRight="16dp"
     android:layout_marginBottom="16dp"
     android:background="@drawable/ripple_round"
     android:stateListAnimator="@anim/fab_anim"
-    android:elevation="1dp"
+    android:elevation="10dp"
     />
 
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 716973a..b9bf844 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -6,6 +6,7 @@
         <item name="android:colorPrimary">@color/theme_dialer_primary</item>
         <item name="android:colorPrimaryDark">@color/theme_dialer_high</item>
         <item name="android:colorAccent">@color/theme_dialer_accent</item>
+        <item name="android:navigationBarColor">@color/theme_dialer_primary</item>
 
         <!-- android transitions -->
         <item name="android:windowContentTransitions">true</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index d9115c2..409abcc 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -10,10 +10,12 @@
 
 
     <!-- Dialer theme -->
+    <color name="dialer_call">#00C853</color>
     <color name="theme_dialer_high">#0277BD</color>
     <color name="theme_dialer_primary">#0288D1</color>
     <color name="theme_dialer_accent">#FFF</color>
 
+    <!-- Reveal transition colors -->
     <color name="color_set_1_primary">#4fc3f7</color>
     <color name="color_set_1_accent">#009688</color>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d00d5e2..746b056 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,15 +5,25 @@
     <string name="action_settings">Settings</string>
     <string name="title_activity_my_activity2">MyActivity2</string>
     <string name="action_example">Example action</string>
-    <string name="hello_world">Hello world!</string>
     <string name="title_activity_nav_drawer">NavDrawerActivity</string>
-    <string name="title_section1">Section 1</string>
-    <string name="title_section2">Section 2</string>
-    <string name="title_section3">Section 3</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="drawer_open">Drawer Open</string>
-    <string name="drawer_closed">Drawer Closed</string>
     <string name="title_activity_color">ColorActivity</string>
+    <string name="drawer_open">Open</string>
+    <string name="drawer_closed">Close</string>
+
+    <!-- Dialer activity -->
+    <string-array name="dialer_numbers">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+        <item>9</item>
+        <item>*</item>
+        <item>0</item>
+        <item>#</item>
+    </string-array>
 
 </resources>

From e8a64be3e281d28507539a549d9c40fa287c1261 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Sat, 8 Nov 2014 17:06:26 +0100
Subject: [PATCH 27/35] Updated Readme

---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d66e878..2216e74 100644
--- a/README.md
+++ b/README.md
@@ -26,4 +26,11 @@ Commit - **f502305**
 
 Commit - **ba9c202**
 
-![](https://lh3.googleusercontent.com/-eQoRYLME7-0/VFEZ9qNaR7I/AAAAAAAAvqg/xk6U4UT_FUY/w420-h747-no/reveal.gif)
\ No newline at end of file
+![](https://lh3.googleusercontent.com/-eQoRYLME7-0/VFEZ9qNaR7I/AAAAAAAAvqg/xk6U4UT_FUY/w420-h747-no/reveal.gif)
+
+## Replicating some parts of the lollypop dialer app basing on the material design principle: Motion provides meaning
+
+Commit - **eb20707**
+
+![](https://lh6.googleusercontent.com/-t40vK2mcvkI/VF4-e7AzhBI/AAAAAAAAwnQ/lyzfRIj9heo/w800-h1422-no/dialer.gif)
+

From 3f1102b50606d2b57781ad5c0de232697da47862 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 27 Nov 2014 18:53:52 +0100
Subject: [PATCH 28/35] Created the elevation sample

---
 app/src/main/AndroidManifest.xml              |  28 ++---
 .../activities/DialerSampleActivity.java      | 119 +-----------------
 .../activities/ElevationSampleActivity.java   |  17 +++
 .../res/drawable/translation_selector.xml     |  20 +++
 .../res/layout/activity_elevation_sample.xml  |  61 +++++++++
 .../main/res/menu/menu_elevation_sample.xml   |   8 ++
 app/src/main/res/values/strings.xml           |   2 +
 7 files changed, 123 insertions(+), 132 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/activities/ElevationSampleActivity.java
 create mode 100644 app/src/main/res/drawable/translation_selector.xml
 create mode 100644 app/src/main/res/layout/activity_elevation_sample.xml
 create mode 100644 app/src/main/res/menu/menu_elevation_sample.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0de5bb..4a7b869 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,31 +7,31 @@
         android:icon="@drawable/ic_launcher"
         android:label=""
         android:theme="@style/AppTheme" >
-
-        <activity
-            android:name=".activities.TransitionFirstActivity">
+        <activity android:name="com.saulmm.material.activities.TransitionFirstActivity" >
         </activity>
-
         <activity
-            android:name=".activities.TransitionSecondActivity"
+            android:name="com.saulmm.material.activities.TransitionSecondActivity"
             android:label="@string/title_activity_my_activity2" >
         </activity>
-
-        <activity
-            android:name=".activities.SlidingActivity" >
+        <activity android:name="com.saulmm.material.activities.SlidingActivity" >
         </activity>
+        <activity
+            android:name="com.saulmm.material.activities.DialerSampleActivity"
+            android:screenOrientation="portrait" >
 
-        <activity android:name=".activities.DialerSampleActivity"
-            android:screenOrientation="portrait">
+        </activity>
+        <activity
+            android:name="com.saulmm.material.activities.ColorActivity"
+            android:label="@string/title_activity_color" />
+        <activity
+            android:name="com.saulmm.material.activities.ElevationSampleActivity"
+            android:label="@string/title_activity_elevation_sample" >
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name=".activities.ColorActivity"
-            android:label="@string/title_activity_color" />
     </application>
+
 </manifest>
diff --git a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
index 27a47c3..527a101 100644
--- a/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/DialerSampleActivity.java
@@ -21,7 +21,7 @@
 import com.saulmm.material.views.adapters.SamplePagerAdapter;
 import com.saulmm.material.views.widgets.SlidingTabLayout;
 
-public class DialerSampleActivity extends ActionBarActivity implements ViewPager.OnPageChangeListener {
+public class DialerSampleActivity extends ActionBarActivity  {
 
     private int screenWidth;
     private ImageButton fabButton;
@@ -35,50 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_dialer);
 
         configureToolbar();
-        configurePager();
-        configureFab();
-        configureDialer();
-
-        dialerKeysContainer = (FrameLayout) findViewById(R.id.activity_dialer_frame_container);
-
-        // Get the screen with
-        Display display = getWindowManager().getDefaultDisplay();
-        Point size = new Point();
-        display.getSize(size);
-        screenWidth = size.x;
-    }
-
-    private void configureFab() {
-
-        fabButton = (ImageButton) findViewById(R.id.view_fab_button);
-        fabButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-            absolutefabPosition = v.getX();
-            GUIUtils.hideViewByScale(fabButton);
-            dialerKeysContainer.setVisibility(View.VISIBLE);
-
-             Animation showDialerContainerAnimation = AnimationUtils.loadAnimation(DialerSampleActivity.this, R.anim.translate_down_on);
-             showDialerContainerAnimation.setAnimationListener(new Animation.AnimationListener() {
-                 @Override
-                 public void onAnimationStart(Animation animation) {}
-
-                 @Override
-                 public void onAnimationEnd(Animation animation) {
-
-                     fabButton.setBackgroundResource(R.drawable.ripple_dialer_call);
-                     fabButton.setX(screenWidth / 2 - fabButton.getWidth() / 2);
-                     GUIUtils.showViewByScale(fabButton);
-                 }
-
-                 @Override
-                 public void onAnimationRepeat(Animation animation) {}
-             });
-
-            dialerKeysContainer.startAnimation(showDialerContainerAnimation);
-            }
-        });
     }
 
     private void configureToolbar() {
@@ -88,77 +44,4 @@ private void configureToolbar() {
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setTitle("Dialer");
     }
-
-    private void configurePager() {
-
-        ViewPager tabsViewPAger = (ViewPager) findViewById(R.id.activity_dialer_pager);
-        tabsViewPAger.setAdapter(new SamplePagerAdapter(this));
-        tabsViewPAger.setCurrentItem(1);
-
-        SlidingTabLayout mSlidingTabLayout = (SlidingTabLayout) findViewById(R.id.activity_dialer_tabs);
-        mSlidingTabLayout.addPagerListener(this);
-        mSlidingTabLayout.setViewPager(tabsViewPAger);
-    }
-
-    private void configureDialer() {
-
-        GridView dialerGrid = (GridView) findViewById(R.id.activity_dialer_pad);
-        dialerGrid.setAdapter(new ArrayAdapter<String>(this, R.layout.list_item_dialer,
-                getResources().getStringArray(R.array.dialer_numbers)));
-    }
-
-    @Override
-    public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
-
-        float fabButtonPosition = (screenWidth / 2 - fabButton.getWidth()) * positionOffset;
-
-
-        if (fabButtonPosition != 0 && position != 1) {
-
-            absolutefabPosition = fabButtonPosition + (screenWidth/2 - fabButton.getWidth()/2);
-            fabButton.setX(absolutefabPosition);
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-
-        if (dialerKeysContainer.getVisibility() == View.VISIBLE) {
-
-            Animation hideAnimation = AnimationUtils.loadAnimation(this, R.anim.translate_down_off);
-            hideAnimation.setAnimationListener(new Animation.AnimationListener() {
-                @Override
-                public void onAnimationStart(Animation animation) {
-
-                    GUIUtils.hideViewByScale(fabButton);
-                }
-
-                @Override
-                public void onAnimationEnd(Animation animation) {
-
-                    dialerKeysContainer.setVisibility(View.INVISIBLE);
-                    fabButton.setBackgroundResource(R.drawable.ripple_dialer_idle);
-                    GUIUtils.showViewByScale(fabButton);
-
-                    fabButton.setX(absolutefabPosition);
-                }
-
-                @Override
-                public void onAnimationRepeat(Animation animation) {}
-            });
-
-            dialerKeysContainer.startAnimation(hideAnimation);
-
-
-
-        } else {
-            super.onBackPressed();
-        }
-    }
-
-    @Override
-    public void onPageSelected(int position) {}
-
-    @Override
-    public void onPageScrollStateChanged(int state) {}
 }
diff --git a/app/src/main/java/com/saulmm/material/activities/ElevationSampleActivity.java b/app/src/main/java/com/saulmm/material/activities/ElevationSampleActivity.java
new file mode 100644
index 0000000..a7ea4db
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/activities/ElevationSampleActivity.java
@@ -0,0 +1,17 @@
+package com.saulmm.material.activities;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import com.saulmm.material.R;
+
+public class ElevationSampleActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_elevation_sample);
+    }
+}
diff --git a/app/src/main/res/drawable/translation_selector.xml b/app/src/main/res/drawable/translation_selector.xml
new file mode 100644
index 0000000..dc4a668
--- /dev/null
+++ b/app/src/main/res/drawable/translation_selector.xml
@@ -0,0 +1,20 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_pressed="true">
+        <set>
+            <objectAnimator android:propertyName="translationZ"
+                android:duration="@android:integer/config_shortAnimTime"
+                android:valueTo="10dp"
+                android:valueType="floatType"/>
+        </set>
+    </item>
+    <item
+        android:state_pressed="false"
+        >
+        <set>
+            <objectAnimator android:propertyName="translationZ"
+                android:duration="100"
+                android:valueTo="2dp"
+                android:valueType="floatType"/>
+        </set>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_elevation_sample.xml b/app/src/main/res/layout/activity_elevation_sample.xml
new file mode 100644
index 0000000..6b9e48f
--- /dev/null
+++ b/app/src/main/res/layout/activity_elevation_sample.xml
@@ -0,0 +1,61 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#EAEAEA"
+    >
+
+    <android.support.v7.widget.Toolbar
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:background="?android:colorPrimary"
+        android:minHeight="?attr/actionBarSize"
+        android:elevation="5dp"
+        />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        >
+
+        <android.support.v7.widget.CardView
+            android:layout_gravity="center"
+            android:layout_width="100dp"
+            android:layout_height="96dp"
+            android:layout_marginTop="16dp"
+            android:stateListAnimator="@drawable/translation_selector"
+            android:elevation="2dp"
+            android:clickable="true"
+            card_view:cardCornerRadius="4dp"
+            />
+
+        <android.support.v7.widget.CardView
+            android:layout_gravity="center"
+            android:layout_width="100dp"
+            android:layout_height="96dp"
+            android:layout_marginTop="16dp"
+            android:stateListAnimator="@drawable/translation_selector"
+            android:elevation="2dp"
+            android:clickable="true"
+            card_view:cardCornerRadius="4dp"
+            />
+
+        <android.support.v7.widget.CardView
+            android:layout_gravity="center"
+            android:layout_width="100dp"
+            android:layout_height="96dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:stateListAnimator="@drawable/translation_selector"
+            android:elevation="2dp"
+            android:clickable="true"
+            card_view:cardCornerRadius="4dp"
+            />
+
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/menu/menu_elevation_sample.xml b/app/src/main/res/menu/menu_elevation_sample.xml
new file mode 100644
index 0000000..31e169c
--- /dev/null
+++ b/app/src/main/res/menu/menu_elevation_sample.xml
@@ -0,0 +1,8 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.saulmm.material.activities.ElevationSampleActivity">
+    <item android:id="@+id/action_settings"
+        android:title="@string/action_settings"
+        android:orderInCategory="100"
+        android:showAsAction="never"/>
+</menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 746b056..d4bacff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -26,4 +26,6 @@
         <item>#</item>
     </string-array>
 
+    <string name="title_activity_elevation_sample">ElevationSampleActivity</string>
+
 </resources>

From e6a0356de699ac7c889f7ab3780534cc6795ea7e Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 27 Nov 2014 18:58:54 +0100
Subject: [PATCH 29/35] Updated Readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 2216e74..c6fff7c 100644
--- a/README.md
+++ b/README.md
@@ -34,3 +34,9 @@ Commit - **eb20707**
 
 ![](https://lh6.googleusercontent.com/-t40vK2mcvkI/VF4-e7AzhBI/AAAAAAAAwnQ/lyzfRIj9heo/w800-h1422-no/dialer.gif)
 
+
+## Using StateListAnimator to change the elevation of a view smootly
+
+Commit - **3f1102b**
+
+![](https://lh4.googleusercontent.com/-qqERGSF7t7Q/VHdlcZmbPgI/AAAAAAAAx1Q/CPo4dJk2_MM/w364-h644-no/elevation_sample.gif)
\ No newline at end of file

From 8239c2f9155dfdaed62b64aeb5b13af394278ef5 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Tue, 17 Mar 2015 21:10:38 +0100
Subject: [PATCH 30/35] Edited .gitignore & libraries versions

---
 .gitignore                               |   4 -
 app/build.gradle                         |  11 +-
 build.gradle                             |   2 +-
 gradle.properties                        |   4 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 0 -> 49896 bytes
 gradle/wrapper/gradle-wrapper.properties |   6 +
 gradlew                                  | 164 +++++++++++++++++++++++
 gradlew.bat                              |  90 +++++++++++++
 8 files changed, 266 insertions(+), 15 deletions(-)
 create mode 100644 gradle/wrapper/gradle-wrapper.jar
 create mode 100644 gradle/wrapper/gradle-wrapper.properties
 create mode 100755 gradlew
 create mode 100644 gradlew.bat

diff --git a/.gitignore b/.gitignore
index 40302dc..5c42b3c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,10 +20,6 @@ gen-external-apklibs
 
 #gradle
 .gradle
-local.properties
-gradlew
-gradlew.bat
-gradle/
 build/
 
 #vi
diff --git a/app/build.gradle b/app/build.gradle
index 9a7c46a..b6a5756 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,17 +11,12 @@ android {
         versionCode 1
         versionName "1.0"
     }
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
+
 }
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile 'com.android.support:cardview-v7:21.0.0'
-    compile 'com.android.support:appcompat-v7:21.0.0'
-    compile 'com.android.support:support-v4:21.0.0'
+    compile 'com.android.support:appcompat-v7:22.0.0'
+    compile 'com.android.support:support-v4:22.0.0'
 }
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index b75798f..d3ff69d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.14.0'
+        classpath 'com.android.tools.build:gradle:1.1.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle.properties b/gradle.properties
index 5d08ba7..1d3591c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,8 +1,8 @@
 # Project-wide Gradle settings.
 
 # IDE (e.g. Android Studio) users:
-# Settings specified in this file will override any Gradle settings
-# configured through the IDE.
+# Gradle settings configured through the IDE *will override*
+# any settings specified in this file.
 
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..8c0fb64a8698b08ecc4158d828ca593c4928e9dd
GIT binary patch
literal 49896
zcmagFb986H(k`5d^NVfUwr$(C?M#x1ZQHiZiEVpg+jrjgoQrerx!>1o_ul)D>ebz~
zs=Mmxr&>W81QY-S1PKWQ%N-;H^tS;2*XwVA`dej1RRn1z<;3VgfE4~kaG`A%QSPsR
z#ovnZe+tS9%1MfeDyz`RirvdjPRK~p(#^q2(^5@O&NM19EHdvN-A&StN>0g6QA^VN
z0Gx%Gq#PD$QMRFzmK+utjS^Y1F0e8&u&^=w5K<;4Rz|i3A=o|IKLY+g`iK6vfr9?+
z-`>gmU&i?FGSL5&F?TXFu`&Js6h;15QFkXp2M1H9|Eq~bpov-GU(uz%mH0n55wUl-
zv#~ccAz`F5wlQ>e_KlJS3@{)B?^v*EQM=IxLa&76^y51a((wq|2-`qON>+4dLc{Oo
z51}}o^Zen(oAjxDK7b++9_Yg`67p$bPo3~BCpGM7uAWmvIhWc5Gi+gQZ|Pw<qsXkJ
z#UKj`c8#DW2he(+i|9&^{QOxN1tjFeAl4C$wk<6$!Hu;tK;hS+!ekG5&mZT4iNNbq
ziXSvf1S2Gd0gfLUJqYVci|hMuS_X7Y`=kA}2Zz5Z7Ww~~qq3*7i>a-Gll@<1xmcPy
z|NZmu6m)g5Ftu~BG&Xdxclw7Cij{xbBMBn-LMII#Slp`AElb&2^Hw+w>(3crLH!;I
zN+Vk$D+wP1#^!MDCiad@vM>H#6+`Ct#~<f_R)I<|+W)L)=C<FS+*s?z=kN7{Q21?(
zY>6VHL4lzmy;l<MYEx8~KG5K1pT0U^i|oh&-U7R6D8Y9REPu%~l)e8$xB#sMbWmvv
zdgy#xQFxTSYfpKoCRFwc-{JK1lOs(5m)=NY2VX=A=W?u$y68?sWcxO6T^SdVqIOJ`
z0<%h8kicZ>Sdk>`z6)=>Wh15Q2)dQtGqvn0vJU@+(B5{MUc*qs4!T+V=q=wy)<6$~
z!G>e_4dN@lGeF_$q9`Ju6Ncb*x?O7=l{anm7Eahuj_6lA{*#Gv*TaJclevPVbbVYu
z(NY?5q+xxbO6%g1xF0r@<!(+el1|4j{yt1~Vs7wpw5x-FtDD(A;*hOxY&zkq)^SRM
z$4w{(lTeXd2wV5XP{QhK%SGG1x}!yMrKE>Ix8fJ~u)VRUp`S%&rN$&e!Od`~s+64J
z5*)*WSi*i{k%JjMSIN#X;jC{HG$-^iX+5f5BGOIHWAl*%15Z#!xntpk($-EGKCzKa
zT7{siZ9;4TICsWQ$pu&wKZQTCvpI$Xvzwxoi+XkkpeE&&kFb!B?h2hi%^YlXt|-@5
zHJ~%AN!g_^tmn1?HSm^|gCE#!GRtK2(L{9pL#hp<C4N8t_wMpvEBE+9!@1(Gy>0xh
zME}|DB>(5)`iE7CM)&_+S}-Bslc#@B5W4_+k4Cp$l>iVyg$KP>CN?SVGZ(&02>iZK
zB<^HP$g$Lq*L$BWd?2(F?-MUbNWTJVQdW7$#8a|k_30#vHAD1Z{c#p;bETk0VnU5A
zBgLe2HFJ3032$G<`m*OB!KM$*sdM20jm)It5OSru@tXpK5LT>#8)N!*skNu1$TpIw
zufjjdp#lyH5bZ%|Iuo|iu9vG1HrIVWLH>278xo>aVBkPN3V$~!=KnlXQ4eDqS7%E%
zQ!z^$Q$b^6Q)g#cLpwur(|<0gWHo6A6jc;n`t(V9T;LzTAU{I<nV^EgiGUNsLgEDs
zkVZoVfS|G^$t~wk@w~l|_P;}a-gefH^GX*>Au*uEQ%Ort1k+Kn+f_N`9|bxYC+~Z1
zCC1UCWv*Orx$_@ydv9mIe(liLfOr7mhbV@tKw{6)q^1DH1nmvZ0cj215R<~&I<4S|
zgnr;9Cdjqpz#o8i0CQjtl`}{c*P)aSdH|abxGdrR)-3z+02-eX(k*B)Uqv6~^nh**
z<b`p}fZ<O_Dm=_!2o?vmD;ZE+PCPca6)ju-xpg^$g`Ft}nN&PoK4`V6F!klpX?$+>
zGh0A%o~bd$iYvP!egRY{hObDIvy_vXAOkeTgl5o!33m!l4VLm@<-FwT0+k|yl~vUh
z@RFcL4=b(QQQmwQ;>FS_e96dyIU`jmR%&&Amxcb8^&?wvpK{_V_IbmqHh);$hBa~S
z;^ph!k~noKv{`Ix7Hi&;Hq%y3wpqUsYO%HhI3Oe~HPmjnSTEasoU;Q_UfYbzd?Vv@
zD6ztDG|W|%xq)xqSx%bU1<hc*Wnq_LM0m(V<5VyJAiq#_@ZfKikrD4o%n&WO4q2ej
zIfyxDg(==DqbX`j=AvfHCX(KgVHyVe4WdRsQSTv_vR<)f4eJ?vBVt|h*)r9hD0!qP
zADW&jInS-o>f>fF#;p9g=Hnjph>Pp$ZHaHS@-DkHw#H&vb1gARf4A*zm3Z75QQ6l(
z=-MPMjish$J$0I49EEg^Ykw8IqSY`XkCP&TC?!7zmO`ILgJ9R{<i@p=4;z_i+sUG)
z0H)plxmrLFLJK@TX@g=ScvqG2p7(U*Qm9_23pWT5bI8fwu`7Z=jgk^X%~85x$${F{
z1e@9O3|NYMRL<+eQ@jDzgV`koqd!0ed!NJT0|TqwXI0vhyJ*Rx)W2jQ1dHJAQpah2
zD?l1K_i<FzR$c(nvUd?#!ZnJ1(sXmlXjQ!S6vd@pAGv|b=-w0bWA<-F>56s-ZY$f>
zU9GwXt`(^0LGOD9@WoNFK0owGKDC1)QACY_r#@IuE2<`tep4B#I^(PRQ_-Fw(5nws
zpkX=rVeVXzR;+%UzoNa;jjx<&<VYAS1p4G0Nz6N1)Ty^N(!C@$Hdx_Lajhe)Wta9`
zC^Xt(bd*jqqL^Wgm6LZlQYCis?7O<F8tCG9vmC{=JVts=z_(%waDz*rELTuiTWE!V
z#^5HTs}5ycsg)}Q+MkSRiA~SNR7?Yz9|<*IWeIh!5*YBnkr~@jmy$nc3@;cAw3t~~
zrO2txz)VL~#h-@P+icqy)Lh-{+Fyx%rGW&886dL>@ABmU5X926KsQsz40o*{@47S2
z)p9z@lt=9?A2~!G*QqJWYT5z^CTeckRwhSWiC3h8PQ0M9R}_#QC+lz>`?kgy2DZio
zz&2Oz<i!GDlpRuj0;341$n>o=yTXVf-?&E;_t`qY<To&+GNQx^TbA!#Vo1eA2Fa5|
z)EJG?^-6#e_uJ2n3b*&ZIiu((@V|j}k}0gKDz~`cOd$1y*~6HI7eLCUcCNSnjGFZj
z9U2KH3r4RoIx5~ko|m5j9q+sY8dqa%aN!JDGDW-!x0pgnYfjv#$rmC(j6gWzS|Ma?
z=YzVI^Orbj6!9?3zA+iVzuggd9f1`6(9ic#5{rEqsW)U&<QWvbC9!^>{Oy>?+7+I=
zWl!tZM_YCLmGXY1nKbIHc;*Mag{Nzx-<P4@aJOV*2fLzG!@ZWhwOPCxitK@~wHm-D
z1#!#3v^uQVn`zvEhkgS|%+BD3r0=A*BS75q`-e~Huc)1f+*vVD$&Z0fea~m?>#yA{
zTATrWj;Nn;NWm6_1#0zy9SQiQV=38f(`DRgD|RxwggL(!^`}lcDTuL4RtLB2F5)lt
z=mNMJN|1gcui=?#{NfL{r^nQY+_|N|6Gp5L^vRgt5&tZjSRIk{_*y<3^NrX6PTkze
zD|*8!08ZVN)-72TA4Wo3B=+Rg1s<WiEcjrtmrFP?-xL`yZw%T20ll1iC&(Z%Bcm6_
z`-1;huVP#q&|&a5ZbSI%S!n;WS5f~*SSxIAXJ%>c>SX9*X>a!rR~ntLVYeWF5MrLl
zA&1L8oli@9ERY|geFokJq^O$2hEpV<D5M>pIW8G>PPH0;=|7|#AQChL2Hz)4XtpAk
zNrN2@Ju^8y&42HCvGddK3)r8FM?oM!3oeQ??bjoYjl$2^3|T7~s}_^835Q(&b>~3}
z2kybqM_%CIKk1KSOuXDo@Y=OG2o!SL{Eb4H0-QCc+BwE8x6{rq9j$6EQUYK5a7JL!
z`#NqLkDC^u0$R1Wh@%&;yj?39HRipTeiy6#+?5OF%pWyN{0+dVIf*7@T&}{v%_aC8
zCCD1xJ+^*uRsDT%lLxEUuiFqSnBZu`0yI<gg`ef@G-s?|xXp3&RHqB9NzDVz5&E`<
zn|5Bf$qFi6W#8J=R=C#@*NEn*RlfXsRY-Dp`<X>FSv*ajhO^DNoi35o1**16bg1JB
z{jl8@msjlA<e`^h=Z8oA=OKW51p)^CZPw4ld;k`T3Wbt#0U111K=bzp3&)WWGDJ3W
zC$=E!w=~$d0hCe`rWhqxnkVh;@K9>n3`qW{1^SIklxN^q#w|#gqFgkAZ4xtaoJN*u
z{YUf|`W)RJfq)@6F&LfUxoMQz%@3SuEJHU;-YXb7a$%W=2RWu5;j44cMjC0oYy|1!
zed@H>VQ!7=f~DVYkWT0nfQfAp*<@FZh{^;wmhr|K(D)i?fq9<M3WP)O7zF<!PXt`n
zW=w*IU$gzHgkeL!Y#;^g!Uak2OrTjGF$uJQowOknjs)=lf@;GAns|qZR(LZ&lw<_%
zK?F?j4YZ)`)Zp=+aiwKz**}z|1eVjpzM=osRDTkdRQ>r2FEIatP=^0(s{f8GBn<8T
zVz_@sKhbLE&d91L-?o`13zv6PNeK}O5dv>f{-`!ms#4U+JtPV=fgQ5;iNPl9Hf&9(
zsJSm<p93&4gDZYcC2+<7H?f{~@$%kIC|f;(sfSJPne&``?&F-b-tX6YdZ5tT#t^rt
zG7n*4Trrlc-(?Z(tS_YZQQ)Y?cMNpy$W&yiGUXo9gJe;lj%qcGlGBn-dcR^$3Fs_5
zu$kvCjEJ}Ui^X()cP4a^({s}oUt2RUP)q6z;smMW*oy#5qLxHZ1AswFOgnx7&IWN8
z06xM`SqgQglTAY+biCAA&cAIUvPu}a?TSiZN0N?-7LLiLssgVVHzY-nVi;4A;=x8n
zO@ffaX-#$GbDV7Obd*ixvC)R*RQjKS9H@%{Paz{U7%S0Xmf~WQNnvg%F`O$hqQ9eI
zE(1$YopB9|P=m%@#H(edX~W7&80!AGzMdT380nbkEVNKm_EM#o(B-h0YJ@{h$xsW%
zXRvL0C~=%mcW2_pBSd!XAdg|dkjG0yPtZOyae9jm>5iXIqN7|;I5M08MjUJ{J2@M3
zYN9ft?xIjx&{$K_>S%;Wfwf9N>#|ArVF^shFb9vS)v9Gm00m_%^wcLxe;gIx$7^xR
zz$-JDB|>2tnGG@Rrt@R>O40AreXSU|kB3Bm)NILHl<Qem81qAZwnTf&VXu)~D><r)
z18g#In{Sk6?}F44@Mv+_n7C>rcQ&jak^+~b`)2;otjI(n8A_X~kvp4N$+4|{8IIIv
zw*(i}tt+)Kife9&xo-TyoPffGYe;D0a%!Uk(Nd^m?SvaF-gdAz4~-DTm3|Qzf%Pfd
zC&tA;D2b4F@d23KV)Csxg6fyOD2>pLy#n+rU&KaQU*txfUj&D3aryVj!Lnz*;xHvl
zzo}=X>kl0mBeSRXoZ^SeF94hlCU*cg+b}8p#>JZvWj8gh#66A0ODJ`AX>rubFqbBw
z-WR3Z5`33S;7D5J8nq%Z^JqvZj^l)wZUX#7^q&*R+XVPln{wtnJ~;_WQzO{BIFV55
zLRuAKXu+A|7*2L*<_P${>0V<tRuzAkdWzz+5h7jo8oP>dVjlC|n^@lRi}r?wnzQQm
z3&h~C3!4C`w<92{?Dpea@5nLP2RJrxvCCBh%Tjobl2FupWZfayq_U$Q@L%$uEB6#X
zrm_1TZA8FEtkd`tg)a_jaqnv3BC_O*AUq-*RNLOT)$>2D!r>FZdH&$x5G_FiAPaw4
zgK*7>(qd6R?+M3s@h>Z|H%7eGPxJWn_U$w`fb(Mp+_IK2Kj37YT#Xe5e6KS-_~mW}
z`NXEovDJh7n!#q4b+=ne<7uB7Y2(TAR<3@PS&o3P$h#cZ-xF$~JiH6_gsv9v(#ehK
zhSB_#AI%lF#+!MB5DMUN+Zhf}=t~{B|Fn{rGM?dOaSvX!D{oGXfS*%~g`W84JJAy4
zMdS?9Bb$vx?`91$J`pD-MGCTHNxU+SxLg&QY+*b_pk0R=A`F}jw$pN*BNM8`6Y=cm
zgRh#vab$N$0=XjH6vMyTHQg*+1~gwOO9yhnzZx#e!1H#|Mr<`jJGetsM;$TnciSPJ
z5I-R0)$)0r8ABy-2<wkPatn?)b`7wG?VPZW69wN;gF6Hcw@+SI3wBBUtVM;^nDxr;
zOw@}HZR0+=4Eg>y&`2$33xx#%1mp+@1Vr|q_e=#t7YjjWXH#3F|Fu&ltG#+-tE2K7
zOJkYxNa74@UT_K4CyJ%mR9Yfa$l=z}lB(6)tZ1Ksp2bv$^OUn3Oed@=Q0M}imYTwX
zQoO^_H7SKzf_#kPgKcs%r<l0PY{=(svpsKlZ?_+BrT_ds-sT3H-qlBnDQJT*ucs0m
zbPX4qaZuhbp%FSZ{Y7p~l#@)5KT1s&TSZ}Wg$qSwcXKCew=8NS!4W1e{Q|?!9eG^v
zQWZ8M>4BFUyAK9MzfYReHCd=l)YJEgPKq-^z3C%4lq%{&8c{2CGQ3jo!iD|wSEhZ#
zjJoH87Rt{4*M_1GdBnBU3trC*hn@KCFABd=Zu`hK;@!TW`hp~;4Aac@24m|GI)Ula
z4y%}ClnEu;AL4XVQ6^*!()W#P>BYC@K5mw7c4X|Hk^(mS9ZtfMsVLoPIiwI?w_X0-
z#vyiV5q9(xq~fS`_FiUZw->8Awktga<tS2TUBwv(V(GLz>>2SrWyvZ|h@LVFtnY#T
z%OX30{<CR{1dX4_88vcTN2W_z$|=%RBjz{I5#_g=`Y>yiSov4!43kFd(8)cPRMyrN
z={af_ONd;m=`^wc7lL|b7V!;zmCI}&8qz=?-6t=uOV;X>G{8pAwf9UJ`Hm=ubIbgR
zs6bw3pFeQHL`1P1m5fP~fL*s?rX_|8%tB`Phrij^Nkj{o0oCo*g|ELexQU+2<b0b^
zH6Si*&}T1;-IIYpVfU-sbg3b!AY(3~!W5e052of>gt66=7}w5A+Qr}mHXC%)(ODT#
zK#XTuzqOmMsO~*wgoYjDcy)P7G`5x7mYVB?DOXV^D3nN89P#?cp?A~c%c$#;+|10O
z8z(C>mwk#A*LDlpv2~JXY_y_OLZ*Mt)>@gqKf-Ym+cZ{8d%+!1xNm3_xMygTp-!A5
zUTpYFd=!lz&4IFq)Ni7kxLYWhd0o2)ngenV-QP@VCu;147_Lo9f~=+=Nw$6=xyZzp
zn7zAe41Sac>O60(dgwPd5a^umFVSH;<7vN<lRA{u-cX8bx?_y2UOPIBB44tjb`IcO
zp6}D0iM}Wf<X;-2WV;9t=wB-R;oPOu2a3g;jpSOFhzk7@VMA`wh-)A@F!Dfu=sqs}
zh3d@>>o;}YlMYhBZFZ}-sz`P^3oAI>SCZy&zUtwKSewH;CYysPQN7H>&m215&e2J?
zY}<s6FT=4{CBlz(b$RJTR}(J~<Q5p;B(@DqA^RlVZDzx`pO{;1k_P+NqV@g@*Y^!b
z9U}UTEbwfq?TYFSxZwif?AY?14KWTB-2?`^zPb+j`a1PC#>>5N-LhaDeRF~C0cB>M
z7@y&xh9q??*EIKnh*;1)n-WuSl6HkrI?OUiS^lx$Sr2C-jUm6zhd{nd(>#O8k9*kF
zPom7-%w1NjFpj7WP=^!>Vx^6SG^r`r+M&s7V(uh~!T7aE;_ubqNSy)<5(Vi)-^Mp9
zEH@8Vs-+FEeJK%M0z3FzqjkXz$n~BzrtjQv`LagAMo>=?dO8-(af?k@UpL5J#;18~
zHCnWuB(m6G6a2gDq2s`^^5km@A3Rqg<a|J50~@3o(TXhi78&sK_*K=g#4V!%w9WX1
zYs8Dti=m0CkoIjQ_@!zEcwxjMKg29Zyu~nvF&-}n4!GMSQf#Q}f0>-oHZ68v5NqVc
zHX_Iw!OOMhz<DqCkmE7ZfX9>S=gfR7k;K1gkEwuFs|MYTeNhc0js>Wo#^=wX4T<`p
zR2$8p6%A9ZTac;OvA4u#Oe3(OUep%&QgqpR8-&{0gjRE()!Ikc?ClygFmGa(7Z^9X
zWzmV0$<8Uh)#qaH1`2YCV4Zu6@~*c*bhtHXw~1I6q4I>{92Eq+ZS@_nSQU43b<g9G
zTKyjN3#5Qd%<Udspb$!V=(rzilam)(#Fs}JSO&nUI(jg<k$kYl(6yA9p$mgFy3e(*
zC3Q3=H8|5%6t#ASoV7&?IEY8p2Gba)IVm>Zyidk@hd$j-_iL=^^2CwPcaXnBP;s;b
zA4C!k+~rg4U)}=bZ2q*)c4BZ#a&o!uJo*6hK3JRBhOOUQ6fQI;dU#3v>_#yi62&Sp
z-%9JJxwIfQ`@<lw;bqz7KXGLVZhZoATNK$7+zaq2l8<MFt|mtHt_xfk+;T^dvn|o;
zq?TCp3~w(TQ;2Ced?j+^z4{&N?QM<7<uDvgkT9(3GoQ@v8}d>w(_qH0J0z~(lbh`P
zHoyp2?Oppx^WXwD<~20v!lYm~n53G1w<bq30_n<2t=n9tt1+;ELL4Qmpi@2S;>*Ej
z9^B*j@lrd>XGW43ff)F;5k|HnGGRu=wmZG9c~#%vDWQHlOIA9(;&TBr#yza{(?k0>
zcGF&nOI}JhuPl`kLViBEd)~p2nY9QL<pZYd>dX42u9C~EUWsl-@CE;05y@^V1^wM$
z&zemD1oZd$Z))kEw9)_Mf+X#nT?}n({(+aXHK2S@j$MDsdrw-iLb?#r{?Vud?I5+I
zVQ8U?LXsQ}8-)JBGaoawyOsTTK_f8~gFFJ&lhDLs8@Rw$ey-wr&eqSEU^~1jtHmz6
z!D2g4Y<b?~IDfEG@|?}~@NK5%EfL8m#@}<DdF^rh-TmzQzJ%ZHlN`o&KN5&i%pd<p
zd)`MogP&IP-kj;}o?vMX8{j)4{4uo>h?3VE*W8=*r&G`?u?M~AdO;uTRPfE(@=Gkg
z7gh=EGu!6VJJ?S_>|5ZwY?dGFBp3B9m4J1=7u=HcGjsCW+y6`W?OWxfH?S#X8&Zk&
zvz6tWcnaS1@~3FTH}q_*$)AjYA_j;yl0H0{I(CW7Rq|;5Q2>Ngd(tmJDp+~qHe_8y
zPU_fiCrn!SJ3x&>o6;WDnjUVEt`2fhc9+uLI>99(l$(>Tzwpbh>O775OA5i`jaBdp
zXnCwUgomyF3K$0tXzgQhSAc!6nhyRh_$fP}Rd$|*Y7?ah(JrN=I7+)+Hp4BLJJ2P~
zFD!)H^uR2*m7<GPV#LHgsC6vhayHW))RX)=VMbT5C%W^{xi!j-vMZEwaizER{bn~`
z*%zcR6b|kIhmXa<;AK(bIsa28`ImW9qn5agw2WKSdP;oS=2TPFicFCWts(xLktJ_m
zD>GQZpLUVS#R3^?2wCd}<N5gl#_ofxV$#HpCC1rQ&C~<QDZZ_2sngr~G&@FH3O56i
zpYU+i^QFIyPm>(gcFcz!u5KN9ld<NJ){7KQD8%x=J0Jw6dq*TNp7ct#f48DN|88K#
zHN1PuP|UV`&5NH6UASf3;wmy!yfBZkt|!hg9d$RGx6Wl#lBtYzLYw$)guuvQcbZZC
zj7gb!+EQSI=jz>NJdh@%onf06z9m~T0n;dqg6<uAT+7VbZL2g(0eDJbOi8&OREsL#
zB+Z?@j2VQ0s4FHSqk1~JRK^IY#?axJDuN?H+C^M2;K4B1fQ{Df4T8j=B2vyZG&LP7
zui$FHVNSS%MFs}(Qi>@?>G@S|rPO*Kj>{su+R|7bH>osA&uD4eqxtr**k($ii`uO?
z7-&VkiL4Rp3S&e+T}2Z#;NtWHZco(v8O3QMvN0g7l8GV|U2>x-DbamkZo5)bjaSFR
zr~Y9(EvF9{o*@|nBPj+e5o$_K`%TH1hD=|its}|qS^o6EQu_gOuDUH=Dtzik;P7G$
zq%_T<>9O}bGIB?;IQ*H`BJ5NWF6+XLv@G7aZwcy(&BoepG~u`aIcG>y+;J7+L=wTZ
zB=%n@O}=+mjBO%1lMo6C0@1*+mhBqqY((%QMUBhyeC~r*5WVqzisOXFncr*5Lr0q6
zyPU&NOV}Vt2jl>&yig4I6j93?D>Ft=keRh=Y;3*^Z-I26nkZ#Jj5OJ89_?@#9lNjp
z#gfAO6i937)~I|98P%xAWxwmk(F&@lTMx63*FZ~2<ClX?bRjNezMp1%S|D?RB{q!<
zEggd%ffIqfo(4Bfx1#P{GLZ``)ZIGI_-D9_&deXQqYt61WxAuBfU`SCW=`I?(Sx0w
z1xkBAcgJ#_E>b{NHU+}EV8+kMAB0bM*Zn#&7ubt98!PT^ZcMOfwMgkYz6+;?CKbvV
zQ}Z@s_3JcMPhF&y1?}9uZFIBiPR3g7lf=+XEr9Bl%zRfGcaKb*ZQq5b35ZkR@=JEw
zP#iqgh2^#@VA-h)>r`7R-$1_ddGr&oWWV$r<x}DZ#bg++!uinCKq;~vC^vT3#yH_E
zs$t6fd0!OeHt{39E9Ex*H(#oq;dj+T-OVaBef>x;pkG0Yohp9p@In_p)hKvMo@qIv
zcN2t{23&^Nj=Y&gX;<A7`MA@yDtof9<+6Ka<)s5q3vdT|2G(LkRiq{LQ}ZLX%0?}`
zoBYW`p?I(xW*)#})K&792W~c8U7Vfv9k`-&Bj0_im@<_<{^BAxovM7Jg)-zd)FL77
z0GdgMk8H`jJ3_uFnKTf)R#VG`K)vMH*+we-BX5<M(Gv`O^;7g=tA0k}c*d@<H$0Nw
z^QAao)GY(CaU6bJ_V{C7?pAyCSI}G(s#2AnRMy}T6})4`;6f^2%?O#x{d>*vJ;kjM
zHE2`jtjVRRn;=WqVAY&m$z=IoKa{>DgJ;To@OPqNbh=#jiS$WE+O4TZIOv?niWs47
zQfRBG&W<EaZbDRqg?K!_2U-S@${R>GmU~>2O{}h17wXGEnigSIhCkg%N~|e?hG8a-
zG!Wv&NMu5z!*80>;c^G9h3n#e<GnZGP4AxF02!2}l|O+3D#j^WP~|FpQfA6|hRdwS
zIa{A9d~$Xw??68C#;=i47E!7>>SBt5JpCm0o-03o2u=@v^n+#6Q^r#96J5Q=Dd=>s
z(n0{v%yj)=j_Je2`DoyT#yykulwTB+@ejCB{dA7VUnG<H2k=F!^!asn0Syeqjv*PH
zM}MxDpnKeKGLA)cG!HXoIT#2&OIlx@1ore?mc%Gn*=YT^g6v7i7s@j|U%Cp9MUIFh
zv(GiuR(0m!jP##O8E;~swen$y%KT`ZC(h}-be#o4T{v@E9Bv!Az4`?QEb@(xkMt!p
z^)!YNe~4A^=QJTge?gJYXOA2vaF5>>4`oE?GFV4sx$5;%9&}yxfz<-wWk|IlA|g&!
zN_Emw#w*2GT=f95(%Y1#Viop;Yro3SqUrW~2`Fl?Ten{jAt==a>hx$0$zXN`^7>V_
zG*o7iqeZV)<S6=vQwnvz+BX*pjK+#g2&d}e&7sf7T*j9VUey;68OC&FKLaT}6`D|)
zUlYnV8^wicy=hE;&$nEiVbo0ppQ)+_VS>txtHUU2#SDTyU#@paP;_yxp!SAG##cB=
zr@LoQg4f~Uy5QM++W`WlbNrDa*U;54`3$T;^YVNSHX4?%z|`B~i7W+kl0wBB`8|(l
zAyI6dXL&-Sei0=f#P^m`z=JJ`=W;PPX18HF;5AaB%Zlze`#pz;t#7B<M-GIl$j*TQ
z?KP!fG0}GOmyE=70u40;@tK<Qp$qe4=K?NH`4m2H-#2rag*boGdFs0!Vi)dSdhqV5
zpcj&&SEf-eS5r9wLXd7GNV&F&-R`p+Vd^6T?aO7Gatc($Mf3pia>zq0;k8IyvdK=R
zBW+4GhjOv+oNq^~#!5(+pDz)Ku{<X$tTXZRJn{h&rj}s7rZIu)WmWA*fY%J|+BmN@
zLaTh;a1fE!z&)>u60bVjyym8Or8L;iqR|qTcxEKTRm^Y%QjFYU=ab+^a|!{!hYc+=
z%Qc02=prKpzD+jiiOwzyb(dELO|-iyWzizeLugO!<1(j|3cbR!8Ty1$C|l@cWoi?v
zLe<5+(Z-eH++=fX**O-I8^ceYZgiA!!dH+7zfoP-Q+@$>;ab&~cLFg!uOUX7h0r==
z`@*QP9tnV1cu1!9pHc43C!{3?-GUBJEzI(&#~vY9MEUcRNR*61)mo!RG>_Yb^rNN7
zR9^bI45V?3Lq`^^BMD!GONuO4NH#v9OP3@s%6*Ha3#S<?){D`p=@UhPJW%rI1>*;f
z6JEi)qW#Iq#5BtIXT9Gby|H?NJG}DN#Li82kZ_Rt1=T0Z@U6OAdyf}4OD|Sk^2%-1
zzgvqZ@b6~kL!^sZLO$r{s!3fQ5b<Yp-sP<2UYg<hksU52A%8|-o$8&DMB5F%z!9jR
ztj6+2s|e!%TJ^)|3HFQf!#O^;K-MkF_4jHOIE^(Xskxk{TF+Kw0kSI4lT_n%|06m1
zQ3Mi|JMgp1NjLPiwXYcE-X8eiF?H12GpB->HW}8r$uTVS*iw1u8^9{YlPp_^Xm5IN
zF|@)ZO<U-^xPAodX<lAEfqplo^sd~r=XsV^Dz|Foe3YWO9^tz&J2n5Lxy~s3{>ReX
zB*#tE<lWYJkyX62^W(k=0>bWEX~@f)ST|s$oUKS@drycE1tYtdJ9b*<T~8vt_-YSR
z>(uFTxNZ{n3BI*kF7wXgT6+@PI@vwH7iQS{1T!Nauk>fm8<V3`g4G-r!zX4MwU{d8
zCl*OywFH<hgEG9ECBvg8#yjEA$w63hu4od^uah*vC?09}`C|sZoNaM>gOLe`->Pi~
z8)3=UL_$OLl2n7QZlHt846nkYFu4V};3LpYA%5VaF#a2#d2g0&ZO~3WA%1XlerVpg
zCAlM;(9<WF5Igo}TVG_p%Z}ctzS(|1i05vs<17aRnekfF+jv51k-~GwKk4WD?jLG2
zy`BxEk9KKblX-;suAOs^8#D{&_iicr?lG7~5B#?iW5B6(0hrrVcZ2ktlFcH1RAV=<
zG({)|S2m7;`M6s*apu<<%a!sAZ)OnM)z&RQI?jh{d)2pmqI@&Xu^uD}b&mpaVXzF4
zKi&bewZN}S0zM!PJ1{7%``*x#sZR4L@b`dEz$euZow$t;95*jVV?3XHDsH^H*;F$!
zo!2VjD>OqH@`(>Tha{*@R%twB!}1ng4V=^+R`Q{#fkRk)C|suozf-uCXrkIH2SC^C
z6wlxR`yS;-U#uu#`OnD<PIu|V4$j^9VtCxo7&*YI{M0NH`ctXUcqQ`+ADzr~@|Zs}
z08FnNCRz>%U<41%C4mp>LYLPIbgVO~WsT1if)Y)T*8nUB`2*(B;U_ha1NWv2`GqrZ
z3MWWpT3tZ!*N@d*!j3=@K4>X*gX4A^@QPAz24?7u90AXaLiFq=Z$|5p$Ok2|YCX_Z
zFgNPiY2r_Bg2BQE!0z=_N*G?%0cNITmAru*!Mws=F+F&Qw!&1?DBN{vSy%IvGRV@1
zS<NSq0fsn2?)Z`#`+aZJ6Doywvf4szK9w(2fgdL{D8f|4s{bQBClQ;$NTl2!eeqto
z-XDk)h}X5;V=UDB5kQ}0zNEkQ{Vw9Is##j|s@|NzmaY+W64hr>->PARgL^XS!-aZj
zi@`~LhWfD!H-L0kNv=Jil9zR0>jZLqu)cLq?$yXVyk%EteKcWbe^qh#spHJPa#?92
za(N<tKb?I1@FhMN5PDD2p_4kPz9dc?WB+15g^z?98@ALJmzeyDZ~Tr8u#q$&m6+TS
zS282#ySe`Uw`48xO{}4TzYJdT--OZs2iYuSZ|~yl@|SUzHMF!-b}@8v`QP-NruK#!
z0`EYBsS2sTCQ_n67SOO+{X)__IEAdx8muIPH153UDmpQdv`Pw;i*#z!C#>(Kw0<V~
zpn6Zq^(VUTS+51RdP6_<>se^$<YYFd`Je6h?~miwRG{s?SSH{$@&l|Ak}i5fEir5}
zlSw1F-#ln9brgfY+M-Bl?)Q4|;oA=L@u`uJkibn?3{?j*qFikxUixB5-0#ESGkrWR
zMnakR21bzhZiSB~Xff5}65`NyGiPC@a!_`m#FxRsl+7}rEF!GIwWrNn)0!*nPD!AK
zrjjaZD^q?yi{@KgTX6n}Z?iNt!jzUhr+HdbdVWen?KIDDn=YA3sKA8MZniOthQ9gp
zq9kDN!Q4}MRmrH!%2Xd@Ybj>7nQUQZBet;C_Dj5(2_?TdrXFYwmebq}YGQbN5Ex7M
zGSCX~Ey;5AqAzEDNr%p^!cuG?&wIeY&Bm5guVg>8F=!nT%7QZTGR(uGM&IZuMw0V_
zhPiIFWm?H?aw*<a+;kuAS!&F>(v6#uVT@NEzi2h5I$cZ-n0~m$tmwdMTjG*of^Y%1
zW?Y%o*-_iMqEJhXo^!Qo?tGFUn1Mb|urN4_;a)9bila2}5rBS#hZ5wV+t1xbyF1TW
zj+~cdjbcMgY$zTOq6;ODaxzNA@PZIXX(-=cT8DBd;9ihfqqtbDr9#gXGtK24BPxjZ
z9+Xp>W1(s)->-}VX~BoQv$I|-CBdO`gULrvNL>;@*HvTdh@wyNf}~IB5mFnTitX2i
z;>W>tlQyc2)T4Mq+f!(i3#KuK-I8Kj3Wm(UYx?KWWt8DEPR_Jdb9CE~Fjc7Rkh#gh
zowNv()KRO@##-C+ig0l!^*ol!Bj%d32_N*~d!|&>{t!k3lc?6VrdlCCb1?qyoR42m
zv;4KdwCgvMT*{?tJKa(T?cl|b;k4P>c&O@~g71K5@}ys$)?}WSxD;<5%4wEz7h=+q
ztLumn6>leWdDk#*@{=v9p)MsvuJMyf_VEs;pJ<y{_VV!a4tk9(A1i3&q7?0(TsCti
zt2t4v6;A5Rg5tt*l<z&%*51aE;pV#@VhKgWVg%@eN^?9HNw&!B<Du6!<Y0V;9ueZH
zX)^on_(Lw+=^rc1?6C?qUeLQ$J^JR@u-z8RctzBHF3&3A8x|+s<MTGToeiLu8IXWh
z7A*T&I<ZE9M)zIF0cb6jyil=R;tLV_=m=|nzAiatUb&#L2>h?i3z7_W@Q|3<Iv-$p
zr4L-Ad1f8|Rv`U-45c4m#4Iu4BXPfse$;{u`z!SYGuqE$w@EC^O3G7bAcHkUy$13H
zkOUN&$30bJ)8jPZ$h9K>p$a}P@MQ-NpMtDUBgH!h4Ia#L&POr4Qw0Tqdw^}gCmQAB
z8Dgkzn?V!_@04(cx0~-pqJOpeP1_}@Ml3pCb45EJoghLows9ET13J8kt0;m$6-jO(
z4F|p+JFD1NT%4bpn4?&)d+~<360$z5on`eS6{H`S>t`VS$>(D`#mC*XK6zULj1Da#
zpV$gw$2Ui{07NiYJQQNK;rOepRxA>soNK~B2;>z;{Ovx`k}(dlOHHuNHfeR}7tmIp
zcM}q4*Fq8vSNJYi@4-;}`@bC?nrUy`3jR%HXhs79qWI5;hyTpH5%n-NcKu&j(aGwT
z1~{geeq?Jd>>HL+?2`0K8dB2pvTS=LO~tb~vx_<=iN8^rW!y@~lBTAaxHmvVQJSeJ
z!cb9ffMdP1lgI=>QJN{XpM4{reRrdIt|v|0-8!p}M*Qw^uV1@Ho-YsNd0!a(os$F*
zT0tGHA#0%u0j*%S>kL*73@~7|iP;;!JbWSTA@`#VHv_l_%Z7CgX@>d<wo!f?;Z%_x
zWtw_K!q_M8*$()&!aPHcZ3ugW`s`40Uni{PBW%;|JdfUNBW#oJJWt#NAn;M_z>hg_
zgn0|U)SY~U-E5<aLBxcqGBaf+uYD5o5TNm63}wyoP>{QiT@(uPp#1jaz!(_3^Cbz2
z4ZgWWz=PdGCiGznk{^4TBfx_;ZjAHQ>dB4YI}zfEnTbf60lR%=@VWt0yc=fd38Ig*
z)Q38#e9^+tA7K}IDG5Z~>JE?J+n%0_-|i2{E*$jb4h?|_^$HRHjVkiyX6@Y+)0C2a
zA+eegpT1dUpqQFIwx;!ayQcWQBQTj1n5&h<%Lggt@&tE19Rm~Rijtqw6nmYip_xg0
zO_IYpU304embcWP+**H|Z5~%R*mqq+y{KbTVqugkb)JFSgjVljsR{-c>u+{?moCCl
zTL)?85;LXk0HIDC3v*|bB-r_z%zvL6Dp__L*A~Z*o?$rm>cYux&)W=6#+Cb}TF&Kd
zdCgz3(ZrNA>-V>$C{a^Y^2F!l_<AwP8>%3lFe$s(IOfLBLEJ4Mcd!y&Ah9r)7q?oc
z5L(+S8{AhZ)@3bw0*8(}Xw{94Vmz6FrK&VF<D4FN)aeEY8AkUU<oHVRp64UimBNVG
zPmOVQuvnjJPR(~l<0v~2(F=*u3ingep6h^NZe3yEUL_kGO?D;I{O<HXqQi)T-q()m
zEw-i<FXFT+PLClyx677F%&0E?%>rJN;xB96QmqYEibFz|yHgUluA-=+yS}I-+#_Pk
zN67-#8W(R^e7f!;i0tXbJgMmJZH%yEwn*-}5ew13D<_FYWnt?{Mv1+MI~u;FN~?~m
z{hUnlD1|RkN}c1HQ6l@^WYbHAXPJ^m0te1woe;LDJ}XEJqh1tPf=sD0%b+Ou<!IGZ
zKsgDSYE#K6n~RRbM~@WstVuh9)moF#U9n>R1aCoP>I>GBn4C24Zu$D)qg=gq;D??5
zUSj%;-Hvk_ffj-+SI{ZCp`gZcNu=L@_N}kCcs?TyMr-<T#dJlx5oxO`inNn|CKXO&
zzLQK?yzl+O7g>37<G^Q(z2KFPh1%rFCK@?V*l8it<Y`;OnZeXPndYXlGvZ@!UVv^2
zD<>fhy$?a<7lt1`fZw<%$8@B6(Wgo!#!z9z{ab|x`+&;kP!(gfdY}A-GP&4Cbh-S<
z1(kmgnMyB2z3ipEj5;4<{(=&<7a>A_Jl`ujUKYV@%k(oD=cD7W@8~5O=R*zdjM_y;
zXwme~0wo0aDa~9rDnjF=B}Bbj|DHRQjN|?@(F^=bVFdr!#mwr|c0843k>%~5J|7|v
zSY=T)iPU6rEAwrM(xTZwPio%D4y9Z4kL0bMLKvu4yd)0ZJA3<;>a2q~rEfcREn}~1
zCJ~3c?Afvx?3^@+!lnf(kB6YwfsJ*u^y7kZA?VmM%nBmaMspWu?WXq4)jQsq`9EbT
zlF2zJ)wXuAF*2u|yd5hNrG>~|i}R&ZyeetTQ!?Hz6xGZZb3W6|vR>Hq=}*m=V=Lsp
zUOMxh;ZfP4za~C{Ppn^%rhitvpnu^G{Z#o-r?TdEgSbtK_+~_iD4<f6Y7V3YF<U&v
zVj0Pa&?~%lU;5MFr8Fr!=O2;I9E%%yuJRL!<OzA)w}+*QepCEc&lYp+cSX9rht2yE
zEfbwX1;;Usd(vWqv=rdELe;@BSnsTtd2_#ZQwE#*(Y``Ii@KLBwJC`YC8(n3!YO&*
zwA8x1tb$KHyiF%4>9xM;$}X*mJF02|WBL{SDqK9}p4N!G$3m=x#@T+4QcapM{4j|Q
zwO!(hldpuSW#by!zHEP@tzIC<ftg$q9K7f^TQ~x75hpz_*ll75X?KcXKjB7J>|KdD
z%BJzQ7Ho1(HemWm`Z8m_D#*`PZ-(R%sZmPrS$aHS#WP<b_K3Q@c>jH3EDitxN|DY+
zYC|3S?PQ3NNYau$Qk8f>{w}~xCX;;CE=7;Kp4^xXR8#&^L+y-jep7oO^wnQ840tg1
zuN17QKsfdqZPlB8OzwF+)q#IsmenEmIbRAJHJ$JjxzawKpk8^sBm3iy=*kB%LppNb
zhSdk`^n?01FKQ;=iU+McN7Mk0^`KE>mMe1CQ2a_R26_}^$bogFm=2vqJake7x)KN(
zYz;gRPL+r4*KD>1U+DU+1jh{mT8#P#(z9^(aDljpeN{mRmx{AZX&hXKXN<h<rn9VB
zjn*jhsA^>uxj3x*RrpjvOaZ#`1EqK!$+8=0yv8}=;>f=E?5tGbRUd4%?Q<cc8-A>L
zy$kq6mZeF%k6E1&8nwAYMd!-lRkhQTob$7s`*XqcHs;l~mHV}fx&0I&i!CHaPVSM{
zHdRh7<Yd8Xytn18mgkX!i|^GCCC-dE(3D0L^sGNL=5C||)^eg5NdM00mh8zeX^<y#
z&2aJIby3iS19Ho*oeMWdwmhia0Mp5;sOAuGVww{|=SaVtqgeul>a>hP)t@YTrWm9y
zl-ENWSVzlKVvTdWK>)enmGCEw(WYS=FtY{srdE{Z(3~4svwd)ct;`6Y{^qiW+9E@A
ztzd?lj5F#k`=E1U-n*1JJc0{x{0q!_tkD<_S6bGsW)^RxGu%Rj^Mvw|R0WP1SqvAI
zs(MiAd@Y5x!UKu376&|quQNxir;{Iz(+}3k-GNb29HaQh?K30u=6sXpIc?j0hF{VY
zM$Do*>pN)eRljAOgpx7fMfSrnZ7>fi@@>Jh;qxj1#-Vj}JC3E^GCbC(r55_AG>6cq
z4ru34FtVuBt)bkX4>ZFWjToyu)VA>IE6hXc+^(3ruUaKRqHnx3z)(GXetm;^0D95s
zQ&drwfjhM4*|q=;i5Io0eDf?I{p}qo@7i7abHX5qLu~VDwYf4bmV~-^M_U?DL(+cG
z{AyE^a|*73Ft)o5k-p)+GLXj#q01VlJ9#ZJkf|+c%6qfRgV<R5+UTr_+90OGWmS7m
z;q?P(_fconepip4k)6HU7092Q_m6ykGJx-)+pdigO6KNeh-_<~Y_WlFmr-Tj&9}5u
zeCf$j*o~m{lqdu!Lth&rcY}x29nI*8Y?GNg;}@3>p&6NsU3~F?!uh}HJm73xq>v$h
zYoW3wJE6n9P|;{8U<^%UE2wjR4x^G_Nc$J(i)!>;g4`CCh2z^Dth#ah#<`#axDR?F
z4>~hnN2%B2ZUuU6j>m1Qjj~5jQSdA&Q#7hOky#=Ue)}7LPJ!8nbZO_0Sw{G>>M7&E
zb1dy|0Zi$(ubk`4^XkVI%4WIpe?Bh!D~IjvZs14yHw=aQ8-`N-=P*?Kzi&eRGZ_6Z
zT>eis`!Dy3eT3=vt#Lbc+;}i5XJf7zM3QneL{t?w=U<1rk7+z2Cu^|~=~54tAeSYF
zsXHsU;nM0dpK>+71yo(NFLV-^Lf7%U?Q$*q{^j04Gl71ya2)^j`nmJ$cmI9eFMjp+
z#)jKmi4lZc<;l>!={@jTm%?!5jS;6;c*Ml55~r6Y?22B^K3bPhKQ(ICc&z%w<4W1=
zjTTtz_}IA$%kCqU)h#$!Yq>>2mVG}qYL}!avmCWYV}x4!YE<j!oVMvb8>eq)pgTp|
zR;+sk<i0M|cJ%Y;oVV#c-&)sBEc}b3*f4IJ@-*cG9V-4%sLCN@VSzt<WgB)QfUjT|
z4|T(_Hlnd@CN_4Q8UOy^0Ki8WnwymQJTV19QuzM)l4SB=$&dFJla}9EuK6s-W}19+
z^7Ga1LwiW{qkq06@O+r^_Yg%7Ro9MxS+g#FodbIEjW9|-UrH`|k49Qezi|Una<+Zv
zZu@_U*I-3I!93w%;-BO4HhlLf)Cw5faDBGnNuHgSkEYp@&MS9<EvwJtVq)?#%yWA=
z+>Huc7YXRLrcbYXt>?@pa{l^2pL>RrZ!22zMmi1ZR?nkaWF*`@XFK4jGh&Em3vn(l
z3~^Q9&tM^eV=f^lccCUc9v02z%^n5VV6s$~k0uq5B#Ipd6`M1Kptg^v<2jiNdlAWQ
z_MmtNEaeYIHaiuaFQdG&df7miiB5lZkSbg&kxY*Eh|KTW`Tk~Vw<M3M(m_<9S!nV`
zDzY8T8DAH(DiRR@y}HfHmJs{1GG->KC~+-GoYE+pvwc{+nIEizq<cM<7GICd!t<Fp
zS6#)ZM(CDnT2c@bn8^dH5Mn7Y6K5_vDT9Bk`HO*$G89poj3{}tb4o=@ex&%I<2WXM
zWPJ7GElfmI51ZQ4RefG!&p5oi$?lkDz2PU6$1_cdMpr{>6!xP>7ZQ(S2%48l$Y98L
zvs7s<&0ArXqOb*GdLH0>Yq-f!{I~e~Z@FUIPm?jzqFZvz9VeZLYNGO}>Vh<=!Er7W
zS!X6RF^et7)IM1pq57z*^hP5w7HKSDd8jHX!*gkKr<Tsi!u2^FB20W%BQYZ5)KQ$L
zBZ_m~(&z=z_bHU6yX*Y#O;EKF98J52TD>Gc-GssrNu5H%7-cNE{h$!aEQK3g*qy;=
z)}pxO8;}nLVYm_24@iEs8)R7i;Th0n4->&$8m6(LKCRd(yn7KY%QHu_f=*#e`H^U(
z{u!`9JaRD?Z?23fEXrjx>A@+a!y-_oaDB)o@2s{2%A97-ctFfrN0cXQ@6aGH`X~Nr
z144?qk;MzDU-cgQOLfT3-ZR#hKmYtKG*iGf4ZJ`|`9!^SkBDUUSJCba)>mM!)k~(z
z<MlkpcVBeX*vh=-GFiZS12N#Md{6&{y>djUqB`)~!UObMHB1b$UItM$<0kwlqHH;c
z=)+~bkOcIT7vI0Iy(wD)vsg9|oi##%Rgrq`Ek;pN)}lbpz`iv{F4K*{ZZ?Zjixxxr
zY|SPl2NsXH+5pimj+MvbZ_+HrfvdC13|9Zs)Y=nW$z<0mh<GitQ487GFo3dN5ShBT
zZ8<EFYJ-MdeLR{9xFDVnhwT@fWSs<3mb9?YXz@YP{GsY6>l}%irBSm5T3ZrN#2AhY
z_ZrTmS(L`U#y}VZ@~QL9wUS6AnU*7LWS02Xyz`b>%rTml#Wb0yr>@c(Ym*40g;P{V
zjV1XSHdU>oY!&Jh7MzhzUV8(9E+yl5UJYga>=0Ldjwtc`5!1>LxaB-kVW;IlSPs+0
zUBx=m8OKVp<`frNvMK>WMO(iKY%P<so97xfVbg0v>uvqD+PK*vP6f?_o!O)MCW5Ic
zv(%f5PLHyOJ<Tb=9-j6HkSOIE+QsoSmE5(Z*9l#bIVj4Av!-%TxAJ*LIZ)k}<E=M5
z8&8~zID(`+E!)HSu<G8+vminFC;ax|(elj2;7YfVa<M+CbkOPemAG#3eNCaipA(J#
zKp0Ny_GnN>2h@Yn_to@54Yq;fdoy40&sbe3A$4uUXHsHP_~K}h#)p&Ty<c(C-{cmP
zd0JxI&cB!QGA1VG>Ox(~JE?y(IBAQKl}~VQjVC-c6oZwmESL;`Xth?2)-b6ImNcJi
z;w|`Q*k?`L(+Dp}t(FocvzWB(%~9$EAB6_J6CrA}hMj-Vy*6iA$FdV}!lvk%6}M)4
zTf<)EbXr9^hveAav1yA?>O0aNEpv0&rju{(Gt|dP=AP%)uQm~OE7@+wEhILrRLt&E
zoEsF^nz>4yK1|EOU*kM+9317S;+bb7?TJM2UUpc!%sDp<o^NvIr13qoE+gG-rp{X(
zM}ATIEoEmu3*AKHeVl}A%qNKwe4Ge&&LS>}7!<`i=W!ot8*C&fpj>mk#<a@1Lml5{
zdPDeAHH~8@6spP8p>qt~GCeqcy)?W6sl>eUnR%yCBR&Ow-rc|q;lhnI+f-%`6Xf)%
zIYZru;27%vA{Qi2=J`PQC<28;tFx(V^sgXf>)8WNxxQ<D8vs)|&bOiN>wT14M9I6-
z+V0@tiCiDkv`7r-06sJS8@s|Lf>mV+8h}SPT4ZGPSMaFK7_SMXH$3KN7b2V?iV-jA
zh1!Z>2tv^HVbHnNUAf-wQW#zMV(h8=3x2Swd|-%AczEIWLcm~EAu7rc3s%56b;7ME
zj}$pe#fc^314Mb9i)xH^_#({)tTD4hsoz<Jv$gLvCcZoVeg{3PW{d}YEx45fdopMQ
zzh4|NvFea3>!7XcHUh9*G|}?k=D?9LBkTm2?fgaIG(%%$DL#}a-_990rQBU+M;jrf
zCcvgM`+oyZmsUqc?lly9axZfO)02l$TMS#I+jHYY`Uk!gtDv|@GBQ||uaG^n*QR3Q
z@tV?D;R;KmkxSDQh<2DkDC1?m?jTvf2i^T;+}aYhzL?ymNZmdns2e)}2V>tDCRw{=
zTV3q3ZQDkdZQHi3?y{@8Y@1!SZQHi(y7|qSx$~Vl=iX<2<dgX$f8@>`@y3eSYpsBV
zI`Q-6;)B=p(ZbX55C*pu1C&yqS|@Pytis3$VDux0kxKK}2tO&GC;cH~759o?W2V)2
z)`;U(nCHBE!<PCa+VaA+eoVg%s&pn6K+Fw6D~Bj(Sq7J}+z_hBY><ghN8H2rs&w3`
zvJRVn>-maQz%z#zoRNpJR+GmJ!3N^<X9k%4f!=ilpGFPH6h^v$(M}b6nqK4#$CIdW
zNzv+9n>@cA>0EGg?OtgM_h|j1X=!4N%!`g~%hdI3%yz&wq4rYChPIGnSg{H%i>96!
z-(@qsCOfnz7ozXoUXzfzDmr>gg$5Z1DK$z#;wn9nnfJhy6T5-oi9fT^_CY%VrL?l}
zGvnrMZP_P|XC$*}{V}b^|Hc38YaZQESOWqA1|tiXKtIxxiQ%Zthz?_wfx@<8I{XUW
z+LH%eO9RxR_)8gia6-1>ZjZB2(=`?uuX|MkX08<in7IG<(1M==n@8kE5Me589?jvT
z(VMo|{oN<TKZ8xV4K`3TfYNXV=KrnM{|906zl<<4RZrah5^Z&u&K8^y<XWR?lqpMq
z*!=RBg#KPn5F{_D#;;s7LX4X-88}i<*nHKzXX~Jcxa5xjm9ck&)A<q<^NIQiecF*)
zAceKtlM&yv?sj$cae2F$&iC2*iv5eVS>2Dz*=ep%hMwK$TVTyr2*|gDy&QOWu<aq=
zES%k$K3|^Rk9-==@u)!=KK2?QF2pCH+kJ5`B#dhzvy1$1H~~Fl0f`I-HG*-)L(~Su
zDv%Hsw!!ZhrZ<p$qVF6deM7+R8E$9&$kq?Wzc_dg`sR3f_WJ68dk7~=SSwOYapvQ>
zorR#*(SDS{S|DzOU$<-I#JTKxj#@0(__e&GRz4NuZZLUS8}$w+$QBgWMMaKge*2-)
zrm62RUyB?YSUCWTiP_j-thgG>#(ZEN+~bMuqT~i3;Ri`l${s0OCvCM>sqtIX?Cy`8
zm)MRz-s^YOw>9`aR#J^tJz6$S-et%elmR2iuSqMd(gr6<O2pC7_LR87#;Sdf%zzI*
zg)&032aiWaeCX%2H}S0O=243UHWOaOv9O9Zse8>a#gA_+=N(I6%Cc+-mg$?_1>PlK
zbgD2`hLZ?z<RAA}($7nPJ~Y%yBCghN4Iv(BPi6%p!!B0Z9H(i_4jmymVmat@5@x$f
z&P@#)-u%pG8st`SK7mwnnq|wi%`9aw$xiu;^g=5`J}Ve&NHoxRQ9J7@-8xy`^2}C^
zRcPOa$y||OOZF&k)*b$K-5!p9ohNx@R~fESqBhel16r=avP&wM(&`tkv`kWMA7_G&
zT9vw-v>4S~uhJf=rraLBL?H#c$cXyqt{u^?#2vX<rF~#xjm8V&3d$WjF72Yk9lqGd
zU2g#5`8V5mak#w|hV^_1GZo-D9~Ey;F|T*gu9J7}u9SD-u9f#*UlY~jE;s&U>2sFb
z^EU-9jmp{IZ~^ii@+7ogf!n_QawvItcLiC}w^$~vgEi(mX79UwDdBg`IlF42E5lWE
zbSibqoIx*0>WWMT{Z_NadHkSg8{YW4*mZ@6!>VP>ey}2PuGwo%>W7FwVv7R!OD32n
zW6ArEJX8g_aIxkbBl^YeTy5mhl1kFGI#n>%3hI>b(^`1uh}2+>kKJh0NUC|1&(l)D
zh3Barl&yHRG+Le2#~u>KoY-#GSF>v)>xsEp%zgpq4;V6upzm3>V&yk^AD}uIF{vIn
zRN-^d4(Sk6ioqc<Qp=>K@EObsAi#Z-u&Hh#kZdv1rjm4u=$2QF<6$mgJ4BE0yefFI
zT7HWn?f668n!;x>!CrbdA~lDfjX?)315k1fMR~lG)|X_o()w|NX&iYUTKxI2TLl|r
z{&TWcBxP>*;|XSZ1GkL&lSg?XL9rR4Ub&4&03kf};+6$F)%2rsI%9W_i_P|P%Z^b@
zDHH2LV*jB@Izq0~E4F^j04+C|SFiV8{!bth%<Tod{MPTY6WHO$dzNX4w2;pzb+Oem
zi}`RS_fkC+T@Og2_EV(M-iPFENHyx@oIv_MuPoIud-{e0V-Uf%7)@4g-N3gQm`~vx
z?xgzfHP-AqiSg$9SflWP^m#NOTddFU+M+?+(8lr_g^KY#6=U~7!isX>bz(KfCg42^
zGz5P7xor$)I4VX}Cf6|DqZ$-hG7(}91tg#AknfMLFozF1-R~KS3&5I0GNb`P1+hIB
z?OPmW8md3RB6v#N{4S5jm@$WTT{Sg{rVEs*)vA^CQLx?XrMKM@*gcB3mk@j#l0(~2
z9I=(Xh8)bcR(@8=&9sl1C?1}w(z+FA2`Z^NXw1t(!rpYH3(gf7&m=mm3+-sls8vRq
z#E(Os4ZNSDdxRo&`NiRpo)Ai|7^GziBL6s@;1DZqlN@P_rfv4Ce1={V2BI~@(;N`A
zMqjHDayBZ);7{j>)-eo~ZwBHz0eMGRu`43F`@I0g!%s~ANs>Vum~RicKT1sUXn<V_
zg@YtD9Y@=Wecy}B#uLZ`0Y6*jpV`vuxU~A+4P62y?i|jRG)tkWzXVjI@x6TqM$m}#
zbS|Bk;hWG!R)sJ3qv;#m`B;@pUIZ{OsCYTt%2wAuR~4+#U+=ZwfPhp%fPgsu{Rrcq
zL~bO~c18x)!WICYfrX*Vf6Lhu6}6<W1yDXGO*a;t%N?v5EEn88Lf2L+chf}>L=gOG
zDR`d=#>s?m+Af1fiaxYxSx{c5@u%@gvoHf#s6g>u57#@#a2~fNvb%uTYPf<C#}ju9
zHihjbYPO9=#1gmJRf;*(Y<k^4B)ySqM)!mgM>BoT_$~a^w96(}#d;-wELAoaiZCbM
zxY4fKl<v{zHLssJ@4LiFPH<esk1E$lEtkXM<D=k?FHU{G^xaGd3~L?TcX;B8eN|@o
zjj(tZEIt*eN_K^=W0b&P;RRu>S6-l1!b1!yra|`LOQoJB))=Cx<t5x}2d!26+-1C^
zR9eZmu9JG?UQV{RPjYn{+%DDoEfyXeJtq?V8!!z7MxQwlem<}2cde<XVcUvCW#h_c
zCr46juv}&4@(MVkKBg~Byf0?bz(EkPTt-l3s=>UAYqFcTDThhA?d}6FD$gYlk**!#
zD=!KW>>tg1EtmSejwz{usaTPgyQm~o+NDg`MvNo)*2eWX*qAQ)4_I?Pl__?+UL>zU
zvoT(dQ)pe9z1y}qa^fi-NawtuXXM>*o6Al~8~$6e>l*vX)3pB_2NFKR#2f&zqbDp7
z5aGX%gMYRH3R1Q3LS91k6-#2tzadzwbwGd{Z~z+fBD5iJ6bz4o1Rj#7cBL|x8k%jO
z{cW0%iYUcCODdCIB(++gAsK(^OkY5tbWY;)>IeTp{{d~Y#hpaDa-5r#&Ha?+G{tn~
zb(#A1=WG1~q1*ReXb4CcR7gFcFK*I6Lr8bXLt9>9IybMR&%ZK15Pg4p_(v5Sya_70
ziuUYG@EBKKbKYLWbDZ)|jXpJJZ&bB|>%8bcJ7<K?KbboaTR($??M~exw`OmcIx7v7
z={kv@I*3UBm_JtqtFd~^0Y(My{C)7O?M1s{T)vS@D($(u<W!r=KwzSywSmkU3_5Df
zP_MIU+Hxpz+^!NFy1LC7I-QOM=d{pcV`ef_t|-ECQ(2y-u2h-4>>l2>hXuf-h5Bm+
zHZ55e9(Sg>G@8a`P@3e2(YWbpKayoLQ}ar?bOh2hs89=v+ifONL~;q(d^X$7qfw=;
zENCt`J*+G;dV_85dL3Tm5qz2K4m$dvUXh>H*6A@*)DSZ2og!!0GMoCPTbc<nj>d!h
z@fRl3f;{F%##~e|?vw6>4VLOJXrgF2O{)k7={TiDIE=(Dq*Qy@oTM*zDr{&ElSiYM
zp<=R4r36J69aTWU+R9Hfd$H5gWmJ?V){KU3!FGyE(^@i!wFjeZHzi@5dLM387u=ld
zDuI1Y9aR$wW>s#I{2!yLDaVkbP0&*0Rw%6<cx1-RS5PNoNfinsujvxd(ZL|$GBWig
zRa-cyjbCj@hjimsWL8a15(2Yx)Y{G|kE;%x%FYu<@p92kV>bi(LtieJQ4(1V!z!ec
zxPd)Ro0iU%RP#L|_l?KE=8&DRHK>jyVOYvhGeH+Dg_E%lgA(HtS6e$v%D7I;JSA2x
zJyAuin-tvpN9g7>R_VAk2y;z??3BAp?u`h-AVDA;hP#m+Ie`7qbROGh%_UTW#<d34
zz&Cs3P;q?uMJ`^xLS#kTigwMwHwV0^d~LVUp9}r;c9y_pcT2*zFrI0v>R8yfGp<`u
zT0}L)#f%<U%8Y+)jqE&8ed=$=JjeSnb4Y#P_lkT5EqSi<>(XEE)^iXVkO8^cvjflS
zqgCxM310)JQde*o>fUl#>ZVeKsgO|j#uKGi)nF_ur&_f+8#C0&TfHnfsLOL|l(2qn
zzdv^wdTi|o>$q(G;+tkTKrC4rE)BY?U`NHrct*gVx&Fq2&`!3htkZEOfODxftr4Te
zoseFuag=IL1Nmq45nu|G#!^@0vYG5IueVyabw#q#aMxI9byjs99WGL*y)AKSaV(zx
z_`(}GNM*1y<}4H9wYYSFJyg9J)H?v((!TfFaWx(sU<t2;aBGeC3Et<4d@8=a1+y1+
zC{viFxsY`fMWFdmm8XA{gpkf9>*fU823wPgN}sS|an>&UvI;9B(IW(V)zPBm!iHD}
z#^w74Lpmu7Q-GzlVS%*T-z*?q9;ZE1rs0ART4jnba~>D}G#opcQ=0H)af6HcoRn+b
z<2rB{evcd1C9+1D2J<8wZ*NxIgjZtv5GLmCgt?t)h#_#ke{c+R6mv6))J@*}Y25ef
z&~LoA&qL-#o=tcfhjH{wqDJ;~-TG^?2bCf~s0k4Rr!xwz%Aef_LeAklxE=Yzv|3jf
zgD0G~)e9wr@<NAwXzn@Tr_JeoALXYsIL!5suMVtRWLsesHCk)H^$%gST+;+pb2o(2
zp@>)BCjlY84wz?$NS8KC9I$wf(T&+79JjF#n?BTI)Oub%4wiOcqw+R`R_q<`dcuoF
z%~hKeL&tDFFYqCY)LkC&5y(k7TTrD>35rIAx}tH4k!g9bwYVJ>Vdir4F$T*wC@$08
z9Vo*Q0>*RcvK##h>MGUhA9xix+?c1wc6xJhn)^9;@B<A{c%wXcknJHL8?TSUQilQ^
zT35Z%hWih0GcUZZgPv6G%jjVNuj1NPD|n^)OAlY0@vSi`)!cZk5VUw@Id1!S;G$IS
z`&_SaqDl=^3l4kv>E6i*Rl8VQdstnLOP1mq$2;!bfASHmiW7|=fA{k$rs^-8n{D6_
z!O0=_K}HvcZJLSOC6z-L^pl3Gg>8-rU#Sp1VHMqgXPE@<y_*(2S91GdCv4<dCoaZ?
zA?4TKM)S&Oq$p$!!5EeBG8Z?C<sUM7r)h{_98iuE!Rj!{@7Y!kZfGX90bSl|Q9|d(
zxcPg$!rc0(rdS0}iJHFbR3;sEmCo#kVYCM&ov7oV-K{L=<CqzGagYVnblf6_U&P1Q
zSLpH1tLN#w0fD5VX@bqBZp(8ahlk9j+Vf;gmN>9x&IHe;K3;!^SQLDP1Gk&szPtk|
z!gP;D7|#y~yVQ?sOFiT*V(Z-}5w1H6Q_<rHoVq2SN~wRz_&Lb+eg25kD%S_<hy!|d
z479UbBeZkS!YA}P`u8#z{w9z_yvIJnA$tgrix7XC=mr8W+{e#<F1sp_;_?cBaw`XT
z{bg_Y4+SLce<~np|HIGH9$+#+Xa9d4AC)F2<R~X3RKz7@#>U5JM#iW16yZiFRP1Re
z6d4#47#NzEm};1qRP9}1;S?AECZC5?6r)p;GIW%UGW3$tBN7WTlOy|7R1?%A<1!8Z
zWcm5P6(|@=;*K&3_$9aiP>2C|H*~SEHl}qnF*32RcmCVYu#s!C?PGvhf1vgQ({MEQ
z0-#j>--RMe{&5&$0wkE87$5Ic5_O3gm&0wuE-r3wCp?G1zA70H{;-u#8CM~=RwB~(
zn~C`<6feUh$bdO1%&N3!qbu6nGRd5`MM1E_qrbKh-8UYp5Bn)+3H>W^BhAn;{BMii
zQ6h=TvFrK)^wKK>Ii6gKj}shWFYof%+9iCj?ME4sR7F+EI)n8FL{{PKEFvB65==*@
ztYjjVTJCuAFf<rY<ZEMlK$u$5-g|rkMy)?}zrg<cj{J4~fJ^?r-mLI|&wp8-{--Y0
z$lBtc{7L`g@4CFzKLU6_{RUts#(({~fZ<<+Tq9>8I~yB-pN_PJtqH&j$`#<<`CruB
zL=_u3WB~-<Bwam@u?Y3tJi%|VkE@FOA_WbQgjf<(NEYJn?j2c2v5%5fY6*Nhc0Kf@
zGyVA6F-((}nGN@{6!@*o-0aL#%yo5ZdR<*#pw-c}Fqq{ED8`ZcDuWb@&5e@{u$??R
zV{;T)A~l!;PQl_M_0q-T2$E*e7zG=uI%X*)DM_7M7K_epWs6wGsb%#n4GsmXWLsXM
zBQM5{n74^ZHYhM!mF)Naiww}*4UI<SX?1IsY%1lG@fVF1N*k`uZNm&coJ%VsTi)30
z63S(&5hkN(3);{^TsoYpatne&4UxTgE!PzT(%CmU7wStmP;ts@1czZcK$fFnmQ60{
z1`faF@nb=Dgf<0A3VGLZjnb0{n@9h2n!kn_HCDKyXu;%%6d9Dt4i)X*2_22dAHbxa
z2srvHbi^3iUv%cZJHSx)8Kd(wg0x*i!0jVB91}Q)OsRD*{RUFUZe`rRbZj*_$$qM6
z%-6(nVT*<9hbz`OdMZ3^{PJ3{Yc<61R-(jj<Z3MHVtdi1*Jd3m$03jA7{pLqiqgWN
zuf`QaEabQ(LKVZptm-fx-rT-qkcLwos%8=P@J-?UgS&Rj;xcvu%L&V&GZ|Av2=2YY
zuK2muzm-$n>;t3q)iNn0eU(mF<W>Tih<4nOAb>1#WtBpLi(I)^zeYIHtkMGXCMx+I
zxn4BT0V=+JPzPeY=!gAL9H~Iu%!rH<j+~n)ld$6<geb2z!M*B;3n68THTn)6(b11z
z4m(Nwk^Vyz86bu0^6;Tn%;Ji#7$WO^G#_C0*A{VAYI#R4+3k40>0-S@IcG%~=tB#6
z3?WE7GAfJ{>GE{?Cn3T!QE}GK9b*EdSJ02&x@t|}JrL{^wrM@w^&})o;&q816M5`}
zv)GB;AU7`haa1_vGQ}a$!m-zkV(+<n8pPDe>M>q!vI0Swo18{;<>GYZw7-V-`G#FZ
z;+`vsBihuCk1RFz1IPbPX8$W|nDk6yiU8Si40!zy{^nmv_P1=2H*j<^as01|W>BQS
zU)H`NU*-*((5?rqp;kgu@+hDpJ;?p8CA1d65)bxtJikJal(bvzdGGk}O*hXz+<}J?
zLcR+L2OeA7Hg4Ngrc@8htV!xzT1}8!;I6q4U&S$O9SdTrot<`XEF=(`1{T&NmQ>K7
zMhGtK9(g1p@`t)<)=eZjN8=Kn#0pC2gzXjX<PjHqiA$Vvf_R%9gKYsvdV^zlWxqzf
z!#>cadjHMc_pfV(@^3541)LC1fY~k2zn&2PdaW`RPEHoKW^(p_b=LxpW&kF?v&nzb
z1`@60=JZj9zNXk(E6<E`2y|0HP0)>D5D}(@k4Oi@$e2^M%grhlEuRwVGjDDay$Qpj
z`_X-Y_!4e-Y*GVgF==F0ow5MlTTAsnKR;h#b0TF>AyJe`6r|%==oiwd6xDy5ky6qQ
z)}Rd0f)8xoNo)1jj59p;ChIv4Eo7z*{m2yXq6)lJrnziw9jn%Ez|A-2Xg4@1)ET2u
zIX8`u5M4m=+-6?`S;?VDFJkEMf+=q?0D7?rRv)mH=gptBFJGuQo21rlIyP>%ymGWk
z=PsJ>>q~i>EN~{zO0TklBIe(8i>xkd=+U@;C{SdQ`E03*KXmWm4v#DEJi_-F+3lrR
z;0al0yXA&axWr)U%1VZ@(83WozZbaogIoGYpl!5vz@Tz5?u36m;N=*f0UY$ssXR!q
zWj~U)qW9Q9Fg9UW?|XPnelikeqa9R^Gk77PgEyEqW$1j=P@<dE4w(u(3iVMi-8SY4
z3}C{Rr_5Fdb7Rr%)CRjq4+&Hx?mUJXe6rA*s&n~(V48wA1sGg{_CaE0GHmqWDt`D~
zX|%%BrEov=miSU@%ILVmtO!gF&qB~Zwn*+dVv$gW4nxk2U|7hBM@%!T=tG2}g!3V8
zkh2ON65LUEoMIT*<uZYoomew53~|P7OCgONbH$V*wBiXS3f4p|H^IsIX`jOD;1u>L
z*ndO!fwPeq_7J_H1Sx>#L$EO_;MfYj{lKuD8ZrUtgQLUUEhvaXA$)-<61v`C=qUhI
zioV&KR#l50fn!-2VT`aMv|LycLOFPT{rRSRGTBMc)A`Cl%K&4KIgMf}G%Qpb2@cB*
zw8obt-BI3q8Lab!O<#zeaz{P-lI2l`2@qrjD+Qy)^VKks5&SeT(I)i?&Kf59{F`Rw
zuh7Q>SQNwqLO%cu2<XTECiMRi^Gbl(lC2paG3*Thj*0)}Xq~An04S6wpQhX<1~$1w
z$|BShs8E$Oh2P_lh%5{Rt@}ZR@|tp`N8?PA&uzngg2`_3EJvV=voL0TNQlm`uQfnb
zmflQz*loTYcGz`!%+Vj=^M0e)jrIFBj=?aWXQV3D12mMODUEwaCDT}9Bp?=+Yq#K7
zp&vz<l)hrRjq0Yx1fxPL#%qOhE`AlXTtmsE?PArtiI!FPsPG%YD{1QYCJzkF(h3yM
zSgG22fY44@_X7qJb~JHEIIXuHl5OFsr%T;sn2uH&>lzcJ7eR*3!g<TJ_lZfH8Wr<#
zgT0tcvD1Q&1BtX2hf7@$jhm<`+i@heDmB$3?k`tQKjG^qZF&M6uLr9-`_h@i$<7L}
zgUL|Kf{v`NW#Z9N7|M>}U)9=EQ}js-q{d%h!wl6X3%H0Z2^8f&^H;yqti4z6TNWc&
zDUU8YV(ZHA*34HHaj#C43PF<m2DoY_InyxnT#nQbdAIC5&)!sabH!!uF>Zq7a><f0
zgtG{pGT8+md}S0t4`>=PMmj4+?C4&l=Y-W1D#1VYvJ1~K%$&g-o*-heAgLXXIGRhU
zufonwl1R<@Kc8dPKkb`i<Tc2Ft*8|Y%hdxlha;A>5P9VFT_NOiRA=#tM0WX2Zut)_
zLjAl<azDfvq~H_KwlbAX@QUQH^9B7mGKnyS-1=w5);r`=sJqkPw~ttGrcw9@zpN33
zC6*)>JS1&nnrL8x8!o$G+*z|kmgv4DMjvfnvH)7s$X=-nQC3(eU!ioQwIkaXrl+58
z@v)uj$7>i`^#+Xu%21!F#AuX|6lD-uelN9ggShOX&ZIN+G#y5<zsBg0Jzu|^0arbz
zHZiy8&9{9<=}nzl@rOCs!y6zYzW)*J$?3ymq5#w^1&H{60|ozf&;t&27aM?KJHT_=
z<UdaNf1K`#u@jOYj3_~Jugv)kjhZ$C{)TR=WdUcB0>T0q+RL*(T(EP)(nP744-ML=
z+Rs3|2`L4I;b=WHwvKX_AD56GU+z92_Q9D*P|HjPYa$yW0o|NO{>4B1Uvq!T;g_N-
zAbNf%J0QBo1cL@iahigvWJ9~A4-glDJEK?>9*+GI6)I~UIWi>7ybj#%Po}yT6d6Li
z^AGh(W{NJwz#a~Qs!IvGKjqYir%cY1+8(5lFgGvl(nhFHc7H2^A(P}yeOa_;%+bh`
zcql{#E$kdu?yhRNS$iE@F8!9E5NISAlyeuOhRD)&xMf0gz^J927u5a<R_91y>K|P-
z>B%*9vSHy?L_q)OD>4+P;^tz4T>d(rqGI7Qp@@@EQ-v9<l3HhbAKAXS;d<mAzAm?%
zWxLu`9iXuSd^l-vs5}td&}`9WmHp3f-ddBjF%W>w-;n;7N05{)V4c7}&Y^!`kH3}Q
z4RtMV6gAARY~y$hG7uSbU|4hRMn97Dv0$Le@1jDIq&DKy{D$FOjqw{NruxivljBGw
zP4iM(4Nrz^^~;{QBD7TVrb6PB=B$<-e9!0QeE8lcZLdDeb?Gv$ePllO2jgy&FSbW*
zSDjDUV^=`S(Oo0;k(Idvzh}aXkfO)F6AqB?wWqYJw-<Q4@a(N2WiV(%Vq!M!1j2wJ
z!(_tjDZ}FRqGOyyFaZ=BcaPLacu6&odeD1kOs>1wOn5!{-ghaHb^v|B^92LmQ9QZj
zHA&X)fd%B$^+TQaM@FPXM$$DdW|Vl)4bM-#?Slb^qUX1`$Yh6Lhc4>9J$I4ba->f3
z9CeGO>T!W3w(){M{OJ+?9!MK68KovK#k9TSX#R?++W4A+N>W8nnk**6AB)e;rev=$
zN_+(?(YEX;vsZ{EkEGw%J#iJYgR8A}p+iW;c@V>Z1&K->wI>!x-+!0*pn|{f=XA7J
zfjw88LeeJgs4YI?&dHkBL|PRX`ULOIZlnniTUgo-k`2O2RXx4FC76;K^|ZC6WOAEw
zz~V0bZ29xe=!#Xk?*b{sjw+^8l0Koy+e7HjWXgmPa4sITz+$VP!YlJ$eyfi<KyWTm
zFcof9N;tvhj*k<(tO<;L#aIbBw`3X1?v|{U!$P^D+Bj~@or<|6qo%K?RMVEGhD~Ka
zJ4LTJE~}5brdzk+`%xg32ga4AN^7K}=mu{->3^6gGx6jZLpbUzX;!Z6K}aoc!1CRi
zB6Lhwt%-GMcUW;Yiy6Y7hX(2oksbsi;Z6k*=;y;1!taBcCNBXkhuVPTi+1N*z*}bf
z`R=&hH*Ck5oWz>FR~>MO$3dbDSJ!y|wrff-H$y(5KadrA_PR|rR>jS=*9&J*ykWLr
z-1Z^<F@{b4F$OXI9nXROeH=v7we7Mk%PT*bsvs`65Ve~Mk98j+>Q<W<ER>OxE=!6I
z%Bozo)mW7#2Hd$-`hzg=F@6*cNz^$#BbGlIf${ZV1ADc}sNl=B72g`41|F7JtZ^BT
z+y}nqn3Ug`2scS_{MjykPW2~*k$i6PhvvxJCW;n!SK5B8Rpm41fCEdy=ea-4F`rN5
zF>ClKp#4?}pI7eR#6U|}t`DA!GQJB7nT$HVV*{qPjIRU1Ou3W;I^pCt54o|ZHvWaH
zooFx9L%#yv)!P;^er5LCU$5@qXMhJ-*T5Ah8|}byGNU5oMp3V)yR;hWJKojJEregX
z<1UPt%&~=5OuP(|B{ty);vLdoe7o^?`tkQa7zoXKAW6D@lc<Y9BEsxR99CK?eu(Be
zGA=o2I=p|tu*T4PbHe2diyG42d8!n4Hg)n2a4xjc6z78^o#R>+FTzucotaOfJ!(Bm
zHE8f8j@6||lH`y2<&hP}Q1wr(=6ze0D6NRL{7QaE1=nTAzqjIeD}Be&@#_d*dyurz
z&L7xo-D9!dS`i>^GaIPArR@r=N#-ppIh!UBcb!N*?nLUO+*%C>_dCF1IH)q>5oT(t
zjQo{AoDB;mWL;3&;vTt?;bvJSj>^Gq4Jrh}S}D>G)+b!>oRDWI?c_d77$kF5ms{Gx
zak*>~*5AvaB-Xl)IgdZ<t6nEV?}Cne<P-n&MECe~i3&sd4ZANKmk95&dg5wNK})LG
zCB8Pla-X7EnslQM^yf-}PB(m;Y8753eJ&Ix-9#IThb=9p5d$-pGni+k$)lElNRT8S
z2KNbs1uGE`I0DL!MEBb)!?uqF-gPGn_4IgS%r?~h{NnAe9R=0vb^&$>^Cupv6HxQ0
zM(KPaDpPsPOd)e)aFw}|=tfzg@J1P8oJx2ZBY=g4>_G(Hkgld(u&~jN((eJ}5@b1}
zI(P7<P_r5po)9z#EH~syS!Kqb>j443AZj*I@%q!$JQ2?DZV47U!|Tt6_;tlb`mSP3
z74DE4#|1FMDqwYbT4P6#wSI%s?*wDc>)MR$4z9ZtJg04+CTUds>1JSDwI}=vpRoRR
zLqx(Tvf34CvkTMOPkoH~$CG~fSZb;(2S4Q6Vpe9G83V={hwQ>acu+MCX)@0i>Vd`%
z4I8Ye+7&Kcbh(*bN1etKmrpN)v|=eI+$oD=zzii6nP&w|kn2Y-f!(v<<k5@rT?>aE
zKmOz#{6PZB(8zD={il`RO6D}v(@mN_66KXUAEefgg|;VmBfP?UrfB$&zaRw7oanna
zkNmVGz4Vhd!vZSnp1(&_5^t;eSv6O771BloJAHi=Pnn+aa6y(e2iiE97uZ{evzQ^8
z*lN@ZYx<-hLXP^IuYLGf<01O*>nDp0fo;;Iyt`JADrxt7-jEF(vv_btyp6CT8=@5t
zm`I0lW+2+_xj2CRL|40kcYysuyYeiGihGe&a)yilqP}5h+^)m8$=mzrUe`$(?BIY>
zfF7-V10Gu0CkWF)wz04&hhI>es0NS7d`cnT`4y8K!wUAKv<L<7Nid8Jrumy4N;IHd
z0paO3I2Y8JehmMfgyduZhif4rEPfg6bIuG&hw$^v0?8-vhVwO#EmG$GgX(#!Qo@^$
z<m+!1?0<C_U%$N(<^XtW4bWV(|L;4D|JhsoHH4d!NAbN}oKfJyuv5AQ6CP*V90d}f
zAmSLHq0?s)+8ts_)0k~2xCrIz!|z4!`W4%My`pD0zopO9WOJw=zZ>$H<u&P)<#gp?
z(e?3pi^~6P4M{O2ae7SeM+!0{y+F5rpa@NvJB^`+VBA%_JCR{x-;!_%(V_^C$+0Fo
zP2ZY+=+UhgjNlCKH0JAQaN!lp>09fa>KeNQvwUNDT1zn}_*RHykC$CD%*h7vRCQ&Z
z4&N-!L>(@8i?K$l5)13n0%VPPV`iG7Q$2{1T3JypLSvN%1kX73goBIOEmg=Uf$9e?
zm}g>JFu}EQKH>|K!)m9teoCmTc`y2Ll}msZYyy0Pkqjeid66>DP_?C{KCw94lHvLW
z-+X!2YSm70s833lH0o+|A%Xwsw`@8lE3ia0n_Dve;LC7@I+i~@%$lD|3fNf&R6ob6
z@iGfx^OC4s`$|vO!0jTWwVpX;X^EqJF{i324I>N=f@u+rTN+xJGGR0LsCQc;iFD=F
zbZJrgOpS;04o^wP7HF5QBaJ$KJgS2V4u02ViWD=6+7rcu`uc&MOoyf%ZBU|gQZkUg
z<}ax>*Fo?d*77Ia)+{(`X45{a8>Bi$u-0BWSteyp#GJnTs?&k&<0NeHA$Qb3;SAJK
zl}<dpK~|?-2MdqSy$cG$9<5m0w^hpeS#3f_m*8b`Btwh>H*~eyD-0qHI3SEcn`_7d
zq@YRsFdBig+k490BZSQwW)j}~GvM7x>2ymO4zakaHZ!q6C2{fz^NvvD8+e%7?BQBH
z-}%B{oROo2+|6g%#+XmyyIJrK_(uEbg%MHlBn3^!&hWi+9c0iqM69enep#5FvV_^r
z?Yr(k*5FbG{==#CGI1zU0Wk{V?UGhB<Ctd|b<#lQNMxZ5VviiRyuMI#pIiZ2^|JDK
zO3L9dCXa}f;^Y$f(=pZwzVcA246lD95B`-WJHN6#wg7oz3xL9W|C>Bfv9<dD0O1Z5
zDLG^Xl+Vlhxug@ILjD1CqP%*c+=P&Df^gw{NCD&our?`fOtE5SV=k3X|F3}{5*{RU
zTN!|*CN{h6y&J|<rmSR8TqE6jhSOEc(c5Lq7H6jK^9P{S<*}s>HP9A-AmcJmL^f4S
zY3E2$WQa<os1kLE5}@;1pUY1%3gz3i)o@!9{w3g}zt-AjedDM>&n#WRQ5DOqty_Pu
z-NWQGCR^Hnu^Vo2rm`-M>zzf|uM<GnavRyT%^9&KYCGX1vzC+ZzJoBv;GM8?M7el_
zOj4`ATGTY0Qyjz0MsEJ+d7MkgeT7odVS~t|L2-3{W5|1Mb|4}HxM{J)D%=MF#!F5H
z$znU~W8GDE6~2jQuI4MQE(l2$c<!zZW}|ItOsYzO@}yDhw1^oS#npP$zC*=lO$*6U
zu88^KQNrO|Xq6jw-X@)K(8^m_c10_RPV^ic1Vi^D1e|SZ@=YeGkvwPwnwfN*rB9q%
z-*Y8R$pQNHhf+PC3yqmzyMhS)YhbF{OjKYv9*GLYu_9w+4+Wa?dcPq`6UO1E2Ny<B
znj!WtPptmhi%@C4^+Q3%$RaJ9LHRmD{p0<C-3^<mgR}Lr>CUd1X0{wISJL2Pp=AO5
zF@(50!g|SYw3n<_VP0T~`WUjtY**6Npphr5bD%i3#*p7h8$#;XTLJAt5J-x~O1~`z
z`2<a~bE>C~P4%XSI(JbrEmVMEwqdsa^aqXWg;A6KBn^jDxTl!}Q!^WhprL$kb(Iqq
zUS`i$tIPs#hdE-zAaMGoxcG?Z;RO2L0Y|gcjV_)FFo|e)MtTl`msLTwq>po$`H6_U
zhdWK97~M>idl9GE_WgobQkK_P85H_0jN?s3O)+m&68B`_;FnbZ3W*Qm++gh<gg&=e
zndjA>Ss7<TnPD^1F;1U(juVW9o>|T4b7m~VVV%j0gl`Iw!?+-9#Lsb!j3O%fSTVuK
z37V>qM81D+Atl};23`TqEAfEkQDpz$-1$e__>X2jN>xh@Sq)<Ygb_LJo1t>I6sj@<
ziJ^66GSmW9c%F7eu6&_t$UaLXF4KweZecS1ZiHPWy-$e_7`jVk74OS*!z=l#(CQ^K
zW-ke|g^&0o=hn+4uh-8lUh0><E4`l}*L0l`Mtr6!;{!8(D|F|5-srYFMx1S#{CLoi
z-u@yl4F$V%pqJZK;U+B~so`D@_w#Z-bY@Qn=YAO{w^pRVf-oYOD2(2OLZqnWR4`y=
zDh@E^+A7oBck(|Ajx3`M4sUxg)ut2KB~3O;R|I=v4>!VIXXnQXwKr>`94+2~<;+`k
z$|}QZ>#pm2g}8k*;)`@EnM~ZQtci%_$ink9t6`HP{gn}P1==;WDAld3JX?k%^GcTU
za>m|CH|UsyFhyJBwG5=`6562hkVRMQ=_ron-Vlm$4bG^GFz|Jh5mM{J1<Tk+4XYX(
ziO#`V$T`))Hnit$gsM99=Wj7wF~qPn*YlclqD|t>`!!hAr~8<bbVd`cJIuqidsrOf
zU2boSJkW~@abR_!UeoB!SbqQ;aILZszb&@Z!rjE#A2zjDGylM{@3Xh6m}m%7>F^w>
z^YhQ=c|bFn_6~9X$v(30v$5IX;#Nl-XXRPgs{g_~RS*znH^6Vhe}8>T?aMA|qfnWO
zQpf(wr^PfygfM+m2u!9}F|frrZPBQ!dh(varsYo!tCV)WA(Wn^_t=WR_G7cQU`AGx
zrK^B6<}9+$w;$vra<KXC!@9QY7p=NFCVMP6-P}~2^ZJJ3eFVYE6&4hIiV8E=s8tr#
z0#qZaEmZE!!D0z*QCvpKn7H8h!avhr%{lz@vGDf7f)P2r!v7rHVgu9Ko#EnO@3(an
z?_kW{_uoD`nVxH1<HCRHk*AAK{oz3Y8>)QWMKf_Tnqg93AMVZ6Qd=q6rdB{;ZhsoT
zWy9QhnpEnc@Dauz4<m19Rdfw8y;`Kav3Hx(A`<JMc*}%4lpGR%kQ5PjiVk{h>!8gq
zqDanAX#$^vf-4~ZqUJtSe?SO+Hmb?)l2#}v(8}2+P{ZZuhlib0$3G0|a5?JR<k*cm
zCmOOnj3(-HNh(i177pAS7^kL4T{>>QgUUP$HTE5hb`h>imq#7P+Y*-UVLm@9km|V#
zoigziFt$bxgQMwqKKhd!c--&ciywIED>faY3zHLrA{V#IA)!mq!FXxf?1coGK~N(b
zjwu*@2B1^(bzFVBJO`4EJ$=it!a0kbgUvPL;Er(0io{W4G7Bkqh)=g)uS|l0YfD}f
zaCJwY7vR-D=P9M68`cmtmQ^!F-$lt@0S|9G7cHgT13A0xMv)HmH#Z<4{~iYo_VOD{
z5!kU+>mUOvHouw+-y?*cNlUlDwD#;6ZvAIc$YcwG&qKZFh>EtM(Eda+w)E$HcfZyB
zG*$<*ae_ApE%gxWx%O^~XMnRSNLv<hmJFP&{*xkGgV^OrK?1kLgGbB96vK2H_jZxB
z{uSH8-Mbv9D(hh0ecU+E0xnSpq9S%5YU?hQTM<WFbb895&H6T9H6~AYhFscp!GJw{
z{CMJQRqzreX33n*BIQ<*tXMmj%uX7F>!y`g99F(J_m)spJAc95P|_joOIoru%atbw
z9PYgkcE*8x#)-W{>96KDl&74iW<<I5n&4tNuY!4LW89B#)kHmkF)^##PQ>#wrK)1s
zxzU{`rW5af+dT6Z@_1dG<}CtDMT`EGVEXSL_5D9)Z;6UJe-TW7)M?bY%E;8G?Yc!$
zic;F5=#dba^P~7f#qvC}Nd#XEo2r_UlgfR_`B2^W0QjXU?RAi$>f&{G_Lu8Fp0qDp
z?vAdm%z#3kcZmaJ@afooB=A@>8_N~O9Yzu=ZCEikM>UgU+{%>pPvmSNzGk@*jnc5~
z(Z#H4OL^gw>)gqZ!9X|3i4LAdp9vo)?F9QCR3##{BHoZ73Uk^Ha={2rc*TBijfKH-
z=$cZQdc<5%*$kV<JTwx?Wn(uqpL99S9cOqdlB;ZG*LbZg!Ka?Zx({N4L0>o|{+bL3
zEoU&tq*YPR)^y-SISeQNQ)YZ9v>Hm4O=J)lf(y=Yu1ao&zj#5GVGxyj%V%vl9}dw<
zO;@NRd4qe@Et}E@Q;SChBR2QPKll1{*5*jT*<$$5TywvC77vt=1=0xZ46>_17Yz<K
za?9xqEdfacW8D|@q#P8^coE6j8@zW82Rl*skXUzNg8|`yh_|Ez<QOHIO{ab;wb2c-
zpc&2NC#^0HqUf$geRxB?^^XHPc`tc7Av0*Fsu&&vziVbfs5<(8uABi0!43C-&I}FV
z-&W55n6DcDZ7%+wV{kPqHvqGABY$aluV=9L`#xwsLVyXOJzhO&qmkkF`Cm4Q(he{(
zvprb*xwWF0QQu|L&9)}$Bwh)8_64+>biBoDffH(1_qFP7v2SVhZmA_7JDB50t#C39
z8V<9(E?bVWI<7d6MzcS^w!XmZ**{AO!~DZNU<pxH8Gxh)IAIm+Zb48*U>)pgr=yY1
zT@!AapE;<gsI*}-Da?=g8*q;d%H8vD(W^0r;;DQ~9M)o3th<${vKD^}5=NW#KU?EW
zh23}<+!)o|kzYJhS~Gs6+Fv`Nc7^UGW4&INySD#A51Npo(p8<dNY)vnQ+cG9ZHrc+
zl4o|9<gkNL)hXxTut*3&t(VaXirZ1eRqB~JTtKwbWRVOKnCiI>yg&hmj*g{I3vd##
zx+d%^O?d%%?Dba|l~X6ZOW|>FPsrjPjn-h4swysH!RNJUWofC?K(^0uHrBPrH5#W>
zMn8^@USzjUucqo%+5&))Dnnw`5l1mp>roaA99Nkk4keZl2wAF7oa(!x?@8uGWzc5Q
zM}g`}zf-D@B6lVFYWmmJ8a+_%z8g$C7Ww~PD9&jk<nl<d;?|xUi{p(U084GCmBMN4
zGFuz{A+U((wpj+c-1uBvX}MHY&K*h!He!l}HpWWz2)-P%&c)+E+b7UeQ`E6LxLc(&
zc6B+<KTUcZqh_;&LwyjloJ7F&d>i08NY!b!fK288R;E?e3Z+Pk{is%HxQU`xu9+y5
zq?DWJD7kKp(B2J$t5Ij8-)?g!T9_n<&0L8F5-D0dp>9!Qnl#E{eDtkNo#lw6rMJG$
z9Gz_Z&a_6ie?;F1Y^6I$Mg9_sml@-z6t!YLr=ml<6{^U~UIbZUUa_zy>fBtR3Rpig
zc1kLSJj!rEJILzL^uE1mQ}hjMCkA|ZlWVC9T-#=~ip%McP%6QscEGlYLuUxDUC=aX
zCK@}@!_@~@<J?+9-)*r5I{=D}hCY%rx`sl0_Jw~le^&*!YtV{Hcj*S)H-E3`In)2X
z@^|b*1L53_m$vc^8UC-t_tNKpXue%JsK(b1D~gVeI4Sln9Kogfm*rF^X&ziLd*z|*
z8?>z;70I+Hp5#Tq4h#d4r!$Np1KhXkAGlY$ap7IZ9DY})&(xoTyle8^<LCYg6(aW6
zy%{G)o970SPj-Lqi=`UVC)3TsSh}>dBXbQUhPE6ehWHrfMh&0=d<)E2+pxvWo=@`^
zIk@;-$}a4zJmK;rnaC)^a1_a_ie7OE*|hYEq1<6EG>r}!XI9+(j>oe!fVBG%7d}?U
z#ja?<qnwPve_3NqgW-6u^A{BN$AWAUcc%hfdf~fcjO8U~dDHuIhK?hwRL&O0F9C#Q
z-1+<O?F7fmi1n1;O~sr-c755<5#4$DRB3kMKAEI%*{v`j6-MQM@6iP6WYqbe-L-L;
ztt=ir<wfn`c?aCGe=AJJQ?|^S)D4L1@S8qo4g5nO$SBF^3Pv@+G0;do?W!x*=0CFT
zatuYcOA+J(#Va~A59>T@`XO(;q~fe2CfFm-g8FbVD;O7y9c;J)k0>#q7z-%oMy4l+
zW>V~Y?s`NoXkBeHlXg&u*8B7)B%alfYcCriYwFQWeZ6Qre!4timF`d$=Y<a(i0bbn
zKKQ{1eJrnxk%*tB_~e&wjFNh9B`YBi?xJv8vE_t*m`2O+;wM0OBw`ShXE;A5a=EOw
ziuz5v={b#v!z9w34UO*k#3zI6`U`aXicVHS5m*U7q0_hGy}+oZI^{&qUgX})LWH$$
zFM;*!BOQ2rK`7%^m@zRQzT<~~ZzW0e3fx!1+_)vH*WPU`Z}uTeUM31rt~Wr#(`kK?
zxTNyj((17b{_2O}H##&<;pY6@7)vBPoWNi<&A@aDT$fR#Cc-mO#<cDOrOg{JHW<+t
z7S=So=BNY<aJbCqWh9z8J|e8ewbfTq$Nf{sB@+g_VD`Ykx~tk+%l*gjEHWqIc#crJ
zYOX{g;0<%K1cv6srUYVUKngF98;qQBFaDKF4Dl2wb7SUr+mD9z4TeOMN!zwi^Znb|
ziK)KiGi}l^Rbw@Hqcu@&ALE?t@BK3xTo(rXyZj0QC!VUX^L?1zeJM7hRJoigLqF4y
z^w9Bt2I=<pilTfE=wR;O<|23c>N~_fPM5Kc8P;B-WIDrg^-j=|{Szq6(TC)oa!V7y
zLmMFN1&0lM`+TC$7}on;!51{<RT@_E@K=fWPGZZOy3nPlPY7Q4(DMf`4E{jCC+%r3
zps5XExcdx;&M<;I#HN$~15vUU2_wI}?-N7%1?-jXo{IDm8{a|JN9;;Fv_>d^&M`UW
ztI$U4S&}_R?G;2sI)g4)uS-t}sbnRoXVwM!&vi3GfYsU?fSI5Hn2GCOJ5IpPZ%Y#+
z=l@;;{<jkPKiGwtaZ+-<{3t<FV4%X@eDZyH=iQ)K$S!-t3X#-#Bp6RZ+)0c!Auu42
zUy^EMbno8)OL|bs7?*|jXf97OIJfRyi|nrG{{TJKXz`<AdsrXVB#KdnT;RBVUqMEM
z@(~pWl<GifrPhq<btJ+rJaC;VTa6|5NlhuP@h&4t;k)JW<17q>XiY_r#^RJSr?s1)
z4b@ve?p5(@YTD-<%79-%w)Iv@!Nf+6F4F1`&t~S{b4!B3fl-!~58a~Uj~d4-xRt`k
zsmGHs$D~Wr&+DWK$cy07NH@_z(Ku8gdSN989efXqp<EP1Av}JofrdXN7or{^(Q&IP
zm&2WJP0w_xq@J1=aG|yuieS}MHm|W%J8&cO*DV<E7=I31!S?q2gp0E02*`AU(5%_w
zP-ZZ@<io<0zc(nFOi#5*h@8Cm5s)=51O=v4hwOw4U4&NrEk6R;8*+?MJ7(uz^V9*H
z)<<Yg?^qHzElXr9?AQ`GEmedXvgE~$y!7FJOsW}SO3UQ|6F5)+7e@47@9E!e;eS%z
zgbbWa02@$DY@IBe0c)xMJt?M8Ne8gz9e|3xts^2tR(H)%sWm&#lTIW25EA<X6G|Xu
zwjeMTEs{1&-7MazKOuCzOT*v?&3;BH?B(A~*7nrvGcX3WxLsy=U9LNsb-lknL-NDM
zC{5oG1fe#NROct<MaMxUyC}Qx%-4+lwiXuymkCy{aqdU3YXRx0UW|=)=frymbQ|_!
z6RE{*nz|sqlxT?YzuAtu$Gog>reBSw$I%17RdxoE<5C^N&9sk!s2b9*#}#v@O@Hgm
z2|U7Gs*@hu1JO$H(Mk)%buh~*>paY&Z|_AK<qFt@cXN))G(1YlcAPtmHj#~eco8p^
z;k=X}&?zo@O$8Z`ek!f=!-2z8e*=Ci->f-?cz6jlT-v<MB#)k)myih=`Ssh@;;x}J
zO=L&!7fiX11t$*%H7VB5wo{JZjW1%IgWgXvd6F(0HB0F91z5JWRqIufOuu_cLA**Z
zmmw%qTf|NDak07Z7<oRn7_*JC+4`$%N{E9m4lEff#9|JoZM34#AXTyroO(bML3A>6
zF>l9?C6EBRpV2&c1~{1$VeSA|G7T(VqyzZr&G>vm87oBq2S%H0D+RbZm}Z`t5Hf$C
zFn7<mF7Xu8aH7&p+*&39KYKi-7OJO{aHNxXz_(kUPiXO$h1pPLlg!bekftiGcm@|n
zyU(ScX{zKfs^svS;XTOg!KfKY**%|-W9{|s3#Gj(QB-;}YLd871P?8UA`w0!A7QzO
zWc7gLe$g*X1OM+=vmP*Ogr9g&xg9ao2KZPbx&pzMzUeef)Ls9B(UPZ{LX-@^?(2ZD
z*Z+U=^^chSPm-dhm%j2s>X*;R_<CwObRhq40Y8dd5<<dXNQ8l6-%BVUErnsW_sE=(
z!O55%E<r;dR?1ZB7kCT6)?R}f%i9(t4I`(jRGO@oHWn&3E^YD89&5@Qt(w|48ry2S
zoB*bqc<9JaF&R#mfSH)?(VOoPH^|n<_Q??t4d71}zL8pZFSq=ZVZAbUXAgY3rpEPs
z*E|~UI$I6~XuCv1s$RdQ4N69~cKH@=e_A|e27l4@UEM(7&fSRN9z5g2ewF7V;V0|_
z=12=mDl3(R0jywl;U)QpaAsH_PgBTqbB<5jq*;UWQu2(lrC~=|Se2^MPArRvD40tM
z$6+K3$?BZv_k1Lilvq+L^AWEgNXK;#OAeJA_E;9iRbUP&JMUDK3P(=3R7Wt=Xr>D^
z#Ug0tYczRP$s!6w<27;5Mw0QT3uNO5xY($|*-DoR1cq8H9l}_^O(=g5jLnbU5*SLx
zGpjfy(NPyjL`^Oln_$u<sR&ps8aH4yQp{NS*Q%a0(@~r)xRsM(JD)2?t_AvTl475@
zn)K3fs>I6(aEh(iS4G=$%0;n39C(iw79RlXG>W&8;R1h;oVaODw2nw^v{~`j(1K8$
z5pHKrj2wJhMfw0Sos}kyOS48Dw_~=ka$0ZPb!9=_FhfOx9NpMxd80!a-$dKOmOGDW
zi$G74Sd(-u8c!%35lL|GkyxZdlYUCML{V-Ovq{g}SXea9t`pYM^ioot&1_(85oVZ6
z<s?t5SIP|7m@nUo6dTqLSV$Mw1iMSK9^=Y!=}N7?-PaxM9#3DE^=sKgl9p=DV}~&@
zYdmLsN{tFAHLs}Iz)`3D?jriOYih|L;lqCLr?EMkk$H3Jm`S~ZH1^!;Tq-R#WnmdP
zf~|;k11U<Y>UhCw#HkfCg7mRT3|>99{swr3FlA@_$RnE?714^o;vps4j4}u=PfUAd
zMmV3j;Rogci^f!ms$Z;gqiy7>soQwo7clLNJ4=JAyrz;=*Yhe8q7<f70~h#PTjf4!
z`0u<%63_AFLQ|%)&bj!``Adogjy)l3r;m#MCF2Ll@`C+DbXll(5X*?|^R&zX-3nTi
zgX@_6?<66$SvPV}kNSPWYtA`Cqk&5%{)w!d%IT$Hwf29}8g}kIASctNu@^*I`02h;
z;~Bi)HM29<Bc+-vXFbX5<q1<Hn`1ta&DKiE4CIn%PI!-mi4Wl&UZ0*jccw<R`3d&%
zL@$iFZ>*$Du970BXW89Xyq92M4GSkNS-6uVN~Y4r7iG>{OyW=R?@DmRoi9GS^QtbP
zFy2DB`|uZTv8|ow|Jcz6?C=10U$*_l2oWiacRwyoLafS!EO%Lv8N-*U8V+2<_~eEA
zgPG-klSM19k%(%;3YM|>F||hE4>7GMA(GaOvZBrE{$t|Hvg(C2^<r300+*m%A4XsQ
zfiH7ngallK6VqHlYML1}?e$Oz<lC(8-7kHC&IxkJU#Gz3a)OPkV=(kNkLy0Bxm5A~
zcc{pE&{?zIUPuZ>PEs<HpN+yarVkty9riOIB=3P{s0uCLYa6`aQz_aV&@Rrup^a{T
zTUBku`R)w=_*fR7p+jOGP?y*LP$rd9b2(C7D2v%Rxkl8$A(2n!M(aM%FeOa}8QGbF
z`hPlm3$Ut|_I+4HLP9|4?(R<M?(W!hONW$ncXxw;G}0m6-6;(sU4jVwx4+|g@oas4
z&-X2^b#36<bKf(w*3>i4+)w#P4jE2XDi2SBm1?<Kqf$kM@%mEPmcN#r-lwaPc=Mg)
z*m-p&Aw#uy3e*D=c!Su=D$*H%aU(oSf)=;R&*{PKh6q%|{w38RYSi*@a6tKAc<inN
zNb4RNNbAl69}bKaO(;chUy82_j5pdyDGnGe@=oYiVf%)@Zc6rOz-<ulQKo}s<`}k$
zz=)K6#!b71jt^)jDE!kxeOg_~;&1!o1GGpA6mm3Kczg<;zQP~%kv}k=HpQ5r@<`cd
zb!k6jFf8v1D)wJ97HgyDlElP>6NiSkOp-IT<|r}L9)4tLI_KJ*GKhv16IV}An+Jyx
z=Mk`vCXkt-qg|ah5=GD;g5<swWwFJHTUMQ?a%|=(gV}~ftE<qvKh(Z1Rar-oEJY08
zphNLm!uC|e04aV}K+`%33%)`8C7_Qi{)BB1Owc-76aG3*%cRe0&&9-LwVv~O!*$1A
ze4@(brH@f8wSP}01~4{G$#xd0GrC=&J7=yV@ZgzSsTgY&OlJZ4K`>gZQugsv!#)$@
zkE=6=6W9u9VWiGjr|MgyF<&XcKX&S3oN{c{jt-*1HHaQgY({yjZiWW97rha^TxZy<
z2%-5X;0EBP>(Y9|x*603*Pz-eMF5*#4M;F`QjTBH>r<Tu44nq(OCKtpe>rO$r3iz5
z?_nH<vaQE^^u_XG(5Lr(oB6nao4oQ=8KZ&JS)ZJ;U$^j52(`Qhcb3d1zaXxH?Z+kK
zo{eCoc#L2r61&TkC9Kh*^Ll2d0jYxGOHsw95>ysyjnizhZQMXo1gz7b{p`yZ8Q78^
zFJ3&CzM9fzAqb6ac}@00d*zjW`)TBzL=s$M`X*0{z8$pkd2@#4CGyKEhzq<e3VICa
zVXrK@mmDpkVLJj>QR!7*Lo@mhw`yNEE6~+nF3p;Qp;x#-C)N5qQD)z#rmZ#)g*~Nk
z)#HPdF_V$0wlJ4f3HFy&fTB#7Iq|HwGdd#P3k=p3dcpfCfn$O)<o&8NigX+IQx(_k
zt!6Q*5R+hsCh4Y5&L}(2M7@TsP%b<s3-cE9`BP8(x0*Zxu|;tEsxvN1!CX^JH+%d{
z#%PF!5ur~~Lz^$}zXbQdR+-dsE=BRoSrrP_RT)>C7;y;;J4Za_;+DEH%|8nKwnWcD
zBgHX)JrDRqtn(hC+?fV5QVpv1^3=t2!q~AVwMBXohuW@6p`!h>>C58%sth4+Baw|u
zh&>N1`t(FHKv(P+@nT$Mvcl){&d%Y5dx|&jkUxjpUO3ii1*^l<K6aNn&v)ViNI=Dr
ztm6c`Y(E;r83@Bjjq?m89qD)2N8WVbZnT@Rqwk`qe%u_QX;6s(1_KFnNvb;9|KvKq
zdzV4af>$zCE*>59`AvAja%`Bfry-`?(Oo?5wY|b4YM0lC?*o7_G$QC~QwKslQTWac
z#;%`sWIt8-mVa1|2KH=u!^ukn-3xyQcm4@|+Ra&~nNBi0F81BZT$XgH@$2h2wk2W%
znp<w2i)e>o1OZuQ1N>bX52II+lsnQ`WVUxmZ?4fR_f0243_m`mbc3`?iy*HBJI)p2
z`GQ{`uS;@;e1COn-vgE2D!>EheLBCF-+ok-x5X8Cu>4H}98dH^O(VlqQwE>jlLcs>
zNG`aSgDNHnH8zWw?h!<tB)vN)5FY@JvMJNFRSGqQ)8Y6+POoR72O@Ig1amD;pbM}A
z!_G?aSt=r|UNn^U7MVI;joP{9U6+jGunRq9JBhz0DQl2OWLL^=?3M-W(HD3y4YIDj
zts@CkCLg5q>tye^aN|%>@k;h`Z_H6*py3hHO^6PE1-GSbkhG%wg;+vVo&dc)3~9&`
zPtZtJyCqCdrFUIEt%Gs_?J``ycD16pKm^bZn>4xq3i>9{b`Ri6y<g65g>H|K>kfC;
zI5l&P)4NHPR)*R0DUcyB4!|2cir(Y1&Bsn3X8v4D(#QW<drU=}`!M~>8Dtv@D)CCO
zadQC85Zy=Rkrhm9&csynbm>B_nwMTFah9ETd<oWfFWz$bNGQ;eULeJVXJ<f7A9L45
zz2(RndIlv@ndf(ylJ5dB@f_#i*f_<xdRxxiY#<f0XG}~)k}3h-pn*{5Wf+rkTNVfU
zvu7LcI^RM=F>NcLU@J{haekA|9*DA2pY&A|FS*L!*O+>@Q$00FeL+2lg2NWLITxH5
z0l;yj=vQWI@q~jVn~+5MG!mV@Y`gE958tV#UcO#56<kOrH+so9B!Y&j2j%NPHe&Kt
z*Jlv04zu4KkKUnN@2v|A_s~D)D~i}2TX9VI`eb&ulUJY3bIAP`=W_MQ<p6TmCi3~9
zR#!gE)1vNaJJy(qr<zWLByJV5kQKURonRb61RNn2oARD`y%(o&)^UlpvCR>hn>b69
zM;lq+P@M<xt{ZP2IVZlQmaF6)dV;0T>W=cIvIXkQmKS$*7l|}AW%6zETA2b`qD*cL
z(=k4-4=t<W8Q>6FzQo#uMXVwF{4HvE%%tGbiOlO)Q3<z@q8w;^CEVc#*w>Y6D<5W$
z9pm>%TBUI99MC`N9S$crpOCr4sW<X@hV&j6o?mAg;rC>JHP)$Zg#N<bE4!*`Hm2T=
z5r3kQe#GwXxWTu&KEtE5F89pZOnr%ScQ_|6s2i!Oem1r{mi@4bd|9F-80WNw;hloq
ztW<@XG@{uj{gHBv_JxQ5>Xa~j?WeVo03P3}_w%##A@F|Bjo-nNxJZX%lbcyQtG8sO
zWKHes>38e-!hu1$6VvY+W-z?<942r=i&i<88UGWdQHuMQjWC-rs$7xE<e><_-PNgC
z_aIqBfG^4puRkogKc%I-rLIVF=M8jCh?C4!M|Q=_kO&3gwwjv$ay{FUDs?k7xr%jD
zHreor1+#e1_;6|2wGPtz$``x}nzWQFj8V&Wm8Tu#oaqM<$BLh+Xis=Tt+bzEpC}w)
z_c&qJ6u&eWHDb<>p;%F_>|`0p6kXYpw0B_3sIT@!=fWHH`M{FYdkF}*CxT|`v%pvx
z#F#^4tdS0|O9M1#db<blyW@3UaX=m-VC3C*AzpL%Zt@gt;JJjmzbO>%MF(5Opy;i(
zL(Pc2aM4*f_Bme@o{xMrsO=)&>YKQw+)P-`FwEHR4vjU>#9~X7ElQ#sRMjR^Cd)wl
zg^67Bgn9CK=WP%Ar>T4J<WQ3|95lNv@(iOW)=p_LUL!1-VhctD*z|@+j`co`Z66v!
z`^J+M`P0R<B6PayFir_vpL#_kCgB2Hfy(fZ`D(OZ){RgJUm9WP5I9_=8@>!}DcLDe
z=ehSmTp##KyQ78cmArL=IjOD6+n@jHCbOatm)#4l$t5YV?q-J86T&;>lEyK&9(XLh
zr{kPuX+P8LN%rd%8&&Ia)iKX_%=j`Mr*)c)cO1`-B$XBvoT3yQCDKA>8F0KL$GpHL
zPe?6dkE&T+VX=<EEjvDP6;>uJOjXyrq$BQ`a8H@wN1%0nw4qBI$2zBx)ID^6;Ux+?
z<t2Ij61D<6$bR>u{?X$_1hoz9d^jkDJpT-N6+HDNo%^MQ2~yqsSBJj4@5;|<UR`pr
zmGgR>1@w+BE04#@Jo4I63<~?O?ok%g%vQakTJKpMsk&oeVES1>cnaF7ZkFpqN6lx`
zzD+YhR%wq2DP0fJCNC}CXK`g{AA6*}!O}%#0!Tdho4ooh&a5&{xtcFmjO4%Kj$f(1
zTk||{u|*?tAT{{<)?PmD_$JVA;dw;UF+x~|!q-EE*Oy?gFIlB*^``@ob2VL?rogtP
z0M34@?<n^#kB5}f662tf-FPK7+=$$^thQJ_=0e1;hhQ6iIZGfFw7z@lxmVdxQ!#YD
z@@+IDMv|25+N!a_rCLgW@%EzHQeAiFUBy6#_b&Y<Vx~v$D%CCO9<Fm)nU)Mm7hLx(
z+OBhjHD+ka+uR|MOWPrSpW8<_sF$kMvQ>2$;}n;^OAV2?o|zHg`+@Adk+&@Syd!rS
zWvW$e5w{onua4sp+jHuJ&olMz#V53Z5y-FkcJDz>Wk%_J>COk5<0ya*aZLZl9LH}A
zJhJ`Q-n9K+c8=0`FWE^x^xn4Fa7PDUc;v2+us(dSaoIUR4D#QQh91R!${|j{)=Zy1
zG;hqgdhSklM-VKL6HNC3&B(p1B)2Nshe7)F=-HBe=8o%OhK1MN*Gq6dBuPvqDRVJ{
z;zVNY?wSB%W0s^OMR_HL(Ws)va7eWGF*MWx<1wG7hZ}o=B62D?i|&0b1<IN$XX^T5
z%N70y9}Uqn!<;jV>4_7UG287YDr%?aYMMpeCkY1i`b+H!J9sqrvKc<L)uh7BYtp$7
zYI<!fmPPG_ASTr99~(~+PA}ncJZBQ?zzQuZe0K(a=Q&Avvvj5@5|G_LL3Njq`V7sn
zdf%<~EuFL#J#oEiV!xvl<9P$2kDP5VAd93fXChCQ#nOSmIT%G(2uky?4Qo5owmXID
zPAT@9%6D<uJTww5Ja3&599`v^?a;}l{us=_Wtuw*M$fZqKYpqvO`YjRlffDE!{g+5
zVdH3imDV!Daaif@$DR7rx0Nn5OU^lipTe=3Ner}<ZD~S<wM>#Y6c8At@QiLSwj)<?
z9DFyN;{iDvLI|AY0%>@ifz~Z|c$lOMA@?cPqFRmZ%_>bz2X4(B=`^3;MDjsEeAO=?
zSoD&+L>A|fGt7+6kF2@LqhL06sD%|~YsIe=EcWqy{e_61N_D(*CacnMvyXMjP87HI
z4PT6!$fzxx{}=>jeqzkkoN+!r9e|@lZUN4pn(T28v`k=_vIhTn^i9O3qTqd)-%!QQ
z<jd9AM{1@GwcZVg<oQg*6vUa`*N7fm@6=<JHmDT7;wr~7?PE;ryAmsxO3!F)HdDJZ
zZ!QzyVesZ-HR*BPFuEi5(@$^b*$~XJQiKDz`*!s!?0jTk#y+Jfp`+uM$1-O~4B%yX
z+cTq@3cZxR=L2UN^929r#)5p0epn*#txp3Qq5sue|JMuum+kq-?!4lG4Dc8x&m=-E
zHI?>YB6*6B@&b(!#X4C~59SLZuorNU_wWZA36{>O%iX)VS5NNZh49C_ppI>?)<pHg
zoC~M~7N1<%@2qgyAM)&s4At>wwml}_0MLzOXT>lmo#&Ew6d?mu8~~I_^4VGBQtC<b
z$ksvC_Au5I^}~oep6LYDHQgU=CfBT&wctG#OGlZ`U53Xlwd_zWXP=>Ake;RQa5DL`
z1PFDPsKb3CS$v;RhlQ1J@AHa1VRuuxp}NOIvrC>4$$A0Ix0VpAc0lfG%8{mR{TRQ(
zbXM#1Tci3H*Wt>cVuMta^6^z`=^B@j+YhJqq9?>zZPxyg2U(wvod=uwJs{8gtpyab
zXHQX<0FOGW6+dw&%c_qMUOI^+Rnb?&HB7Fee|33p4#8i>%_ev(aTm7N1f#6lV%28O
zQ`tQh$VDjy8x(Lh#$rg1Kco$Bw%gULq+lc4$&HFGvLMO30QBSDvZ#*~hEHVZ`5=Kw
z3y^9D512@P%d~s{x!lrHeL4!TzL`9(ITC97`Cwnn8PSdxPG@0_v{No|kfu3DbtF}K
zuoP+88j4dP+Bn7hlGwU$BJy+LN6g&d3HJWMAd1P9xCXG-_P)raipYg5R{KQO$j;I9
z1y1cw#13K|&kfsRZ@qQC<>j=|OC?*v1|VrY$s=2!{}e33aQcZghqc@YsHKq^)kpkg
z><rgHH|yOI5lM&60F%aLmgk4vw(wR1EIb5`i$0Au5`<D^w)OTd#h}+IH6bl|l~ASd
zLvu(rRS+}&bCyqZ2wVl~^^prNkrvH9d*H8$eC}I=Lk<&VlA|Xu!EY|<BPc7hfuH3{
zimrE3hw4oVADm#2l1S}++Z=<wd?>B;CWNX+K=u|y#N)O>n5YuyvPl5cO6B^scmG?J
z<KOI{m8vYOVhJPPOIHCptG0+(@oDno9z%+WYeJZ3o5CpRcLo;t)SxsGOR8ZyZ5#$b
zw(a#c9c64Zm4A&1!R7I|JUTv-JF-k*?(bpUN=jpL-X2NkYP)G-a=sjG^STB9fZ|TI
z2KStBC4MY)u~}R~ttZ4!`Q6EyTl1IJpg2DjV&bKCsOK}4;{gbj^8rouy{R|+?!@hZ
zrT8zc1rczMy*pB^4vA?9JM$^^MTHWwjZ`LC+#=fXFtkk&w}E=6W6@I%j`<aBr76yF
z2iRr;;zXsJGboB12C5WuO)1^<>C8ix)E1P<X_%5bHEQmQRnjC@<;fyCELPI*x5IBe
zghy@a&H_C7B&O2<y933&B7r5YnoJG>lhNaw8FpD+b|D$z`Id^4)rJe78MNiBga?Z-
z0$L&MRTieSB1_E#KaN*H#Ns1}?zOA%Ybr{G+Sn3moXTVZj=L`nt?D&-MjOMz-Yq&@
z$P3h23d_F8Dcf*?txX7}p>nM<l{Qn?uEgn@yf~}YdEK1CaY|S)sKm5%E_A>*s+65t
z1il8bHHsBynUK|aEXSjzY6sz1nZ%|%XeWTcGLRyRl@q4YAR)JovbdTTY&7u>@}28A
zgV^<e**a7WuD0_57|#$M-bDY4Dl!_>Npp<sAnkx7os>?}I!?3K7IXu9ml-Lw;w@9m
zBYTeU+Seh8uJ-w?4e_6byq0f7>O3xm<T-=IFd&#pS0-Fods9njUMwYsRqq<?zWYLD
zfQV)Ux0VAf-GhE9#2pvi*%}6TncJD=b`5tFqkr(+7|GT8HW*ql076rUzXuFAn0$b}
ztB~=fV48IwJVxdQEM(u+^GG9i|8m!}@Gx>(hO}Y=fgU5^vW|>0yQ^0+?}LT55ei$i
zzlU-iRbd8TRX9Ept<Y_yCY)9AN#@44E0QQ@l+Wm>%h%ariV=%u%F@@FA>U*XdA<Yz
zYB4@$IL70Mq*UiYdF!wju0Kb}PJtpQQvXI<J8O>alcH%>#5_a&w)g`<dBOnWNnH-A
z)lTdxEzfBq6Cw*wE~=_CdPlgv%<-3OKBrm26@_ub2DA4t-_B!rBRHZ>uW%3}m?vP-
zc5}DkuF6ruKDwEYj+2YTSQ9=rkp19U5P@(zRm(nLod(sG9{~nw1BUoS2OFDXa{xfw
zZ~UaZLFUZxfQ*9?_X?*~`d;nn-BbaefLJ`DT13KF6?T5Mnt;v5d>H}s)aAIzJcs#B
z|CuXPJKww}hWBKsUfks#Kh$)ptp?5U1b@ttXFRbe_BZ&_R9XC6CA4WhWhMUE9Y2H4
z{w#CBCR<)Fd1M;mx*m?Z=L-^1kv1WKtqG(BjMiR4M^5yN4rlFM6oGUS2Wf~7Z@e*-
ze84Vr`Bmi!(a1y}-m^HHMpbAiKPVEv<svW7U^@p-C~aOLvRc5ptq-Alx_+3VLn`vT
z$Arz4y`QO%gQ^)TU&5;~ub7;p4l60Z!kSr0$0Tamnl#x6jaDz5FuP`OnuT?gam3fh
zW-E3aE=~5{^<i!iqEDAEgjm^e(`^Zl3sQqfd^*9z4K~ILcPZAUdvFIn#Zy+03^i4d
zQ0rAf=8gKh!XB~PebW8sh##BYjM5Ao@$rEpKJ~9X;V&+D|8QYf)cilih1xor1HybQ
zWPWnAY?^@(v}U=ICkzB;U3rkcuLQZ&1HKRSG)P`Bqol1@S-}!fLLQf*7^C~N`N-n#
z$>|(7=|}D#Ihfk+-S5Hlkf<mO<>ch02z&$(zS3vrYz2g*ic{xBy~*gIp(eG}^gMc7
zPu2Eivnp@BH3SOgx!aJXttx*()!=2)%Bf$Gs^4cCs@)=(PJNxhH5lVY&qSZ<ermz;
z*AW$ATa5X{5*^QV)cKip=adjN-+zu<Qbj`b8aKDJ-$7YqrHCn=V==a76z#J|4|C=6
ziQA;AHP{X4+#{W}C>Yaa?A^LhZW`B9(N?fx<^gCb(VE%3QpA*_Pohgp6vCB36iVaq
zc1TI%L2Le?kuv?6Dq`H+W>AqnjyEzUBK948|DB|)U0_4DzWF#7L{agwo%y$hC>->r
z4|_g_6ZC!n2=GF4RqVh6$$reQ(bG0K)i9(oC1t6kY)R@DNxicxGxejwL2sB<>l#w4
zE$QkyFI^(kZ#eE5srv*JDRIqRp2Totc8I%{jWhC$GrPWVc&gE1(8#?k!xDEQ)Tu~e
zdU@aD8enALmN@%1FmWUz;4p}41)@c>Fg}1vv~q>xD}KC#sF|L&FU);^Ye|Q;1#^ps
z)WmmdQI2;%?S%6i86-GD88>r|(nJackvJ#50vG6fm$1GWf*f6>oBiDKG0Kkw<U}GI
zL^YF-xy$sYcJMmiN0ngM(V(;uc)nRNAg-<2BZ%P*)kWkIK)?XHJSmc`?IKMeee=02
z(zZ=v_AxI~%FVp$EfT<efis=BFx^Xmds6b*A?AKP<|2-I4XThUW&>b17KPnS%7CKb
zB7$V58cTd8x*NXg=uEX8Man_cDu;)4+P}<f?2h4JBG{uqPK9;88sh{0wi3bcn?YjF
z^|SE#+I9}S_<Im1WVZg0@?>BuC<Z#C{(lf6;dchu8U3}j{gVnnsj@ck@Dn0Wop$4a
zQzc6Fn;?A(fkDx1$Y=x<Vtp}8<{~qnS9J#(Xmw57hcl6x>vYH6P|`x-#CMOp;%u$e
z&BZNHgXz-KlbLp;j)s<RuYu0Dk0j^92qMJcIT=sQByuycFbf!R2}09C)Zr<&m8ngG
z0P@{2A&&){_n0x4%21>i^~BI{<VR;A%GE_$&6BTtwdzHzZV-&q3D$YomWT8a9H7dS
z$%$Wg)<_@Gc6KJ~xm38<4rN(#v6!<GfV&NgbR){Tbm#Q(jThOK4Ea-d@V@PH!cd6R
zd0k-es%5)FmCAJ~x4G3~F<`E?{xhbZCj36*WNPr8MOFJp6}VGB=P&?z3I*=5D)%ef
zrVKh)paJ6Zd?6fwcCTu!j5xfj@(cEjAHHYt{7uWQ57*1(0u{TI9P|C8Qx^s8U5KJA
zBJaG2P_>!yNLWs5fK+!##G;yVWq|<>7TlosfaWN-;C@oag~V`3rZM_HN`kpF`u1p#
ztNTl4`j*Lf>>3NIoiu{ZrM9&E5H~ozq-Qz@Lkbp-xdm>FbHQ2KCc8WD7kt?=R*kG#
z!rQ178&ZoU(~U<;lsg@n216Ze3rB2FwqjbZ=u|J?nN%<4J9(Bl(90xevE|7ejUYm9
zg@E_xX}u2d%O1mpA2XzjRwWinvSeg)gHABeMH(2!A^g@~4l%8e0WWAkBvv60Cr>TR
zQB1%EQ<IS=62wktFl3@bq?<$7Fi$7<vgVpF%7SI3{e{_?kPXB}oJoDi)6AVm9yCe>
zUoZeUdqjh+1gFo6h~C~z#A57mf5i<Z>bmq$y_uVtA_kWv8X)CzfVEooDaY!#P?5$Y
zGPKXbE<75nc%D-|w4OrP#;87oL@2^4+sxKah;a-5&z_&SUf~-z(1}bP=tM^GYtR3a
z!x4zjSa^)KWG6jxfUI#{<26g$iAI;o_+B{LXY@WfWEdEl6%#8s3@b`?&Tm#aSK!~|
z^%DdrXnijW`d!ajWuKApw&{L+WCPpFialo&^dZ9jC7A%BO`2ZF&YUDe;Yu|zFuv`2
z)BE*7Lkay)M7uohJ)446X``0x0%PzPTWY92`1Oq4a2D_7V0wypPnXFR)WM0IlFgg@
zqz#hv<D0q2`XDaeeh`;vW;a@)LS>2xJEQL8eu}O;e(w4rSA?5|eZHbS6jEN<LYrmK
zS>ytJBq59?bOf>Wrl8<u806q;G;j++Cn$-#N@*)|YQ1Oc1>ySZH36H(6fGR#vHM6q
zn}!7!I@4$*+LFXs{x?|=q2*QtYT%Lw3+5(8uc0j8o3}TrG(zSV#>4wo6~)u|R+Yx#
z?0$AspZDjv{df<u+~yn3WB3HDes|!>v417~C17Oy%Fal{%+B6H(NX`$Bl>II-L3N3
zZc+sKZbqewU*&_Xt;9k=%4*aVYBvE1n&JZS7Uqjd%n8nOQmzh^x#vWK{;In~=QO)g
zT-n3OU(1<pC%^0p(x=6TZRnBNp&Ne%Y8tlj>@3QfL|$g1d2xeBb@O15Rl0<wkYLDD
z+ie<()sq`w;04+|&9rf+B&EVGd3>1+hmpup2De7p%Yrd$E7(In!*R+;IJZh}v!svi
z;7N~pq8<?3Y@|9}TxvDz@LqvwilszncIcoPuvf?2l)cCypvx@P+0bR<xPW)Z*}?M4
zdDSjh8q#cdVFp76x>KZDXXap0qd_D=Y^B)rz4S0^SF=&v6YYTAV$ad43#x!+n~-6<
zK{8*vWoAdW(gGGt&URD}@g6tMoY(+Lw=vvxhfIIK9AjvNF_(W}1Rxn(mp;tJfDV<0
zbJN0t(@Xb8UeO{&T{$$uDrs7)j$}=?WsuDl+T2N5Y<4TMHGOMcocPr$%~(yvtKv(n
z`U96d!D0cb9>Dx2zz$m&lAhazs%UeR^K*gb>d8CPs+?qlpfA;t{InX<O#)_wb~ZJz
zOhlV1HZTS-A}6%HRsloNhRCT$<a1q#*t!(tfKY;MvTUEGs}w*#+XT*;w;2zk8}UYw
zZvt{!yPw_#j^N(vBPyr&>a)^2ryC(FU(Zc6Xbnnh`lg`K&g^JeS>}^c0MJKUCfV+~
z<?PrWsmA0`k*MHcTSYZ^SNU>V(EN0Z5ztoN;hqcj!8V+VRbSltJ<~|y`U+9#wv|~H
zNE!j9uXa=dec@JQSgJ6N6@Il&tzCBJv9#ldR`Lm*<)YwH4tdlAlG0Fl8Nfa(J~<et
z>c%DQ2AA-}x8D=p(l#n1+hgx;N;1Aq?lq@{Lt9FKu89CjnnHD1G_@p;%L<QHk<<H#
z%Q>p`+b@ttb33!E_Xt;QUD9~nRQl&xAro9-{+&6^ljK2f-d>&q<xz}hO>y&d#0xwH
z@slNv@ULKp!Cf*JHuS@#4c?F->WjPc)yiuSargAIEg>muRxzY?Hzdq@G5CS)U1*Et
zE2SLh=@DI1J(guiy2Igq(?(xI9WL%g^f@{5Hmr|!Qz4`vn|LjrtO=b~I6~5EU5Fxy
z;-#<)6w#<N5=AghGQ%g7({wVc#=`dCLpXV5h7n_i_A0Szj?Fpl7Bn=iuV=WGtR6Uu
zNu&$<aar<@2rLPLnQ=VQHv9D;70`**YaQz!mx@i<tJ2gK&Scqi7A(<=BTPK&WDwnB
za&}mmmJHiIiN4{Xt$&GnOmI<>w=DkpSthAu+E;OL?!?6C9Mwt*o(@68(Jhvs-eX4V
z=d=>HI|`3J%H5X|gSrC8KH^IL?h5=3ID6svwHH@(wRbSG`Zsor^q4`3PCn#-(YX?<
z_q8+T)51$E0xyKR{L!LN(G=+9K6$3#PDT^IAe|Igkx=!4#rqKWoXiZdh`&ocjp=Ok
zemJe6*{it~>;sr(B0fSmp(S#*y5I0)OOz~Oe6Im+($S}e3tyx7Y6pA8vKCBmSEQDa
zLfkm*;uMbTLpcR0)tF_v-lbK%`5>POyI2E(!)2=Rj0p;WKi=|UNt6HsQv0xR3QIK9
zsew(AFyzH!7Azxum{%VC^`cqhGdGbABGQ4cYdNBPTx+XpJ=NUEDeP^e^w^AOE1pQI
zP{Us-sk!v$gj}@684E!uWjzvpoF|%v-6hwnitN1sCSg@(>RDCVgU8Ile_-xX`hL6u
zzI4*Q)AVu(-ef8{#~P9STQ5t|qIMRoh&S?7Oq+cL6vxG?{NUr@k(~7^%w)<J@%A@#
zd>P6nPbDa~4Jw}*p-|cT4p1?)!c0FoB(^DNJ+FDg+LoP6=RgB7Or673WD5MG&C!4<
zerd6<aS!6%omMUG1rB_ibwC3Z<FAkOr-Av0C-5&b(0Ijm>q$ODkBvFoy*%cpHGKSt
z3uDC6Sc=x<LEuPYV)CJJ#eplV!COGThUp&RV_B{GH(lNctGS5PP8t)W3PB`p#!e<H
z&2`mxw>vv@kDzRD)aIO`x}BaWLycA%<XY$Q_q9GVL~J84+zWr<Ganp)3n;}BJ36+T
z`Z86y8`!LHC<2a@0gbZjQf1m>(w-D`Pd+uL*rL|etagQ;U&xt_9?7#}=}5HI)cU-0
z%pMA`>Xb7s)|Y)4HKSZOu;{lg=KjeIyXb0{@EM`FTDkLRH`!W%z*lQJ74P%Ka76)H
zblrSIzf+dMWbO`g;=(b@{pS)zUcO&GrIFe%&?YeX4r8B2bBArB%-5ZrQ+vonr%AYy
z1+u0*K{UVUmV>h5vD!F;6}a%KdMZQLs04oGkp<Pp5IZ^H15**bp}t?2!g>iaC)zI(
zT2U9qta5o|6Y+It1)sE8>u&0)W~l$NX@ZQ8UZfB=`($EW6?FT%<IH$}PfK)-mk4_P
zM2R%A;4_B^=pW}8R*%_A(E0^3ZUs_4IKk5=Kb3eYmuv+yu}vu`$TpaKMBldJqb{z;
zIuVCVdUCjq8w56cf)C~yB)uDYvYVpK6nxz>{EoRhOrb9)z@3r8y?Z99FNLDE;7V=Q
zotj&igu*Rh^VQn3MQKBq!T{yTwGhn1YL6k*?j?{_ek5xe8#i#GG4S-a_Re2lssG!}
z`Y-d0BcOdB@!m?4y&hMN68}#0-IIlm_xO)d#}ugX{q^OZe{-@LeJyv`cY&ze4t2~!
zKb{qX-j;kt{?gC(vW%}X4pm@1F?~LH{^Q8d@X$dy@5ff~p!J3zmA>H`A)y+6RB_h*
zZfIO+bd=*LiymR<B*bH}4|&jZ1;Rlt)T_a7*adShM5rJM;aVs<hX!30`%#oQG{-jm
zD&ObtHpCT_P=%-~4Wp~enl~CtGYwtLvfj^jpzaLp>w{asW%xxaVl33_xtdVrrqIPn
zc@y8oMJvNtgcO~4i0`f)GCFkWY8EF?4duLVjHTdb6oYLnO9}Q-pe{CKQJL)hV8)JI
z$mVA0Dq&7Z1TbYdSC(WbJ+IBjXngZTu&I+vHF|>Zo$757{8lL;8Zr-Exkf?3jzN5k
z_d<rMUMzxj_t06F^6GdZlck$oF?EfDxYJCXv!(uHV~h_Kt`vB!PA>9I>{>^J?!l)<
zNd$7E9FVrta}3qy3L7Ys$^fRWNuu^hs^{*eXvazd&+Q*?lTfc>2+EdP(o0P_Z05HX
zVKsfFAQ{t^CRu~Dw(CuJ>tvx*p$5@flA>QRl455b&{*U?xU8`)nF2T$uu_(l8VNtq
z?pBiRQIckGzk8W&SFSB=g6eG`<XB)>ZC;6v9w`?eF*S}3E@N`2ropeHP<uVaPLTC%
zqy$w^_c}_<gmvnjqf4z8v7W!kbnw_pCaVr@HqPLVRLgLa+U(mBw1Y1YkfZY`o(ZmI
zd$;9N{-eGjxL*hB#@*grySry0?F595vZc)8)T9=+q`pOl^9Z0qhdJuJjlQIHm{=Ha
zw0sV438TXrP8;JG9kFkVG7FZP+b_fzpy`n6`xQ+37%?1*xBUVl<5-os{un%b(3f|O
z_e}*Zp|oPuL9Xl3qjk<Yt~bs+$fVKCE^jU8x$L?}!RFx>)E}o?qJkyVEI;K$!)bWY
zt9>4WmDVJh7U~m$|K`T#hF!v|znj^=M;69uXrFys#51XT;DbMr4H)>7UQ1e2(cuQf
z4kr~Tt1tpBB2GaJ(|j~lHgW40EgMMVqR6eJoJig1SBg|2=$~4I3P0eP$q%_`sS&4~
z26=&a&tLjQbch1`cVXa-2fTl1y8}->|Nqu?uVrNTov!=VKh)g89wUPTgAzkSKZ57_
zr=B^mcldE3K04t4{;RaG5<iW&j0o`H?mv@F)~_PT0KZ@gypg|u^T(Cv{e3O@pJdYf
zGU6h_ib}N7B0nR*f)E2ox*ykf;v(Sh-(}VRlmfV7`YFZmj}$+I*#DI9#oy^3eW$wm
zXTl%4`oA!n`WPDL0>3&9yovq;@aR#VHx+R1^^*kr-vEEd!uea68Z<{R%_DD6fn&T4
zu;fDj07L-(_fLSJGdkeh&c&7A(ZLj`7iwnkAcqUexU;WjUkqeg1m1-IU<?H2;Wv!p
zf0yB}^(83YqL?rx1khY22YeFWw~GJ1^1N+<rsUt?0mV!$9qoZ9l|;-ejra`=jO^{D
z0oDMMzlH8W2@J};8})#dfe0j_`5PVhndjXLr2GxRk09DWYlX3yi6c-M7$}eZ`@92V
zq`lh)mKp=t4Cwy>ZTIZA(4dtr2Gr`e{BIejlCgS<33MB=1!8?a74!F%=Uo7N`F@k}
ze+1C_eU4Y_$mvdjc<J~+Q~lq7z|TDICs@D51fC3Y09ac79!+!!v#SGG{&--6|7X=Q
zQ~nlB;MFUK?|}+zzDFnrnmQlC6M#N7W6i}Aeqgn}2ZlWVuH63jmFLY*_gm;6Pfggx
z$iVSGTF#)Tpn=pMQ2T(3p5Iid=<ma-gW`h5%zVIQ0k+ED;QpxA|JJNQqoqCIg-ZMu
z?;nr;zr{`i%{6E&t_PM_so%2vxg~?f7<qt$QTorQ^rK_@?a1_V{=Q3kfQATp089e{
z{<nZ3peWx{0h|B-UEc$3{B?crw9}OTQOfT!A)twaK*DbPojlKb@YlqDZ}<N+4F)lJ
zg2IEwCwPDdQ~xDzKf(T3urd7FEWg(qXe59K)PsM6`iHmxp!o+CUVmWP)%q9t|JmyY
zSUQ`ZW!OQfKvl0FsAhEkMD<@ZutDKL^_w5yEdYOl|M4XLq~;7t1*#?aKqX=JFR1>i
zwEtCIphA2PBzBhng5=M#e4r%)RW5rVD|_`PvY$7BK`}w~d>%0O9sY#*<AMAI{nsBq
z?WuvXfGWp4u<Sbh!t#G;zv{?<VuGHkf561|{1x-xpRot!0X^ycz;o{P3(v2e$G<xF
z4ay06Qul%Lt<V4F{C#%?>LUAq=^OjMF^PY5m<7!=s5jyRfosCQAo#hL`h5vN-M}6Q
z0Li}){5?wi8)GVHNkF|U9*8V5ej)nhb^TLw1KqiPK(@{P1^L&P=`ZNt?_+}&0(8Uh
zfyyZFPgMV7ECt;Jdw|`|{}b$w4&x77VxR>8wUs|GQ5FBf1UlvasqX$qfk5rI4>Wfr
zztH>y`=daAef**C12yJ7;LDf&3;h3X+5@dGPy@vS(RSs3CWimbTp=g<eRcTg5gqWy
N6sQqkUiJO2{|C|0X_No}

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..0c71e76
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

From 463e08a5f6f9b06a0b22103b3eecc731a5bc1cb9 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 19 Mar 2015 01:16:41 +0100
Subject: [PATCH 31/35] Upgraded target versions

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b6a5756..924e79c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
+    compileSdkVersion 22
     buildToolsVersion "20.0.0"
 
     defaultConfig {
         applicationId "com.saulmm.material.myapplication"
         minSdkVersion 21
-        targetSdkVersion 21
+        targetSdkVersion 22
         versionCode 1
         versionName "1.0"
     }

From 17ac59ac1b37fc2ab2a0af1b1d9d0776a2d03fa1 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 19 Mar 2015 03:26:36 +0100
Subject: [PATCH 32/35] Improved transitions at TransitionFirstActivity &
 TransitionSecondActivity

---
 app/src/main/AndroidManifest.xml              | 19 ++++---
 .../material/activities/SlidingActivity.java  |  2 +-
 .../activities/TransitionFirstActivity.java   | 34 ++++++------
 .../activities/TransitionSecondActivity.java  | 54 ++++++++-----------
 .../material/utils/AnimatorAdapter.java       | 25 +++++++++
 .../com/saulmm/material/utils/GUIUtils.java   |  4 --
 app/src/main/res/drawable/ripple_round.xml    |  2 +-
 app/src/main/res/layout/activity_color.xml    | 10 ++--
 .../res/layout/activity_transition_first.xml  | 16 +++---
 .../res/layout/activity_transition_second.xml |  5 +-
 app/src/main/res/layout/view_sample_row.xml   |  5 +-
 app/src/main/res/values-v21/styles.xml        | 15 +++++-
 12 files changed, 111 insertions(+), 80 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/utils/AnimatorAdapter.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4a7b869..2ebe7f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -7,12 +7,20 @@
         android:icon="@drawable/ic_launcher"
         android:label=""
         android:theme="@style/AppTheme" >
-        <activity android:name="com.saulmm.material.activities.TransitionFirstActivity" >
+
+        <activity android:name="com.saulmm.material.activities.TransitionFirstActivity"
+            android:theme="@style/TransitionSampleActivity">
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
+
         <activity
             android:name="com.saulmm.material.activities.TransitionSecondActivity"
-            android:label="@string/title_activity_my_activity2" >
-        </activity>
+            android:theme="@style/TransitionSampleSecondActivity"/>
+
         <activity android:name="com.saulmm.material.activities.SlidingActivity" >
         </activity>
         <activity
@@ -27,10 +35,7 @@
             android:name="com.saulmm.material.activities.ElevationSampleActivity"
             android:label="@string/title_activity_elevation_sample" >
 
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
+
         </activity>
     </application>
 
diff --git a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
index b0e76dd..98f92c5 100644
--- a/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/SlidingActivity.java
@@ -52,7 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
     }
 
     private void configureToolbar() {
-        Toolbar mainToolbar = (Toolbar) findViewById(R.id.dialer_toolbar);
+        Toolbar mainToolbar = (Toolbar) findViewById(R.id.activity_transition_header);
         setSupportActionBar(mainToolbar);
         getSupportActionBar().setTitle("Sliding");
 
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index 26d6d4f..1fb12d9 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -4,15 +4,17 @@
 import android.app.ActivityOptions;
 import android.content.Intent;
 import android.os.Bundle;
+import android.transition.Slide;
 import android.util.Pair;
+import android.view.Gravity;
 import android.view.View;
 
 import com.saulmm.material.R;
-import com.saulmm.material.utils.GUIUtils;
 
 public class TransitionFirstActivity extends Activity {
 
-    private View fabButton;
+    private View mFabButton;
+    private View mHeader;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -20,26 +22,24 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_transition_first);
 
-        // Set explode animation when enter and exit the activity
-        GUIUtils.configureWindowEnterExitExplodeTransition(getWindow());
+        mFabButton = findViewById(R.id.fab_button);
+        mHeader = findViewById(R.id.activity_transition_header);
 
-        // Fab Button
-        fabButton = findViewById(R.id.fab_button);
-        fabButton.setOnClickListener(fabClickListener);
-        GUIUtils.configureFab(fabButton);
+        Slide slideExitTransition = new Slide(Gravity.BOTTOM);
+        slideExitTransition.excludeTarget(android.R.id.navigationBarBackground, true);
+        slideExitTransition.excludeTarget(android.R.id.statusBarBackground, true);
+        slideExitTransition.excludeTarget(R.id.activity_transition_header, true);
+        getWindow().setExitTransition(slideExitTransition);
     }
 
+    public void onFabPressed(View view) {
 
-    View.OnClickListener fabClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View view) {
+        Intent i  = new Intent (TransitionFirstActivity.this,
+            TransitionSecondActivity.class);
 
-        Intent i  = new Intent (TransitionFirstActivity.this, TransitionSecondActivity.class);
-
-        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(TransitionFirstActivity.this,
-                Pair.create(fabButton, "fab"));
+        ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(
+            this, Pair.create(mFabButton, "fab"), Pair.create(mHeader, "holder1"));
 
         startActivity(i, transitionActivityOptions.toBundle());
-        }
-    };
+    }
 }
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index b47b520..2056ea4 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -3,52 +3,50 @@
 import android.animation.Animator;
 import android.app.Activity;
 import android.os.Bundle;
+import android.transition.Slide;
 import android.transition.Transition;
+import android.view.Gravity;
 import android.view.View;
 import android.view.ViewPropertyAnimator;
 import android.widget.LinearLayout;
 
 import com.saulmm.material.R;
-import com.saulmm.material.utils.GUIUtils;
+import com.saulmm.material.utils.AnimatorAdapter;
+import com.saulmm.material.utils.TransitionAdapter;
 
 public class TransitionSecondActivity extends Activity {
 
-    private static final int NUM_VIEWS = 5;
     private static final int SCALE_DELAY = 30;
     private LinearLayout rowContainer;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
 
+        super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_transition_second);
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
-        GUIUtils.configureWindowEnterExitExplodeTransition(getWindow());
+        Slide slideExitTransition = new Slide(Gravity.TOP);
+        slideExitTransition.excludeTarget(android.R.id.navigationBarBackground, true);
+        slideExitTransition.excludeTarget(android.R.id.statusBarBackground, true);
+        getWindow().setEnterTransition(slideExitTransition);
 
-        getWindow().getEnterTransition().addListener(new Transition.TransitionListener() {
-            @Override
-            public void onTransitionStart(Transition transition) {}
 
-            @Override
-            public void onTransitionCancel(Transition transition) {}
+        getWindow().getEnterTransition().addListener(new TransitionAdapter() {
 
             @Override
-            public void onTransitionPause(Transition transition) {}
+            public void onTransitionEnd(Transition transition) {
 
-            @Override
-            public void onTransitionResume(Transition transition) {}
+                super.onTransitionEnd(transition);
 
-            @Override
-            public void onTransitionEnd(Transition transition) {
                 getWindow().getEnterTransition().removeListener(this);
 
                 for (int i = 0; i < rowContainer.getChildCount(); i++) {
 
                     View rowView = rowContainer.getChildAt(i);
                     rowView.animate().setStartDelay(i * SCALE_DELAY)
-                            .scaleX(1).scaleY(1);
+                        .scaleX(1).scaleY(1);
                 }
             }
         });
@@ -60,25 +58,19 @@ public void onBackPressed() {
         for (int i = 0; i < rowContainer.getChildCount(); i++) {
 
             View rowView = rowContainer.getChildAt(i);
-            ViewPropertyAnimator propertyAnimator = rowView.animate().setStartDelay(i * SCALE_DELAY)
-                .scaleX(0).scaleY(0);
-
-            propertyAnimator.setListener(new Animator.AnimatorListener() {
-                @Override
-                public void onAnimationStart(Animator animator) {}
 
-                @Override
-                public void onAnimationEnd(Animator animator) {
-
-                    finishAfterTransition();
-                }
+            ViewPropertyAnimator propertyAnimator = rowView.animate()
+                .setStartDelay(i * SCALE_DELAY)
+                .scaleX(0).scaleY(0)
+                .setListener(new AnimatorAdapter() {
 
-                @Override
-                public void onAnimationCancel(Animator animator) {}
+                    @Override
+                    public void onAnimationEnd(Animator animation) {
 
-                @Override
-                public void onAnimationRepeat(Animator animator) {}
-            });
+                        super.onAnimationEnd(animation);
+                        finishAfterTransition();
+                    }
+                });
         }
     }
 }
diff --git a/app/src/main/java/com/saulmm/material/utils/AnimatorAdapter.java b/app/src/main/java/com/saulmm/material/utils/AnimatorAdapter.java
new file mode 100644
index 0000000..4de2736
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/utils/AnimatorAdapter.java
@@ -0,0 +1,25 @@
+package com.saulmm.material.utils;
+
+import android.animation.Animator;
+
+public class AnimatorAdapter implements Animator.AnimatorListener {
+    @Override
+    public void onAnimationStart(Animator animation) {
+
+    }
+
+    @Override
+    public void onAnimationEnd(Animator animation) {
+
+    }
+
+    @Override
+    public void onAnimationCancel(Animator animation) {
+
+    }
+
+    @Override
+    public void onAnimationRepeat(Animator animation) {
+
+    }
+}
diff --git a/app/src/main/java/com/saulmm/material/utils/GUIUtils.java b/app/src/main/java/com/saulmm/material/utils/GUIUtils.java
index d48da35..4034769 100644
--- a/app/src/main/java/com/saulmm/material/utils/GUIUtils.java
+++ b/app/src/main/java/com/saulmm/material/utils/GUIUtils.java
@@ -3,11 +3,8 @@
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.graphics.Outline;
-import android.transition.Explode;
 import android.transition.Fade;
-import android.transition.Slide;
 import android.view.View;
 import android.view.ViewAnimationUtils;
 import android.view.ViewPropertyAnimator;
@@ -33,7 +30,6 @@ public static void configureFab (View fabButton) {
 
         int fabSize = fabButton.getContext().getResources()
             .getDimensionPixelSize(R.dimen.fab_size);
-
         Outline fabOutLine = new Outline();
         fabOutLine.setOval(0, 0, fabSize, fabSize);
     }
diff --git a/app/src/main/res/drawable/ripple_round.xml b/app/src/main/res/drawable/ripple_round.xml
index ead7fa8..2524a0b 100644
--- a/app/src/main/res/drawable/ripple_round.xml
+++ b/app/src/main/res/drawable/ripple_round.xml
@@ -6,7 +6,7 @@
 
     <item>
         <shape android:shape="oval">
-            <solid android:color="?android:colorPrimary"/>
+            <solid android:color="?android:colorAccent"/>
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_color.xml b/app/src/main/res/layout/activity_color.xml
index 774dfee..78816d1 100644
--- a/app/src/main/res/layout/activity_color.xml
+++ b/app/src/main/res/layout/activity_color.xml
@@ -14,20 +14,20 @@
         />
 
     <View
-        android:id="@+id/dialer_toolbar"
+        android:id="@+id/activity_transition_header"
         android:layout_width="match_parent"
         android:background="?android:colorPrimary"
         android:layout_height="?attr/actionBarSize"
         />
 
         <RelativeLayout
-            android:id="@+id/holder_view"
+            android:id="@+id/activity_transition_header"
             android:layout_width="match_parent"
             android:layout_height="168dp"
             android:paddingLeft="72dp"
             android:paddingRight="16dp"
             android:transitionName="holder1"
-            android:layout_below="@id/dialer_toolbar"
+            android:layout_below="@id/activity_transition_header"
             android:background="?android:colorPrimary"
             >
 
@@ -56,7 +56,7 @@
         android:paddingLeft="16dp"
         android:paddingRight="16dp"
         android:orientation="vertical"
-        android:layout_below="@id/holder_view">
+        android:layout_below="@id/activity_transition_header">
 
         <TextView
             android:layout_width="match_parent"
@@ -185,7 +185,7 @@
         android:background="@drawable/ripple_round"
         android:stateListAnimator="@anim/fab_anim"
         android:elevation="4dp"
-        android:layout_below="@+id/holder_view"
+        android:layout_below="@+id/activity_transition_header"
         android:layout_marginTop="-26dp"
         android:layout_alignParentEnd="true"
         />
diff --git a/app/src/main/res/layout/activity_transition_first.xml b/app/src/main/res/layout/activity_transition_first.xml
index fe15993..807b54a 100644
--- a/app/src/main/res/layout/activity_transition_first.xml
+++ b/app/src/main/res/layout/activity_transition_first.xml
@@ -7,7 +7,7 @@
     >
 
     <View
-        android:id="@+id/holder_view"
+        android:id="@+id/activity_transition_header"
         android:layout_width="match_parent"
         android:layout_height="144dp"
         android:transitionName="holder1"
@@ -15,18 +15,18 @@
         />
 
     <Button
-        xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/fab_button"
-        android:transitionName="fab"
         android:layout_width="@dimen/fab_size"
         android:layout_height="@dimen/fab_size"
+        android:layout_marginTop="-26dp"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_below="@+id/activity_transition_header"
+        android:layout_alignParentEnd="true"
+        android:elevation="5dp"
         android:background="@drawable/ripple_round"
         android:stateListAnimator="@anim/fab_anim"
-        android:elevation="5dp"
-        android:layout_below="@+id/holder_view"
-        android:layout_marginTop="-26dp"
-        android:layout_alignParentEnd="true"
+        android:onClick="onFabPressed"
+        android:transitionName="fab"
         />
 
     <RelativeLayout
@@ -35,7 +35,7 @@
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_horizontal_margin"
-        android:layout_below="@id/holder_view">
+        android:layout_below="@id/activity_transition_header">
 
         <Button
             android:layout_width="150dp"
diff --git a/app/src/main/res/layout/activity_transition_second.xml b/app/src/main/res/layout/activity_transition_second.xml
index 543ff63..fa8ab6a 100644
--- a/app/src/main/res/layout/activity_transition_second.xml
+++ b/app/src/main/res/layout/activity_transition_second.xml
@@ -7,17 +7,18 @@
     >
 
     <android.support.v7.widget.Toolbar
-        android:id="@+id/dialer_toolbar"
+        android:id="@+id/activity_transition_header"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
         android:background="?android:colorPrimary"
+        android:transitionName="holder1"
         android:minHeight="?attr/actionBarSize"/>
 
     <LinearLayout
         android:id="@+id/row_container2"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_below="@id/dialer_toolbar"
+        android:layout_below="@id/activity_transition_header"
         android:orientation="vertical"
         android:layout_centerHorizontal="true"
         android:paddingLeft="@dimen/activity_horizontal_margin"
diff --git a/app/src/main/res/layout/view_sample_row.xml b/app/src/main/res/layout/view_sample_row.xml
index b4f4373..a1b0e5f 100644
--- a/app/src/main/res/layout/view_sample_row.xml
+++ b/app/src/main/res/layout/view_sample_row.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<View xmlns:android="http://schemas.android.com/apk/res/android"
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="55dp"
-    android:background="@color/gray_row_color"
     android:layout_marginTop="10dp"
     android:scaleX="0"
     android:scaleY="0"
     >
 
-</View>
\ No newline at end of file
+</Button>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index b9bf844..cf11967 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -12,9 +12,22 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">true</item>
         <item name="android:windowAllowReturnTransitionOverlap">true</item>
-
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
     </style>
+    
+    
+    <style name="TransitionSampleActivity" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorPrimaryDark">@color/color_set_1_primary</item>
+        <item name="android:colorPrimary">@color/color_set_1_primary</item>
+        <item name="android:colorAccent">@color/color_set_1_accent</item>
+    </style>
+
+    <style name="TransitionSampleSecondActivity" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:colorPrimaryDark">@color/color_set_1_primary</item>
+        <item name="android:colorPrimary">@color/color_set_1_primary</item>
+        <item name="android:colorAccent">@color/color_set_1_accent</item>
+        <item name="android:windowExitTransition">@android:transition/slide_top</item>
+    </style>
 
     <style name="theme1" parent="AppTheme">
         <item name="android:colorPrimary">@color/color_set_1_primary</item>

From f651bd99e9b3199b8f0643e258ef81d76b4600d9 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Thu, 19 Mar 2015 15:57:01 +0100
Subject: [PATCH 33/35] Added missing classes

---
 .../activities/TransitionFirstActivity.java   |  2 +-
 .../activities/TransitionSecondActivity.java  |  3 +-
 .../material/utils/TransitionAdapter.java     | 31 +++++++++++++++++++
 .../res/layout/activity_transition_first.xml  |  3 +-
 app/src/main/res/values-v21/styles.xml        |  1 -
 5 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/com/saulmm/material/utils/TransitionAdapter.java

diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
index 1fb12d9..23e359b 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionFirstActivity.java
@@ -38,7 +38,7 @@ public void onFabPressed(View view) {
             TransitionSecondActivity.class);
 
         ActivityOptions transitionActivityOptions = ActivityOptions.makeSceneTransitionAnimation(
-            this, Pair.create(mFabButton, "fab"), Pair.create(mHeader, "holder1"));
+            TransitionFirstActivity.this,Pair.create(mFabButton, "fab"), Pair.create(mHeader, "holder1"));
 
         startActivity(i, transitionActivityOptions.toBundle());
     }
diff --git a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
index 2056ea4..376c26c 100644
--- a/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
+++ b/app/src/main/java/com/saulmm/material/activities/TransitionSecondActivity.java
@@ -27,10 +27,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         rowContainer = (LinearLayout) findViewById(R.id.row_container2);
 
-        Slide slideExitTransition = new Slide(Gravity.TOP);
+        Slide slideExitTransition = new Slide(Gravity.BOTTOM);
         slideExitTransition.excludeTarget(android.R.id.navigationBarBackground, true);
         slideExitTransition.excludeTarget(android.R.id.statusBarBackground, true);
-        getWindow().setEnterTransition(slideExitTransition);
 
 
         getWindow().getEnterTransition().addListener(new TransitionAdapter() {
diff --git a/app/src/main/java/com/saulmm/material/utils/TransitionAdapter.java b/app/src/main/java/com/saulmm/material/utils/TransitionAdapter.java
new file mode 100644
index 0000000..1297bb8
--- /dev/null
+++ b/app/src/main/java/com/saulmm/material/utils/TransitionAdapter.java
@@ -0,0 +1,31 @@
+package com.saulmm.material.utils;
+
+import android.transition.Transition;
+
+public class TransitionAdapter implements Transition.TransitionListener {
+
+    @Override
+    public void onTransitionStart(Transition transition) {
+
+    }
+
+    @Override
+    public void onTransitionEnd(Transition transition) {
+
+    }
+
+    @Override
+    public void onTransitionCancel(Transition transition) {
+
+    }
+
+    @Override
+    public void onTransitionPause(Transition transition) {
+
+    }
+
+    @Override
+    public void onTransitionResume(Transition transition) {
+
+    }
+}
diff --git a/app/src/main/res/layout/activity_transition_first.xml b/app/src/main/res/layout/activity_transition_first.xml
index 807b54a..82083ee 100644
--- a/app/src/main/res/layout/activity_transition_first.xml
+++ b/app/src/main/res/layout/activity_transition_first.xml
@@ -18,6 +18,8 @@
         android:id="@+id/fab_button"
         android:layout_width="@dimen/fab_size"
         android:layout_height="@dimen/fab_size"
+        android:transitionName="fab"
+
         android:layout_marginTop="-26dp"
         android:layout_marginRight="@dimen/activity_horizontal_margin"
         android:layout_below="@+id/activity_transition_header"
@@ -26,7 +28,6 @@
         android:background="@drawable/ripple_round"
         android:stateListAnimator="@anim/fab_anim"
         android:onClick="onFabPressed"
-        android:transitionName="fab"
         />
 
     <RelativeLayout
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index cf11967..3a30fbe 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -26,7 +26,6 @@
         <item name="android:colorPrimaryDark">@color/color_set_1_primary</item>
         <item name="android:colorPrimary">@color/color_set_1_primary</item>
         <item name="android:colorAccent">@color/color_set_1_accent</item>
-        <item name="android:windowExitTransition">@android:transition/slide_top</item>
     </style>
 
     <style name="theme1" parent="AppTheme">

From fe0b0a3c56be5becc79dcb7dd1dc111fbb49c766 Mon Sep 17 00:00:00 2001
From: Saul M <saulmm2@gmail.com>
Date: Tue, 14 Apr 2015 14:12:02 +0200
Subject: [PATCH 34/35] Deleted unused tests

---
 .../material/myapplication/ApplicationTest.java     | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 app/src/androidTest/java/com/saulmm/material/myapplication/ApplicationTest.java

diff --git a/app/src/androidTest/java/com/saulmm/material/myapplication/ApplicationTest.java b/app/src/androidTest/java/com/saulmm/material/myapplication/ApplicationTest.java
deleted file mode 100644
index 2475efc..0000000
--- a/app/src/androidTest/java/com/saulmm/material/myapplication/ApplicationTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.saulmm.material.myapplication;
-
-import android.app.Application;
-import android.test.ApplicationTestCase;
-
-/**
- * <a href="http://d.android.com/tools/testing/testing_android.html">Testing Fundamentals</a>
- */
-public class ApplicationTest extends ApplicationTestCase<Application> {
-    public ApplicationTest() {
-        super(Application.class);
-    }
-}
\ No newline at end of file

From 7424eb11b9a5790ad3dd123f748b955f52099d55 Mon Sep 17 00:00:00 2001
From: Paresh Mayani <pareshmayani@gmail.com>
Date: Wed, 14 Oct 2015 15:23:38 +0530
Subject: [PATCH 35/35] Include commit links

---
 README.md | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index c6fff7c..10ea820 100644
--- a/README.md
+++ b/README.md
@@ -1,42 +1,42 @@
 ### Working with shared elements
 
-Commit - **8872619**
+Commit - [**8872619**](https://github.com/saulmm/Android-Material-Examples/commit/8872619ba751d99044a8426a35e6d2416d3af286)
 
 ![](https://lh4.googleusercontent.com/-dmDFoF7c5UY/VD77NsFK8kI/AAAAAAAAuLM/MtSqP8JoQco/w282-h499-no/2014-10-16%2B00_51_34.gif)
 
 ### Working with shared elements, explode transition, and animations
 
-Commit - **901d62c**
+Commit - [**901d62c**](https://github.com/saulmm/Android-Material-Examples/commit/901d62c65bbe70f55d944b718b8e6c6c2c69839d)
 
 ![](https://lh6.googleusercontent.com/-ecoWQejLmFE/VEBoRo3Qs_I/AAAAAAAAuTU/YZ7855GmOfw/w276-h498-no/appear.gif)
 
 ## Playing with the new menu-to arrow toggle animattion added in the Support Library
 
-Commit - **ead8ada**
+Commit - [**ead8ada**](https://github.com/saulmm/Android-Material-Examples/commit/ead8adaafb482bd29a9ef86568a08afebeffd043)
 
 ![](https://0b53cc8370cd7638a6bca2ead36937afe31044d3.googledrive.com/host/0B62SZ3WRM2R2aVA4TDVRV04walU/gif-arrow.gif)
 
 ## Reusing an example to build a pretty effect like the tab slide of google play app
 
-Commit - **f502305**
+Commit - [**f502305**](https://github.com/saulmm/Android-Material-Examples/commit/f5023057d1e088cc69849c9c7f60d32279604214)
 
 ![](https://lh5.googleusercontent.com/-N-0aREntDdM/VEvP4I5kxrI/AAAAAAAAvQA/3CRH8pH5Vq4/s1006-no/sliding.gif)
 
 ## Using CircularReveal to show a pretty effect between activities
 
-Commit - **ba9c202**
+Commit - [**ba9c202**](https://github.com/saulmm/Android-Material-Examples/commit/ba9c2026bbe5fc57d6166389f60030176d065623)
 
 ![](https://lh3.googleusercontent.com/-eQoRYLME7-0/VFEZ9qNaR7I/AAAAAAAAvqg/xk6U4UT_FUY/w420-h747-no/reveal.gif)
 
 ## Replicating some parts of the lollypop dialer app basing on the material design principle: Motion provides meaning
 
-Commit - **eb20707**
+Commit - [**eb20707**](https://github.com/saulmm/Android-Material-Examples/commit/eb20707d8db3aef321ae30cb80faada5e3cd7b4d)
 
 ![](https://lh6.googleusercontent.com/-t40vK2mcvkI/VF4-e7AzhBI/AAAAAAAAwnQ/lyzfRIj9heo/w800-h1422-no/dialer.gif)
 
 
 ## Using StateListAnimator to change the elevation of a view smootly
 
-Commit - **3f1102b**
+Commit - [**3f1102b**](https://github.com/saulmm/Android-Material-Examples/commit/3f1102b50606d2b57781ad5c0de232697da47862)
 
-![](https://lh4.googleusercontent.com/-qqERGSF7t7Q/VHdlcZmbPgI/AAAAAAAAx1Q/CPo4dJk2_MM/w364-h644-no/elevation_sample.gif)
\ No newline at end of file
+![](https://lh4.googleusercontent.com/-qqERGSF7t7Q/VHdlcZmbPgI/AAAAAAAAx1Q/CPo4dJk2_MM/w364-h644-no/elevation_sample.gif)