map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[Android] Fixed zoom buttons position after Android unlock

Browse source 
Signed-off-by: S. Kozyr <s.trump@gmail.com>
This commit is contained in:
Sergiy Kozyr 2023-09-18 12:58:07 +03:00 • committed by Alexander Borsuk
parent 97dd635403
commit 4f41095d1d
2 changed files with 16 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
android/app/src/main/java/app/organicmaps/MwmActivity.java
View file

@ -829,9 +829,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void initMainMenu()
{
final View menuFrame = findViewById(R.id.menu_frame);
mMainMenu = new MainMenu(menuFrame, () -> {
mMainMenu = new MainMenu(menuFrame, (visible) -> {
this.updateBottomWidgetsOffset();
mPlacePageViewModel.setPlacePageDistanceToTop(menuFrame.getTop());
if (visible)
mPlacePageViewModel.setPlacePageDistanceToTop(menuFrame.getTop());
});
if (mIsTabletLayout)
@ -1272,11 +1273,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void updateMenu()
{
boolean isVisible = adjustMenuLineFrameVisibility();
if (!isVisible)
return;
final RoutingController controller = RoutingController.get();
if (RoutingController.get().isNavigating())
if (controller.isNavigating())
{
mNavigationController.show(true);
closeSearchToolbar(false, false);
@ -1284,39 +1283,25 @@ public class MwmActivity extends BaseMwmFragmentActivity
return;
}
if (RoutingController.get().isPlanning())
{
mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, isFullscreen());
return;
}
mMainMenu.setState(MainMenu.State.MENU, isFullscreen());
}
private boolean adjustMenuLineFrameVisibility()
{
final RoutingController controller = RoutingController.get();
if (controller.isBuilt())
{
showMainMenu(true);
return true;
return;
}
if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered())
{
if (showAddStartOrFinishFrame(controller, true))
{
return true;
}
return;
showMainMenu(false);
return false;
if (controller.isPlanning())
{
mMainMenu.setState(MainMenu.State.ROUTE_PREPARE, isFullscreen());
return;
}
}
hideRoutingActionFrame();
showMainMenu(true);
return true;
mMainMenu.setState(MainMenu.State.MENU, isFullscreen());
}
private boolean showAddStartOrFinishFrame(@NonNull RoutingController controller,

6
android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java
View file

@ -29,7 +29,7 @@ public class MainMenu
return;
UiUtils.showIf(show, mFrame);
mOnMenuSizeChangedListener.OnMenuSizeChange();
mOnMenuSizeChangedListener.OnMenuSizeChange(show);
}
public int getMenuHeight()
@ -59,7 +59,7 @@ public class MainMenu
public interface OnMenuSizeChangedListener
{
void OnMenuSizeChange();
void OnMenuSizeChange(boolean visible);
}
private class FrameLayoutChangeListener implements View.OnLayoutChangeListener
@ -69,7 +69,7 @@ public class MainMenu
int oldTop, int oldRight, int oldBottom)
{
mMenuHeight = bottom - top;
mOnMenuSizeChangedListener.OnMenuSizeChange();
mOnMenuSizeChangedListener.OnMenuSizeChange(UiUtils.isVisible(mFrame));
}
}
}