From 57ba257bad7188fc77a5b4077ca22d3232a8f9fc Mon Sep 17 00:00:00 2001
From: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
Date: Thu, 12 Mar 2020 10:25:21 -0300
Subject: [PATCH 1/9] rename TextInputHighlight to ValueTextHighlight

---
 .../widget/{TextInputHighlight.kt => ValueTextHighlight.kt} | 2 +-
 ...ghtActivityTest.kt => ValueTextHighlightActivityTest.kt} | 4 ++--
 sample/src/main/AndroidManifest.xml                         | 2 +-
 .../main/kotlin/com/natura/android/sample/MainActivity.kt   | 2 +-
 ...utHighlightActivity.kt => ValueTextHighlightActivity.kt} | 6 +++---
 sample/src/main/res/layout/activity_main.xml                | 2 +-
 .../src/main/res/layout/activity_text_input_highlight.xml   | 5 +++--
 7 files changed, 12 insertions(+), 11 deletions(-)
 rename designsystem/src/main/kotlin/com/natura/android/widget/{TextInputHighlight.kt => ValueTextHighlight.kt} (96%)
 rename sample/src/androidTest/kotlin/com/natura/android/sample/components/{TextInputHighlightActivityTest.kt => ValueTextHighlightActivityTest.kt} (94%)
 rename sample/src/main/kotlin/com/natura/android/sample/components/{TextInputHighlightActivity.kt => ValueTextHighlightActivity.kt} (73%)

diff --git a/designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
similarity index 96%
rename from designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt
rename to designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
index c5cffc8e3..6853a3cab 100644
--- a/designsystem/src/main/kotlin/com/natura/android/widget/TextInputHighlight.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
@@ -7,7 +7,7 @@ import android.view.LayoutInflater
 import android.widget.TextView
 import com.natura.android.R
 
-class TextInputHighlight @JvmOverloads constructor(
+class ValueTextHighlight @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
similarity index 94%
rename from sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt
rename to sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
index beeb33aa7..5150efd3c 100644
--- a/sample/src/androidTest/kotlin/com/natura/android/sample/components/TextInputHighlightActivityTest.kt
+++ b/sample/src/androidTest/kotlin/com/natura/android/sample/components/ValueTextHighlightActivityTest.kt
@@ -14,11 +14,11 @@ import org.junit.Test
 import org.junit.runner.RunWith
 
 @RunWith(AndroidJUnit4::class)
-class TextInputHighlightActivityTest {
+class ValueTextHighlightActivityTest {
 
     @Before
     fun setup() {
-        ActivityScenario.launch(TextInputHighlightActivity::class.java)
+        ActivityScenario.launch(ValueTextHighlightActivity::class.java)
     }
 
     @Test
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f5921552b..f2ed6dd1e 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -39,7 +39,7 @@
             android:name=".components.LoadingActivity"
             android:theme="@style/Theme.Natura" />
         <activity
-            android:name=".components.TextInputHighlightActivity"
+            android:name=".components.ValueTextHighlightActivity"
             android:theme="@style/Theme.Natura" />
         <activity
             android:name=".components.StyleButtonActivity"
diff --git a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
index 541a425a0..5d4c167f2 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -45,7 +45,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         findViewById<Button>(R.id.btn_input_text_highlight).setOnClickListener {
-            startActivity(Intent(this, TextInputHighlightActivity::class.java))
+            startActivity(Intent(this, ValueTextHighlightActivity::class.java))
         }
 
         findViewById<Button>(R.id.btn_style_buttons).setOnClickListener {
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
similarity index 73%
rename from sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt
rename to sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
index fdc15ba10..97a24d7e0 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/TextInputHighlightActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/ValueTextHighlightActivity.kt
@@ -3,14 +3,14 @@ package com.natura.android.sample.components
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import com.natura.android.sample.R
-import com.natura.android.widget.TextInputHighlight
+import com.natura.android.widget.ValueTextHighlight
 
-class TextInputHighlightActivity: AppCompatActivity() {
+class ValueTextHighlightActivity: AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_text_input_highlight)
 
-        val inputHighlight = findViewById<TextInputHighlight>(R.id.highlightInitViaCode)
+        val inputHighlight = findViewById<ValueTextHighlight>(R.id.highlightInitViaCode)
         inputHighlight.setDescription("Add description via code")
         inputHighlight.setHighlightedInfo("$ 00.00")
     }
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index 1aab14dc3..f91fe2f63 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -78,7 +78,7 @@
             android:id="@+id/btn_input_text_highlight"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Input Text Highlight"
+            android:text="Value Text Highlight"
             android:textColor="@color/colorBrdNatGray" />
 
     </LinearLayout>
diff --git a/sample/src/main/res/layout/activity_text_input_highlight.xml b/sample/src/main/res/layout/activity_text_input_highlight.xml
index 878a5029e..7f0f4b837 100644
--- a/sample/src/main/res/layout/activity_text_input_highlight.xml
+++ b/sample/src/main/res/layout/activity_text_input_highlight.xml
@@ -5,9 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
+    android:padding="16dp"
     android:theme="@style/Theme.Natura">
 
-    <com.natura.android.widget.TextInputHighlight
+    <com.natura.android.widget.ValueTextHighlight
         android:id="@+id/highlightInitOnXml"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -18,7 +19,7 @@
         android:layout_width="0dp"
         android:layout_height="20dp"/>
 
-    <com.natura.android.widget.TextInputHighlight
+    <com.natura.android.widget.ValueTextHighlight
         android:id="@+id/highlightInitViaCode"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"/>

From 3ab11e83d099ffefad43fcdf6e8d371016010397 Mon Sep 17 00:00:00 2001
From: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
Date: Thu, 12 Mar 2020 16:24:18 -0300
Subject: [PATCH 2/9] fix button styles

---
 .../ds_mtrl_colored_stroke_color_selector.xml |  5 ++
 ...s_mtrl_default_btn_text_color_selector.xml |  2 +-
 .../ds_mtrl_sec_btn_background_selector.xml   |  5 --
 .../ds_mtrl_sec_btn_text_color_selector.xml   |  5 --
 ...rl_sec_colored_btn_text_color_selector.xml |  5 --
 ...mtrl_sec_colored_ripple_color_selector.xml |  8 ---
 .../src/main/res/values/button_styles.xml     | 20 +++---
 .../main/res/values/custom_theme_attrs.xml    | 10 +++
 designsystem/src/main/res/values/themes.xml   | 23 ++++++-
 .../sample/components/StyleButtonActivity.kt  |  7 ++
 .../res/layout/activity_styled_button.xml     | 68 +++++--------------
 11 files changed, 71 insertions(+), 87 deletions(-)
 create mode 100644 designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml
 delete mode 100644 designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml
 delete mode 100644 designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml
 delete mode 100644 designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml
 delete mode 100644 designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml
 create mode 100644 designsystem/src/main/res/values/custom_theme_attrs.xml

diff --git a/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml
new file mode 100644
index 000000000..a61db46aa
--- /dev/null
+++ b/designsystem/src/main/res/color/ds_mtrl_colored_stroke_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?colorPrimary" android:state_enabled="true"/>
+    <item android:alpha="0.12" android:color="@android:color/black"/>
+</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
index 5df2cf0c3..6dabd2a41 100644
--- a/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
+++ b/designsystem/src/main/res/color/ds_mtrl_default_btn_text_color_selector.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" android:state_enabled="true"/>
+    <item android:color="@color/colorHighEmphasis" android:state_enabled="true"/>
     <item android:color="@color/mtrlBtnTextColorDisabled"/>
 </selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml
deleted file mode 100644
index 239a2595e..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_btn_background_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?colorSecondary" android:state_enabled="true"/>
-    <item android:color="@color/colorBrdBlack_12"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml
deleted file mode 100644
index 5df2cf0c3..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_btn_text_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@android:color/black" android:state_enabled="true"/>
-    <item android:color="@color/mtrlBtnTextColorDisabled"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml
deleted file mode 100644
index 67efe7c28..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_colored_btn_text_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?colorSecondary" android:state_enabled="true"/>
-    <item android:color="@color/mtrlBtnTextColorDisabled"/>
-</selector>
diff --git a/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml b/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml
deleted file mode 100644
index 3c7de66ce..000000000
--- a/designsystem/src/main/res/color/ds_mtrl_sec_colored_ripple_color_selector.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:alpha="0.16" android:color="?attr/colorSecondary" android:state_pressed="true"/>
-    <item android:alpha="0.12" android:color="?attr/colorSecondary" android:state_focused="true" android:state_hovered="true"/>
-    <item android:alpha="0.12" android:color="?attr/colorSecondary" android:state_focused="true"/>
-    <item android:alpha="0.04" android:color="?attr/colorSecondary" android:state_hovered="true"/>
-    <item android:alpha="0.00" android:color="?attr/colorSecondary"/>
-</selector>
diff --git a/designsystem/src/main/res/values/button_styles.xml b/designsystem/src/main/res/values/button_styles.xml
index e6b09f415..3b1d8a3c4 100644
--- a/designsystem/src/main/res/values/button_styles.xml
+++ b/designsystem/src/main/res/values/button_styles.xml
@@ -1,26 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Widget.Natura.Button" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Natura.Button" parent="Widget.MaterialComponents.Button"/>
+
+    <style name="Widget.Natura.Button.DarkText" parent="Widget.Natura.Button">
         <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
-    <style name="Widget.Natura.Button.Secondary" parent="Widget.Natura.Button">
-        <item name="backgroundTint">@color/ds_mtrl_sec_btn_background_selector</item>
+    <style name="Widget.Natura.Button.Outlined.DarkText" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
-    <style name="Widget.Natura.Button.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton"/>
-
-    <style name="Widget.Natura.Button.Outlined.Secondary" parent="Widget.Natura.Button.Outlined">
-        <item name="android:textColor">@color/ds_mtrl_sec_colored_btn_text_color_selector</item>
-        <item name="rippleColor">@color/ds_mtrl_sec_colored_ripple_color_selector</item>
+    <style name="Widget.Natura.Button.Outlined.StrokeColored" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="strokeColor">@color/ds_mtrl_colored_stroke_color_selector</item>
     </style>
 
     <style name="Widget.Natura.Button.TextButton" parent="Widget.MaterialComponents.Button.TextButton"/>
 
-    <style name="Widget.Natura.Button.TextButton.Secondary" parent="Widget.Natura.Button.TextButton">
-        <item name="android:textColor">@color/ds_mtrl_sec_colored_btn_text_color_selector</item>
-        <item name="rippleColor">@color/ds_mtrl_sec_colored_ripple_color_selector</item>
+    <style name="Widget.Natura.Button.TextButton.DarkText" parent="Widget.MaterialComponents.Button.TextButton">
+        <item name="android:textColor">@color/ds_mtrl_default_btn_text_color_selector</item>
     </style>
 
 </resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/custom_theme_attrs.xml b/designsystem/src/main/res/values/custom_theme_attrs.xml
new file mode 100644
index 000000000..328e866fc
--- /dev/null
+++ b/designsystem/src/main/res/values/custom_theme_attrs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <!-- To be replaced with default attr from google:material lib -->
+    <!-- Style to use for Material Outlined Buttons in this theme. -->
+    <!-- Since it's not available in support:design lib -->
+    <attr name="materialButtonOutlinedStyle" format="reference"/>
+    <attr name="materialBorderlessButtonStyle" format="reference"/>
+
+</resources>
\ No newline at end of file
diff --git a/designsystem/src/main/res/values/themes.xml b/designsystem/src/main/res/values/themes.xml
index c20177fe3..faf9ec0f2 100644
--- a/designsystem/src/main/res/values/themes.xml
+++ b/designsystem/src/main/res/values/themes.xml
@@ -17,10 +17,31 @@
 
         <!--Remap legacy AppCompat attributes to MaterialComponent attributes-->
         <item name="colorAccent">?colorPrimary</item>
+
+        <!--Material buttons style-->
+        <item name="materialButtonStyle">@style/Widget.Natura.Button.DarkText</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.DarkText</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton.DarkText</item>
     </style>
 
+    <!--Not supported officialy-->
     <style name="Theme.Avon" parent="Theme.Natura">
         <item name="colorPrimary">#DE0085</item>
-        <item name="colorSecondary">#A70058</item>
+        <item name="colorSecondary">#E9E9E9</item>
+
+        <!--Material buttons style-->
+        <item name="materialButtonStyle">@style/Widget.Natura.Button</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.StrokeColored</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton</item>
+    </style>
+
+    <!--Not supported officialy-->
+    <style name="Theme.BodyShop" parent="Theme.Natura">
+        <item name="colorPrimary">#004236</item>
+        <item name="colorSecondary">#A55F53</item>
+
+        <item name="materialButtonStyle">@style/Widget.Natura.Button</item>
+        <item name="materialButtonOutlinedStyle">@style/Widget.Natura.Button.Outlined.StrokeColored</item>
+        <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
index 8b45191f8..fbe7b5ce3 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/StyleButtonActivity.kt
@@ -27,5 +27,12 @@ class StyleButtonActivity : AppCompatActivity() {
             startActivity(intent)
             finish()
         }
+
+        findViewById<View>(R.id.bodyShopThemeBtn).setOnClickListener {
+            val intent = Intent(baseContext, StyleButtonActivity::class.java)
+            intent.putExtra("theme", R.style.Theme_BodyShop)
+            startActivity(intent)
+            finish()
+        }
     }
 }
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_styled_button.xml b/sample/src/main/res/layout/activity_styled_button.xml
index a160e9507..391e0aae6 100644
--- a/sample/src/main/res/layout/activity_styled_button.xml
+++ b/sample/src/main/res/layout/activity_styled_button.xml
@@ -15,14 +15,14 @@
             android:orientation="vertical">
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button"
+                style="?materialButtonStyle"
                 android:text="Default Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button"
+                style="?materialButtonStyle"
                 android:text="Default Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
@@ -30,29 +30,14 @@
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Secondary"
-                android:text="Secondary Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Secondary"
-                android:text="Secondary Button Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined"
+                style="?materialButtonOutlinedStyle"
                 android:text="Outlined Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined"
+                style="?materialButtonOutlinedStyle"
                 android:text="Outlined Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
@@ -60,52 +45,33 @@
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined.Secondary"
-                android:text="Secondary Outlined"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.Outlined.Secondary"
-                android:text="Secondary Outlined Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton"
+                style="?materialBorderlessButtonStyle"
                 android:text="Text Button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
             <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton"
+                style="?materialBorderlessButtonStyle"
                 android:text="Text Button Disabled"
                 android:enabled="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton.Secondary"
-                android:text="Secondary Text Button"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
-
-            <android.support.design.button.MaterialButton
-                style="@style/Widget.Natura.Button.TextButton.Secondary"
-                android:text="Secondary Text Button Disabled"
-                android:enabled="false"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="10dp"/>
         </LinearLayout>
     </ScrollView>
 
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/bodyShopThemeBtn"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        app:fabSize="mini"
+        app:backgroundTint="#004236"
+        android:layout_marginRight="40dp"
+        android:layout_marginBottom="40dp"
+        app:layout_constraintBottom_toTopOf="@id/naturaThemeBtn"
+        app:layout_constraintRight_toRightOf="parent"/>
+
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/avonThemeBtn"
         android:layout_width="24dp"

From e93134d0eb9edccbd714ba8d1293e392f98107ed Mon Sep 17 00:00:00 2001
From: Rodrigo Souza <rodrigo.otavio89@gmail.com>
Date: Mon, 16 Mar 2020 18:22:03 -0300
Subject: [PATCH 3/9] update unit test config (#37)

Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
---
 designsystem/build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/designsystem/build.gradle b/designsystem/build.gradle
index 46aef9854..e306163ff 100644
--- a/designsystem/build.gradle
+++ b/designsystem/build.gradle
@@ -13,6 +13,7 @@ android {
         targetSdkVersion rootProject.targetSdkVersion
         vectorDrawables.useSupportLibrary = true
         consumerProguardFiles 'consumer-rules.pro'
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
@@ -20,6 +21,7 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {}
     }
 
     sourceSets {

From 60831f48a0cde9daed3999dbe73433aa12ed4971 Mon Sep 17 00:00:00 2001
From: Rodrigo Souza <rodrigo.otavio89@gmail.com>
Date: Mon, 16 Mar 2020 18:22:28 -0300
Subject: [PATCH 4/9] bump version (#38)

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
---
 tools/publish.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/publish.gradle b/tools/publish.gradle
index f94caa042..417b8f4b0 100644
--- a/tools/publish.gradle
+++ b/tools/publish.gradle
@@ -6,7 +6,7 @@ if (file("github_credentials.properties").file) {
 }
 
 def getVersionName = { ->
-    return "0.0.9"
+    return "0.0.10"
 }
 
 def getGroupId = { ->

From 6d70d40c71074ebd05353965443b47b59cd68ec1 Mon Sep 17 00:00:00 2001
From: Rodrigo Souza <rodrigo.otavio89@gmail.com>
Date: Wed, 18 Mar 2020 15:42:45 -0300
Subject: [PATCH 5/9] Bugfix/minor component fix (#41)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Release (#39)

* rename TextInputHighlight to ValueTextHighlight

* fix button styles

* update unit test config (#37)

Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>

* bump version (#38)

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Rodrigo Souza <rodrigo.otavio89@gmail.com>

* text field input should return current typed text

* run and fix klint warnings

* text field input should return current typed text

* run and fix klint warnings

Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Angélica Oliveira <angelica.liv@gmail.com>
Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
---
 .../android/textfield/TextFieldInput.kt       | 15 ++++++------
 .../android/widget/ValueTextHighlight.kt      |  2 +-
 .../android/textfield/TextFieldInputTest.kt   | 23 ++++++++++++-------
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt b/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
index 1adf57b6f..993284294 100644
--- a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
@@ -12,11 +12,9 @@ import android.view.inputmethod.EditorInfo
 import android.widget.EditText
 import android.widget.LinearLayout
 import android.widget.TextView
-import android.widget.Toast
 import com.natura.android.R
 import com.natura.android.icon.FontIcon
 
-
 @SuppressLint("CustomViewStyleable")
 class TextFieldInput @JvmOverloads constructor(
     context: Context,
@@ -95,6 +93,9 @@ class TextFieldInput @JvmOverloads constructor(
             field = value
             inputValue.setText(value)
         }
+        get() {
+            return inputValue.text.toString()
+        }
 
     var icon: String? = null
         set(value) {
@@ -149,10 +150,10 @@ class TextFieldInput @JvmOverloads constructor(
         set(value) {
             field = value
             footer = value
-            if (value != null) {
-                state = State.ERROR
+            state = if (value != null) {
+                State.ERROR
             } else {
-                state = State.NONE
+                State.NONE
             }
         }
 
@@ -178,7 +179,7 @@ class TextFieldInput @JvmOverloads constructor(
         else view.visibility = View.VISIBLE
     }
 
-    private fun intToState(vstate: Int)= when(vstate) {
+    private fun intToState(vstate: Int) = when (vstate) {
             1 -> State.SUCCESS
             2 -> State.ERROR
             else -> State.NONE
@@ -200,7 +201,7 @@ class TextFieldInput @JvmOverloads constructor(
         val vtext = typedArray.getString(R.styleable.ds_text_field_input_text_field_text)
         val vicon = typedArray.getString(R.styleable.ds_text_field_input_text_field_icon)
         val vfooter = typedArray.getString(R.styleable.ds_text_field_input_text_field_footer)
-        var vstate = typedArray.getInt(R.styleable.ds_text_field_input_text_field_state, 0)
+        val vstate = typedArray.getInt(R.styleable.ds_text_field_input_text_field_state, 0)
 
         typedArray.recycle()
 
diff --git a/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
index 6853a3cab..56d67215d 100644
--- a/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/widget/ValueTextHighlight.kt
@@ -49,4 +49,4 @@ class ValueTextHighlight @JvmOverloads constructor(
         highlightInfoLabel.invalidate()
         highlightInfoLabel.requestLayout()
     }
-}
\ No newline at end of file
+}
diff --git a/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt b/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt
index d0d0f5707..f002b30de 100644
--- a/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt
+++ b/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt
@@ -20,7 +20,7 @@ import org.robolectric.Robolectric
 import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
-@Config(sdk=[28])
+@Config(sdk = [28])
 class TextFieldInputTest {
 
     val activityController = Robolectric.buildActivity(Activity::class.java)
@@ -45,7 +45,7 @@ class TextFieldInputTest {
     @Test
     fun basicConstructor_NoStyledAttributes() {
         assertThat(textFieldInput.label).isNull()
-        assertThat(textFieldInput.text).isNull()
+        assertThat(textFieldInput.text).isEmpty()
         assertThat(textFieldInput.footer).isNull()
         assertThat(textFieldInput.icon).isNull()
         assertThat(textFieldInput.state).isEqualTo(TextFieldInput.State.NONE)
@@ -160,8 +160,12 @@ class TextFieldInputTest {
         test_seError(NOT_EMPTY_TEXT, NOT_EMPTY_TEXT, View.VISIBLE, ERROR_ICON_CODE.toIcon())
     }
 
-    private fun test_seError(value: String?, expectedValue: String, expectedVisibility: Int,
-                             expectedIcon: String) {
+    private fun test_seError(
+        value: String?,
+        expectedValue: String,
+        expectedVisibility: Int,
+        expectedIcon: String
+    ) {
         val footerView = textFieldInput.findViewById(R.id.text_field_input_footer) as TextView
         val footerIconView = textFieldInput.findViewById(R.id.text_field_input_footer_icon) as FontIcon
         val footerBoxView = textFieldInput.findViewById(R.id.text_field_input_footer_box) as View
@@ -191,8 +195,12 @@ class TextFieldInputTest {
         test_setState(TextFieldInput.State.SUCCESS, TextFieldInput.LayoutState.SUCCESS, View.VISIBLE, SUCCESS_ICON_CODE.toIcon())
     }
 
-    private fun test_setState(state: TextFieldInput.State, expectedLayoutState: TextFieldInput.LayoutState,
-                              expectedIconVisibility: Int, expectedIconValue: String) {
+    private fun test_setState(
+        state: TextFieldInput.State,
+        expectedLayoutState: TextFieldInput.LayoutState,
+        expectedIconVisibility: Int,
+        expectedIconValue: String
+    ) {
         val labelView = textFieldInput.findViewById(R.id.text_field_input_label) as TextView
         val footerView = textFieldInput.findViewById(R.id.text_field_input_footer) as TextView
         val footerIconView = textFieldInput.findViewById(R.id.text_field_input_footer_icon) as FontIcon
@@ -354,5 +362,4 @@ class TextFieldInputTest {
     }
 
     private fun getColor(id: Int) = ContextCompat.getColor(textFieldInput.context, id)
-
-}
\ No newline at end of file
+}

From 878299b7a5320583e8d57461a456c8172d7beba9 Mon Sep 17 00:00:00 2001
From: Rodrigo Souza <rodrigo.otavio89@gmail.com>
Date: Wed, 18 Mar 2020 15:47:39 -0300
Subject: [PATCH 6/9] Bump version to 0.0.11 (#42)

* bump version

* Delete .java-version

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
---
 tools/publish.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/publish.gradle b/tools/publish.gradle
index 417b8f4b0..5bf4484d6 100644
--- a/tools/publish.gradle
+++ b/tools/publish.gradle
@@ -6,7 +6,7 @@ if (file("github_credentials.properties").file) {
 }
 
 def getVersionName = { ->
-    return "0.0.10"
+    return "0.0.11"
 }
 
 def getGroupId = { ->

From 0e7925983d7967a836a8d9998b45201e4ad91b0f Mon Sep 17 00:00:00 2001
From: Rodrigo Souza <rodrigo.otavio89@gmail.com>
Date: Wed, 18 Mar 2020 16:29:21 -0300
Subject: [PATCH 7/9] add no action bar style (#44)

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
---
 designsystem/src/main/res/values/themes.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/designsystem/src/main/res/values/themes.xml b/designsystem/src/main/res/values/themes.xml
index faf9ec0f2..55fc368ed 100644
--- a/designsystem/src/main/res/values/themes.xml
+++ b/designsystem/src/main/res/values/themes.xml
@@ -24,6 +24,11 @@
         <item name="materialBorderlessButtonStyle">@style/Widget.Natura.Button.TextButton.DarkText</item>
     </style>
 
+    <style name="Theme.Natura.NoActionBar" parent="Theme.Natura">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
     <!--Not supported officialy-->
     <style name="Theme.Avon" parent="Theme.Natura">
         <item name="colorPrimary">#DE0085</item>

From 089dabaa1515295c2ebb6a1a18309576d72438a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patr=C3=ADcia=20Muniz?= <pmuniz@thoughtworks.com>
Date: Wed, 18 Mar 2020 16:29:59 -0300
Subject: [PATCH 8/9] DSY-494 / Iconography (#43)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Release (#39)

* rename TextInputHighlight to ValueTextHighlight

* fix button styles

* update unit test config (#37)

Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>

* bump version (#38)

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>

Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Rodrigo Souza <rodrigo.otavio89@gmail.com>

* Add drawables for icons used on financial screens

* Comment TODOs on code to address tech debts

* Remove old button activity

* Add activity to show icon as drawables

* Update README.md

* Remove unused imports

Co-authored-by: Bianca Letti <bihletti@gmail.com>
Co-authored-by: Angélica Oliveira <angelica.liv@gmail.com>
Co-authored-by: Rodrigo Nunes <rodrigo.nunes.trd@c6bank.com>
Co-authored-by: Rodrigo Souza <rodrigo.otavio89@gmail.com>
---
 README.md                                     |  5 +
 .../natura/android/button/DsPrimaryButton.kt  |  1 +
 .../natura/android/error/DsErrorDefault.kt    |  1 +
 .../com/natura/android/icon/FontIcon.kt       |  1 +
 .../android/textfield/TextFieldInput.kt       |  1 +
 .../main/res/drawable/ds_ic_arrow_down.xml    | 21 ----
 .../drawable/ds_ic_filled_action_cancel.xml   |  9 ++
 .../drawable/ds_ic_filled_action_check.xml    |  9 ++
 .../drawable/ds_ic_outlined_action_cancel.xml |  9 ++
 .../drawable/ds_ic_outlined_action_mic.xml    |  9 ++
 .../drawable/ds_ic_outlined_action_search.xml |  9 ++
 .../ds_ic_outlined_finance_transfermoney.xml  |  9 ++
 .../ds_ic_outlined_navigation_arrowbottom.xml |  9 ++
 .../ds_ic_outlined_navigation_arrowleft.xml   |  9 ++
 .../ds_ic_outlined_navigation_arrowright.xml  |  9 ++
 .../ds_ic_outlined_navigation_arrowtop.xml    |  9 ++
 .../ds_ic_outlined_navigation_close.xml       |  9 ++
 ..._ic_outlined_navigation_directionright.xml |  9 ++
 .../src/main/res/layout/ds_menu_view.xml      |  3 +-
 sample/src/main/AndroidManifest.xml           |  4 +-
 .../com/natura/android/sample/MainActivity.kt | 35 ++++---
 .../components/ButtonPrimaryActivity.kt       | 13 ---
 .../sample/components/DrawableActivity.kt     | 49 ++++++++++
 .../sample/components/DrawableAdapter.kt      | 36 +++++++
 .../res/layout/activity_button_primary.xml    | 42 --------
 sample/src/main/res/layout/activity_main.xml  | 97 +++++++++++++------
 .../res/layout/activity_styled_button.xml     | 29 ++++++
 sample/src/main/res/layout/item_drawable.xml  | 21 ++++
 sample/src/main/res/values/colors.xml         |  6 +-
 29 files changed, 344 insertions(+), 129 deletions(-)
 delete mode 100644 designsystem/src/main/res/drawable/ds_ic_arrow_down.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_filled_action_cancel.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_filled_action_check.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_action_cancel.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_action_mic.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_action_search.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_finance_transfermoney.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowbottom.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowleft.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowright.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowtop.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_close.xml
 create mode 100644 designsystem/src/main/res/drawable/ds_ic_outlined_navigation_directionright.xml
 delete mode 100644 sample/src/main/kotlin/com/natura/android/sample/components/ButtonPrimaryActivity.kt
 create mode 100644 sample/src/main/kotlin/com/natura/android/sample/components/DrawableActivity.kt
 create mode 100644 sample/src/main/kotlin/com/natura/android/sample/components/DrawableAdapter.kt
 delete mode 100644 sample/src/main/res/layout/activity_button_primary.xml
 create mode 100644 sample/src/main/res/layout/item_drawable.xml

diff --git a/README.md b/README.md
index ff2aa7d83..8ddf04d5f 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,11 @@ In construction
 
 You can contribute submitting [pull requests](https://github.com/natura-cosmeticos/natds-android/pulls).
 
+### How to add resource icons
+It is preferable that the icon resources are saved as vectors (XML format). The nomenclature of drawables must be `ds_ic_<pack>_<scope>_<name withuot separators>`.
+
+For instance: `ds_ic_outlined_navigation_arrowbottom.xml`
+
 ### How to create a new version
 In the file **publish.gradle** update field in the method **getVersionName** with the new version number. Example, for the version 1.0.1:
 
diff --git a/designsystem/src/main/kotlin/com/natura/android/button/DsPrimaryButton.kt b/designsystem/src/main/kotlin/com/natura/android/button/DsPrimaryButton.kt
index 0843b9536..833fb9bd1 100644
--- a/designsystem/src/main/kotlin/com/natura/android/button/DsPrimaryButton.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/button/DsPrimaryButton.kt
@@ -17,6 +17,7 @@ class DsPrimaryButton @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
+    // TODO remover esta classe pois android.support.design.button.MaterialButton ja atende
     private val buttonLabel by lazy { findViewById<AppCompatTextView>(R.id.button_primary_text) }
     private val buttonIconLeft by lazy { findViewById<FontIcon>(R.id.button_primary_icon_left) }
     private val buttonIconRight by lazy { findViewById<FontIcon>(R.id.button_primary_icon_right) }
diff --git a/designsystem/src/main/kotlin/com/natura/android/error/DsErrorDefault.kt b/designsystem/src/main/kotlin/com/natura/android/error/DsErrorDefault.kt
index bf75ddc5f..ca404beef 100644
--- a/designsystem/src/main/kotlin/com/natura/android/error/DsErrorDefault.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/error/DsErrorDefault.kt
@@ -17,6 +17,7 @@ class DsErrorDefault @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
+    // TODO mover esta classe para com.natura.android.pattern
     private val erroIcon by lazy { findViewById<AppCompatImageView>(R.id.ds_default_error_icon) }
     private val errorLabel by lazy { findViewById<AppCompatTextView>(R.id.ds_default_error_label) }
     private val errorButton by lazy { findViewById<DsPrimaryButton>(R.id.ds_default_error_button) }
diff --git a/designsystem/src/main/kotlin/com/natura/android/icon/FontIcon.kt b/designsystem/src/main/kotlin/com/natura/android/icon/FontIcon.kt
index 1914531a2..b607b7995 100644
--- a/designsystem/src/main/kotlin/com/natura/android/icon/FontIcon.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/icon/FontIcon.kt
@@ -11,6 +11,7 @@ class FontIcon @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : AppCompatTextView(context, attrs, defStyleAttr) {
 
+    // TODO considerar usar esta classe como inner class de MenuView
     private val natDsFontPath = "fonts/natds_icons.ttf"
 
     init {
diff --git a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt b/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
index 993284294..4dfd69c2d 100644
--- a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
@@ -22,6 +22,7 @@ class TextFieldInput @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : ConstraintLayout(context, attrs, defStyleAttr) {
 
+    // TODO trocar FontIcon por AppCompatImageView
     enum class State {
         NONE, ERROR, SUCCESS
     }
diff --git a/designsystem/src/main/res/drawable/ds_ic_arrow_down.xml b/designsystem/src/main/res/drawable/ds_ic_arrow_down.xml
deleted file mode 100644
index 1989b419b..000000000
--- a/designsystem/src/main/res/drawable/ds_ic_arrow_down.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M0,0h24v24h-24z M 0,0" />
-        <path
-            android:fillAlpha="0.996"
-            android:fillColor="@android:color/transparent"
-            android:pathData="M0,0h24v24h-24z"
-            android:strokeAlpha="0.996" />
-        <path
-            android:fillColor="@android:color/transparent"
-            android:pathData="M16.481,10.001 L11.766,14.715L11.714,14.715L7,10.001"
-            android:strokeWidth="1"
-            android:strokeColor="#333"
-            android:strokeLineCap="round"
-            android:strokeLineJoin="round" />
-    </group>
-</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_filled_action_cancel.xml b/designsystem/src/main/res/drawable/ds_ic_filled_action_cancel.xml
new file mode 100644
index 000000000..0086e9d9f
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_filled_action_cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,3a9,9 0,1 0,9 9,9 9,0 0,0 -9,-9zM16.35,15.65a0.48,0.48 0,0 1,0 0.7,0.48 0.48,0 0,1 -0.7,0L12,12.71l-3.65,3.64a0.48,0.48 0,0 1,-0.7 0,0.48 0.48,0 0,1 0,-0.7L11.29,12 7.65,8.35a0.49,0.49 0,0 1,0.7 -0.7L12,11.29l3.65,-3.64a0.49,0.49 0,0 1,0.7 0.7L12.71,12z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_filled_action_check.xml b/designsystem/src/main/res/drawable/ds_ic_filled_action_check.xml
new file mode 100644
index 000000000..42dc440d4
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_filled_action_check.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,3a9,9 0,1 0,9 9,9 9,0 0,0 -9,-9zM18.35,8.35l-7.56,7.57a0.51,0.51 0,0 1,-0.36 0.15,0.49 0.49,0 0,1 -0.35,-0.15l-4.43,-4.43a0.5,0.5 0,0 1,0 -0.71,0.5 0.5,0 0,1 0.7,0l4.08,4.08 7.22,-7.21a0.49,0.49 0,1 1,0.7 0.7z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_action_cancel.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_action_cancel.xml
new file mode 100644
index 000000000..02a92701a
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_action_cancel.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,21.52c-7.328,0 -11.909,-7.933 -8.245,-14.28C7.42,0.893 16.58,0.893 20.245,7.24A9.525,9.525 0,0 1,21.52 12,9.531 9.531,0 0,1 12,21.52zM12,3.52c-6.528,0 -10.608,7.067 -7.344,12.72 3.264,5.653 11.424,5.653 14.688,0A8.481,8.481 0,0 0,12 3.52zM7.5,17a0.468,0.468 0,0 1,-0.35 -0.15,0.48 0.48,0 0,1 0,-0.7L11.3,12 7.15,7.85a0.495,0.495 0,0 1,0.7 -0.7L12,11.3l4.15,-4.15a0.495,0.495 0,0 1,0.7 0.7L12.7,12l4.15,4.15a0.48,0.48 0,0 1,0 0.7,0.468 0.468,0 0,1 -0.35,0.15 0.468,0.468 0,0 1,-0.35 -0.15L12,12.7l-4.15,4.15a0.468,0.468 0,0 1,-0.35 0.15z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_action_mic.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_action_mic.xml
new file mode 100644
index 000000000..c1b48af6c
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_action_mic.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.89,13.866L12.073,13.866C13.43,13.782 14.464,12.617 14.387,11.26L14.387,5.114C14.269,3.133 12.049,2.023 10.392,3.115C9.715,3.563 9.287,4.303 9.238,5.114L9.238,11.278C9.273,12.717 10.45,13.866 11.89,13.866ZM11.89,14.78C9.951,14.776 8.369,13.226 8.324,11.287L8.324,5.114C8.461,2.429 11.455,0.9 13.712,2.361C14.653,2.971 15.243,3.995 15.301,5.114L15.301,11.195C15.415,13.06 13.993,14.663 12.128,14.771L11.89,14.771ZM12.357,21.291L16.289,21.291C16.641,21.291 16.86,21.672 16.685,21.977C16.603,22.119 16.452,22.205 16.289,22.205L7.437,22.205C7.085,22.205 6.865,21.824 7.041,21.52C7.122,21.378 7.273,21.291 7.437,21.291L11.442,21.291L11.442,17.436C8.186,17.154 5.623,14.433 5.599,11.104L5.599,8.16C5.599,7.907 5.804,7.702 6.056,7.702C6.308,7.702 6.513,7.907 6.513,8.16L6.513,11.104C6.538,14.099 8.959,16.52 11.954,16.545L12.055,16.545C15.055,16.545 17.487,14.113 17.487,11.113L17.487,8.16C17.487,7.907 17.691,7.702 17.944,7.702C18.196,7.702 18.401,7.907 18.401,8.16L18.401,11.113C18.396,14.515 15.72,17.289 12.357,17.452Z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_action_search.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_action_search.xml
new file mode 100644
index 000000000..d83d18720
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_action_search.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9.912,17.56C4.138,17.56 0.53,11.31 3.417,6.31C6.304,1.31 13.52,1.31 16.407,6.31C17.065,7.45 17.412,8.743 17.412,10.06C17.409,11.914 16.735,13.61 15.62,14.919L21.452,20.59C21.648,20.782 21.648,21.098 21.452,21.29C21.357,21.386 21.227,21.44 21.092,21.44C20.961,21.442 20.835,21.391 20.742,21.3L14.919,15.638C13.592,16.831 11.837,17.557 9.912,17.56ZM9.912,3.56C4.908,3.56 1.781,8.977 4.283,13.31C6.492,17.135 11.624,17.583 14.518,14.656C14.534,14.633 14.552,14.611 14.572,14.59C14.59,14.572 14.609,14.555 14.629,14.541C14.969,14.179 15.276,13.769 15.541,13.31C16.112,12.322 16.412,11.201 16.412,10.06C16.412,6.47 13.502,3.56 9.912,3.56Z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_finance_transfermoney.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_finance_transfermoney.xml
new file mode 100644
index 000000000..5d8a12ba1
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_finance_transfermoney.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.34,12.77C19.064,12.759 18.849,12.526 18.86,12.25C19.09,7.02 13.573,3.502 8.929,5.918C7.643,6.586 6.613,7.643 5.977,8.925L7.42,8.42C7.679,8.332 7.962,8.464 8.06,8.72C8.154,8.98 8.019,9.266 7.76,9.36L5.29,10.24L5.179,10.246C5.105,10.258 5.027,10.253 4.95,10.23C4.77,10.175 4.645,10.027 4.611,9.855L3.8,7.44C3.72,7.178 3.862,6.9 4.12,6.81C4.38,6.718 4.665,6.858 4.75,7.12L5.164,8.355C6.549,5.767 9.299,4.13 12.31,4.22C16.614,4.377 19.981,7.985 19.84,12.29C19.829,12.558 19.609,12.77 19.34,12.77ZM12,19.8L11.74,19.8C7.462,19.653 4.106,16.079 4.23,11.8C4.235,11.525 4.465,11.309 4.74,11.32C5.016,11.325 5.236,11.554 5.23,11.83C5.095,15.576 8.034,18.716 11.78,18.83C14.42,18.9 16.828,17.447 18.022,15.159L16.64,15.65C16.378,15.737 16.094,15.6 16,15.34C15.906,15.08 16.041,14.794 16.3,14.7L18.77,13.83C18.896,13.785 19.034,13.785 19.16,13.83C19.278,13.891 19.367,13.995 19.41,14.12L20.28,16.59C20.373,16.847 20.238,17.13 19.98,17.22C19.93,17.245 19.876,17.262 19.82,17.27C19.609,17.27 19.422,17.138 19.35,16.94L18.89,15.645C17.551,18.163 14.919,19.789 12,19.8ZM9.85,14.54C9.779,14.324 9.742,14.098 9.74,13.87C9.74,13.485 10.157,13.245 10.49,13.437C10.645,13.526 10.74,13.691 10.74,13.87C10.738,13.993 10.758,14.115 10.8,14.23C10.948,14.697 11.361,15.007 11.82,15.045C11.84,15.042 11.86,15.04 11.88,15.04C11.909,15.04 11.938,15.043 11.966,15.047C12.071,15.043 12.176,15.024 12.28,14.99C12.76,14.814 13.074,14.351 13.06,13.84C13.06,13.534 12.885,13.254 12.61,13.12L10.79,12.24C10.157,11.913 9.768,11.252 9.79,10.54C9.77,9.729 10.218,8.979 10.94,8.61C11.082,8.543 11.229,8.491 11.38,8.453L11.38,8C11.385,7.726 11.606,7.505 11.88,7.5C12.156,7.5 12.38,7.724 12.38,8L12.38,8.436C13.351,8.658 14.082,9.514 14.11,10.55C14.11,10.826 13.886,11.05 13.61,11.05C13.344,11.036 13.13,10.826 13.11,10.56C13.099,9.909 12.571,9.385 11.92,9.38C11.743,9.389 11.57,9.433 11.41,9.51C11.037,9.703 10.805,10.09 10.81,10.51C10.795,10.851 10.983,11.169 11.29,11.32L13.11,12.19C13.72,12.5 14.106,13.125 14.11,13.81C14.126,14.754 13.539,15.603 12.65,15.92C12.561,15.951 12.471,15.976 12.38,15.996L12.38,16.42C12.38,16.696 12.156,16.92 11.88,16.92C11.606,16.915 11.385,16.694 11.38,16.42L11.38,15.984C10.666,15.804 10.079,15.266 9.85,14.54Z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowbottom.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowbottom.xml
new file mode 100644
index 000000000..1f31cbfcf
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowbottom.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12.03,14.867C11.881,14.87 11.736,14.82 11.62,14.727L6.91,10.007C6.641,9.738 6.764,9.278 7.132,9.179C7.303,9.134 7.485,9.182 7.61,9.307L12,13.657L16.39,9.277C16.659,9.008 17.119,9.131 17.218,9.499C17.264,9.67 17.215,9.852 17.09,9.977L12.38,14.697C12.291,14.799 12.165,14.86 12.03,14.867Z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowleft.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowleft.xml
new file mode 100644
index 000000000..ce516e0d0
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowleft.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M9.646,17.247a0.464,0.464 0,0 1,-0.35 -0.15,0.48 0.48,0 0,1 0,-0.7l4.35,-4.41 -4.35,-4.39a0.495,0.495 0,1 1,0.7 -0.7l4.72,4.71c0.09,0.094 0.141,0.22 0.14,0.35a0.641,0.641 0,0 1,-0.14 0.41l-4.72,4.71a0.485,0.485 0,0 1,-0.35 0.17z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowright.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowright.xml
new file mode 100644
index 000000000..d225af02b
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowright.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.354,17.249a0.5,0.5 0,0 1,-0.35 -0.15l-4.71,-4.73a0.468,0.468 0,0 1,-0.15 -0.35,0.584 0.584,0 0,1 0.15,-0.41l4.71,-4.71a0.5,0.5 0,0 1,0.71 0c0.19,0.194 0.19,0.506 0,0.7l-4.39,4.39 4.39,4.39c0.19,0.194 0.19,0.506 0,0.7a0.512,0.512 0,0 1,-0.36 0.17z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowtop.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowtop.xml
new file mode 100644
index 000000000..e2cd132d7
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_arrowtop.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M16.74,14.849C16.609,14.855 16.481,14.804 16.39,14.709L12,10.319L7.61,14.709C7.416,14.9 7.104,14.9 6.91,14.709C6.713,14.514 6.713,14.195 6.91,13.999L11.62,9.289C11.838,9.1 12.162,9.1 12.38,9.289L17.09,13.999C17.287,14.195 17.287,14.514 17.09,14.709C16.999,14.804 16.871,14.855 16.74,14.849Z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_close.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_close.xml
new file mode 100644
index 000000000..45cb0e1b7
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_close.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M5.605,18.892a0.473,0.473 0,0 1,-0.35 -0.14,0.5 0.5,0 0,1 0,-0.71l6.035,-6.04 -6.035,-6.04a0.5,0.5 0,0 1,0.7 -0.71l6.042,6.042 6.038,-6.042a0.51,0.51 0,0 1,0.71 0,0.5 0.5,0 0,1 0,0.71l-6.04,6.04 6.04,6.04a0.5,0.5 0,0 1,0 0.71,0.473 0.473,0 0,1 -0.35,0.14 0.501,0.501 0,0 1,-0.36 -0.14l-6.038,-6.042 -6.042,6.042a0.46,0.46 0,0 1,-0.35 0.14z"/>
+</vector>
diff --git a/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_directionright.xml b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_directionright.xml
new file mode 100644
index 000000000..9767a92e7
--- /dev/null
+++ b/designsystem/src/main/res/drawable/ds_ic_outlined_navigation_directionright.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.654,12.494H5.534l6.68,6.68a0.51,0.51 0,0 1,0 0.71,0.54 0.54,0 0,1 -0.35,0.14 0.545,0.545 0,0 1,-0.36 -0.14l-7.51,-7.52a0.503,0.503 0,0 1,-0.148 -0.365,0.503 0.503,0 0,1 0.148,-0.365l7.51,-7.51a0.5,0.5 0,0 1,0.71 0.7l-6.652,6.67h14.092a0.5,0.5 0,0 1,0 1z"/>
+</vector>
diff --git a/designsystem/src/main/res/layout/ds_menu_view.xml b/designsystem/src/main/res/layout/ds_menu_view.xml
index 95e94936e..0cd0e8761 100644
--- a/designsystem/src/main/res/layout/ds_menu_view.xml
+++ b/designsystem/src/main/res/layout/ds_menu_view.xml
@@ -85,6 +85,7 @@
         app:layout_constraintBottom_toBottomOf="@id/ds_menu_label"
         app:layout_constraintEnd_toEndOf="@+id/ds_menu_view_background"
         app:layout_constraintTop_toTopOf="@id/ds_menu_label"
-        app:srcCompat="@drawable/ds_ic_arrow_down"
+        app:srcCompat="@drawable/ds_ic_outlined_navigation_arrowbottom"
         app:tint="@color/colorBrdNatGray" />
+
 </merge>
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
index f2ed6dd1e..05258c14e 100644
--- a/sample/src/main/AndroidManifest.xml
+++ b/sample/src/main/AndroidManifest.xml
@@ -12,7 +12,6 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.Natura">
         <activity android:name=".components.ErrorActivity"></activity>
-        <activity android:name=".components.ButtonPrimaryActivity" />
         <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -35,6 +34,9 @@
         <activity
             android:name=".components.IconActivity"
             android:theme="@style/Theme.Natura" />
+        <activity
+            android:name=".components.DrawableActivity"
+            android:theme="@style/Theme.Natura" />
         <activity
             android:name=".components.LoadingActivity"
             android:theme="@style/Theme.Natura" />
diff --git a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
index 5d4c167f2..b703c5333 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/MainActivity.kt
@@ -12,10 +12,29 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        // tokens
+        findViewById<Button>(R.id.btn_icons_font).setOnClickListener {
+            startActivity(Intent(this, IconActivity::class.java))
+        }
+
+        findViewById<Button>(R.id.btn_icons_drawables).setOnClickListener {
+            startActivity(Intent(this, DrawableActivity::class.java))
+        }
+
+        // components
         findViewById<Button>(R.id.btn_textfield).setOnClickListener {
             startActivity(Intent(this, TextFieldActivity::class.java))
         }
 
+        findViewById<Button>(R.id.btn_input_text_highlight).setOnClickListener {
+            startActivity(Intent(this, ValueTextHighlightActivity::class.java))
+        }
+
+        findViewById<Button>(R.id.btn_style_buttons).setOnClickListener {
+            startActivity(Intent(this, StyleButtonActivity::class.java))
+        }
+
+        // patterns
         findViewById<Button>(R.id.btn_submenu).setOnClickListener {
             startActivity(Intent(this, SubmenuActivity::class.java))
         }
@@ -28,29 +47,13 @@ class MainActivity : AppCompatActivity() {
             startActivity(Intent(this, MenuActivity::class.java))
         }
 
-        findViewById<Button>(R.id.btn_icons).setOnClickListener {
-            startActivity(Intent(this, IconActivity::class.java))
-        }
-
         findViewById<Button>(R.id.btn_loading).setOnClickListener {
             startActivity(Intent(this, LoadingActivity::class.java))
         }
 
-        findViewById<Button>(R.id.btn_button_primary).setOnClickListener {
-            startActivity(Intent(this, ButtonPrimaryActivity::class.java))
-        }
-
         findViewById<Button>(R.id.btn_error_default).setOnClickListener {
             startActivity(Intent(this, ErrorActivity::class.java))
         }
-
-        findViewById<Button>(R.id.btn_input_text_highlight).setOnClickListener {
-            startActivity(Intent(this, ValueTextHighlightActivity::class.java))
-        }
-
-        findViewById<Button>(R.id.btn_style_buttons).setOnClickListener {
-            startActivity(Intent(this, StyleButtonActivity::class.java))
-        }
     }
 }
 
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/ButtonPrimaryActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/ButtonPrimaryActivity.kt
deleted file mode 100644
index 22b614ca0..000000000
--- a/sample/src/main/kotlin/com/natura/android/sample/components/ButtonPrimaryActivity.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.natura.android.sample.components
-
-import android.os.Bundle
-import android.support.v7.app.AppCompatActivity
-import com.natura.android.sample.R
-
-class ButtonPrimaryActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_button_primary)
-    }
-}
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/DrawableActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/DrawableActivity.kt
new file mode 100644
index 000000000..eb2d88824
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/DrawableActivity.kt
@@ -0,0 +1,49 @@
+package com.natura.android.sample.components
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import android.support.v7.widget.GridLayoutManager
+import android.support.v7.widget.RecyclerView
+import com.natura.android.sample.R
+
+class DrawableActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_icon)
+
+        val iconGrid = findViewById<RecyclerView>(R.id.icon_grid)
+        iconGrid.layoutManager = GridLayoutManager(this, 2)
+
+        iconGrid.adapter = DrawableAdapter(this, recoverListIds(), recoverListNames())
+    }
+
+    private fun recoverListIds() = listOf(
+        R.drawable.ds_ic_filled_action_cancel,
+        R.drawable.ds_ic_filled_action_check,
+        R.drawable.ds_ic_outlined_action_cancel,
+        R.drawable.ds_ic_outlined_action_mic,
+        R.drawable.ds_ic_outlined_action_search,
+        R.drawable.ds_ic_outlined_finance_transfermoney,
+        R.drawable.ds_ic_outlined_navigation_arrowbottom,
+        R.drawable.ds_ic_outlined_navigation_arrowleft,
+        R.drawable.ds_ic_outlined_navigation_arrowright,
+        R.drawable.ds_ic_outlined_navigation_arrowtop,
+        R.drawable.ds_ic_outlined_navigation_close,
+        R.drawable.ds_ic_outlined_navigation_directionright
+    )
+
+    private fun recoverListNames() = listOf(
+        "ds_ic_filled_action_cancel",
+        "ds_ic_filled_action_check",
+        "ds_ic_outlined_action_cancel",
+        "ds_ic_outlined_action_mic",
+        "ds_ic_outlined_action_search",
+        "ds_ic_outlined_finance_transfermoney",
+        "ds_ic_outlined_navigation_arrowbottom",
+        "ds_ic_outlined_navigation_arrowleft",
+        "ds_ic_outlined_navigation_arrowright",
+        "ds_ic_outlined_navigation_arrowtop",
+        "ds_ic_outlined_navigation_close",
+        "ds_ic_outlined_navigation_directionright"
+    )
+}
\ No newline at end of file
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/DrawableAdapter.kt b/sample/src/main/kotlin/com/natura/android/sample/components/DrawableAdapter.kt
new file mode 100644
index 000000000..5bb261b86
--- /dev/null
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/DrawableAdapter.kt
@@ -0,0 +1,36 @@
+package com.natura.android.sample.components
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import com.natura.android.sample.R
+
+class DrawableAdapter(
+    private val context: Context,
+    private val idList: List<Int>,
+    private val nameList: List<String>
+) : RecyclerView.Adapter<DrawableAdapter.ViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) =
+        ViewHolder(LayoutInflater.from(context).inflate(R.layout.item_drawable, parent, false))
+
+    override fun getItemCount() = idList.size
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        holder.bind(idList[position], nameList[position])
+    }
+
+    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+        private val itemIcon = itemView.findViewById<ImageView>(R.id.item_icon)
+        private val code = itemView.findViewById<TextView>(R.id.item_icon_code)
+
+        fun bind(resourceId: Int, name: String) {
+            itemIcon.setBackgroundResource(resourceId)
+            code.text = name
+        }
+    }
+}
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_button_primary.xml b/sample/src/main/res/layout/activity_button_primary.xml
deleted file mode 100644
index cbb54abfa..000000000
--- a/sample/src/main/res/layout/activity_button_primary.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="10dp"
-    tools:context=".components.ButtonPrimaryActivity">
-
-    <com.natura.android.button.DsPrimaryButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        app:button_enabled="true"
-        app:button_label="ENABLED" />
-
-    <com.natura.android.button.DsPrimaryButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        app:button_enabled="true"
-        app:button_icon_left="EA08"
-        app:button_label="ICON LEFT" />
-
-    <com.natura.android.button.DsPrimaryButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        app:button_enabled="true"
-        app:button_icon_right="EA08"
-        app:button_label="ICON RIGHT" />
-
-    <com.natura.android.button.DsPrimaryButton
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
-        app:button_enabled="false"
-        app:button_label="DISABLED" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/sample/src/main/res/layout/activity_main.xml b/sample/src/main/res/layout/activity_main.xml
index f91fe2f63..de00b35c5 100644
--- a/sample/src/main/res/layout/activity_main.xml
+++ b/sample/src/main/res/layout/activity_main.xml
@@ -8,78 +8,111 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:orientation="vertical"
-        android:padding="@dimen/ds_spacing_small">
+        android:background="@color/background"
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="TOKEN (A-Z)"
+            android:padding="16dp"
+            android:textAlignment="center"
+            />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_textfield"
+            android:id="@+id/btn_icons_drawables"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Text Field"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Icons (drawables)"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_menu"
+            android:id="@+id/btn_icons_font"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Menu Item"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Icons (fonts)"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="COMPONENT (A-Z)"
+            android:padding="16dp"
+            android:textAlignment="center"
+            />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_submenu"
+            android:id="@+id/btn_style_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Submenu Item"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Button"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_navigation_drawer"
+            android:id="@+id/btn_textfield"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Navigation Drawer"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Text Field"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_icons"
+            android:id="@+id/btn_input_text_highlight"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Ícones"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Value Text Highlight"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="PATTERN (A-Z)"
+            android:padding="16dp"
+            android:textAlignment="center"
+            />
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_loading"
+            android:id="@+id/btn_menu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Loading"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Menu Item"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_error_default"
+            android:id="@+id/btn_submenu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Error Default"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Submenu Item"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_button_primary"
+            android:id="@+id/btn_navigation_drawer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Botão Primário"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Navigation Drawer"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_style_buttons"
+            android:id="@+id/btn_loading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Botão de estilo"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Loading"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
         <android.support.v7.widget.AppCompatButton
-            android:id="@+id/btn_input_text_highlight"
+            android:id="@+id/btn_error_default"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Value Text Highlight"
-            android:textColor="@color/colorBrdNatGray" />
+            android:text="Error Default"
+            android:background="@color/surface"
+            android:textColor="@color/highEmphasis" />
 
     </LinearLayout>
 </ScrollView>
diff --git a/sample/src/main/res/layout/activity_styled_button.xml b/sample/src/main/res/layout/activity_styled_button.xml
index 391e0aae6..b362c49e5 100644
--- a/sample/src/main/res/layout/activity_styled_button.xml
+++ b/sample/src/main/res/layout/activity_styled_button.xml
@@ -21,6 +21,26 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
+            <android.support.design.button.MaterialButton
+                style="?materialButtonStyle"
+                android:text="Default Button Icon Left"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ds_ic_outlined_navigation_arrowright"
+                app:iconTint="@color/highEmphasis"
+                android:layout_marginBottom="10dp"/>
+
+
+            <android.support.design.button.MaterialButton
+                style="?materialButtonStyle"
+                android:text="Default Button Icon Right"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:icon="@drawable/ds_ic_outlined_navigation_arrowleft"
+                app:iconTint="@color/highEmphasis"
+                android:layoutDirection="rtl"
+                android:layout_marginBottom="10dp"/>
+
             <android.support.design.button.MaterialButton
                 style="?materialButtonStyle"
                 android:text="Default Button Disabled"
@@ -29,6 +49,15 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="10dp"/>
 
+            <android.support.design.button.MaterialButton
+                style="?materialButtonStyle"
+                android:text="Default Button Disabled Icon Left"
+                android:enabled="false"
+                app:icon="@drawable/ds_ic_outlined_navigation_arrowright"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="10dp"/>
+
             <android.support.design.button.MaterialButton
                 style="?materialButtonOutlinedStyle"
                 android:text="Outlined Button"
diff --git a/sample/src/main/res/layout/item_drawable.xml b/sample/src/main/res/layout/item_drawable.xml
new file mode 100644
index 000000000..1902ff2a0
--- /dev/null
+++ b/sample/src/main/res/layout/item_drawable.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:padding="@dimen/ds_spacing_standard"
+    android:orientation="vertical">
+    <ImageView
+        android:id="@+id/item_icon"
+        android:layout_width="@dimen/ds_text_default_icon_big_size"
+        android:layout_height="@dimen/ds_text_default_icon_big_size"
+        android:layout_gravity="center"
+        tools:src="@drawable/ds_ic_outlined_navigation_arrowbottom" />
+    <TextView
+        android:id="@+id/item_icon_code"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/ds_text_small"
+        tools:text="drawable name"/>
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
index 69b22338c..979eb60eb 100644
--- a/sample/src/main/res/values/colors.xml
+++ b/sample/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#008577</color>
-    <color name="colorPrimaryDark">#00574B</color>
-    <color name="colorAccent">#D81B60</color>
+    <color name="background">#FAFAFA</color>
+    <color name="surface">#FFFFFF</color>
+    <color name="highEmphasis">#333333</color>
 </resources>

From 7fd025c7118c949f264fa06adcbbf89fe725eaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patr=C3=ADcia=20Muniz?= <pmuniz@thoughtworks.com>
Date: Wed, 18 Mar 2020 18:55:40 -0300
Subject: [PATCH 9/9] [NFS-408] correct filled status and rename class (#45)

---
 .../{TextFieldInput.kt => TextField.kt}       |  12 +-
 ...TextFieldInputTest.kt => TextFieldTest.kt} | 171 +++++++++---------
 .../sample/components/TextFieldActivity.kt    |  27 ++-
 .../main/res/layout/activity_textfield.xml    |  35 +++-
 4 files changed, 147 insertions(+), 98 deletions(-)
 rename designsystem/src/main/kotlin/com/natura/android/textfield/{TextFieldInput.kt => TextField.kt} (93%)
 rename designsystem/src/test/kotlin/com/natura/android/textfield/{TextFieldInputTest.kt => TextFieldTest.kt} (56%)

diff --git a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt b/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt
similarity index 93%
rename from designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
rename to designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt
index 4dfd69c2d..7e1f091b9 100644
--- a/designsystem/src/main/kotlin/com/natura/android/textfield/TextFieldInput.kt
+++ b/designsystem/src/main/kotlin/com/natura/android/textfield/TextField.kt
@@ -16,7 +16,7 @@ import com.natura.android.R
 import com.natura.android.icon.FontIcon
 
 @SuppressLint("CustomViewStyleable")
-class TextFieldInput @JvmOverloads constructor(
+class TextField @JvmOverloads constructor(
     context: Context,
     attrs: AttributeSet? = null,
     defStyleAttr: Int = 0
@@ -28,7 +28,8 @@ class TextFieldInput @JvmOverloads constructor(
     }
 
     enum class LayoutState(val borderWidth: Int, val borderColor: Int, val labelColor: Int, val textColor: Int, val footerColor: Int) {
-        DEFAULT(R.dimen.ds_border_tiny, R.color.colorHighEmphasis, R.color.colorMediumEmphasis, R.color.colorHighEmphasis, R.color.colorMediumEmphasis),
+        DEFAULT(R.dimen.ds_border_tiny, R.color.colorLowEmphasis, R.color.colorMediumEmphasis, R.color.colorMediumEmphasis, R.color.colorMediumEmphasis),
+        FILLED(R.dimen.ds_border_tiny, R.color.colorHighEmphasis, R.color.colorMediumEmphasis, R.color.colorHighEmphasis, R.color.colorMediumEmphasis),
         DISABLED(R.dimen.ds_border_tiny, R.color.colorLowEmphasis, R.color.colorLowEmphasis, R.color.colorLowEmphasis, R.color.colorLowEmphasis),
         FOCUSED(R.dimen.ds_border_emphasis, R.color.colorBrdNatYellow, R.color.colorMediumEmphasis, R.color.colorHighEmphasis, R.color.colorMediumEmphasis),
         ERROR(R.dimen.ds_border_emphasis, R.color.colorBrdNatRed, R.color.colorBrdNatRed, R.color.colorHighEmphasis, R.color.colorBrdNatRed),
@@ -55,6 +56,11 @@ class TextFieldInput @JvmOverloads constructor(
         resetLayoutState()
     }
 
+    val editTextView: EditText
+        get() {
+            return inputValue
+        }
+
     var inputType: Int = EditorInfo.TYPE_CLASS_TEXT
         set(value) {
             field = value
@@ -93,6 +99,7 @@ class TextFieldInput @JvmOverloads constructor(
         set(value) {
             field = value
             inputValue.setText(value)
+            resetLayoutState()
         }
         get() {
             return inputValue.text.toString()
@@ -165,6 +172,7 @@ class TextFieldInput @JvmOverloads constructor(
             else -> {
                 if (!isEnabled) LayoutState.DISABLED
                 else if (inputValue.isFocused) LayoutState.FOCUSED
+                else if (inputValue.text.isNotEmpty()) LayoutState.FILLED
                 else LayoutState.DEFAULT
             }
         }
diff --git a/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt b/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldTest.kt
similarity index 56%
rename from designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt
rename to designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldTest.kt
index f002b30de..db866be4a 100644
--- a/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldInputTest.kt
+++ b/designsystem/src/test/kotlin/com/natura/android/textfield/TextFieldTest.kt
@@ -21,10 +21,10 @@ import org.robolectric.annotation.Config
 
 @RunWith(AndroidJUnit4::class)
 @Config(sdk = [28])
-class TextFieldInputTest {
+class TextFieldTest {
 
     val activityController = Robolectric.buildActivity(Activity::class.java)
-    val textFieldInput = TextFieldInput(activityController.get())
+    val textField = TextField(activityController.get())
 
     val EMPTY_TEXT = ""
     val NOT_EMPTY_TEXT = "test"
@@ -44,40 +44,49 @@ class TextFieldInputTest {
 
     @Test
     fun basicConstructor_NoStyledAttributes() {
-        assertThat(textFieldInput.label).isNull()
-        assertThat(textFieldInput.text).isEmpty()
-        assertThat(textFieldInput.footer).isNull()
-        assertThat(textFieldInput.icon).isNull()
-        assertThat(textFieldInput.state).isEqualTo(TextFieldInput.State.NONE)
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.DEFAULT)
-        assertThat(textFieldInput.inputType).isEqualTo(InputType.TYPE_CLASS_TEXT)
-        assertThat(textFieldInput.hint).isNull()
-        assertThat(textFieldInput.lines).isEqualTo(1)
-        assertThat(textFieldInput.maxLength).isEqualTo(Integer.MAX_VALUE)
-        assertThat(textFieldInput.maxLength).isEqualTo(Integer.MAX_VALUE)
+        assertThat(textField.label).isNull()
+        assertThat(textField.text).isEmpty()
+        assertThat(textField.editTextView).isNotNull()
+        assertThat(textField.footer).isNull()
+        assertThat(textField.icon).isNull()
+        assertThat(textField.state).isEqualTo(TextField.State.NONE)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.DEFAULT)
+        assertThat(textField.inputType).isEqualTo(InputType.TYPE_CLASS_TEXT)
+        assertThat(textField.hint).isNull()
+        assertThat(textField.lines).isEqualTo(1)
+        assertThat(textField.maxLength).isEqualTo(Integer.MAX_VALUE)
+        assertThat(textField.maxLength).isEqualTo(Integer.MAX_VALUE)
+    }
+
+    @Test
+    fun textEditTextView() {
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
+
+        assertThat(textField.editTextView).isEqualTo(textView)
     }
 
     @Test
     fun setText_NullValue() {
-        test_setText(null, EMPTY_TEXT, View.VISIBLE)
+        test_setText(null, EMPTY_TEXT, TextField.LayoutState.DEFAULT)
     }
 
     @Test
     fun setText_EmptyValue() {
-        test_setText(EMPTY_TEXT, EMPTY_TEXT, View.VISIBLE)
+        test_setText(EMPTY_TEXT, EMPTY_TEXT, TextField.LayoutState.DEFAULT)
     }
 
     @Test
     fun setText_NoEmptyValue() {
-        test_setText(NOT_EMPTY_TEXT, NOT_EMPTY_TEXT, View.VISIBLE)
+        test_setText(NOT_EMPTY_TEXT, NOT_EMPTY_TEXT, TextField.LayoutState.FILLED)
     }
 
-    private fun test_setText(value: String?, expectedValue: String, expectedVisibility: Int) {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+    private fun test_setText(value: String?, expectedValue: String, expectedLayout: TextField.LayoutState) {
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.text = value
+        textField.text = value
+        assertThat(textField.text).isEqualTo(expectedValue)
         assertThat(textView.text.toString()).isEqualTo(expectedValue)
-        assertThat(textView.visibility).isEqualTo(expectedVisibility)
+        assertThat(textField.layoutState).isEqualTo(expectedLayout)
     }
 
     @Test
@@ -96,9 +105,9 @@ class TextFieldInputTest {
     }
 
     private fun test_setLabel(value: String?, expectedValue: String, expectedVisibility: Int) {
-        val labelView = textFieldInput.findViewById(R.id.text_field_input_label) as TextView
+        val labelView = textField.findViewById(R.id.text_field_input_label) as TextView
 
-        textFieldInput.label = value
+        textField.label = value
         assertThat(labelView.text.toString()).isEqualTo(expectedValue)
         assertThat(labelView.visibility).isEqualTo(expectedVisibility)
     }
@@ -119,9 +128,9 @@ class TextFieldInputTest {
     }
 
     private fun test_setIcon(value: String?, expectedValue: String, expectedVisibility: Int) {
-        val iconView = textFieldInput.findViewById(R.id.text_field_input_icon) as FontIcon
+        val iconView = textField.findViewById(R.id.text_field_input_icon) as FontIcon
 
-        textFieldInput.icon = value
+        textField.icon = value
         assertThat(iconView.text.toString()).isEqualTo(expectedValue)
         assertThat(iconView.visibility).isEqualTo(expectedVisibility)
     }
@@ -142,10 +151,10 @@ class TextFieldInputTest {
     }
 
     private fun test_setFooter(value: String?, expectedValue: String, expectedVisibility: Int) {
-        val footerView = textFieldInput.findViewById(R.id.text_field_input_footer) as TextView
-        val footerBoxView = textFieldInput.findViewById(R.id.text_field_input_footer_box) as View
+        val footerView = textField.findViewById(R.id.text_field_input_footer) as TextView
+        val footerBoxView = textField.findViewById(R.id.text_field_input_footer_box) as View
 
-        textFieldInput.footer = value
+        textField.footer = value
         assertThat(footerView.text.toString()).isEqualTo(expectedValue)
         assertThat(footerBoxView.visibility).isEqualTo(expectedVisibility)
     }
@@ -166,11 +175,11 @@ class TextFieldInputTest {
         expectedVisibility: Int,
         expectedIcon: String
     ) {
-        val footerView = textFieldInput.findViewById(R.id.text_field_input_footer) as TextView
-        val footerIconView = textFieldInput.findViewById(R.id.text_field_input_footer_icon) as FontIcon
-        val footerBoxView = textFieldInput.findViewById(R.id.text_field_input_footer_box) as View
+        val footerView = textField.findViewById(R.id.text_field_input_footer) as TextView
+        val footerIconView = textField.findViewById(R.id.text_field_input_footer_icon) as FontIcon
+        val footerBoxView = textField.findViewById(R.id.text_field_input_footer_box) as View
 
-        textFieldInput.error = value
+        textField.error = value
         assertThat(footerView.text.toString()).isEqualTo(expectedValue)
         assertThat(footerIconView.text).isEqualTo(expectedIcon)
         assertThat(footerIconView.visibility).isEqualTo(expectedVisibility)
@@ -180,34 +189,34 @@ class TextFieldInputTest {
     @Test
     fun setState_None() {
         val expectedStatusColor = getColor(R.color.colorHighEmphasis)
-        test_setState(TextFieldInput.State.NONE, TextFieldInput.LayoutState.DEFAULT, View.GONE, "")
+        test_setState(TextField.State.NONE, TextField.LayoutState.DEFAULT, View.GONE, "")
     }
 
     @Test
     fun setState_Error() {
         val expectedStatusColor = getColor(R.color.colorBrdNatRed)
-        test_setState(TextFieldInput.State.ERROR, TextFieldInput.LayoutState.ERROR, View.VISIBLE, ERROR_ICON_CODE.toIcon())
+        test_setState(TextField.State.ERROR, TextField.LayoutState.ERROR, View.VISIBLE, ERROR_ICON_CODE.toIcon())
     }
 
     @Test
     fun setState_Success() {
         val expectedStatusColor = getColor(R.color.colorBrdNatGreen)
-        test_setState(TextFieldInput.State.SUCCESS, TextFieldInput.LayoutState.SUCCESS, View.VISIBLE, SUCCESS_ICON_CODE.toIcon())
+        test_setState(TextField.State.SUCCESS, TextField.LayoutState.SUCCESS, View.VISIBLE, SUCCESS_ICON_CODE.toIcon())
     }
 
     private fun test_setState(
-        state: TextFieldInput.State,
-        expectedLayoutState: TextFieldInput.LayoutState,
+        state: TextField.State,
+        expectedLayoutState: TextField.LayoutState,
         expectedIconVisibility: Int,
         expectedIconValue: String
     ) {
-        val labelView = textFieldInput.findViewById(R.id.text_field_input_label) as TextView
-        val footerView = textFieldInput.findViewById(R.id.text_field_input_footer) as TextView
-        val footerIconView = textFieldInput.findViewById(R.id.text_field_input_footer_icon) as FontIcon
+        val labelView = textField.findViewById(R.id.text_field_input_label) as TextView
+        val footerView = textField.findViewById(R.id.text_field_input_footer) as TextView
+        val footerIconView = textField.findViewById(R.id.text_field_input_footer_icon) as FontIcon
 
-        textFieldInput.state = state
+        textField.state = state
 
-        assertThat(textFieldInput.layoutState).isEqualTo(expectedLayoutState)
+        assertThat(textField.layoutState).isEqualTo(expectedLayoutState)
         assertThat(labelView.currentTextColor).isEqualTo(getColor(expectedLayoutState.labelColor))
         assertThat(footerView.currentTextColor).isEqualTo(getColor(expectedLayoutState.footerColor))
         assertThat(footerIconView.currentTextColor).isEqualTo(getColor(expectedLayoutState.footerColor))
@@ -218,27 +227,27 @@ class TextFieldInputTest {
     @Test
     fun setInputType() {
         val expectedValue = InputType.TYPE_TEXT_VARIATION_PASSWORD
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.inputType = expectedValue
+        textField.inputType = expectedValue
         assertThat(textView.inputType).isEqualTo(expectedValue)
     }
 
     @Test
     fun setHint() {
         val expectedValue = "test"
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.hint = expectedValue
+        textField.hint = expectedValue
         assertThat(textView.hint).isEqualTo(expectedValue)
     }
 
     @Test
     fun setLines() {
         val expectedValue = 5
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.lines = expectedValue
+        textField.lines = expectedValue
         assertThat(textView.maxLines).isEqualTo(expectedValue)
         assertThat(textView.minLines).isEqualTo(expectedValue)
     }
@@ -246,64 +255,64 @@ class TextFieldInputTest {
     @Test
     fun setMaxLines() {
         val expectedValue = 5
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.maxLines = expectedValue
+        textField.maxLines = expectedValue
         assertThat(textView.maxLines).isEqualTo(expectedValue)
     }
 
     @Test
     fun setMaxLength() {
         val expectedValue = 5
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.maxLength = expectedValue
+        textField.maxLength = expectedValue
         assertThat((textView.filters[0] as InputFilter.LengthFilter).max).isEqualTo(expectedValue)
     }
 
     @Test
     fun onRequestFocus_ChangeToFocusColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
         textView.requestFocus()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.FOCUSED)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.FOCUSED)
     }
 
     @Test
     fun onClearFocus_ChangeToDefaultColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
         textView.requestFocus()
         textView.clearFocus()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.DEFAULT)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.DEFAULT)
     }
 
     @Test
     fun onClearFocus_ChangeToErrorColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.state = TextFieldInput.State.ERROR
+        textField.state = TextField.State.ERROR
         textView.requestFocus()
         textView.clearFocus()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.ERROR)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.ERROR)
     }
 
     @Test
     fun onClearFocus_ChangeToSuccessColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.state = TextFieldInput.State.SUCCESS
+        textField.state = TextField.State.SUCCESS
         textView.requestFocus()
         textView.clearFocus()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.SUCCESS)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.SUCCESS)
     }
 
     @Test
     fun onClickIcon_CallListener() {
-        val iconView = textFieldInput.findViewById(R.id.text_field_input_icon) as FontIcon
+        val iconView = textField.findViewById(R.id.text_field_input_icon) as FontIcon
         var clicked = false
 
-        textFieldInput.setOnIconClickListener(View.OnClickListener {
+        textField.setOnIconClickListener(View.OnClickListener {
             clicked = true
         })
         iconView.performClick()
@@ -312,38 +321,38 @@ class TextFieldInputTest {
 
     @Test
     fun onClickIcon_ChangeToFocusColor() {
-        val iconView = textFieldInput.findViewById(R.id.text_field_input_icon) as FontIcon
+        val iconView = textField.findViewById(R.id.text_field_input_icon) as FontIcon
 
-        textFieldInput.isEnabled = true
+        textField.isEnabled = true
         iconView.performClick()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.FOCUSED)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.FOCUSED)
     }
 
     @Test
     fun setIsEnabledFalse_ChangeToDisabledColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.isEnabled = false
+        textField.isEnabled = false
         assertThat(textView.isEnabled).isFalse()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.DISABLED)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.DISABLED)
 
-        textFieldInput.isEnabled = true
+        textField.isEnabled = true
     }
 
     @Test
     fun setIsEnabledTrue_ChangeToDefaultColor() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
 
-        textFieldInput.isEnabled = false
-        textFieldInput.isEnabled = true
+        textField.isEnabled = false
+        textField.isEnabled = true
         assertThat(textView.isEnabled).isTrue()
-        assertThat(textFieldInput.layoutState).isEqualTo(TextFieldInput.LayoutState.DEFAULT)
+        assertThat(textField.layoutState).isEqualTo(TextField.LayoutState.DEFAULT)
     }
 
     @Test
     fun testFocusWhenBoxIsClicked() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
-        val textBoxView = textFieldInput.findViewById(R.id.text_field_input_box) as View
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
+        val textBoxView = textField.findViewById(R.id.text_field_input_box) as View
 
         textBoxView.callOnClick()
         assertThat(textView.isFocused).isTrue()
@@ -351,15 +360,15 @@ class TextFieldInputTest {
 
     @Test
     fun testNoFocusWhenBoxIsClickedButIsDisabled() {
-        val textView = textFieldInput.findViewById(R.id.text_field_input_value) as EditText
-        val textBoxView = textFieldInput.findViewById(R.id.text_field_input_box) as View
-        textFieldInput.isEnabled = false
+        val textView = textField.findViewById(R.id.text_field_input_value) as EditText
+        val textBoxView = textField.findViewById(R.id.text_field_input_box) as View
+        textField.isEnabled = false
 
         textBoxView.callOnClick()
         assertThat(textView.isFocused).isFalse()
 
-        textFieldInput.isEnabled = true
+        textField.isEnabled = true
     }
 
-    private fun getColor(id: Int) = ContextCompat.getColor(textFieldInput.context, id)
+    private fun getColor(id: Int) = ContextCompat.getColor(textField.context, id)
 }
diff --git a/sample/src/main/kotlin/com/natura/android/sample/components/TextFieldActivity.kt b/sample/src/main/kotlin/com/natura/android/sample/components/TextFieldActivity.kt
index d01e02ea3..698095cd1 100644
--- a/sample/src/main/kotlin/com/natura/android/sample/components/TextFieldActivity.kt
+++ b/sample/src/main/kotlin/com/natura/android/sample/components/TextFieldActivity.kt
@@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity
 import android.text.InputType
 import android.view.View
 import com.natura.android.sample.R
-import com.natura.android.textfield.TextFieldInput
+import com.natura.android.textfield.TextField
 
 class TextFieldActivity : AppCompatActivity() {
 
@@ -13,13 +13,24 @@ class TextFieldActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_textfield)
 
-        val clickable = findViewById<TextFieldInput>(R.id.clickable_item)
+
+        val textItem = findViewById<TextField>(R.id.text_item)
+        val inputProgrammatically = findViewById<View>(R.id.input_text_programmatically)
+        inputProgrammatically.setOnClickListener {
+            textItem.text = "text added programmatically"
+        }
+        val clearProgrammatically = findViewById<View>(R.id.clear_text_programmatically)
+        clearProgrammatically.setOnClickListener {
+            textItem.text = ""
+        }
+
+        val clickable = findViewById<TextField>(R.id.clickable_item)
         clickable.setOnIconClickListener(View.OnClickListener {
             clickable.text = ""
             clickable.requestFocus()
         })
 
-        val mutableItem = findViewById<TextFieldInput>(R.id.mutable_item)
+        val mutableItem = findViewById<TextField>(R.id.mutable_item)
         val switchDisabledItem = findViewById<View>(R.id.switch_item_disabled)
         switchDisabledItem.setOnClickListener {
             if (mutableItem.isEnabled) {
@@ -33,7 +44,7 @@ class TextFieldActivity : AppCompatActivity() {
 
         val switchErroredItem = findViewById<View>(R.id.switch_item_errored)
         switchErroredItem.setOnClickListener {
-            if (mutableItem.state == TextFieldInput.State.ERROR) {
+            if (mutableItem.state == TextField.State.ERROR) {
                 mutableItem.error = null
             } else {
                 mutableItem.error = "error message"
@@ -42,17 +53,17 @@ class TextFieldActivity : AppCompatActivity() {
 
         val switchSucceedItem = findViewById<View>(R.id.switch_item_succeed)
         switchSucceedItem.setOnClickListener {
-            if (mutableItem.state == TextFieldInput.State.SUCCESS) {
+            if (mutableItem.state == TextField.State.SUCCESS) {
                 mutableItem.footer = ""
-                mutableItem.state = TextFieldInput.State.NONE
+                mutableItem.state = TextField.State.NONE
             } else {
                 mutableItem.footer = "success message"
-                mutableItem.state = TextFieldInput.State.SUCCESS
+                mutableItem.state = TextField.State.SUCCESS
             }
         }
 
         var passwordMode = true
-        val password = findViewById<TextFieldInput>(R.id.password_item)
+        val password = findViewById<TextField>(R.id.password_item)
         password.setOnIconClickListener(View.OnClickListener {
             if (passwordMode) {
                 password.inputType =
diff --git a/sample/src/main/res/layout/activity_textfield.xml b/sample/src/main/res/layout/activity_textfield.xml
index ea8c5c2d1..3b503660b 100644
--- a/sample/src/main/res/layout/activity_textfield.xml
+++ b/sample/src/main/res/layout/activity_textfield.xml
@@ -14,7 +14,8 @@
         android:orientation="vertical"
         android:padding="15dp">
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
+        android:id="@+id/text_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:hint="Hint"
@@ -23,7 +24,27 @@
         app:text_field_footer="this field accept any text"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <TextView
+        android:paddingTop="5dp"
+        android:id="@+id/input_text_programmatically"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="click here to insert text programmatically in text field"
+        android:textColor="@color/colorBrdNatRed"
+        android:clickable="true"
+        />
+
+    <TextView
+        android:paddingTop="5dp"
+        android:id="@+id/clear_text_programmatically"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="click here to clear text programmatically in text field"
+        android:textColor="@color/colorBrdNatRed"
+        android:clickable="true"
+        />
+
+    <com.natura.android.textfield.TextField
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:inputType="number"
@@ -32,7 +53,7 @@
         app:text_field_footer="this field accept only numbers"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
         android:id="@+id/password_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -43,14 +64,14 @@
         app:text_field_footer="click on icon to change input type"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="15dp"
         android:hint="this field has no label and no detail footer"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:lines="3"
@@ -61,7 +82,7 @@
         app:text_field_footer="This field accepts only 10 characters, including line breaks"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
         android:id="@+id/clickable_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -72,7 +93,7 @@
         app:text_field_footer="Click on icon to clean the text"
         />
 
-    <com.natura.android.textfield.TextFieldInput
+    <com.natura.android.textfield.TextField
         android:id="@+id/mutable_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"