drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-27 08:23:38 +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

5
android/app/src/main/java/app/organicmaps/ChartController.java
View File

@@ -21,8 +21,9 @@ import com.github.mikephil.charting.formatter.ValueFormatter;
import com.github.mikephil.charting.highlight.Highlight;
import com.github.mikephil.charting.listener.OnChartValueSelectedListener;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.ElevationInfo;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
import app.organicmaps.widget.placepage.AxisValueFormatter;
import app.organicmaps.widget.placepage.CurrentLocationMarkerView;
import app.organicmaps.widget.placepage.FloatingMarkerView;

61
android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
View File

@@ -1,5 +1,15 @@
package app.organicmaps;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DISK_ERROR;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DOWNLOAD_ERROR;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_DOWNLOAD_SUCCESS;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_NOT_ENOUGH_FREE_SPACE;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_NO_MORE_FILES;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.ERR_STORAGE_DISCONNECTED;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeCancelCurrentFile;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeGetBytesToDownload;
import static app.organicmaps.sdk.DownloadResourcesLegacyActivity.nativeStartNextFileDownload;
import android.annotation.SuppressLint;
import android.app.Dialog;
import android.content.ComponentName;
@@ -12,22 +22,21 @@ import android.view.View;
import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.CallSuper;
import androidx.annotation.Keep;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.core.view.ViewCompat;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.downloader.MapManager;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.intent.Factory;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationListener;
import app.organicmaps.util.Config;
import app.organicmaps.util.ConnectionState;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.ConnectionState;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
@@ -45,15 +54,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
{
private static final String TAG = DownloadResourcesLegacyActivity.class.getSimpleName();
// Error codes, should match the same codes in JNI
private static final int ERR_DOWNLOAD_SUCCESS = 0;
private static final int ERR_DISK_ERROR = -1;
private static final int ERR_NOT_ENOUGH_FREE_SPACE = -2;
private static final int ERR_STORAGE_DISCONNECTED = -3;
private static final int ERR_DOWNLOAD_ERROR = -4;
private static final int ERR_NO_MORE_FILES = -5;
private static final int ERR_FILE_IN_PROGRESS = -6;
private MaterialTextView mTvMessage;
private LinearProgressIndicator mProgress;
private MaterialButton mBtnDownload;
@@ -81,19 +81,6 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
private int mCountryDownloadListenerSlot;
private interface Listener
{
// Called by JNI.
@Keep
@SuppressWarnings("unused")
void onProgress(int percent);
// Called by JNI.
@Keep
@SuppressWarnings("unused")
void onFinish(int errorCode);
}
private final LocationListener mLocationListener = new LocationListener()
{
@Override
@@ -126,11 +113,11 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
mChbDownloadCountry.setText(checkBoxText);
}
LocationHelper.from(DownloadResourcesLegacyActivity.this).removeListener(this);
MwmApplication.from(DownloadResourcesLegacyActivity.this).getLocationHelper().removeListener(this);
}
};
private final Listener mResourcesDownloadListener = new Listener()
private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener = new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener()
{
@Override
public void onProgress(final int percent)
@@ -235,14 +222,14 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
{
super.onResume();
if (!isFinishing())
LocationHelper.from(this).addListener(mLocationListener);
MwmApplication.from(this).getLocationHelper().addListener(mLocationListener);
}
@Override
protected void onPause()
{
super.onPause();
LocationHelper.from(this).removeListener(mLocationListener);
MwmApplication.from(this).getLocationHelper().removeListener(mLocationListener);
if (mAlertDialog != null && mAlertDialog.isShowing())
mAlertDialog.dismiss();
mAlertDialog = null;
@@ -458,8 +445,4 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
{
return R.style.MwmTheme_DownloadResourcesLegacy;
}
private static native int nativeGetBytesToDownload();
private static native int nativeStartNextFileDownload(Listener listener);
private static native void nativeCancelCurrentFile();
}

6
android/app/src/main/java/app/organicmaps/MapFragment.java
View File

@@ -16,8 +16,10 @@ import androidx.annotation.Nullable;
import androidx.core.content.res.ConfigurationHelper;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.display.DisplayType;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;

6
android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java
View File

@@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.display.DisplayChangedListener;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.display.DisplayType;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
public class MapPlaceholderActivity extends BaseMwmFragmentActivity implements DisplayChangedListener
{

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

59
android/app/src/main/java/app/organicmaps/MwmApplication.java
View File

@@ -1,6 +1,6 @@
package app.organicmaps;
import static app.organicmaps.location.LocationState.LOCATION_TAG;
import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
import android.app.Activity;
import android.app.Application;
@@ -22,22 +22,23 @@ import java.lang.ref.WeakReference;
import app.organicmaps.background.OsmUploadWork;
import app.organicmaps.downloader.Android7RootCertificateWorkaround;
import app.organicmaps.downloader.DownloaderNotifier;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationState;
import app.organicmaps.location.SensorHelper;
import app.organicmaps.location.TrackRecorder;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.location.SensorHelper;
import app.organicmaps.sdk.location.TrackRecorder;
import app.organicmaps.location.TrackRecordingService;
import app.organicmaps.maplayer.isolines.IsolinesManager;
import app.organicmaps.maplayer.subway.SubwayManager;
import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
import app.organicmaps.sdk.maplayer.subway.SubwayManager;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.OrganicMaps;
import app.organicmaps.util.Config;
import app.organicmaps.util.ConnectionState;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.ConnectionState;
import app.organicmaps.util.Utils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.util.log.LogsManager;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.sdk.util.log.LogsManager;
public class MwmApplication extends Application implements Application.ActivityLifecycleCallbacks
{
@@ -48,22 +49,6 @@ public class MwmApplication extends Application implements Application.ActivityL
@NonNull
private OrganicMaps mOrganicMaps;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private SubwayManager mSubwayManager;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private IsolinesManager mIsolinesManager;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private LocationHelper mLocationHelper;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private SensorHelper mSensorHelper;
@SuppressWarnings("NotNullFieldNotInitialized")
@NonNull
private DisplayManager mDisplayManager;
@@ -81,25 +66,25 @@ public class MwmApplication extends Application implements Application.ActivityL
@NonNull
public SubwayManager getSubwayManager()
{
return mSubwayManager;
return getOrganicMaps().getSubwayManager();
}
@NonNull
public IsolinesManager getIsolinesManager()
{
return mIsolinesManager;
return getOrganicMaps().getIsolinesManager();
}
@NonNull
public LocationHelper getLocationHelper()
{
return mLocationHelper;
return getOrganicMaps().getLocationHelper();
}
@NonNull
public SensorHelper getSensorHelper()
{
return mSensorHelper;
return getOrganicMaps().getSensorHelper();
}
@NonNull
@@ -150,10 +135,6 @@ public class MwmApplication extends Application implements Application.ActivityL
TrackRecordingService.createNotificationChannel(this);
registerActivityLifecycleCallbacks(this);
mSubwayManager = new SubwayManager(this);
mIsolinesManager = new IsolinesManager(this);
mLocationHelper = new LocationHelper(this);
mSensorHelper = new SensorHelper(this);
mDisplayManager = new DisplayManager();
}
@@ -193,7 +174,7 @@ public class MwmApplication extends Application implements Application.ActivityL
{
Logger.d(TAG, "activity = " + activity);
Utils.showOnLockScreen(Config.isShowOnLockScreenEnabled(), activity);
mSensorHelper.setRotation(activity.getWindowManager().getDefaultDisplay().getRotation());
getSensorHelper().setRotation(activity.getWindowManager().getDefaultDisplay().getRotation());
mTopActivity = new WeakReference<>(activity);
}
@@ -224,7 +205,7 @@ public class MwmApplication extends Application implements Application.ActivityL
{
Logger.d(TAG);
mLocationHelper.resumeLocationInForeground();
getLocationHelper().resumeLocationInForeground();
}
private void onBackground()
@@ -244,7 +225,7 @@ public class MwmApplication extends Application implements Application.ActivityL
else
{
Logger.i(LOCATION_TAG, "Stopping location in the background");
mLocationHelper.stop();
getLocationHelper().stop();
}
}
}

2
android/app/src/main/java/app/organicmaps/PanelAnimator.java
View File

@@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment;
import org.chromium.base.ObserverList;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
class PanelAnimator
{

12
android/app/src/main/java/app/organicmaps/SplashActivity.java
View File

@@ -22,17 +22,17 @@ import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.downloader.DownloaderActivity;
import app.organicmaps.intent.Factory;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.util.Config;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.io.IOException;

2
android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
View File

@@ -11,7 +11,7 @@ import android.webkit.WebViewClient;
import androidx.annotation.NonNull;
import app.organicmaps.base.OnBackPressListener;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
public abstract class WebContainerDelegate implements OnBackPressListener
{

6
android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java
View File

@@ -11,9 +11,9 @@ import androidx.work.WorkRequest;
import androidx.work.Worker;
import androidx.work.WorkerParameters;
import app.organicmaps.MwmApplication;
import app.organicmaps.editor.Editor;
import app.organicmaps.editor.OsmOAuth;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.sdk.util.log.Logger;
public class OsmUploadWork extends Worker
{

6
android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
View File

@@ -24,11 +24,11 @@ import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.SplashActivity;
import app.organicmaps.util.Config;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.util.RtlUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import java.util.Objects;

2
android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
View File

@@ -18,7 +18,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
import app.organicmaps.widget.PlaceholderView;

2
android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
View File

@@ -14,7 +14,7 @@ import androidx.fragment.app.FragmentManager;
import com.google.android.material.appbar.MaterialToolbar;
import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
public abstract class BaseToolbarActivity extends BaseMwmFragmentActivity

2
android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java
View File

@@ -5,7 +5,7 @@ import android.content.Context;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import java.util.List;

4
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
View File

@@ -12,8 +12,8 @@ import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseToolbarActivity;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.util.ThemeUtils;
public class BookmarkCategoriesActivity extends BaseToolbarActivity

4
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java
View File

@@ -14,8 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import java.util.List;

16
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java
View File

@@ -27,21 +27,21 @@ import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.bookmarks.data.KmlFileType;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.PlaceholderView;
import app.organicmaps.widget.recycler.DividerItemDecorationWithPadding;
import app.organicmaps.util.StorageUtils;
import app.organicmaps.sdk.util.StorageUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
import java.io.File;
import java.util.ArrayList;

2
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java
View File

@@ -8,7 +8,7 @@ import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
public class BookmarkCategorySettingsActivity extends BaseMwmFragmentActivity
{

4
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java
View File

@@ -17,8 +17,8 @@ import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.util.Utils;
import app.organicmaps.util.InputUtils;

6
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
View File

@@ -11,9 +11,9 @@ import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.util.UiUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;

4
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
View File

@@ -11,8 +11,8 @@ import androidx.fragment.app.Fragment;
import app.organicmaps.R;
import app.organicmaps.base.BaseToolbarActivity;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.util.ThemeUtils;
public class BookmarkListActivity extends BaseToolbarActivity

12
android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
View File

@@ -12,12 +12,12 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.IconClickListener;
import app.organicmaps.bookmarks.data.SortedBlock;
import app.organicmaps.content.DataSource;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.IconClickListener;
import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.sdk.content.DataSource;
import app.organicmaps.widget.recycler.RecyclerClickListener;
import app.organicmaps.widget.recycler.RecyclerLongClickListener;

26
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
View File

@@ -26,23 +26,23 @@ import androidx.recyclerview.widget.ConcatAdapter;
import androidx.recyclerview.widget.RecyclerView;
import androidx.recyclerview.widget.SimpleItemAnimator;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.bookmarks.data.CategoryDataSource;
import app.organicmaps.bookmarks.data.Icon;
import app.organicmaps.bookmarks.data.KmlFileType;
import app.organicmaps.bookmarks.data.SortedBlock;
import app.organicmaps.bookmarks.data.Track;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.CategoryDataSource;
import app.organicmaps.sdk.bookmarks.data.Icon;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.sdk.bookmarks.data.Track;
import app.organicmaps.sdk.search.BookmarkSearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
@@ -423,7 +423,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
{
mLastSortTimestamp = System.nanoTime();
final Location loc = LocationHelper.from(requireContext()).getSavedLocation();
final Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation();
final boolean hasMyPosition = loc != null;
if (!hasMyPosition && sortingType == BookmarkManager.SORT_BY_DISTANCE)
return;
@@ -511,7 +511,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
private int[] getAvailableSortingTypes()
{
final long catId = mCategoryDataSource.getData().getId();
final Location loc = LocationHelper.from(requireContext()).getSavedLocation();
final Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation();
final boolean hasMyPosition = loc != null;
return BookmarkManager.INSTANCE.getAvailableSortingTypes(catId, hasMyPosition);
}

10
android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
View File

@@ -9,12 +9,12 @@ import androidx.annotation.Nullable;
import androidx.fragment.app.FragmentActivity;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.bookmarks.data.KmlFileType;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
import app.organicmaps.sdk.bookmarks.data.KmlFileType;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import java.util.ArrayList;

2
android/app/src/main/java/app/organicmaps/bookmarks/CategoryValidator.java
View File

@@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.dialog.EditTextDialogFragment;
class CategoryValidator implements EditTextDialogFragment.Validator

2
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryAdapter.java
View File

@@ -12,7 +12,7 @@ import com.google.android.material.radiobutton.MaterialRadioButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import java.util.List;

4
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarkCategoryFragment.java
View File

@@ -14,8 +14,8 @@ import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.dialog.EditTextDialogFragment;
import java.util.List;

4
android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
View File

@@ -14,8 +14,8 @@ import androidx.fragment.app.FragmentManager;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.util.UiUtils;
public class ChooseBookmarksSortingTypeFragment extends BaseMwmDialogFragment
implements RadioGroup.OnCheckedChangeListener

16
android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
View File

@@ -16,19 +16,19 @@ import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView;
import com.google.android.material.checkbox.MaterialCheckBox;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.IconClickListener;
import app.organicmaps.bookmarks.data.Track;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.IconClickListener;
import app.organicmaps.sdk.bookmarks.data.Track;
import app.organicmaps.util.Utils;
import app.organicmaps.widget.recycler.RecyclerClickListener;
import app.organicmaps.widget.recycler.RecyclerLongClickListener;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
public class Holders
{
@@ -361,7 +361,7 @@ public class Holders
BookmarkInfo bookmark = new BookmarkInfo(sectionsDataSource.getCategory().getId(),
bookmarkId);
mName.setText(bookmark.getName());
final Location loc = LocationHelper.from(mIcon.getContext()).getSavedLocation();
final Location loc = MwmApplication.from(mIcon.getContext()).getLocationHelper().getSavedLocation();
String distanceValue = loc == null ? "" : bookmark.getDistance(loc.getLatitude(),
loc.getLongitude(), 0.0).toString(mDistance.getContext());

2
android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
View File

@@ -10,7 +10,7 @@ import android.widget.ArrayAdapter;
import com.google.android.material.imageview.ShapeableImageView;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.Icon;
import app.organicmaps.sdk.bookmarks.data.Icon;
import app.organicmaps.util.Graphics;
import java.util.List;

4
android/app/src/main/java/app/organicmaps/bookmarks/OperationStatus.java
View File

@@ -6,8 +6,8 @@ import android.os.Parcelable;
import androidx.annotation.Nullable;
import androidx.core.os.ParcelCompat;
import app.organicmaps.bookmarks.data.Error;
import app.organicmaps.bookmarks.data.Result;
import app.organicmaps.sdk.bookmarks.data.Error;
import app.organicmaps.sdk.bookmarks.data.Result;
public class OperationStatus implements Parcelable
{

20
android/app/src/main/java/app/organicmaps/car/CarAppSession.java
View File

@@ -12,10 +12,10 @@ import androidx.car.app.SessionInfo;
import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.MapPlaceholderScreen;
import app.organicmaps.car.screens.MapScreen;
@@ -30,16 +30,16 @@ import app.organicmaps.car.util.CurrentCountryChangedListener;
import app.organicmaps.car.util.IntentUtils;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.display.DisplayChangedListener;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.display.DisplayType;
import app.organicmaps.location.LocationState;
import app.organicmaps.sdk.display.DisplayChangedListener;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.PlacePageActivationListener;
import app.organicmaps.util.Config;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.widget.placepage.PlacePageData;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import app.organicmaps.sdk.widget.placepage.PlacePageData;
import java.io.IOException;
import java.util.ArrayList;

16
android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
View File

@@ -1,6 +1,6 @@
package app.organicmaps.car;
import static app.organicmaps.display.DisplayType.Car;
import static app.organicmaps.sdk.display.DisplayType.Car;
import android.graphics.Rect;
import android.view.Surface;
@@ -16,14 +16,14 @@ import androidx.lifecycle.DefaultLifecycleObserver;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.Framework;
import app.organicmaps.Map;
import app.organicmaps.MapRenderingListener;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.sdk.MapRenderingListener;
import app.organicmaps.R;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.settings.UnitLocale;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.settings.UnitLocale;
import app.organicmaps.sdk.util.concurrency.UiThread;
import app.organicmaps.sdk.util.log.Logger;
public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallback, MapRenderingListener
{

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

@@ -11,8 +11,8 @@ import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.display.DisplayType;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
public class MapPlaceholderScreen extends BaseScreen
{

21
android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
View File

@@ -18,7 +18,8 @@ import androidx.car.app.navigation.model.Trip;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.car.CarAppService;
import app.organicmaps.car.SurfaceRenderer;
@@ -28,15 +29,15 @@ import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingUtils;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationListener;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.routing.JunctionInfo;
import app.organicmaps.routing.NavigationService;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sound.TtsPlayer;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.sound.TtsPlayer;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import java.util.List;
import java.util.Objects;
@@ -89,7 +90,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
@Override
public void onStopNavigation()
{
LocationHelper.from(getCarContext()).removeListener(mLocationListener);
MwmApplication.from(getCarContext()).getLocationHelper().removeListener(mLocationListener);
mNavigationCancelled = true;
mRoutingController.cancel();
}
@@ -112,7 +113,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
return;
}
final LocationHelper locationHelper = LocationHelper.from(getCarContext());
final LocationHelper locationHelper = MwmApplication.from(getCarContext()).getLocationHelper();
locationHelper.startNavigationSimulation(points);
}
@@ -134,7 +135,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
mNavigationManager.setNavigationManagerCallback(this);
mNavigationManager.navigationStarted();
LocationHelper.from(getCarContext()).addListener(mLocationListener);
MwmApplication.from(getCarContext()).getLocationHelper().addListener(mLocationListener);
if (LocationUtils.checkFineLocationPermission(getCarContext()))
NavigationService.startForegroundService(getCarContext(), CarAppService.getCarNotificationExtender(getCarContext()));
updateTrip();
@@ -151,7 +152,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
public void onDestroy(@NonNull LifecycleOwner owner)
{
NavigationService.stopService(getCarContext());
LocationHelper.from(getCarContext()).removeListener(mLocationListener);
MwmApplication.from(getCarContext()).getLocationHelper().removeListener(mLocationListener);
if (mRoutingController.isNavigating())
mRoutingController.onSaveState();

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

@@ -26,10 +26,11 @@ import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
@@ -38,12 +39,11 @@ import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.OnBackPressedCallback;
import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.routing.ResultCodesHelper;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.Router;
import app.organicmaps.util.Config;
import app.organicmaps.sdk.util.Config;
import java.util.Objects;
@@ -105,7 +105,7 @@ public class PlaceScreen extends BaseMapScreen implements OnBackPressedCallback.
}
else if (hasIncorrectEndPoint || isNotPlanningMode)
{
mRoutingController.prepare(LocationHelper.from(getCarContext()).getMyPosition(), mMapObject);
mRoutingController.prepare(MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition(), mMapObject);
}
}
}

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

@@ -12,8 +12,8 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;

22
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksLoader.java
View File

@@ -16,19 +16,19 @@ import androidx.car.app.model.ItemList;
import androidx.car.app.model.Row;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkInfo;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.Icon;
import app.organicmaps.bookmarks.data.SortedBlock;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.Icon;
import app.organicmaps.sdk.bookmarks.data.SortedBlock;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.RoutingHelpers;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.util.Distance;
import app.organicmaps.sdk.util.Distance;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import java.util.ArrayList;
import java.util.HashMap;
@@ -112,7 +112,7 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
if (sortingType < 0)
return false;
final Location loc = LocationHelper.from(mCarContext).getSavedLocation();
final Location loc = MwmApplication.from(mCarContext).getLocationHelper().getSavedLocation();
final boolean hasMyPosition = loc != null;
if (!hasMyPosition && sortingType == BookmarkManager.SORT_BY_DISTANCE)
return false;
@@ -146,7 +146,7 @@ class BookmarksLoader implements BookmarkManager.BookmarksSortingListener
@NonNull
private ItemList createBookmarksList(@NonNull BookmarkInfo[] bookmarks)
{
final Location location = LocationHelper.from(mCarContext).getSavedLocation();
final Location location = MwmApplication.from(mCarContext).getLocationHelper().getSavedLocation();
final ItemList.Builder builder = new ItemList.Builder();
final Map<Icon, CarIcon> iconsCache = new HashMap<>();
for (final BookmarkInfo bookmarkInfo : bookmarks)

2
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java
View File

@@ -14,7 +14,7 @@ import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;

8
android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java
View File

@@ -16,13 +16,13 @@ import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.BookmarkCategory;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.location.LocationHelper;
import java.util.Arrays;
import java.util.stream.IntStream;
@@ -133,7 +133,7 @@ class SortingScreen extends BaseMapScreen
@BookmarkManager.SortingType
private int[] getAvailableSortingTypes()
{
final Location loc = LocationHelper.from(getCarContext()).getSavedLocation();
final Location loc = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation();
final boolean hasMyPosition = loc != null;
return BookmarkManager.INSTANCE.getAvailableSortingTypes(mBookmarkCategoryId, hasMyPosition);
}

8
android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java
View File

@@ -7,10 +7,10 @@ import androidx.annotation.NonNull;
import androidx.car.app.model.Action;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.downloader.MapManager;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen
{
@@ -26,7 +26,7 @@ class DownloadMapsForFirstLaunchScreen extends DownloadMapsScreen
public void onResume(@NonNull LifecycleOwner owner)
{
// Attempting to streamline initial download by including the current country in the list of missing maps for simultaneous retrieval.
final Location location = LocationHelper.from(getCarContext()).getSavedLocation();
final Location location = MwmApplication.from(getCarContext()).getLocationHelper().getSavedLocation();
if (location == null)
return;
final String countryId = MapManager.nativeFindCountry(location.getLatitude(), location.getLongitude());

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

@@ -11,8 +11,8 @@ import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.R;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.Colors;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.util.StringUtils;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.util.StringUtils;
import java.util.List;

2
android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java
View File

@@ -6,7 +6,7 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.BuildConfig;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.sdk.downloader.CountryItem;
import java.util.ArrayList;
import java.util.Collection;

8
android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
View File

@@ -14,10 +14,10 @@ import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.R;
import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.downloader.MapManager;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.concurrency.UiThread;
import java.util.HashMap;
import java.util.List;

2
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java
View File

@@ -15,7 +15,7 @@ import androidx.core.app.NotificationManagerCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.sdk.util.LocationUtils;
import java.util.Objects;

2
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java
View File

@@ -10,7 +10,7 @@ import androidx.car.app.CarContext;
import androidx.car.app.Screen;
import androidx.core.content.ContextCompat;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
public class RequestPermissionsScreenBuilder
{

2
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java
View File

@@ -19,7 +19,7 @@ import app.organicmaps.car.screens.ErrorScreen;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.Colors;
import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.sdk.util.LocationUtils;
import java.util.Arrays;
import java.util.List;

6
android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java
View File

@@ -24,9 +24,9 @@ import app.organicmaps.R;
import app.organicmaps.car.CarAppService;
import app.organicmaps.car.screens.base.BaseScreen;
import app.organicmaps.car.util.UserActionRequired;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import java.util.concurrent.ExecutorService;

8
android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java
View File

@@ -17,17 +17,17 @@ import androidx.car.app.navigation.model.MapWithContentTemplate;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.sdk.search.SearchRecents;
import app.organicmaps.sdk.search.SearchResult;
import app.organicmaps.util.Language;
import app.organicmaps.sdk.util.Language;
public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
{
@@ -140,7 +140,7 @@ public class SearchOnMapScreen extends BaseMapScreen implements SearchListener
{
SearchEngine.INSTANCE.cancel();
final MapObject location = LocationHelper.from(getCarContext()).getMyPosition();
final MapObject location = MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition();
final boolean hasLocation = location != null;
final double lat = hasLocation ? location.getLat() : 0;
final double lon = hasLocation ? location.getLon() : 0;

8
android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java
View File

@@ -16,16 +16,16 @@ import androidx.car.app.model.Template;
import androidx.core.graphics.drawable.IconCompat;
import androidx.lifecycle.LifecycleOwner;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.search.SearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.sdk.search.SearchRecents;
import app.organicmaps.sdk.search.SearchResult;
import app.organicmaps.util.Language;
import app.organicmaps.sdk.util.Language;
public class SearchScreen extends BaseMapScreen implements SearchTemplate.SearchCallback, SearchListener
{
@@ -89,7 +89,7 @@ public class SearchScreen extends BaseMapScreen implements SearchTemplate.Search
return;
}
final MapObject location = LocationHelper.from(getCarContext()).getMyPosition();
final MapObject location = MwmApplication.from(getCarContext()).getLocationHelper().getMyPosition();
final boolean hasLocation = location != null;
final double lat = hasLocation ? location.getLat() : 0;
final double lon = hasLocation ? location.getLon() : 0;

2
android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java
View File

@@ -19,7 +19,7 @@ import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.Toggle;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.sdk.routing.RoutingOptions;
import app.organicmaps.settings.RoadType;
import app.organicmaps.sdk.settings.RoadType;
import java.util.HashMap;
import java.util.Map;

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

@@ -12,12 +12,12 @@ import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.BuildConfig;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.util.DateUtils;
import app.organicmaps.sdk.util.DateUtils;
public class HelpScreen extends BaseMapScreen
{

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

@@ -13,14 +13,14 @@ import androidx.car.app.model.Row;
import androidx.car.app.model.Template;
import androidx.car.app.navigation.model.MapWithContentTemplate;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.util.ThemeUtils;
import app.organicmaps.car.util.Toggle;
import app.organicmaps.car.util.UiHelpers;
import app.organicmaps.util.Config;
import app.organicmaps.sdk.util.Config;
public class SettingsScreen extends BaseMapScreen
{

19
android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java
View File

@@ -14,10 +14,9 @@ import androidx.car.app.hardware.info.CarSensors;
import androidx.car.app.hardware.info.Compass;
import androidx.core.content.ContextCompat;
import app.organicmaps.Map;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.SensorHelper;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.Map;
import app.organicmaps.MwmApplication;
import app.organicmaps.sdk.util.log.Logger;
import java.util.List;
import java.util.concurrent.Executor;
@@ -48,10 +47,10 @@ public class CarSensorsManager
if (mIsCarCompassUsed)
mCarSensors.addCompassListener(CarSensors.UPDATE_RATE_NORMAL, executor, this::onCarCompassDataAvailable);
else
SensorHelper.from(mCarContext).addListener(this::onCompassUpdated);
MwmApplication.from(mCarContext).getSensorHelper().addListener(this::onCompassUpdated);
if (!LocationHelper.from(mCarContext).isActive())
LocationHelper.from(mCarContext).start();
if (!MwmApplication.from(mCarContext).getLocationHelper().isActive())
MwmApplication.from(mCarContext).getLocationHelper().start();
if (mIsCarLocationUsed)
mCarSensors.addCarHardwareLocationListener(CarSensors.UPDATE_RATE_FASTEST, executor, this::onCarLocationDataAvailable);
@@ -62,7 +61,7 @@ public class CarSensorsManager
if (mIsCarCompassUsed)
mCarSensors.removeCompassListener(this::onCarCompassDataAvailable);
else
SensorHelper.from(mCarContext).removeListener(this::onCompassUpdated);
MwmApplication.from(mCarContext).getSensorHelper().removeListener(this::onCompassUpdated);
if (mIsCarLocationUsed)
mCarSensors.removeCarHardwareLocationListener(this::onCarLocationDataAvailable);
@@ -97,7 +96,7 @@ public class CarSensorsManager
{
final Location loc = location.getValue();
if (loc != null)
LocationHelper.from(mCarContext).onLocationChanged(loc);
MwmApplication.from(mCarContext).getLocationHelper().onLocationChanged(loc);
}
}
@@ -113,6 +112,6 @@ public class CarSensorsManager
Logger.d(TAG);
mIsCarCompassUsed = false;
mCarSensors.removeCompassListener(this::onCarCompassDataAvailable);
SensorHelper.from(mCarContext).addListener(this::onCompassUpdated);
MwmApplication.from(mCarContext).getSensorHelper().addListener(this::onCompassUpdated);
}
}

4
android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
View File

@@ -9,8 +9,8 @@ import androidx.car.app.ScreenManager;
import app.organicmaps.car.screens.download.DownloadMapsScreen;
import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
import app.organicmaps.downloader.CountryItem;
import app.organicmaps.downloader.MapManager;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.routing.RoutingController;
public class CurrentCountryChangedListener implements MapManager.CurrentCountryChangedListener

14
android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
View File

@@ -11,19 +11,19 @@ import androidx.car.app.Screen;
import androidx.car.app.ScreenManager;
import androidx.car.app.notification.CarPendingIntent;
import app.organicmaps.Framework;
import app.organicmaps.Map;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.api.Const;
import app.organicmaps.api.ParsedSearchRequest;
import app.organicmaps.api.RequestType;
import app.organicmaps.sdk.api.ParsedSearchRequest;
import app.organicmaps.sdk.api.RequestType;
import app.organicmaps.car.CarAppService;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.NavigationScreen;
import app.organicmaps.car.screens.search.SearchScreen;
import app.organicmaps.display.DisplayManager;
import app.organicmaps.display.DisplayType;
import app.organicmaps.sdk.display.DisplayManager;
import app.organicmaps.sdk.display.DisplayType;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
public final class IntentUtils
{

2
android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java
View File

@@ -16,7 +16,7 @@ public final class RoutingHelpers
private RoutingHelpers() {}
@NonNull
public static Distance createDistance(@NonNull final app.organicmaps.util.Distance distance)
public static Distance createDistance(@NonNull final app.organicmaps.sdk.util.Distance distance)
{
int displayUnit = switch (distance.mUnits)
{

7
android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java
View File

@@ -14,10 +14,11 @@ import androidx.car.app.navigation.model.TravelEstimate;
import androidx.car.app.navigation.model.Trip;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.routing.LaneWay;
import app.organicmaps.sdk.routing.RoutingInfo;
import app.organicmaps.sdk.routing.SingleLaneInfo;
import app.organicmaps.sdk.util.Distance;
import app.organicmaps.util.Graphics;
import app.organicmaps.widget.LanesDrawable;
@@ -56,7 +57,7 @@ public final class RoutingUtils
// TODO (AndrewShkrob): Use real distance and time estimates
builder.addStep(createCurrentStep(context, info), createTravelEstimate(info.distToTurn, 0));
if (!TextUtils.isEmpty(info.nextStreet))
builder.addStep(createNextStep(context, info), createTravelEstimate(app.organicmaps.util.Distance.EMPTY, 0));
builder.addStep(createNextStep(context, info), createTravelEstimate(Distance.EMPTY, 0));
return builder.build();
}
@@ -96,7 +97,7 @@ public final class RoutingUtils
@SuppressWarnings("NewApi") // ZonedDateTime is backported for Android versions below 8.0.
@NonNull
private static TravelEstimate createTravelEstimate(@NonNull app.organicmaps.util.Distance distance, int time)
private static TravelEstimate createTravelEstimate(@NonNull Distance distance, int time)
{
return new TravelEstimate.Builder(RoutingHelpers.createDistance(distance), ZonedDateTime.now().plusSeconds(time))
.setRemainingTimeSeconds(time)

1
android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
View File

@@ -9,7 +9,6 @@ import androidx.annotation.StringRes;
import androidx.annotation.UiThread;
import androidx.car.app.CarContext;
import app.organicmaps.Framework;
import app.organicmaps.R;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.sdk.MapStyle;

19
android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
View File

@@ -14,18 +14,19 @@ import androidx.car.app.model.Row;
import androidx.car.app.navigation.model.MapController;
import androidx.core.graphics.drawable.IconCompat;
import app.organicmaps.Map;
import app.organicmaps.sdk.Map;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.car.SurfaceRenderer;
import app.organicmaps.car.screens.base.BaseMapScreen;
import app.organicmaps.car.screens.settings.SettingsScreen;
import app.organicmaps.editor.OpeningHours;
import app.organicmaps.editor.data.Timetable;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.location.LocationState;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.editor.data.Timetable;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationState;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.util.Utils;
import java.util.Calendar;
@@ -180,7 +181,7 @@ public final class UiHelpers
builder.setIcon(icon);
builder.setOnClickListener(() -> {
LocationState.nativeSwitchToNextMode();
final LocationHelper locationHelper = LocationHelper.from(context);
final LocationHelper locationHelper = MwmApplication.from(context).getLocationHelper();
if (!locationHelper.isActive() && LocationUtils.checkFineLocationPermission(context))
locationHelper.start();
});

2
android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java
View File

@@ -24,7 +24,7 @@ import com.google.android.material.textfield.TextInputEditText;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.util.InputUtils;
import app.organicmaps.util.StringUtils;
import app.organicmaps.sdk.util.StringUtils;
public class EditTextDialogFragment extends BaseMwmDialogFragment
{

2
android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java
View File

@@ -15,7 +15,7 @@ import javax.net.ssl.SSLSocketFactory;
import javax.net.ssl.TrustManagerFactory;
import app.organicmaps.R;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.util.log.Logger;
// Fix missing root certificates for HTTPS connections on Android 7 and below:
// https://community.letsencrypt.org/t/letsencrypt-certificates-fails-on-android-phones-running-android-7-or-older/205686

21
android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
View File

@@ -1,14 +1,27 @@
package app.organicmaps.downloader;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_APPLYING;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_DONE;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_DOWNLOADABLE;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_ENQUEUED;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_FAILED;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_PARTLY;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_PROGRESS;
import static app.organicmaps.sdk.downloader.CountryItem.STATUS_UPDATABLE;
import android.view.View;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import app.organicmaps.R;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import static app.organicmaps.downloader.CountryItem.*;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.downloader.UpdateInfo;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
class BottomPanel
{

10
android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
View File

@@ -14,13 +14,15 @@ import androidx.fragment.app.FragmentActivity;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.widget.WheelProgressView;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import java.util.List;
@@ -115,7 +117,7 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
{
super.onResume();
Location loc = LocationHelper.from(requireContext()).getSavedLocation();
Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation();
if (loc != null)
{
String id = MapManager.nativeFindCountry(loc.getLatitude(), loc.getLongitude());

10
android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
View File

@@ -19,11 +19,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -580,7 +582,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
if (!mMyMapsMode && CountryItem.isRoot(parent))
{
Location loc = LocationHelper.from(mActivity).getSavedLocation();
Location loc = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
hasLocation = (loc != null);
if (hasLocation)
{

4
android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
View File

@@ -17,6 +17,8 @@ import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.base.OnBackPressListener;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.search.MapSearchListener;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.widget.PlaceholderView;
@@ -54,9 +56,7 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
private final MapSearchListener mSearchListener = new MapSearchListener()
{
// Called from JNI.
@Keep
@SuppressWarnings("unused")
@Override
public void onMapSearchResults(@NonNull Result[] results, long timestamp, boolean isLast)
{

2
android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
View File

@@ -10,7 +10,7 @@ import androidx.core.view.OnApplyWindowInsetsListener;
import androidx.core.view.WindowInsetsCompat;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils;
final class DownloaderInsetsListener implements OnApplyWindowInsetsListener

5
android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
View File

@@ -19,8 +19,9 @@ import androidx.core.content.ContextCompat;
import app.organicmaps.MwmActivity;
import app.organicmaps.R;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.log.Logger;
public class DownloaderNotifier
{

4
android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
View File

@@ -17,7 +17,9 @@ import androidx.core.content.ContextCompat;
import java.util.List;
import app.organicmaps.MwmApplication;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.log.Logger;
public class DownloaderService extends Service implements MapManager.StorageCallback
{

3
android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
View File

@@ -9,9 +9,10 @@ import androidx.annotation.DrawableRes;
import com.google.android.material.imageview.ShapeableImageView;
import app.organicmaps.R;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.widget.WheelProgressView;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
public class DownloaderStatusIcon
{

2
android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
View File

@@ -7,7 +7,7 @@ import android.view.View;
import app.organicmaps.R;
import app.organicmaps.widget.SearchToolbarController;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
class DownloaderToolbarController extends SearchToolbarController
{

14
android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
View File

@@ -12,13 +12,15 @@ import com.google.android.material.button.MaterialButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.location.LocationHelper;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.util.Config;
import app.organicmaps.util.ConnectionState;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.downloader.CountryItem;
import app.organicmaps.sdk.downloader.MapManager;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.ConnectionState;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import app.organicmaps.widget.WheelProgressView;
@@ -161,7 +163,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
!failed &&
ConnectionState.INSTANCE.isWifiConnected())
{
Location loc = LocationHelper.from(mActivity).getSavedLocation();
Location loc = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
if (loc != null)
{
String country = MapManager.nativeFindCountry(loc.getLatitude(), loc.getLongitude());

5
android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
View File

@@ -14,10 +14,11 @@ import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.util.Constants;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.util.Constants;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.InputUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textfield.TextInputEditText;

1
android/app/src/main/java/app/organicmaps/editor/CuisineAdapter.java
View File

@@ -12,6 +12,7 @@ import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.sdk.editor.Editor;
import java.util.ArrayList;
import java.util.Arrays;

20
android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
View File

@@ -25,20 +25,22 @@ import com.google.android.material.textfield.TextInputLayout;
import com.google.android.material.textfield.TextInputEditText;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.editor.data.LocalizedName;
import app.organicmaps.editor.data.LocalizedStreet;
import app.organicmaps.editor.data.TimeFormatUtils;
import app.organicmaps.editor.data.Timetable;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.editor.data.LocalizedName;
import app.organicmaps.sdk.editor.data.LocalizedStreet;
import app.organicmaps.sdk.editor.data.TimeFormatUtils;
import app.organicmaps.sdk.editor.data.Timetable;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.InputUtils;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.sdk.util.Utils;
import java.util.HashMap;
import java.util.Map;

14
android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
View File

@@ -18,13 +18,15 @@ import androidx.fragment.app.FragmentManager;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.editor.data.Language;
import app.organicmaps.editor.data.LocalizedName;
import app.organicmaps.editor.data.LocalizedStreet;
import app.organicmaps.editor.data.NamesDataSource;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.sdk.editor.data.Language;
import app.organicmaps.sdk.editor.data.LocalizedName;
import app.organicmaps.sdk.editor.data.LocalizedStreet;
import app.organicmaps.sdk.editor.data.NamesDataSource;
import app.organicmaps.editor.data.PhoneFragment;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
import app.organicmaps.widget.SearchToolbarController;

3
android/app/src/main/java/app/organicmaps/editor/FeatureCategoryActivity.java
View File

@@ -5,7 +5,8 @@ import android.content.Intent;
import androidx.fragment.app.Fragment;
import app.organicmaps.base.BaseMwmFragmentActivity;
import app.organicmaps.editor.data.FeatureCategory;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.data.FeatureCategory;
public class FeatureCategoryActivity extends BaseMwmFragmentActivity implements FeatureCategoryFragment.FeatureCategoryListener
{

4
android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
View File

@@ -12,8 +12,8 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.editor.data.FeatureCategory;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.data.FeatureCategory;
import app.organicmaps.sdk.util.UiUtils;
public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
{

9
android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
View File

@@ -1,5 +1,7 @@
package app.organicmaps.editor;
import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
@@ -11,10 +13,11 @@ import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.editor.data.FeatureCategory;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.data.FeatureCategory;
import app.organicmaps.widget.SearchToolbarController;
import app.organicmaps.widget.ToolbarController;
import app.organicmaps.util.Language;
import app.organicmaps.sdk.util.Language;
import app.organicmaps.util.Utils;
import java.util.Arrays;
@@ -91,7 +94,7 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
for (int i = 0; i < creatableTypes.length; ++i)
{
String localizedType = Utils.getLocalizedFeatureType(requireContext(), creatableTypes[i]);
String localizedType = getLocalizedFeatureType(requireContext(), creatableTypes[i]);
categories[i] = new FeatureCategory(creatableTypes[i], localizedType);
}

4
android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
View File

@@ -24,8 +24,8 @@ import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmDialogFragment;
import app.organicmaps.editor.data.HoursMinutes;
import app.organicmaps.util.DateUtils;
import app.organicmaps.sdk.editor.data.HoursMinutes;
import app.organicmaps.sdk.util.DateUtils;
import app.organicmaps.util.ThemeUtils;
import app.organicmaps.util.Utils;

2
android/app/src/main/java/app/organicmaps/editor/LanguagesAdapter.java
View File

@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.editor.data.Language;
import app.organicmaps.sdk.editor.data.Language;
public class LanguagesAdapter extends RecyclerView.Adapter<LanguagesAdapter.Holder>
{

3
android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java
View File

@@ -6,7 +6,8 @@ import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.editor.data.Language;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.data.Language;
import java.util.ArrayList;
import java.util.Collections;

9
android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
View File

@@ -10,10 +10,11 @@ import androidx.recyclerview.widget.RecyclerView;
import com.google.android.material.textfield.TextInputLayout;
import com.google.android.material.textfield.TextInputEditText;
import app.organicmaps.R;
import app.organicmaps.editor.data.Language;
import app.organicmaps.editor.data.LocalizedName;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.data.Language;
import app.organicmaps.sdk.editor.data.LocalizedName;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import java.util.List;

13
android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
View File

@@ -12,17 +12,18 @@ import android.widget.ScrollView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.util.Constants;
import app.organicmaps.util.DateUtils;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.sdk.util.Constants;
import app.organicmaps.sdk.util.DateUtils;
import app.organicmaps.util.InputUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;

5
android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
View File

@@ -12,8 +12,9 @@ import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textfield.TextInputLayout;
import com.google.android.material.textfield.TextInputEditText;
import app.organicmaps.R;
import app.organicmaps.util.StringUtils;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.util.StringUtils;
import app.organicmaps.sdk.util.UiUtils;
import java.util.ArrayList;
import java.util.List;

7
android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
View File

@@ -14,11 +14,12 @@ import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.OsmOAuth;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.util.concurrency.UiThread;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.concurrency.UiThread;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.imageview.ShapeableImageView;
import com.google.android.material.textview.MaterialTextView;

3
android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
View File

@@ -11,7 +11,8 @@ import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmToolbarFragment;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.util.UiUtils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
import com.google.android.material.textfield.TextInputEditText;

2
android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java
View File

@@ -12,7 +12,7 @@ import com.google.android.material.radiobutton.MaterialRadioButton;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.util.Utils;
import app.organicmaps.sdk.util.Utils;
public class SelfServiceAdapter extends RecyclerView.Adapter<SelfServiceAdapter.ViewHolder>
{

3
android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java
View File

@@ -10,7 +10,8 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.bookmarks.data.Metadata;
import app.organicmaps.sdk.bookmarks.data.Metadata;
import app.organicmaps.sdk.editor.Editor;
public class SelfServiceFragment extends BaseMwmRecyclerFragment<SelfServiceAdapter>
{

11
android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
View File

@@ -19,11 +19,12 @@ import com.google.android.material.checkbox.MaterialCheckBox;
import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.R;
import app.organicmaps.editor.data.HoursMinutes;
import app.organicmaps.editor.data.TimeFormatUtils;
import app.organicmaps.editor.data.Timespan;
import app.organicmaps.editor.data.Timetable;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.editor.data.HoursMinutes;
import app.organicmaps.sdk.editor.data.TimeFormatUtils;
import app.organicmaps.sdk.editor.data.Timespan;
import app.organicmaps.sdk.editor.data.Timetable;
import app.organicmaps.sdk.util.UiUtils;
import java.util.ArrayList;
import java.util.Arrays;

2
android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java
View File

@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.editor.data.HoursMinutes;
import app.organicmaps.sdk.editor.data.HoursMinutes;
public class SimpleTimetableFragment extends BaseMwmRecyclerFragment<SimpleTimetableAdapter>
implements TimetableProvider,

4
android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
View File

@@ -14,8 +14,8 @@ import com.google.android.material.textview.MaterialTextView;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.editor.data.LocalizedStreet;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.data.LocalizedStreet;
import app.organicmaps.sdk.util.UiUtils;
public class StreetAdapter extends RecyclerView.Adapter<StreetAdapter.BaseViewHolder>
{

3
android/app/src/main/java/app/organicmaps/editor/StreetFragment.java
View File

@@ -13,7 +13,8 @@ import androidx.annotation.Nullable;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmRecyclerFragment;
import app.organicmaps.dialog.EditTextDialogFragment;
import app.organicmaps.editor.data.LocalizedStreet;
import app.organicmaps.sdk.editor.Editor;
import app.organicmaps.sdk.editor.data.LocalizedStreet;
public class StreetFragment extends BaseMwmRecyclerFragment<StreetAdapter>
{

3
android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
View File

@@ -16,7 +16,8 @@ import androidx.fragment.app.FragmentActivity;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.util.UiUtils;
import app.organicmaps.sdk.editor.OpeningHours;
import app.organicmaps.sdk.util.UiUtils;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.android.material.textview.MaterialTextView;

2
android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java
View File

@@ -12,7 +12,7 @@ import androidx.core.view.ViewCompat;
import app.organicmaps.R;
import app.organicmaps.WebContainerDelegate;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.util.Constants;
import app.organicmaps.sdk.util.Constants;
import app.organicmaps.util.WindowInsetUtils;
public class CopyrightFragment extends BaseMwmFragment

2
android/app/src/main/java/app/organicmaps/help/FaqFragment.java
View File

@@ -15,7 +15,7 @@ import androidx.core.view.ViewCompat;
import app.organicmaps.R;
import app.organicmaps.WebContainerDelegate;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.util.Constants;
import app.organicmaps.sdk.util.Constants;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils;

8
android/app/src/main/java/app/organicmaps/help/HelpFragment.java
View File

@@ -15,12 +15,12 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import app.organicmaps.BuildConfig;
import app.organicmaps.Framework;
import app.organicmaps.sdk.Framework;
import app.organicmaps.R;
import app.organicmaps.base.BaseMwmFragment;
import app.organicmaps.util.Config;
import app.organicmaps.util.Constants;
import app.organicmaps.util.DateUtils;
import app.organicmaps.sdk.util.Config;
import app.organicmaps.sdk.util.Constants;
import app.organicmaps.sdk.util.DateUtils;
import app.organicmaps.util.Graphics;
import app.organicmaps.util.SharingUtils;
import app.organicmaps.util.Utils;

22
android/app/src/main/java/app/organicmaps/intent/Factory.java
View File

@@ -7,23 +7,23 @@ import android.net.Uri;
import androidx.annotation.NonNull;
import androidx.core.content.IntentCompat;
import app.organicmaps.Framework;
import app.organicmaps.Map;
import app.organicmaps.sdk.Framework;
import app.organicmaps.sdk.Map;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.api.ParsedRoutingData;
import app.organicmaps.api.ParsedSearchRequest;
import app.organicmaps.api.RequestType;
import app.organicmaps.api.RoutePoint;
import app.organicmaps.bookmarks.data.BookmarkManager;
import app.organicmaps.bookmarks.data.FeatureId;
import app.organicmaps.bookmarks.data.MapObject;
import app.organicmaps.sdk.api.ParsedRoutingData;
import app.organicmaps.sdk.api.ParsedSearchRequest;
import app.organicmaps.sdk.api.RequestType;
import app.organicmaps.sdk.api.RoutePoint;
import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
import app.organicmaps.sdk.bookmarks.data.FeatureId;
import app.organicmaps.sdk.bookmarks.data.MapObject;
import app.organicmaps.editor.OsmLoginActivity;
import app.organicmaps.routing.RoutingController;
import app.organicmaps.search.SearchActivity;
import app.organicmaps.sdk.search.SearchEngine;
import app.organicmaps.util.StorageUtils;
import app.organicmaps.util.concurrency.ThreadPool;
import app.organicmaps.sdk.util.StorageUtils;
import app.organicmaps.sdk.util.concurrency.ThreadPool;
import java.io.File;
import java.util.Collections;

13
android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java
View File

@@ -23,8 +23,11 @@ import androidx.core.content.ContextCompat;
import app.organicmaps.MwmActivity;
import app.organicmaps.MwmApplication;
import app.organicmaps.R;
import app.organicmaps.util.LocationUtils;
import app.organicmaps.util.log.Logger;
import app.organicmaps.sdk.location.LocationHelper;
import app.organicmaps.sdk.location.LocationListener;
import app.organicmaps.sdk.location.TrackRecorder;
import app.organicmaps.sdk.util.LocationUtils;
import app.organicmaps.sdk.util.log.Logger;
import static android.Manifest.permission.ACCESS_FINE_LOCATION;
import static android.Manifest.permission.POST_NOTIFICATIONS;
@@ -54,7 +57,7 @@ public class TrackRecordingService extends Service implements LocationListener
{
if (!TrackRecorder.nativeIsTrackRecordingEnabled())
TrackRecorder.nativeStartTrackRecording();
LocationHelper.from(context).restartWithNewMode();
MwmApplication.from(context).getLocationHelper().restartWithNewMode();
ContextCompat.startForegroundService(context, new Intent(context, TrackRecordingService.class));
}
@@ -130,7 +133,7 @@ public class TrackRecordingService extends Service implements LocationListener
mWarningBuilder = null;
if (TrackRecorder.nativeIsTrackRecordingEnabled())
TrackRecorder.nativeStopTrackRecording();
LocationHelper.from(this).removeListener(this);
MwmApplication.from(this).getLocationHelper().removeListener(this);
// The notification is cancelled automatically by the system.
}
@@ -181,7 +184,7 @@ public class TrackRecordingService extends Service implements LocationListener
Logger.e(TAG, "Failed to promote the service to foreground", e);
}
final LocationHelper locationHelper = LocationHelper.from(this);
final LocationHelper locationHelper = MwmApplication.from(this).getLocationHelper();
// Subscribe to location updates. This call is idempotent.
locationHelper.addListener(this);

1
android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
View File

@@ -9,6 +9,7 @@ import androidx.annotation.StringRes;
import app.organicmaps.R;
import app.organicmaps.adapter.OnItemClickListener;
import app.organicmaps.sdk.maplayer.Mode;
import app.organicmaps.util.ThemeUtils;
public class LayerBottomSheetItem

Some files were not shown because too many files have changed in this diff Show More