[android] fix: Menu fit problem on Nexus 7.
fix: Menu icons updated.
Before ![]() (image error) Size: 614 B After ![]() (image error) Size: 680 B ![]() ![]() |
Before ![]() (image error) Size: 663 B After ![]() (image error) Size: 639 B ![]() ![]() |
Before ![]() (image error) Size: 394 B After ![]() (image error) Size: 365 B ![]() ![]() |
Before ![]() (image error) Size: 196 B After ![]() (image error) Size: 200 B ![]() ![]() |
Before ![]() (image error) Size: 590 B After ![]() (image error) Size: 572 B ![]() ![]() |
Before ![]() (image error) Size: 168 B After ![]() (image error) Size: 167 B ![]() ![]() |
Before ![]() (image error) Size: 299 B After ![]() (image error) Size: 289 B ![]() ![]() |
Before ![]() (image error) Size: 458 B After ![]() (image error) Size: 472 B ![]() ![]() |
Before ![]() (image error) Size: 458 B After ![]() (image error) Size: 474 B ![]() ![]() |
Before ![]() (image error) Size: 397 B After ![]() (image error) Size: 329 B ![]() ![]() |
Before ![]() (image error) Size: 369 B After ![]() (image error) Size: 413 B ![]() ![]() |
Before ![]() (image error) Size: 440 B After ![]() (image error) Size: 477 B ![]() ![]() |
Before ![]() (image error) Size: 472 B After ![]() (image error) Size: 416 B ![]() ![]() |
Before ![]() (image error) Size: 273 B After ![]() (image error) Size: 248 B ![]() ![]() |
Before ![]() (image error) Size: 152 B After ![]() (image error) Size: 159 B ![]() ![]() |
Before ![]() (image error) Size: 386 B After ![]() (image error) Size: 360 B ![]() ![]() |
Before ![]() (image error) Size: 105 B After ![]() (image error) Size: 117 B ![]() ![]() |
Before ![]() (image error) Size: 223 B After ![]() (image error) Size: 222 B ![]() ![]() |
Before ![]() (image error) Size: 330 B After ![]() (image error) Size: 317 B ![]() ![]() |
Before ![]() (image error) Size: 330 B After ![]() (image error) Size: 333 B ![]() ![]() |
Before ![]() (image error) Size: 287 B After ![]() (image error) Size: 240 B ![]() ![]() |
Before ![]() (image error) Size: 250 B After ![]() (image error) Size: 272 B ![]() ![]() |
Before ![]() (image error) Size: 783 B After ![]() (image error) Size: 859 B ![]() ![]() |
Before ![]() (image error) Size: 832 B After ![]() (image error) Size: 749 B ![]() ![]() |
Before ![]() (image error) Size: 508 B After ![]() (image error) Size: 414 B ![]() ![]() |
Before ![]() (image error) Size: 239 B After ![]() (image error) Size: 234 B ![]() ![]() |
Before ![]() (image error) Size: 743 B After ![]() (image error) Size: 688 B ![]() ![]() |
Before ![]() (image error) Size: 146 B After ![]() (image error) Size: 145 B ![]() ![]() |
Before ![]() (image error) Size: 378 B After ![]() (image error) Size: 380 B ![]() ![]() |
Before ![]() (image error) Size: 532 B After ![]() (image error) Size: 605 B ![]() ![]() |
Before ![]() (image error) Size: 594 B After ![]() (image error) Size: 608 B ![]() ![]() |
Before ![]() (image error) Size: 500 B After ![]() (image error) Size: 407 B ![]() ![]() |
Before ![]() (image error) Size: 440 B After ![]() (image error) Size: 508 B ![]() ![]() |
Before ![]() (image error) Size: 1.1 KiB After ![]() (image error) Size: 1.2 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.1 KiB After ![]() (image error) Size: 1.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 720 B After ![]() (image error) Size: 611 B ![]() ![]() |
Before ![]() (image error) Size: 312 B After ![]() (image error) Size: 304 B ![]() ![]() |
Before ![]() (image error) Size: 1 KiB After ![]() (image error) Size: 1 KiB ![]() ![]() |
Before ![]() (image error) Size: 187 B After ![]() (image error) Size: 217 B ![]() ![]() |
Before ![]() (image error) Size: 533 B After ![]() (image error) Size: 532 B ![]() ![]() |
Before ![]() (image error) Size: 856 B After ![]() (image error) Size: 884 B ![]() ![]() |
Before ![]() (image error) Size: 853 B After ![]() (image error) Size: 859 B ![]() ![]() |
Before ![]() (image error) Size: 671 B After ![]() (image error) Size: 560 B ![]() ![]() |
Before ![]() (image error) Size: 674 B After ![]() (image error) Size: 740 B ![]() ![]() |
Before ![]() (image error) Size: 1.2 KiB After ![]() (image error) Size: 1.4 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.2 KiB After ![]() (image error) Size: 1.4 KiB ![]() ![]() |
Before ![]() (image error) Size: 997 B After ![]() (image error) Size: 780 B ![]() ![]() |
Before ![]() (image error) Size: 418 B After ![]() (image error) Size: 396 B ![]() ![]() |
Before ![]() (image error) Size: 1.3 KiB After ![]() (image error) Size: 1.3 KiB ![]() ![]() |
Before ![]() (image error) Size: 230 B After ![]() (image error) Size: 228 B ![]() ![]() |
Before ![]() (image error) Size: 753 B After ![]() (image error) Size: 752 B ![]() ![]() |
Before ![]() (image error) Size: 1,011 B After ![]() (image error) Size: 1.2 KiB ![]() ![]() |
Before ![]() (image error) Size: 1.1 KiB After ![]() (image error) Size: 1.1 KiB ![]() ![]() |
Before ![]() (image error) Size: 869 B After ![]() (image error) Size: 682 B ![]() ![]() |
Before ![]() (image error) Size: 891 B After ![]() (image error) Size: 1,003 B ![]() ![]() |
|
@ -5,15 +5,12 @@
|
|||
android:orientation="horizontal">
|
||||
<!-- Gap for MyPosition button -->
|
||||
<View android:layout_width="@dimen/menu_line_button_width_edge"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<!-- Fake view to make layout symmetrical -->
|
||||
<Space android:id="@+id/symmetrical_gap"
|
||||
android:layout_width="@dimen/menu_line_height"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:layout_width="@dimen/menu_line_button_width"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<!-- Anchor ID. Disables menu toggle button if present. -->
|
||||
<Space android:id="@+id/disable_toggle"
|
||||
|
@ -23,29 +20,21 @@
|
|||
|
||||
<ImageView android:id="@+id/search"
|
||||
style="@style/MwmTheme.Menu.Line.Button"
|
||||
android:src="@drawable/ic_menu_search"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:src="@drawable/ic_menu_search"/>
|
||||
|
||||
<ImageView android:id="@+id/route"
|
||||
<!-- ImageView android:id="@+id/route"
|
||||
style="@style/MwmTheme.Menu.Line.Button"
|
||||
android:src="@drawable/ic_menu_point_to_point"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
tools:visibility="visible"/ -->
|
||||
|
||||
<ImageView android:id="@+id/bookmarks"
|
||||
style="@style/MwmTheme.Menu.Line.Button"
|
||||
android:src="@drawable/ic_menu_bookmarks"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:src="@drawable/ic_menu_bookmarks"/>
|
||||
|
||||
<ImageView android:id="@+id/share"
|
||||
style="@style/MwmTheme.Menu.Line.Button"
|
||||
android:src="@drawable/ic_menu_share"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:src="@drawable/ic_menu_share"/>
|
||||
|
||||
<Space android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
|
@ -55,9 +44,7 @@
|
|||
android:layout_height="match_parent">
|
||||
<ImageView android:id="@+id/download_maps"
|
||||
style="@style/MwmTheme.Menu.Line.Button"
|
||||
android:src="@drawable/ic_menu_download"
|
||||
android:layout_marginLeft="@dimen/margin_base"
|
||||
android:layout_marginRight="@dimen/margin_base"/>
|
||||
android:src="@drawable/ic_menu_download"/>
|
||||
|
||||
<include layout="@layout/menu_news_marker"/>
|
||||
</FrameLayout>
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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);
|
||||
|
|