drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-21 05:43:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android][sdk] Move everything to .sdk package

Browse Source 
Signed-off-by: Andrei Shkrob <andrei@shkrob.dev>
This commit is contained in:
Andrei Shkrob
2025-05-07 22:30:58 +02:00
committed by Konstantin Pastbin
parent cee3f24cd9
commit b465b95854
370 changed files with 1998 additions and 1883 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,38 +48,39 @@ import app.organicmaps.backup.PeriodicBackupRunner;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.base.OnBackPressListener;
import app.organicmaps.bookmarks.BookmarkCategoriesActivity;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.display.DisplayChangedListener;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.display.DisplayType;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.downloader.DownloaderFragment;
import app.organicmaps.downloader.MapManager;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.downloader.OnmapDownloader;
import app.organicmaps.downloader.UpdateInfo;
import app.organicmaps.editor.Editor;
import app.organicmaps.sdk.downloader.UpdateInfo;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.editor.EditorActivity;
import app.organicmaps.editor.EditorHostFragment;
import app.organicmaps.editor.FeatureCategoryActivity;
import app.organicmaps.editor.OsmLoginActivity;
import app.organicmaps.editor.OsmOAuth;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.editor.ReportFragment;
import app.organicmaps.help.HelpActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.intent.IntentProcessor;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationListener;
import app.organicmaps.location.LocationState;
import app.organicmaps.location.SensorHelper;
import app.organicmaps.location.SensorListener;
import app.organicmaps.location.TrackRecorder;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.location.SensorListener;
import app.organicmaps.sdk.location.TrackRecorder;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.maplayer.MapButtonsController;
import app.organicmaps.maplayer.MapButtonsViewModel;
import app.organicmaps.maplayer.ToggleMapLayerFragment;
import app.organicmaps.maplayer.isolines.IsolinesManager;
import app.organicmaps.maplayer.isolines.IsolinesState;
import app.organicmaps.sdk.maplayer.isolines.IsolinesState;
import app.organicmaps.routing.ManageRouteBottomSheet;
import app.organicmaps.routing.NavigationController;
import app.organicmaps.routing.NavigationService;
@@ -98,27 +99,27 @@ import app.organicmaps.search.SearchActivity;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.search.SearchFragment;
import app.organicmaps.settings.DrivingOptionsActivity;
import app.organicmaps.settings.RoadType;
import app.organicmaps.sdk.settings.RoadType;
import app.organicmaps.settings.SettingsActivity;
import app.organicmaps.settings.UnitLocale;
import app.organicmaps.sdk.settings.UnitLocale;
import app.organicmaps.leftbutton.LeftButton;
import app.organicmaps.leftbutton.LeftButtonsHolder;
import app.organicmaps.leftbutton.LeftToggleButton;
import app.organicmaps.util.Config;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.PowerManagment;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.PowerManagment;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.ThemeSwitcher;
import app.organicmaps.sdk.util.ThemeSwitcher;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.widget.StackedButtonsDialog;
import app.organicmaps.widget.menu.MainMenu;
import app.organicmaps.widget.placepage.PlacePageController;
import app.organicmaps.widget.placepage.PlacePageData;
import app.organicmaps.sdk.widget.placepage.PlacePageData;
import app.organicmaps.widget.placepage.PlacePageViewModel;
import com.google.android.material.appbar.MaterialToolbar;
@@ -132,15 +133,16 @@ import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.Manifest.permission.POST_NOTIFICATIONS;
import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static app.organicmaps.location.LocationState.FOLLOW;
import static app.organicmaps.location.LocationState.FOLLOW_AND_ROTATE;
import static app.organicmaps.location.LocationState.LOCATION_TAG;
import static app.organicmaps.sdk.location.LocationState.FOLLOW;
import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_ADD_PLACE_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_HELP_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_RECORD_TRACK_CODE;
import static app.organicmaps.leftbutton.LeftButtonsHolder.BUTTON_SETTINGS_CODE;
import static app.organicmaps.util.PowerManagment.POWER_MANAGEMENT_TAG;
import static app.organicmaps.util.concurrency.UiThread.runLater;
import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
import static app.organicmaps.sdk.util.concurrency.UiThread.runLater;
public class MwmActivity extends BaseMwmFragmentActivity
implements PlacePageActivationListener,
@@ -283,10 +285,8 @@ public class MwmActivity extends BaseMwmFragmentActivity
checkMeasurementSystem();
}
// Called from JNI.
@Override
@Keep
@SuppressWarnings("unused")
public void onRenderingInitializationFinished()
{
ThemeSwitcher.INSTANCE.restart(true);
@@ -472,7 +472,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
private void shareMyLocation()
{
final Location loc = LocationHelper.from(this).getSavedLocation();
final Location loc = MwmApplication.from(this).getLocationHelper().getSavedLocation();
if (loc != null)
{
SharingUtils.shareLocation(this, loc);
@@ -1140,7 +1140,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
LocationState.nativeSwitchToNextMode();
}
MapObject startPoint = LocationHelper.from(this).getMyPosition();
MapObject startPoint = MwmApplication.from(this).getLocationHelper().getMyPosition();
RoutingController.get().prepare(startPoint, endPoint);
// TODO: check for tablet.
@@ -1295,7 +1295,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mNavigationController.refresh();
refreshLightStatusBar();
SensorHelper.from(this).addListener(this);
MwmApplication.from(this).getSensorHelper().addListener(this);
}
@Override
@@ -1319,7 +1319,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
{
if (mOnmapDownloader != null)
mOnmapDownloader.onPause();
SensorHelper.from(this).removeListener(this);
MwmApplication.from(this).getSensorHelper().removeListener(this);
dismissLocationErrorDialog();
dismissAlertDialog();
super.onPause();
@@ -1332,9 +1332,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
Framework.nativePlacePageActivationListener(this);
BookmarkManager.INSTANCE.addLoadingListener(this);
RoutingController.get().attach(this);
IsolinesManager.from(getApplicationContext()).attach(this::onIsolinesStateChanged);
MwmApplication.from(getApplicationContext()).getIsolinesManager().attach(this::onIsolinesStateChanged);
LocationState.nativeSetListener(this);
LocationHelper.from(this).addListener(this);
MwmApplication.from(this).getLocationHelper().addListener(this);
mSearchController.attach(this);
Utils.keepScreenOn(Config.isKeepScreenOnEnabled() || RoutingController.get().isNavigating(), getWindow());
}
@@ -1345,13 +1345,13 @@ public class MwmActivity extends BaseMwmFragmentActivity
super.onStop();
Framework.nativeRemovePlacePageActivationListener(this);
BookmarkManager.INSTANCE.removeLoadingListener(this);
LocationHelper.from(this).removeListener(this);
MwmApplication.from(this).getLocationHelper().removeListener(this);
if (mDisplayManager.isDeviceDisplayUsed() && !RoutingController.get().isNavigating())
{
LocationState.nativeRemoveListener();
RoutingController.get().detach();
}
IsolinesManager.from(getApplicationContext()).detach();
MwmApplication.from(getApplicationContext()).getIsolinesManager().detach();
mSearchController.detach();
Utils.keepScreenOn(false, getWindow());
@@ -1453,26 +1453,20 @@ public class MwmActivity extends BaseMwmFragmentActivity
return true;
}
// Called from JNI.
@Override
@SuppressWarnings("unused")
public void onPlacePageActivated(@NonNull PlacePageData data)
{
// This will open the place page
mPlacePageViewModel.setMapObject((MapObject) data);
}
// Called from JNI.
@Override
@SuppressWarnings("unused")
public void onPlacePageDeactivated()
{
closePlacePage();
}
// Called from JNI.
@Override
@SuppressWarnings("unused")
public void onSwitchFullScreenMode()
{
if ((mPanelAnimator != null && mPanelAnimator.isVisible()) || UiUtils.isVisible(mSearchController.getToolbar()))
@@ -1542,7 +1536,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
mMapFragment.updateCompassOffset(offsetX, offsetY);
final double north = SensorHelper.from(this).getSavedNorth();
final double north = MwmApplication.from(this).getSensorHelper().getSavedNorth();
if (!Double.isNaN(north))
Map.onCompassUpdated(north, true);
}
@@ -1627,7 +1621,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
// +S+F-L -> Hide
// +S+F+L -> Hide
MapObject myPosition = LocationHelper.from(this).getMyPosition();
MapObject myPosition = MwmApplication.from(this).getLocationHelper().getMyPosition();
if (myPosition != null && controller.getEndPoint() == null)
{
@@ -1953,7 +1947,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
(dialog, which) -> controller.swapPoints() :
(dialog, which) -> {
// The current location may change while this dialog is still shown on the screen.
final MapObject myPosition = LocationHelper.from(this).getMyPosition();
final MapObject myPosition = MwmApplication.from(this).getLocationHelper().getMyPosition();
controller.setStartPoint(myPosition);
}
)
@@ -1972,7 +1966,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered())
showAddStartOrFinishFrame(controller, true);
final LocationHelper locationHelper = LocationHelper.from(this);
final LocationHelper locationHelper = MwmApplication.from(this).getLocationHelper();
// Check if location was disabled by the user.
if (LocationState.getMode() == LocationState.NOT_FOLLOW_NO_POSITION)
@@ -2291,7 +2285,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
@Override
public void onUseMyPositionAsStart()
{
RoutingController.get().setStartPoint(LocationHelper.from(this).getMyPosition());
RoutingController.get().setStartPoint(MwmApplication.from(this).getLocationHelper().getMyPosition());
}
@Override