diff --git a/android/res/drawable-hdpi/ic_follow.png b/android/res/drawable-hdpi/ic_follow.png index aac1191362..b51c1413f9 100644 Binary files a/android/res/drawable-hdpi/ic_follow.png and b/android/res/drawable-hdpi/ic_follow.png differ diff --git a/android/res/drawable-hdpi/ic_follow_and_rotate.png b/android/res/drawable-hdpi/ic_follow_and_rotate.png index 03afc0ba58..97a27474ee 100644 Binary files a/android/res/drawable-hdpi/ic_follow_and_rotate.png and b/android/res/drawable-hdpi/ic_follow_and_rotate.png differ diff --git a/android/res/drawable-hdpi/ic_menu_bookmarks.png b/android/res/drawable-hdpi/ic_menu_bookmarks.png index eddac6cb1e..41c45478f8 100644 Binary files a/android/res/drawable-hdpi/ic_menu_bookmarks.png and b/android/res/drawable-hdpi/ic_menu_bookmarks.png differ diff --git a/android/res/drawable-hdpi/ic_menu_close.png b/android/res/drawable-hdpi/ic_menu_close.png index 6a0643d966..d84e7beb85 100644 Binary files a/android/res/drawable-hdpi/ic_menu_close.png and b/android/res/drawable-hdpi/ic_menu_close.png differ diff --git a/android/res/drawable-hdpi/ic_menu_download.png b/android/res/drawable-hdpi/ic_menu_download.png index 115660c582..2ce688fc9f 100644 Binary files a/android/res/drawable-hdpi/ic_menu_download.png and b/android/res/drawable-hdpi/ic_menu_download.png differ diff --git a/android/res/drawable-hdpi/ic_menu_open.png b/android/res/drawable-hdpi/ic_menu_open.png index ecb5597dbf..d89334dab3 100644 Binary files a/android/res/drawable-hdpi/ic_menu_open.png and b/android/res/drawable-hdpi/ic_menu_open.png differ diff --git a/android/res/drawable-hdpi/ic_menu_point_to_point.png b/android/res/drawable-hdpi/ic_menu_point_to_point.png index d7f8a951f7..3c68b63f16 100644 Binary files a/android/res/drawable-hdpi/ic_menu_point_to_point.png and b/android/res/drawable-hdpi/ic_menu_point_to_point.png differ diff --git a/android/res/drawable-hdpi/ic_menu_search.png b/android/res/drawable-hdpi/ic_menu_search.png index a5ce4ca5cb..c067478675 100644 Binary files a/android/res/drawable-hdpi/ic_menu_search.png and b/android/res/drawable-hdpi/ic_menu_search.png differ diff --git a/android/res/drawable-hdpi/ic_menu_settings.png b/android/res/drawable-hdpi/ic_menu_settings.png index 259f1341c2..c6243d6bb4 100644 Binary files a/android/res/drawable-hdpi/ic_menu_settings.png and b/android/res/drawable-hdpi/ic_menu_settings.png differ diff --git a/android/res/drawable-hdpi/ic_no_position.png b/android/res/drawable-hdpi/ic_no_position.png index 8737e7fc33..98c9c3dbd5 100644 Binary files a/android/res/drawable-hdpi/ic_no_position.png and b/android/res/drawable-hdpi/ic_no_position.png differ diff --git a/android/res/drawable-hdpi/ic_not_follow.png b/android/res/drawable-hdpi/ic_not_follow.png index 1c52756708..c2a42a373a 100644 Binary files a/android/res/drawable-hdpi/ic_not_follow.png and b/android/res/drawable-hdpi/ic_not_follow.png differ diff --git a/android/res/drawable-mdpi/ic_follow.png b/android/res/drawable-mdpi/ic_follow.png index e01576c73b..39db1847d1 100644 Binary files a/android/res/drawable-mdpi/ic_follow.png and b/android/res/drawable-mdpi/ic_follow.png differ diff --git a/android/res/drawable-mdpi/ic_follow_and_rotate.png b/android/res/drawable-mdpi/ic_follow_and_rotate.png index aa4c0231a7..932305e38a 100644 Binary files a/android/res/drawable-mdpi/ic_follow_and_rotate.png and b/android/res/drawable-mdpi/ic_follow_and_rotate.png differ diff --git a/android/res/drawable-mdpi/ic_menu_bookmarks.png b/android/res/drawable-mdpi/ic_menu_bookmarks.png index cf4a055469..9fd80e91cd 100644 Binary files a/android/res/drawable-mdpi/ic_menu_bookmarks.png and b/android/res/drawable-mdpi/ic_menu_bookmarks.png differ diff --git a/android/res/drawable-mdpi/ic_menu_close.png b/android/res/drawable-mdpi/ic_menu_close.png index d5ecaefb5b..54ec87e8b8 100644 Binary files a/android/res/drawable-mdpi/ic_menu_close.png and b/android/res/drawable-mdpi/ic_menu_close.png differ diff --git a/android/res/drawable-mdpi/ic_menu_download.png b/android/res/drawable-mdpi/ic_menu_download.png index 45f6cfd915..6698137ec6 100644 Binary files a/android/res/drawable-mdpi/ic_menu_download.png and b/android/res/drawable-mdpi/ic_menu_download.png differ diff --git a/android/res/drawable-mdpi/ic_menu_open.png b/android/res/drawable-mdpi/ic_menu_open.png index b4b8e61b83..573a623fba 100644 Binary files a/android/res/drawable-mdpi/ic_menu_open.png and b/android/res/drawable-mdpi/ic_menu_open.png differ diff --git a/android/res/drawable-mdpi/ic_menu_point_to_point.png b/android/res/drawable-mdpi/ic_menu_point_to_point.png index 8108b59421..57affdcc87 100644 Binary files a/android/res/drawable-mdpi/ic_menu_point_to_point.png and b/android/res/drawable-mdpi/ic_menu_point_to_point.png differ diff --git a/android/res/drawable-mdpi/ic_menu_search.png b/android/res/drawable-mdpi/ic_menu_search.png index cc1e463414..8369df7074 100644 Binary files a/android/res/drawable-mdpi/ic_menu_search.png and b/android/res/drawable-mdpi/ic_menu_search.png differ diff --git a/android/res/drawable-mdpi/ic_menu_settings.png b/android/res/drawable-mdpi/ic_menu_settings.png index 2cb866ab95..c3a3623a54 100644 Binary files a/android/res/drawable-mdpi/ic_menu_settings.png and b/android/res/drawable-mdpi/ic_menu_settings.png differ diff --git a/android/res/drawable-mdpi/ic_no_position.png b/android/res/drawable-mdpi/ic_no_position.png index 42df503571..84eb90d724 100644 Binary files a/android/res/drawable-mdpi/ic_no_position.png and b/android/res/drawable-mdpi/ic_no_position.png differ diff --git a/android/res/drawable-mdpi/ic_not_follow.png b/android/res/drawable-mdpi/ic_not_follow.png index af11c118d0..c1946dd54b 100644 Binary files a/android/res/drawable-mdpi/ic_not_follow.png and b/android/res/drawable-mdpi/ic_not_follow.png differ diff --git a/android/res/drawable-xhdpi/ic_follow.png b/android/res/drawable-xhdpi/ic_follow.png index 17a1411b64..0fdc96a78d 100644 Binary files a/android/res/drawable-xhdpi/ic_follow.png and b/android/res/drawable-xhdpi/ic_follow.png differ diff --git a/android/res/drawable-xhdpi/ic_follow_and_rotate.png b/android/res/drawable-xhdpi/ic_follow_and_rotate.png index 418d50bb7a..052a863394 100644 Binary files a/android/res/drawable-xhdpi/ic_follow_and_rotate.png and b/android/res/drawable-xhdpi/ic_follow_and_rotate.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_bookmarks.png b/android/res/drawable-xhdpi/ic_menu_bookmarks.png index 9a6fd49c9a..b9b4532b2c 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_bookmarks.png and b/android/res/drawable-xhdpi/ic_menu_bookmarks.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_close.png b/android/res/drawable-xhdpi/ic_menu_close.png index a9f4c6b832..b7ceea5fb1 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_close.png and b/android/res/drawable-xhdpi/ic_menu_close.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_download.png b/android/res/drawable-xhdpi/ic_menu_download.png index de338bd861..a66bcbfefe 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_download.png and b/android/res/drawable-xhdpi/ic_menu_download.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_open.png b/android/res/drawable-xhdpi/ic_menu_open.png index 6ec444ee17..f035c15fa2 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_open.png and b/android/res/drawable-xhdpi/ic_menu_open.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_point_to_point.png b/android/res/drawable-xhdpi/ic_menu_point_to_point.png index 65b7cc4cc5..5a6a66b45e 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_point_to_point.png and b/android/res/drawable-xhdpi/ic_menu_point_to_point.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_search.png b/android/res/drawable-xhdpi/ic_menu_search.png index b6dc5c5e0e..2cbbdad3e9 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_search.png and b/android/res/drawable-xhdpi/ic_menu_search.png differ diff --git a/android/res/drawable-xhdpi/ic_menu_settings.png b/android/res/drawable-xhdpi/ic_menu_settings.png index 5af76051e6..fdf67f0e36 100644 Binary files a/android/res/drawable-xhdpi/ic_menu_settings.png and b/android/res/drawable-xhdpi/ic_menu_settings.png differ diff --git a/android/res/drawable-xhdpi/ic_no_position.png b/android/res/drawable-xhdpi/ic_no_position.png index 720b6f15b6..90b7823682 100644 Binary files a/android/res/drawable-xhdpi/ic_no_position.png and b/android/res/drawable-xhdpi/ic_no_position.png differ diff --git a/android/res/drawable-xhdpi/ic_not_follow.png b/android/res/drawable-xhdpi/ic_not_follow.png index 32b0c8d139..e04783cfa3 100644 Binary files a/android/res/drawable-xhdpi/ic_not_follow.png and b/android/res/drawable-xhdpi/ic_not_follow.png differ diff --git a/android/res/drawable-xxhdpi/ic_follow.png b/android/res/drawable-xxhdpi/ic_follow.png index ed92f05a10..856c80cb07 100644 Binary files a/android/res/drawable-xxhdpi/ic_follow.png and b/android/res/drawable-xxhdpi/ic_follow.png differ diff --git a/android/res/drawable-xxhdpi/ic_follow_and_rotate.png b/android/res/drawable-xxhdpi/ic_follow_and_rotate.png index 4867f2f3fb..2d9f57361c 100644 Binary files a/android/res/drawable-xxhdpi/ic_follow_and_rotate.png and b/android/res/drawable-xxhdpi/ic_follow_and_rotate.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_bookmarks.png b/android/res/drawable-xxhdpi/ic_menu_bookmarks.png index 780234552f..f984e641e8 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_bookmarks.png and b/android/res/drawable-xxhdpi/ic_menu_bookmarks.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_close.png b/android/res/drawable-xxhdpi/ic_menu_close.png index 655ee9d9b5..6ca24419ea 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_close.png and b/android/res/drawable-xxhdpi/ic_menu_close.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_download.png b/android/res/drawable-xxhdpi/ic_menu_download.png index 2031634db5..34fc2c67f5 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_download.png and b/android/res/drawable-xxhdpi/ic_menu_download.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_open.png b/android/res/drawable-xxhdpi/ic_menu_open.png index 1962cbefae..6658de79f6 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_open.png and b/android/res/drawable-xxhdpi/ic_menu_open.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_point_to_point.png b/android/res/drawable-xxhdpi/ic_menu_point_to_point.png index 9dae378b0a..4838523a4f 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_point_to_point.png and b/android/res/drawable-xxhdpi/ic_menu_point_to_point.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_search.png b/android/res/drawable-xxhdpi/ic_menu_search.png index c359195a1a..5bbbe6586c 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_search.png and b/android/res/drawable-xxhdpi/ic_menu_search.png differ diff --git a/android/res/drawable-xxhdpi/ic_menu_settings.png b/android/res/drawable-xxhdpi/ic_menu_settings.png index eb36a4246a..9fe43e24b0 100644 Binary files a/android/res/drawable-xxhdpi/ic_menu_settings.png and b/android/res/drawable-xxhdpi/ic_menu_settings.png differ diff --git a/android/res/drawable-xxhdpi/ic_no_position.png b/android/res/drawable-xxhdpi/ic_no_position.png index 6a3cc918a0..bf28e0818c 100644 Binary files a/android/res/drawable-xxhdpi/ic_no_position.png and b/android/res/drawable-xxhdpi/ic_no_position.png differ diff --git a/android/res/drawable-xxhdpi/ic_not_follow.png b/android/res/drawable-xxhdpi/ic_not_follow.png index 81e6e3a32b..95838f920f 100644 Binary files a/android/res/drawable-xxhdpi/ic_not_follow.png and b/android/res/drawable-xxhdpi/ic_not_follow.png differ diff --git a/android/res/drawable-xxxhdpi/ic_follow.png b/android/res/drawable-xxxhdpi/ic_follow.png index f6f554598c..b06e7901b5 100644 Binary files a/android/res/drawable-xxxhdpi/ic_follow.png and b/android/res/drawable-xxxhdpi/ic_follow.png differ diff --git a/android/res/drawable-xxxhdpi/ic_follow_and_rotate.png b/android/res/drawable-xxxhdpi/ic_follow_and_rotate.png index 211cbf95a4..2bc2695e63 100644 Binary files a/android/res/drawable-xxxhdpi/ic_follow_and_rotate.png and b/android/res/drawable-xxxhdpi/ic_follow_and_rotate.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_bookmarks.png b/android/res/drawable-xxxhdpi/ic_menu_bookmarks.png index 5c9c2640ea..e20b052504 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_bookmarks.png and b/android/res/drawable-xxxhdpi/ic_menu_bookmarks.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_close.png b/android/res/drawable-xxxhdpi/ic_menu_close.png index 4d44f8055d..72dd7e8e95 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_close.png and b/android/res/drawable-xxxhdpi/ic_menu_close.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_download.png b/android/res/drawable-xxxhdpi/ic_menu_download.png index 5ca25e2a61..688f15b4aa 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_download.png and b/android/res/drawable-xxxhdpi/ic_menu_download.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_open.png b/android/res/drawable-xxxhdpi/ic_menu_open.png index bf808dd29c..5f72d1aaba 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_open.png and b/android/res/drawable-xxxhdpi/ic_menu_open.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_point_to_point.png b/android/res/drawable-xxxhdpi/ic_menu_point_to_point.png index a873fc7c7e..e5dabfe3ae 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_point_to_point.png and b/android/res/drawable-xxxhdpi/ic_menu_point_to_point.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_search.png b/android/res/drawable-xxxhdpi/ic_menu_search.png index 17d3718ccb..c40e05d5f4 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_search.png and b/android/res/drawable-xxxhdpi/ic_menu_search.png differ diff --git a/android/res/drawable-xxxhdpi/ic_menu_settings.png b/android/res/drawable-xxxhdpi/ic_menu_settings.png index 4aafcb5f93..fb9af8fd10 100644 Binary files a/android/res/drawable-xxxhdpi/ic_menu_settings.png and b/android/res/drawable-xxxhdpi/ic_menu_settings.png differ diff --git a/android/res/drawable-xxxhdpi/ic_no_position.png b/android/res/drawable-xxxhdpi/ic_no_position.png index 0784ead0b7..2155e59ab2 100644 Binary files a/android/res/drawable-xxxhdpi/ic_no_position.png and b/android/res/drawable-xxxhdpi/ic_no_position.png differ diff --git a/android/res/drawable-xxxhdpi/ic_not_follow.png b/android/res/drawable-xxxhdpi/ic_not_follow.png index 2fbed0edbb..e555046c97 100644 Binary files a/android/res/drawable-xxxhdpi/ic_not_follow.png and b/android/res/drawable-xxxhdpi/ic_not_follow.png differ diff --git a/android/res/layout-w840dp/menu_buttons_line.xml b/android/res/layout-w840dp/menu_buttons_line.xml index 4e177ba9fd..fdbc795b97 100644 --- a/android/res/layout-w840dp/menu_buttons_line.xml +++ b/android/res/layout-w840dp/menu_buttons_line.xml @@ -5,15 +5,12 @@ android:orientation="horizontal"> + android:layout_height="match_parent"/> + android:layout_width="@dimen/menu_line_button_width" + android:layout_height="match_parent"/> + android:src="@drawable/ic_menu_search"/> - + tools:visibility="visible"/ --> + android:src="@drawable/ic_menu_bookmarks"/> + android:src="@drawable/ic_menu_share"/> + android:src="@drawable/ic_menu_download"/> diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java index 7ebead89ee..80e5c5cbdf 100644 --- a/android/src/com/mapswithme/maps/MwmActivity.java +++ b/android/src/com/mapswithme/maps/MwmActivity.java @@ -635,9 +635,9 @@ public class MwmActivity extends BaseMwmFragmentActivity }); break; - case ROUTE: + /*case ROUTE: buildRoute(); - break; + break;*/ case BOOKMARKS: closeMenuAndRun(AlohaHelper.TOOLBAR_BOOKMARKS, new Runnable() diff --git a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java index dd2e7e8ede..e57738236b 100644 --- a/android/src/com/mapswithme/maps/widget/menu/MainMenu.java +++ b/android/src/com/mapswithme/maps/widget/menu/MainMenu.java @@ -34,7 +34,7 @@ public class MainMenu private static final String STATE_OPEN = "MenuOpen"; private static final String STATE_LAST_INFO = "MenuLastInfo"; - private final int mButtonsHeight = UiUtils.dimen(R.dimen.menu_line_height); + private final int mButtonsWidth = UiUtils.dimen(R.dimen.menu_line_button_width); private final int mPanelWidth = UiUtils.dimen(R.dimen.panel_width); @@ -87,7 +87,7 @@ public class MainMenu mToggle.animateCollapse(!collapsed); - mSymmetricalGapScale = (float) mButtonsHeight / mPanelWidth; + mSymmetricalGapScale = (float) mButtonsWidth / mPanelWidth; } @Override @@ -112,7 +112,7 @@ public class MainMenu return; lp = (LinearLayout.LayoutParams) mAnimationSymmetricalGap.getLayoutParams(); - lp.width = mButtonsHeight - (int) (mSymmetricalGapScale * offset); + lp.width = mButtonsWidth - (int) (mSymmetricalGapScale * offset); mAnimationSymmetricalGap.setLayoutParams(lp); } }; @@ -122,7 +122,7 @@ public class MainMenu { TOGGLE(R.id.toggle), SEARCH(R.id.search), - ROUTE(R.id.route), + //ROUTE(R.id.route), BOOKMARKS(R.id.bookmarks), SHARE(R.id.share), DOWNLOADER(R.id.download_maps), @@ -183,8 +183,8 @@ public class MainMenu mAlwaysShow = (mFrame.findViewById(R.id.disable_toggle) == null); mapItem(Item.TOGGLE, frame); - @SuppressWarnings("SuspiciousNameCombination") - Rect bounds = new Rect(0, 0, mButtonsHeight, mButtonsHeight); + int sz = UiUtils.dimen(R.dimen.menu_line_height); + Rect bounds = new Rect(0, 0, sz, sz); mOpenImage = new TrackedTransitionDrawable(new Drawable[] { new RotateByAlphaDrawable(R.drawable.ic_menu_open, false) .setInnerBounds(bounds), @@ -276,7 +276,7 @@ public class MainMenu return; LinearLayout.LayoutParams lp = (LinearLayout.LayoutParams) mAnimationSymmetricalGap.getLayoutParams(); - lp.width = (mCollapsed ? 0 : mButtonsHeight); + lp.width = (mCollapsed ? 0 : mButtonsWidth); mAnimationSymmetricalGap.setLayoutParams(lp); } @@ -358,7 +358,7 @@ public class MainMenu private void init() { mapItem(Item.SEARCH); - mapItem(Item.ROUTE); + //mapItem(Item.ROUTE); mapItem(Item.BOOKMARKS); mapItem(Item.SHARE); mapItem(Item.DOWNLOADER);