Issue #370: Use gridicons instead of dashicons for the format bar

WordPressEditor/build.gradle

@@ -45,9 +45,9 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:23.1.1'
-    compile 'com.android.support:support-v4:23.1.1'
-    compile 'com.android.support:design:23.1.1'
+    compile 'com.android.support:appcompat-v7:23.4.0'
+    compile 'com.android.support:support-v4:23.4.0'
+    compile 'com.android.support:design:23.4.0'
     compile 'org.wordpress:utils:1.9.0'
 
     // Test libraries

WordPressEditor/src/main/res/drawable/format_bar_button_bold.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887
+c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189
+C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z
+M20,20.946
+h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236
+c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z
+M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502
+s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_bold_disabled.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#E8EEF2"
+        android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887
+c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189
+C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z
+M20,20.946
+h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236
+c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z
+M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502
+s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_bold_highlighted.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#0084BC"
+        android:pathData="M17,15.009h4.547c2.126,0,3.671,0.303,4.632,0.907c0.962,0.605,1.442,1.567,1.442,2.887
+c0,0.896-0.211,1.63-0.631,2.205c-0.421,0.574-0.98,0.919-1.678,1.036v0.103c0.951,0.212,1.637,0.608,2.057,1.189
+C27.79,23.916,28,24.688,28,25.652c0,1.367-0.494,2.434-1.482,3.199C25.529,29.617,24.186,30,22.491,30H17V15.009z
+M20,20.946
+h2.027c0.862,0,1.486-0.133,1.872-0.4c0.387-0.267,0.579-0.708,0.579-1.323c0-0.574-0.21-0.986-0.63-1.236
+c-0.421-0.249-1.087-0.374-1.996-0.374H20V20.946z
+M20,23.469v3.906h2.253c0.876,0,1.521-0.167,1.939-0.502
+s0.626-0.848,0.626-1.539c0-1.244-0.889-1.865-2.668-1.865H20z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_bold_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_bold_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_bold_selected_state"/>
-    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_bold_disabled_state"/>
-    <item>
-        <bitmap
-            android:src="@drawable/format_bar_button_bold"
-            android:gravity="center"/>
-    </item>
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_bold_highlighted"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_bold_highlighted"/>
+    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_bold_disabled"/>
+    <item android:drawable="@drawable/format_bar_button_bold"/>
 </selector>

WordPressEditor/src/main/res/drawable/format_bar_button_html.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M16.294,25h-1.288v-2.738h-1.907V25h-1.292v-6.398h1.292v2.588h1.907v-2.588h1.288V25z" />
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M21.348,19.678h-1.582V25h-1.297v-5.322h-1.555v-1.077h4.434V19.678z" />
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M23.777,18.602l1.209,4.627l1.204-4.627h1.688V25h-1.296v-1.731l0.118-2.667L25.422,25h-0.879
+l-1.279-4.399l0.119,2.667V25H22.09v-6.398H23.777z" />
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M30.207,23.928h2.268V25h-3.561v-6.398h1.293V23.928z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_html_disabled.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#E8EEF2"
+        android:pathData="M15.006,21.19h-1.907v-2.588h-1.292V25h1.292v-2.738h1.907V25h1.288v-6.398h-1.288V21.19z
+M16.914,19.678h1.555V25h1.297v-5.322h1.582v-1.077h-4.434V19.678z
+M24.986,23.229l-1.209-4.627H22.09V25h1.293v-1.731
+l-0.119-2.667L24.543,25h0.879l1.278-4.399l-0.118,2.667V25h1.296v-6.398H26.19L24.986,23.229z
+M30.207,23.928v-5.326h-1.293V25 h3.561v-1.072H30.207z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_html_highlighted.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#0084BC"
+        android:pathData="M15.006,21.19h-1.907v-2.588h-1.292V25h1.292v-2.738h1.907V25h1.288v-6.398h-1.288V21.19z
+M16.914,19.678h1.555V25h1.297v-5.322h1.582v-1.077h-4.434V19.678z
+M24.986,23.229l-1.209-4.627H22.09V25h1.293v-1.731
+l-0.119-2.667L24.543,25h0.879l1.278-4.399l-0.118,2.667V25h1.296v-6.398H26.19L24.986,23.229z
+M30.207,23.928v-5.326h-1.293V25 h3.561v-1.072H30.207z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_html_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_html_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_html_selected_state"/>
-    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_html_disabled_state"/>
-    <item>
-        <bitmap
-            android:src="@drawable/format_bar_button_html"
-            android:gravity="center"/>
-    </item>
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_html_highlighted"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_html_highlighted"/>
+    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_html_disabled"/>
+    <item android:drawable="@drawable/format_bar_button_html"/>
 </selector>

WordPressEditor/src/main/res/drawable/format_bar_button_italic.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M 20.536 15 L 20.109 17 L 21.609 17 L 19.263 28 L 17.763 28 L 17.336 30 L 23.464 30 L 23.89 28 L 22.39 28 L 24.737 17 L 26.237 17 L 26.664 15 Z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_italic_disabled.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#E8EEF2"
+        android:pathData="M 20.536 15 L 20.109 17 L 21.609 17 L 19.263 28 L 17.763 28 L 17.336 30 L 23.464 30 L 23.89 28 L 22.39 28 L 24.737 17 L 26.237 17 L 26.664 15 Z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_italic_highlighted.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#0084BC"
+        android:pathData="M 20.536 15 L 20.109 17 L 21.609 17 L 19.263 28 L 17.763 28 L 17.336 30 L 23.464 30 L 23.89 28 L 22.39 28 L 24.737 17 L 26.237 17 L 26.664 15 Z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_italic_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_italic_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_italic_selected_state"/>
-    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_italic_disabled_state"/>
-    <item>
-        <bitmap
-            android:src="@drawable/format_bar_button_italic"
-            android:gravity="center"/>
-    </item>
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_italic_highlighted"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_italic_highlighted"/>
+    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_italic_disabled"/>
+    <item android:drawable="@drawable/format_bar_button_italic"/>
 </selector>

WordPressEditor/src/main/res/drawable/format_bar_button_link.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M27,23H17v-2h10V23z
+M28,17h-1c-1.631,0-3.065,0.792-3.977,2H27h1c1.103,0,2,0.897,2,2v2
+c0,1.103-0.897,2-2,2h-1h-3.977c0.913,1.208,2.347,2,3.977,2h1c2.209,0,4-1.791,4-4v-2C32,18.791,30.209,17,28,17z
+M12,21v2
+c0,2.209,1.791,4,4,4h1c1.63,0,3.065-0.792,3.977-2H17h-1c-1.103,0-2-0.897-2-2v-2c0-1.103,0.897-2,2-2h1h3.977
+c-0.913-1.208-2.347-2-3.977-2h-1C13.791,17,12,18.791,12,21z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_link_disabled.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#E8EEF2"
+        android:pathData="M27,23H17v-2h10V23z
+M28,17h-1c-1.631,0-3.065,0.792-3.977,2H27h1c1.103,0,2,0.897,2,2v2
+c0,1.103-0.897,2-2,2h-1h-3.977c0.913,1.208,2.347,2,3.977,2h1c2.209,0,4-1.791,4-4v-2C32,18.791,30.209,17,28,17z
+M12,21v2
+c0,2.209,1.791,4,4,4h1c1.63,0,3.065-0.792,3.977-2H17h-1c-1.103,0-2-0.897-2-2v-2c0-1.103,0.897-2,2-2h1h3.977
+c-0.913-1.208-2.347-2-3.977-2h-1C13.791,17,12,18.791,12,21z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_link_highlighted.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#0084BC"
+        android:pathData="M27,23H17v-2h10V23z
+M28,17h-1c-1.631,0-3.065,0.792-3.977,2H27h1c1.103,0,2,0.897,2,2v2
+c0,1.103-0.897,2-2,2h-1h-3.977c0.913,1.208,2.347,2,3.977,2h1c2.209,0,4-1.791,4-4v-2C32,18.791,30.209,17,28,17z
+M12,21v2
+c0,2.209,1.791,4,4,4h1c1.63,0,3.065-0.792,3.977-2H17h-1c-1.103,0-2-0.897-2-2v-2c0-1.103,0.897-2,2-2h1h3.977
+c-0.913-1.208-2.347-2-3.977-2h-1C13.791,17,12,18.791,12,21z" />
+</vector>

WordPressEditor/src/main/res/drawable/format_bar_button_link_selector.xml

@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_link_selected_state"/>
-    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_link_selected_state"/>
-    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_link_disabled_state"/>
-    <item>
-        <bitmap
-            android:src="@drawable/format_bar_button_link"
-            android:gravity="center"/>
-    </item>
+    <item android:state_checked="true" android:drawable="@drawable/format_bar_button_link_highlighted"/>
+    <item android:state_pressed="true" android:drawable="@drawable/format_bar_button_link_highlighted"/>
+    <item android:state_enabled="false" android:drawable="@drawable/format_bar_button_link_disabled"/>
+    <item android:drawable="@drawable/format_bar_button_link"/>
 </selector>

WordPressEditor/src/main/res/drawable/format_bar_button_media.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="44dp"
+    android:height="44dp"
+    android:viewportWidth="44"
+    android:viewportHeight="44">
+
+    <path
+        android:fillColor="#87A6BC"
+        android:pathData="M33,14v2h-3v3h-2v-3h-3v-2h3v-3h2v3H33z
+M24.5,21c0.828,0,1.5-0.672,1.5-1.5S25.328,18,24.5,18
+S23,18.672,23,19.5S23.672,21,24.5,21z
+M28,24.234l-0.513-0.57c-0.794-0.885-2.181-0.885-2.976,0l-0.656,0.731L19,19l-3,3.333V16h7
+v-2h-7c-1.105,0-2,0.895-2,2v12c0,1.105,0.895,2,2,2h12c1.105,0,2-0.895,2-2v-7h-2V24.234z" />
+</vector>