rename and update editor colors

wordpress-mobile · Mar 5, 2015 · 94e0f77 · 94e0f77
1 parent 1b3b384
commit 94e0f77
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 26 deletions.
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_bold_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_editor_bold" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_italic_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_editor_italic" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_link_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_admin_links" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_media_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/noticon_picture" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_more_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_more_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_editor_insertmore" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_quote_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_format_quote" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_strike_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_editor_strikethrough" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml b/WordPressEditor/src/main/res/drawable/format_bar_button_underline_selected_state.xml
@@ -3,10 +3,10 @@
     xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/blue_medium"/>
+            <solid android:color="@color/format_bar_button_selected"/>
         </shape>
     </item>
     <item>
         <bitmap android:src="@drawable/dashicon_editor_underline" android:gravity="center"/>
     </item>
-</layer-list>
+</layer-list>
diff --git a/WordPressEditor/src/main/res/drawable/list_divider.xml b/WordPressEditor/src/main/res/drawable/list_divider.xml
@@ -4,7 +4,7 @@
     android:insetRight="@dimen/margin_extra_large">
     <shape android:shape="rectangle">
 
-        <solid android:color="@color/grey_extra_light" />
+        <solid android:color="@color/format_bar_background" />
 
     </shape>
-</inset>
+</inset>
diff --git a/WordPressEditor/src/main/res/layout/fragment_edit_post_content.xml b/WordPressEditor/src/main/res/layout/fragment_edit_post_content.xml
@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@color/white"
+    android:background="@android:color/white"
     android:focusableInTouchMode="true">
 
     <ScrollView
@@ -46,7 +46,7 @@
                 android:textSize="18sp"
                 android:inputType="textMultiLine|textCapSentences|textAutoCorrect"
                 android:imeOptions="flagNoExtractUi"
-                android:textColorLink="@color/wordpress_blue" />
+                android:textColorLink="@color/placeholder_content_text" />
         </LinearLayout>
     </ScrollView>
 
@@ -81,7 +81,7 @@
         android:layout_width="fill_parent"
         android:layout_height="@dimen/format_bar_height"
         android:layout_gravity="bottom"
-        android:background="@color/grey_extra_light"
+        android:background="@color/format_bar_background"
         android:orientation="horizontal"
         android:visibility="gone">
 

diff --git a/WordPressEditor/src/main/res/values/colors.xml b/WordPressEditor/src/main/res/values/colors.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="white">#FFFFFF</color>
-    <color name="wordpress_blue">#21759B</color>
-    <color name="blue_new_kid">#2EA2CC</color>
-    <color name="grey_extra_light">#eeeeee</color>
+    <color name="format_bar_button_selected">#00aadc</color>
+    <color name="placeholder_content_text">#21759B</color>
+    <color name="format_bar_background">#eeeeee</color>
+    <color name="image_options_label">#cccccc</color>
     <color name="pressed_wordpress">#CC78C8E6</color>
-    <color name="image_options_label">#CCCCCC</color>
 </resources>