Merge pull request #909 from wordpress-mobile/issue/908-fix-toolbar-cross

Added logic to rotate the add button only when selected

Author: anitaa1990

aztec/src/main/kotlin/org/wordpress/aztec/toolbar/ToolbarAction.kt

@@ -22,7 +22,7 @@ enum class ToolbarAction constructor(
             setOf(AztecTextFormat.FORMAT_NONE)),
     ADD_MEDIA_EXPAND(
             R.id.format_bar_button_media_expanded,
-            R.drawable.format_bar_button_media_expanded_selector,
+            R.drawable.format_bar_button_media_collapsed_selector,
             ToolbarActionType.OTHER,
             setOf(AztecTextFormat.FORMAT_NONE)),
     HEADING(R.id.format_bar_button_heading,

aztec/src/main/res/drawable/format_bar_button_media_collapsed.xml

@@ -7,9 +7,14 @@
     android:viewportHeight="48"
     android:viewportWidth="48">
 
+    <group
+        android:pivotX="24"
+        android:pivotY="24"
+        android:rotation="45.0">
     <path
         android:fillColor="?attr/toolbarIconNormalColor"
         android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z">
     </path>
+    </group>
 
 </vector>

aztec/src/main/res/drawable/format_bar_button_media_collapsed_disabled.xml

@@ -8,9 +8,14 @@
     android:viewportWidth="48" >
 
     <!-- @color/grey_lighten_20 -->
+    <group
+        android:pivotX="24"
+        android:pivotY="24"
+        android:rotation="45.0">
     <path
         android:fillColor="?attr/toolbarIconDisabledColor"
         android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z" >
     </path>
+    </group>
 
 </vector>

aztec/src/main/res/drawable/format_bar_button_media_collapsed_highlighted.xml

@@ -8,9 +8,14 @@
     android:viewportWidth="48" >
 
     <!-- @color/almost_black -->
+    <group
+        android:pivotX="24"
+        android:pivotY="24"
+        android:rotation="45.0">
     <path
         android:fillColor="?attr/toolbarIconHighlightColor"
         android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z" >
     </path>
+    </group>
 
 </vector>

aztec/src/main/res/drawable/format_bar_button_media_expanded.xml

@@ -8,8 +8,7 @@
 
     <group
         android:pivotX="24"
-        android:pivotY="24"
-        android:rotation="45.0">
+        android:pivotY="24">
         <path
             android:fillColor="?attr/toolbarIconNormalColor"
             android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z">

aztec/src/main/res/drawable/format_bar_button_media_expanded_disabled.xml

@@ -8,8 +8,7 @@
 
     <group
         android:pivotX="24"
-        android:pivotY="24"
-        android:rotation="45.0">
+        android:pivotY="24">
         <path
             android:fillColor="?attr/toolbarIconDisabledColor"
             android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z">

aztec/src/main/res/drawable/format_bar_button_media_expanded_highlighted.xml

@@ -8,8 +8,7 @@
 
     <group
         android:pivotX="24"
-        android:pivotY="24"
-        android:rotation="45.0">
+        android:pivotY="24">
         <path
             android:fillColor="?attr/toolbarIconHighlightColor"
             android:pathData="M24,15.3c4.8,0,8.7,3.9,8.7,8.7s-3.9,8.7-8.7,8.7s-8.7-3.9-8.7-8.7S19.2,15.3,24,15.3 M24,13.1c-6,0-10.9,4.9-10.9,10.9 S18,34.9,24,34.9S34.9,30,34.9,24S30,13.1,24,13.1L24,13.1z M29.5,22.9h-4.4v-4.4h-2.2v4.4h-4.4v2.2h4.4v4.4h2.2v-4.4h4.4V22.9z">