pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] fixed main menu restore state.

Browse source
This commit is contained in:
Roman Romanov 2016-11-07 16:17:16 +04:00 • committed by Ilya Grechuhin
parent 4810a62b55
commit a0272693cf
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/mapswithme/maps/MwmActivity.java
View file

@ -894,7 +894,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void adjustZoomButtons()
{
UiUtils.showIf(showZoomButtons(), mNavZoomIn, mNavZoomOut);
UiUtils.showIf(showZoomButtons() && !mIsFullscreen, mNavZoomIn, mNavZoomOut);
// TODO animate zoom buttons & myposition
}
@ -1334,7 +1334,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
mNavigationController.show(true);
mSearchController.hide();
mMainMenu.setState(MainMenu.State.NAVIGATION, false);
mMainMenu.setState(MainMenu.State.NAVIGATION, false, mIsFullscreen);
return;
}
@ -1345,11 +1345,11 @@ public class MwmActivity extends BaseMwmFragmentActivity
}
else if (RoutingController.get().isPlanning())
{
mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, false);
mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, false, mIsFullscreen);
return;
}
mMainMenu.setState(MainMenu.State.MENU, false);
mMainMenu.setState(MainMenu.State.MENU, false, mIsFullscreen);
}
private void adjustMenuLineFrameVisibility()

6
android/src/com/mapswithme/maps/widget/menu/MainMenu.java
View file

@ -222,7 +222,7 @@ public class MainMenu extends BaseMenu
mapItem(Item.SETTINGS);
adjustCollapsedItems();
setState(State.MENU, false);
setState(State.MENU, false, false);
}
public MainMenu(View frame, ItemClickListener<Item> itemClickListener)
@ -250,7 +250,7 @@ public class MainMenu extends BaseMenu
return R.dimen.menu_line_height;
}
public void setState(State state, boolean animateToggle)
public void setState(State state, boolean animateToggle, boolean isFullScreen)
{
if (state != State.NAVIGATION)
{
@ -281,7 +281,7 @@ public class MainMenu extends BaseMenu
if (mLayoutMeasured)
{
show(state != State.NAVIGATION);
show(state != State.NAVIGATION && !isFullScreen);
mContentFrame.measure(ViewGroup.LayoutParams.MATCH_PARENT,
ViewGroup.LayoutParams.WRAP_CONTENT);
mContentHeight = mContentFrame.getMeasuredHeight();