From bb8c5373b684744326b2aad1e8e42e74cce8e9a1 Mon Sep 17 00:00:00 2001
From: Alex Forcier <alex.forcier@automattic.com>
Date: Fri, 17 Apr 2015 12:01:44 -0400
Subject: [PATCH] Added format bar buttons and dividers to editor layout

---
 .../src/main/res/layout/fragment_editor.xml   | 104 +++++++++++++++---
 .../src/main/res/values/dimens.xml            |   8 ++
 .../src/main/res/values/styles.xml            |  17 +++
 3 files changed, 113 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 WordPressEditor/src/main/res/layout/fragment_editor.xml
 mode change 100644 => 100755 WordPressEditor/src/main/res/values/styles.xml

diff --git a/WordPressEditor/src/main/res/layout/fragment_editor.xml b/WordPressEditor/src/main/res/layout/fragment_editor.xml
old mode 100644
new mode 100755
index a573dfe74b40..698057d3dd36
--- a/WordPressEditor/src/main/res/layout/fragment_editor.xml
+++ b/WordPressEditor/src/main/res/layout/fragment_editor.xml
@@ -14,27 +14,99 @@
         android:layout_width="fill_parent"
         android:layout_height="@dimen/format_bar_height"
         android:layout_gravity="bottom"
-        android:background="@color/format_bar_background"
-        android:orientation="horizontal">
+        android:background="@android:color/white"
+        android:orientation="vertical">
 
-        <HorizontalScrollView
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1">
+        <View
+            android:id="@+id/format_bar_horizontal_divider"
+            android:layout_width="fill_parent"
+            android:layout_height="@dimen/format_bar_horizontal_divider_height"
+            style="@style/Divider"/>
 
-            <LinearLayout
-                android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/format_bar_buttons"
+            android:layout_width="fill_parent"
+            android:layout_height="@dimen/format_bar_height"
+            android:layout_gravity="bottom"
+            android:layout_marginLeft="@dimen/format_bar_side_margin"
+            android:layout_marginRight="@dimen/format_bar_side_margin"
+            android:orientation="horizontal">
+
+            <HorizontalScrollView
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                android:layout_weight="1">
 
-                <ToggleButton
-                    android:id="@+id/bold"
-                    style="@style/ToggleButton"
+                <LinearLayout
                     android:layout_width="wrap_content"
-                    android:layout_height="fill_parent"
-                    android:background="@drawable/format_bar_button_bold_selector" />
-            </LinearLayout>
-        </HorizontalScrollView>
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_media"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_media_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_bold"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_bold_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_italic"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_italic_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_quote"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_quote_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_ul"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_ul_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_ol"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_ol_selector"/>
+
+                    <ToggleButton
+                        android:id="@+id/format_bar_button_link"
+                        style="@style/FormatBarButton"
+                        android:layout_width="wrap_content"
+                        android:layout_height="fill_parent"
+                        android:background="@drawable/format_bar_button_link_selector"/>
+                </LinearLayout>
+            </HorizontalScrollView>
+
+            <View
+                android:id="@+id/format_bar_vertical_divider"
+                android:layout_width="@dimen/format_bar_vertical_divider_width"
+                android:layout_height="@dimen/format_bar_vertical_divider_height"
+                android:layout_gravity="center"
+                style="@style/Divider"/>
+
+            <ToggleButton
+                android:id="@+id/format_bar_button_html"
+                style="@style/FormatBarHtmlButton"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:background="@drawable/format_bar_button_html_selector"/>
+        </LinearLayout>
     </LinearLayout>
 
 </FrameLayout>
diff --git a/WordPressEditor/src/main/res/values/dimens.xml b/WordPressEditor/src/main/res/values/dimens.xml
index de41f98eb40c..3653981a463f 100644
--- a/WordPressEditor/src/main/res/values/dimens.xml
+++ b/WordPressEditor/src/main/res/values/dimens.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="format_bar_height">40dp</dimen>
+    <dimen name="format_bar_side_margin">5dp</dimen>
+    <dimen name="format_bar_button_right_margin">4dp</dimen>
+    <dimen name="format_bar_html_button_left_margin">9dp</dimen>
+
+    <dimen name="format_bar_horizontal_divider_height">1dp</dimen>
+    <dimen name="format_bar_vertical_divider_width">0.6dp</dimen>
+    <dimen name="format_bar_vertical_divider_height">28dp</dimen>
 
     <dimen name="format_bar_button_highlighted_underline_top">37dp</dimen>
     <dimen name="format_bar_button_highlighted_underline_width">2dp</dimen>
 
     <dimen name="post_editor_content_side_margin">20dp</dimen>
+
     <dimen name="margin_extra_small">2dp</dimen>
     <dimen name="margin_small">4dp</dimen>
     <dimen name="margin_medium">8dp</dimen>
diff --git a/WordPressEditor/src/main/res/values/styles.xml b/WordPressEditor/src/main/res/values/styles.xml
old mode 100644
new mode 100755
index b319abea3f8f..8ac61de5e2ea
--- a/WordPressEditor/src/main/res/values/styles.xml
+++ b/WordPressEditor/src/main/res/values/styles.xml
@@ -6,4 +6,21 @@
         <item name="android:textOn">""</item>
         <item name="android:textOff">""</item>
     </style>
+
+    <style name="FormatBarButton">
+        <item name="android:minWidth">@dimen/format_bar_height</item>
+        <item name="android:minHeight">@dimen/format_bar_height</item>
+        <item name="android:layout_marginRight">@dimen/format_bar_button_right_margin</item>
+        <item name="android:textOn">""</item>
+        <item name="android:textOff">""</item>
+    </style>
+
+    <style name="FormatBarHtmlButton" parent="FormatBarButton">
+        <item name="android:layout_marginLeft">@dimen/format_bar_html_button_left_margin</item>
+    </style>
+
+    <style name="Divider">
+        <item name="android:background">@color/wp_gray</item>
+        <item name="android:alpha">0.5</item>
+    </style>
 </resources>