diff --git a/android/res/drawable-hdpi/ic_bg_zoom_normal.png b/android/res/drawable-hdpi/ic_bg_zoom_normal.png new file mode 100644 index 0000000000..763c1c33e7 Binary files /dev/null and b/android/res/drawable-hdpi/ic_bg_zoom_normal.png differ diff --git a/android/res/drawable-hdpi/ic_bg_zoom_pressed.png b/android/res/drawable-hdpi/ic_bg_zoom_pressed.png new file mode 100644 index 0000000000..5ac8fc3f48 Binary files /dev/null and b/android/res/drawable-hdpi/ic_bg_zoom_pressed.png differ diff --git a/android/res/drawable-hdpi/ic_btn_zoom_in.png b/android/res/drawable-hdpi/ic_btn_zoom_in.png deleted file mode 100644 index c5ef1a995c..0000000000 Binary files a/android/res/drawable-hdpi/ic_btn_zoom_in.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_btn_zoom_out.png b/android/res/drawable-hdpi/ic_btn_zoom_out.png deleted file mode 100644 index b1a5efb0ea..0000000000 Binary files a/android/res/drawable-hdpi/ic_btn_zoom_out.png and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_zoom_in.png b/android/res/drawable-hdpi/ic_zoom_in.png new file mode 100644 index 0000000000..98599ad604 Binary files /dev/null and b/android/res/drawable-hdpi/ic_zoom_in.png differ diff --git a/android/res/drawable-hdpi/ic_zoom_out.png b/android/res/drawable-hdpi/ic_zoom_out.png new file mode 100644 index 0000000000..6351b9bec7 Binary files /dev/null and b/android/res/drawable-hdpi/ic_zoom_out.png differ diff --git a/android/res/drawable-ldpi/ic_btn_zoom_in.png b/android/res/drawable-ldpi/ic_btn_zoom_in.png deleted file mode 100644 index 8c8b2e24c0..0000000000 Binary files a/android/res/drawable-ldpi/ic_btn_zoom_in.png and /dev/null differ diff --git a/android/res/drawable-ldpi/ic_btn_zoom_out.png b/android/res/drawable-ldpi/ic_btn_zoom_out.png deleted file mode 100644 index 6e8dbfcf53..0000000000 Binary files a/android/res/drawable-ldpi/ic_btn_zoom_out.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_bg_zoom_normal.png b/android/res/drawable-mdpi/ic_bg_zoom_normal.png new file mode 100644 index 0000000000..b54f866a4c Binary files /dev/null and b/android/res/drawable-mdpi/ic_bg_zoom_normal.png differ diff --git a/android/res/drawable-mdpi/ic_bg_zoom_pressed.png b/android/res/drawable-mdpi/ic_bg_zoom_pressed.png new file mode 100644 index 0000000000..6a11a96d2f Binary files /dev/null and b/android/res/drawable-mdpi/ic_bg_zoom_pressed.png differ diff --git a/android/res/drawable-mdpi/ic_btn_zoom_in.png b/android/res/drawable-mdpi/ic_btn_zoom_in.png deleted file mode 100644 index 44bbab4a75..0000000000 Binary files a/android/res/drawable-mdpi/ic_btn_zoom_in.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_btn_zoom_out.png b/android/res/drawable-mdpi/ic_btn_zoom_out.png deleted file mode 100644 index 613cac23c9..0000000000 Binary files a/android/res/drawable-mdpi/ic_btn_zoom_out.png and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_zoom_in.png b/android/res/drawable-mdpi/ic_zoom_in.png new file mode 100644 index 0000000000..61029c5d88 Binary files /dev/null and b/android/res/drawable-mdpi/ic_zoom_in.png differ diff --git a/android/res/drawable-mdpi/ic_zoom_out.png b/android/res/drawable-mdpi/ic_zoom_out.png new file mode 100644 index 0000000000..8ee5623c8b Binary files /dev/null and b/android/res/drawable-mdpi/ic_zoom_out.png differ diff --git a/android/res/drawable-xhdpi/ic_bg_zoom_normal.png b/android/res/drawable-xhdpi/ic_bg_zoom_normal.png new file mode 100644 index 0000000000..16b8112e77 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_bg_zoom_normal.png differ diff --git a/android/res/drawable-xhdpi/ic_bg_zoom_pressed.png b/android/res/drawable-xhdpi/ic_bg_zoom_pressed.png new file mode 100644 index 0000000000..15f8c5ff80 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_bg_zoom_pressed.png differ diff --git a/android/res/drawable-xhdpi/ic_btn_zoom_in.png b/android/res/drawable-xhdpi/ic_btn_zoom_in.png deleted file mode 100644 index 366966197c..0000000000 Binary files a/android/res/drawable-xhdpi/ic_btn_zoom_in.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_btn_zoom_out.png b/android/res/drawable-xhdpi/ic_btn_zoom_out.png deleted file mode 100644 index 4b6807e177..0000000000 Binary files a/android/res/drawable-xhdpi/ic_btn_zoom_out.png and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_zoom_in.png b/android/res/drawable-xhdpi/ic_zoom_in.png new file mode 100644 index 0000000000..9dbe5fbd5a Binary files /dev/null and b/android/res/drawable-xhdpi/ic_zoom_in.png differ diff --git a/android/res/drawable-xhdpi/ic_zoom_out.png b/android/res/drawable-xhdpi/ic_zoom_out.png new file mode 100644 index 0000000000..8aaed3cd3c Binary files /dev/null and b/android/res/drawable-xhdpi/ic_zoom_out.png differ diff --git a/android/res/drawable-xxhdpi/ic_bg_zoom_normal.png b/android/res/drawable-xxhdpi/ic_bg_zoom_normal.png new file mode 100644 index 0000000000..b4d81f5429 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_bg_zoom_normal.png differ diff --git a/android/res/drawable-xxhdpi/ic_bg_zoom_pressed.png b/android/res/drawable-xxhdpi/ic_bg_zoom_pressed.png new file mode 100644 index 0000000000..484571f807 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_bg_zoom_pressed.png differ diff --git a/android/res/drawable-xxhdpi/ic_btn_zoom_in.png b/android/res/drawable-xxhdpi/ic_btn_zoom_in.png deleted file mode 100644 index d1e3fa86a4..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_btn_zoom_in.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_btn_zoom_out.png b/android/res/drawable-xxhdpi/ic_btn_zoom_out.png deleted file mode 100644 index 08af184dff..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_btn_zoom_out.png and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_zoom_in.png b/android/res/drawable-xxhdpi/ic_zoom_in.png new file mode 100644 index 0000000000..40170fe191 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_zoom_in.png differ diff --git a/android/res/drawable-xxhdpi/ic_zoom_out.png b/android/res/drawable-xxhdpi/ic_zoom_out.png new file mode 100644 index 0000000000..1d7ddce42e Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_zoom_out.png differ diff --git a/android/res/drawable/btn_zoom_bg_selector.xml b/android/res/drawable/bg_btn_zoom.xml similarity index 66% rename from android/res/drawable/btn_zoom_bg_selector.xml rename to android/res/drawable/bg_btn_zoom.xml index ffd1fcec86..04e7b71880 100644 --- a/android/res/drawable/btn_zoom_bg_selector.xml +++ b/android/res/drawable/bg_btn_zoom.xml @@ -5,7 +5,7 @@ android:exitFadeDuration="200" tools:ignore="UnusedAttribute"> - - + + \ No newline at end of file diff --git a/android/res/layout-sw600dp/map_navigation_buttons.xml b/android/res/layout-sw600dp/map_navigation_buttons.xml index e14c1a239b..ea34dc1a23 100644 --- a/android/res/layout-sw600dp/map_navigation_buttons.xml +++ b/android/res/layout-sw600dp/map_navigation_buttons.xml @@ -21,20 +21,20 @@ style="@style/Widget.MapButtonZoom" android:layout_width="@dimen/zoom_buttom_size" android:layout_height="@dimen/zoom_buttom_size" + android:layout_above="@+id/map_button_minus" android:layout_alignParentRight="true" - android:layout_below="@id/yop_it" - android:layout_marginTop="@dimen/margin_large" android:onClick="onPlusClicked" - android:src="@drawable/ic_btn_zoom_in"/> + android:src="@drawable/ic_zoom_in"/> + android:src="@drawable/ic_zoom_out"/> diff --git a/android/res/layout/map_navigation_buttons.xml b/android/res/layout/map_navigation_buttons.xml index 8adfd60546..bd28f5f0a8 100644 --- a/android/res/layout/map_navigation_buttons.xml +++ b/android/res/layout/map_navigation_buttons.xml @@ -32,7 +32,7 @@ android:layout_alignParentRight="true" android:layout_below="@id/anchor_center" android:onClick="onPlusClicked" - android:src="@drawable/ic_btn_zoom_in"/> + android:src="@drawable/ic_zoom_in"/> + android:src="@drawable/ic_zoom_out"/> diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml index dee01598b4..c05ea76c38 100644 --- a/android/res/values/dimens.xml +++ b/android/res/values/dimens.xml @@ -46,7 +46,7 @@ 24dp 320dp - 40dp + 56dp 56dp 56dp diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml index 8bec8e3eea..435e11277d 100644 --- a/android/res/values/styles.xml +++ b/android/res/values/styles.xml @@ -54,7 +54,7 @@