[android] fix: Nicer bottom menu selectors on API 21+.

11 files changed, 50 insertions, 4 deletions

diff --git a/android/res/drawable-v21/menu_button.xml b/android/res/drawable-v21/menu_button.xml
new file mode 100644
index 0000000000..9dd001c724
--- /dev/null
+++ b/android/res/drawable-v21/menu_button.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+  <item android:id="@android:id/mask">
+    <shape android:shape="rectangle">
+      <corners android:radius="50dp"/>
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/menu_button_left.xml b/android/res/drawable-v21/menu_button_left.xml
new file mode 100644
index 0000000000..265a278c5f
--- /dev/null
+++ b/android/res/drawable-v21/menu_button_left.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+  <item android:id="@android:id/mask">
+    <shape android:shape="rectangle">
+      <corners android:topRightRadius="50dp"
+               android:bottomRightRadius="50dp"/>
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/menu_button_right.xml b/android/res/drawable-v21/menu_button_right.xml
new file mode 100644
index 0000000000..006dd47c2a
--- /dev/null
+++ b/android/res/drawable-v21/menu_button_right.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+  <item android:id="@android:id/mask">
+    <shape android:shape="rectangle">
+      <corners android:topLeftRadius="50dp"
+               android:bottomLeftRadius="50dp"/>
+      <solid android:color="@android:color/white"/>
+    </shape>
+  </item>
+</ripple>
\ No newline at end of file
diff --git a/android/res/drawable/menu_button.xml b/android/res/drawable/menu_button.xml
new file mode 100644
index 0000000000..e740440b51
--- /dev/null
+++ b/android/res/drawable/menu_button.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/abc_item_background_holo_light"/>
+</selector>
diff --git a/android/res/drawable/menu_button_left.xml b/android/res/drawable/menu_button_left.xml
new file mode 100644
index 0000000000..7f6bd90201
--- /dev/null
+++ b/android/res/drawable/menu_button_left.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/menu_button"/>
+</selector>
diff --git a/android/res/drawable/menu_button_right.xml b/android/res/drawable/menu_button_right.xml
new file mode 100644
index 0000000000..7f6bd90201
--- /dev/null
+++ b/android/res/drawable/menu_button_right.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/menu_button"/>
+</selector>
diff --git a/android/res/layout/menu.xml b/android/res/layout/menu.xml
index 9ab052cce1..a27c6f43bc 100644
--- a/android/res/layout/menu.xml
+++ b/android/res/layout/menu.xml
@@ -32,6 +32,7 @@
                  android:layout_height="wrap_content">
       <ImageView android:id="@+id/my_position"
                  style="@style/MwmTheme.Menu.Line.Button"
+                 android:background="@drawable/menu_button_left"
                  android:layout_width="@dimen/menu_line_button_width_edge"
                  android:layout_height="@dimen/menu_line_height"
                  android:paddingLeft="@dimen/margin_half"
@@ -44,6 +45,7 @@
                  android:layout_gravity="right"
                  android:paddingRight="@dimen/margin_half"
                  android:src="@drawable/ic_menu_open"
+                 android:background="@drawable/menu_button_right"
                  tools:layout_marginTop="50dp"/>
 
       <include android:id="@+id/buttons_frame"
diff --git a/android/res/values-w840dp/dimens.xml b/android/res/values-w840dp/dimens.xml
index a5e624eb52..37fdb3f669 100644
--- a/android/res/values-w840dp/dimens.xml
+++ b/android/res/values-w840dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <dimen name="menu_line_button_width">72dp</dimen>
+  <dimen name="menu_line_button_width">80dp</dimen>
 </resources>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
index 2ce7652d77..446a6ef5a9 100644
--- a/android/res/values/dimens.xml
+++ b/android/res/values/dimens.xml
@@ -72,7 +72,7 @@
 
   <!-- Bottom menu -->
   <dimen name="menu_line_height">48dp</dimen>
-  <dimen name="menu_line_button_width">64dp</dimen>
+  <dimen name="menu_line_button_width">72dp</dimen>
   <dimen name="menu_line_button_width_edge">56dp</dimen>
   <dimen name="menu_list_item_height">48dp</dimen>
 
diff --git a/android/res/values/styles-menu.xml b/android/res/values/styles-menu.xml
index 2c472283e6..6eed3ce1bd 100644
--- a/android/res/values/styles-menu.xml
+++ b/android/res/values/styles-menu.xml
@@ -8,7 +8,7 @@
     <item name="android:layout_width">@dimen/menu_line_button_width</item>
     <item name="android:layout_height">@dimen/menu_line_height</item>
     <item name="android:scaleType">centerInside</item>
-    <item name="android:background">?clickableBackground</item>
+    <item name="android:background">@drawable/menu_button</item>
   </style>
 
   <style name="MwmTheme.Menu.Line.CurrentLocationText">
diff --git a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java
index da424d8667..eba59ed210 100644
--- a/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java
+++ b/android/src/com/mapswithme/maps/widget/RotateByAlphaDrawable.java
@@ -73,7 +73,7 @@ public class RotateByAlphaDrawable extends Drawable
   public void draw(Canvas canvas)
   {
     canvas.save();
-    canvas.rotate(mAngle, getBounds().width() / 2, getBounds().height() / 2);
+    canvas.rotate(mAngle, mBaseDrawable.getBounds().width() / 2, mBaseDrawable.getBounds().height() / 2);
     mBaseDrawable.draw(canvas);
     canvas.restore();
   }