From 6faa384570644d445ccfa22a2532461cccdb79f8 Mon Sep 17 00:00:00 2001
From: Wesley Lima <fio-alpha@hotmail.com>
Date: Sun, 9 Aug 2015 18:01:36 -0300
Subject: [PATCH 1/2] Criancao do ToolBar e estiliacao do mesmo

---
 app/src/main/res/values/color.xml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 app/src/main/res/values/color.xml

diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
new file mode 100644
index 0000000..a6b3dae
--- /dev/null
+++ b/app/src/main/res/values/color.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources></resources>
\ No newline at end of file

From 90f7e6ce4eef8def28701c97eb9f0056146085bb Mon Sep 17 00:00:00 2001
From: Wesley Lima <fio-alpha@hotmail.com>
Date: Sun, 9 Aug 2015 18:03:30 -0300
Subject: [PATCH 2/2] Criacao o ToolBar e  estelizacao do toolbar

---
 .idea/gradle.xml                              |  5 ++--
 .idea/misc.xml                                | 29 ++++++++++++++++++-
 .idea/vcs.xml                                 |  2 +-
 .../br/com/gdgabc/askov/MainActivity.java     |  9 ++++++
 app/src/main/res/layout/activity_main.xml     | 25 +++++++++++++---
 app/src/main/res/values/color.xml             | 10 ++++++-
 app/src/main/res/values/styles.xml            | 19 ++++++++++--
 7 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 1bbc21d..bd4202c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -3,9 +3,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.7" />
+        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.4" />
+        <option name="gradleJvm" value="1.8" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index e45faed..5d19981 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="EntryPointsManager">
+    <entry_points version="2.0" />
+  </component>
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="4">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="false">
     <OptionsSetting value="true" id="Add" />
     <OptionsSetting value="true" id="Remove" />
@@ -10,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 6564d52..94a25f7 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/br/com/gdgabc/askov/MainActivity.java b/app/src/main/java/br/com/gdgabc/askov/MainActivity.java
index 5adc233..4504b8d 100644
--- a/app/src/main/java/br/com/gdgabc/askov/MainActivity.java
+++ b/app/src/main/java/br/com/gdgabc/askov/MainActivity.java
@@ -2,6 +2,7 @@
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 
@@ -11,6 +12,14 @@ public class MainActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+
+        //Instanciando o ToolBar
+        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+
+        //Set do titulo
+        toolbar.setTitle("Askov");
+        //Inflando o Menu
+        toolbar.inflateMenu(R.menu.menu_main);
     }
 
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 24253af..3629524 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,21 @@
-<fragment xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:id="@+id/fragment"
-    android:name="br.com.gdgabc.askov.MainActivityFragment" tools:layout="@layout/fragment_main"
-    android:layout_width="match_parent" android:layout_height="match_parent" />
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="br.com.gdgabc.askov.MainActivity"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+    <android.support.v7.widget.Toolbar
+        android:layout_width="match_parent"
+        android:layout_height="150dp"
+        android:id="@+id/toolbar"
+        android:elevation="5dp"
+        android:translationZ="10dp"
+        android:minHeight="?attr/actionBarSize"
+        android:background="@color/colorPrimary"
+        android:theme="?attr/colorPrimary"/>
+    <fragment
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:name="br.com.gdgabc.askov.MainActivityFragment"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index a6b3dae..796b845 100644
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -1,2 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<!-- Aqui vira todos os valores de colores para o app -->
+<resources>
+    <!-- Cores Basica dos itens do ToolBar -->
+    <color name="colorPrimary">#2196F3</color>
+    <color name="colorPrimarydark">#1976D2</color>
+    <color name="colorAccent">#F44336</color>
+    <color name="textColorPrimary">#FFFFFF</color>
+    <color name="windowColorBackground">#DDDDDD</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 766ab99..40d327b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,23 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--Customizar os itens do toolbar no tema -->
+        <!-- Cor do ActionBar -->
+        <item name="android:colorPrimary">@color/colorPrimary</item>
+        <!-- Color -->
+        <item name="android:colorPrimaryDark">@color/colorPrimarydark</item>
+        <item name="android:colorAccent">@color/colorAccent</item>
+        <item name="android:navigationBarColor">@color/colorPrimarydark</item>
+        <!-- Cor do Texto do Toolbar-->
+        <item name="android:textColorPrimary">@color/textColorPrimary</item>
+
+        <item name="android:colorBackground">@color/windowColorBackground</item>
+        <item name="android:windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="Theme.AppBar.Normal" parent="ThemeOverlay.AppCompat.Dark">
+        <item name="android:textColorPrimary">@color/textColorPrimary</item>
     </style>
 
 </resources>