drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-03 03:13:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

[drape] Allow controlling viewport restoration on DeactivateMapSelection

Browse Source 
Signed-off-by: hemanggs <hemangmanhas@gmail.com>
This commit is contained in:
hemanggs
2025-06-08 19:13:12 +05:30
committed by Konstantin Pastbin
parent fc199252eb
commit 90492e95e6
12 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/app/src/main/java/app/organicmaps/MwmActivity.java
View File

@@ -767,9 +767,16 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void showPositionChooser(ChoosePositionMode mode, boolean isBusiness, boolean applyPosition)
{
closeFloatingToolbarsAndPanels(false);
int width = mMapFragment.getView().getWidth();
int height = mMapFragment.getView().getHeight();
Framework.nativeSetVisibleRect(0, 0, width, height);
if (mMapFragment != null)
{
final View mapView = mMapFragment.getView();
if (mapView != null)
{
int width = mapView.getWidth();
int height = mapView.getHeight();
Framework.nativeSetVisibleRect(0, 0, width, height);
}
}
UiUtils.show(mPointChooser);
mMapButtonsViewModel.setButtonsHidden(true);
ChoosePositionMode.set(mode, isBusiness, applyPosition);

4
android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
View File

@@ -287,7 +287,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
@Override
public void onBuiltRoute()
{
Framework.nativeDeactivateMapSelectionCircle();
Framework.nativeDeactivateMapSelectionCircle(true);
mMapObject = mRoutingController.getEndPoint();
invalidate();
}
@@ -295,7 +295,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
@Override
public void onPlanningCancelled()
{
Framework.nativeDeactivateMapSelectionCircle();
Framework.nativeDeactivateMapSelectionCircle(true);
}
@Override

2
android/app/src/main/java/app/organicmaps/sdk/Framework.java
View File

@@ -163,7 +163,7 @@ public class Framework
public static native @Nullable String nativeGetParsedBackUrl();
public static native void nativeDeactivatePopup();
public static native void nativeDeactivateMapSelectionCircle();
public static native void nativeDeactivateMapSelectionCircle(boolean restoreViewport);
public static native String nativeGetDataFileExt();

5
android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
View File

@@ -225,10 +225,9 @@ public class PlacePageController
private void onHiddenInternal()
{
if (ChoosePositionMode.get() == ChoosePositionMode.None) {
if (ChoosePositionMode.get() == ChoosePositionMode.None)
Framework.nativeDeactivatePopup();
}
Framework.nativeDeactivateMapSelectionCircle();
Framework.nativeDeactivateMapSelectionCircle(false);
PlacePageUtils.updateMapViewport(mCoordinator, mDistanceToTop, mViewportMinHeight);
resetPlacePageHeightBounds();
removePlacePageFragments();

8
android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
View File

@@ -621,9 +621,9 @@ void Framework::DeactivatePopup()
m_work.DeactivateMapSelection();
}
void Framework::DeactivateMapSelectionCircle()
void Framework::DeactivateMapSelectionCircle(bool restoreViewport)
{
m_work.DeactivateMapSelectionCircle();
m_work.DeactivateMapSelectionCircle(restoreViewport);
}
/*
@@ -1448,9 +1448,9 @@ Java_app_organicmaps_sdk_Framework_nativeDeactivatePopup(JNIEnv * env, jclass)
}
JNIEXPORT void JNICALL
Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass)
Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass, jboolean restoreViewport)
{
return g_framework->DeactivateMapSelectionCircle();
return g_framework->DeactivateMapSelectionCircle(restoreViewport);
}
JNIEXPORT void JNICALL

2
android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
View File

@@ -171,7 +171,7 @@ namespace android
void ExecuteMapApiRequest();
void DeactivatePopup();
void DeactivateMapSelectionCircle();
void DeactivateMapSelectionCircle(bool restoreViewport);
// std::string GetOutdatedCountriesString();