diff --git a/android/app/src/fdroid/java/app/organicmaps/location b/android/app/src/fdroid/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/fdroid/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/fdroid/java/app/organicmaps/sdk/location b/android/app/src/fdroid/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/fdroid/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java b/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java similarity index 97% rename from android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java rename to android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java index f33db2a8d..500de1d3b 100644 --- a/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java +++ b/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java @@ -1,8 +1,8 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static app.organicmaps.util.concurrency.UiThread.runLater; +import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; import android.app.PendingIntent; import android.content.Context; @@ -26,8 +26,8 @@ import com.google.android.gms.location.LocationSettingsStatusCodes; import com.google.android.gms.location.Priority; import com.google.android.gms.location.SettingsClient; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; class GoogleFusedLocationProvider extends BaseLocationProvider { diff --git a/android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java b/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java similarity index 88% rename from android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java rename to android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java index 5b802eb03..7232f118e 100644 --- a/android/app/src/google/java/app/organicmaps/location/LocationProviderFactory.java +++ b/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java @@ -1,12 +1,13 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import androidx.annotation.NonNull; import com.google.android.gms.common.ConnectionResult; import com.google.android.gms.common.GoogleApiAvailability; -import app.organicmaps.util.Config; -import app.organicmaps.util.log.Logger; + +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.log.Logger; public class LocationProviderFactory { diff --git a/android/app/src/huawei/java/app/organicmaps/location b/android/app/src/huawei/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/huawei/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/huawei/java/app/organicmaps/sdk/location b/android/app/src/huawei/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/huawei/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/android/app/src/main/cpp/CMakeLists.txt b/android/app/src/main/cpp/CMakeLists.txt index 2aa64f470..770e2682a 100644 --- a/android/app/src/main/cpp/CMakeLists.txt +++ b/android/app/src/main/cpp/CMakeLists.txt @@ -5,21 +5,21 @@ project(organicmaps C CXX) set(SRC # JNI headers ../../../../../private.h - app/organicmaps/core/jni_helper.hpp - app/organicmaps/core/jni_java_methods.hpp - app/organicmaps/core/logging.hpp - app/organicmaps/core/ScopedEnv.hpp - app/organicmaps/core/ScopedLocalRef.hpp - app/organicmaps/Framework.hpp - app/organicmaps/opengl/android_gl_utils.hpp - app/organicmaps/opengl/androidoglcontext.hpp - app/organicmaps/opengl/androidoglcontextfactory.hpp - app/organicmaps/opengl/gl3stub.h - app/organicmaps/platform/GuiThread.hpp - app/organicmaps/platform/AndroidPlatform.hpp - app/organicmaps/util/Distance.hpp - app/organicmaps/util/FeatureIdBuilder.hpp - app/organicmaps/vulkan/android_vulkan_context_factory.hpp + app/organicmaps/sdk/core/jni_helper.hpp + app/organicmaps/sdk/core/jni_java_methods.hpp + app/organicmaps/sdk/core/logging.hpp + app/organicmaps/sdk/core/ScopedEnv.hpp + app/organicmaps/sdk/core/ScopedLocalRef.hpp + app/organicmaps/sdk/Framework.hpp + app/organicmaps/sdk/opengl/android_gl_utils.hpp + app/organicmaps/sdk/opengl/androidoglcontext.hpp + app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp + app/organicmaps/sdk/opengl/gl3stub.h + app/organicmaps/sdk/platform/GuiThread.hpp + app/organicmaps/sdk/platform/AndroidPlatform.hpp + app/organicmaps/sdk/util/Distance.hpp + app/organicmaps/sdk/util/FeatureIdBuilder.hpp + app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp # JNI sources app/organicmaps/sdk/search/DisplayedCategories.cpp @@ -39,47 +39,47 @@ set(SRC app/organicmaps/sdk/MapStyle.cpp app/organicmaps/sdk/OrganicMaps.cpp app/organicmaps/sdk/Router.cpp - app/organicmaps/core/jni_helper.cpp - app/organicmaps/core/jni_java_methods.cpp - app/organicmaps/core/logging.cpp - app/organicmaps/bookmarks/data/BookmarkManager.cpp - app/organicmaps/DownloadResourcesLegacyActivity.cpp - app/organicmaps/editor/Editor.cpp - app/organicmaps/editor/OpeningHours.cpp - app/organicmaps/editor/OsmOAuth.cpp - app/organicmaps/Framework.cpp - app/organicmaps/isolines/IsolinesManager.cpp - app/organicmaps/LocationState.cpp - app/organicmaps/Map.cpp - app/organicmaps/MapManager.cpp - app/organicmaps/settings/UnitLocale.cpp - app/organicmaps/settings/MapLanguageCode.cpp - app/organicmaps/sound/tts.cpp - app/organicmaps/subway/SubwayManager.cpp - app/organicmaps/TrackRecorder.cpp - app/organicmaps/TrafficState.cpp - app/organicmaps/UserMarkHelper.cpp - app/organicmaps/opengl/android_gl_utils.cpp - app/organicmaps/opengl/androidoglcontext.cpp - app/organicmaps/opengl/androidoglcontextfactory.cpp - app/organicmaps/opengl/gl3stub.cpp - app/organicmaps/platform/GuiThread.cpp - app/organicmaps/platform/HttpThread.cpp - app/organicmaps/platform/Language.cpp - app/organicmaps/platform/Localization.cpp - app/organicmaps/platform/AndroidPlatform.cpp - app/organicmaps/platform/PThreadImpl.cpp - app/organicmaps/platform/SecureStorage.cpp - app/organicmaps/platform/SocketImpl.cpp - app/organicmaps/util/Config.cpp - app/organicmaps/util/GeoUtils.cpp - app/organicmaps/util/HttpClient.cpp - app/organicmaps/util/Language.cpp - app/organicmaps/util/LogsManager.cpp - app/organicmaps/util/NetworkPolicy.cpp - app/organicmaps/util/StringUtils.cpp - app/organicmaps/util/UiThread.cpp - app/organicmaps/vulkan/android_vulkan_context_factory.cpp + app/organicmaps/sdk/core/jni_helper.cpp + app/organicmaps/sdk/core/jni_java_methods.cpp + app/organicmaps/sdk/core/logging.cpp + app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp + app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp + app/organicmaps/sdk/editor/Editor.cpp + app/organicmaps/sdk/editor/OpeningHours.cpp + app/organicmaps/sdk/editor/OsmOAuth.cpp + app/organicmaps/sdk/Framework.cpp + app/organicmaps/sdk/isolines/IsolinesManager.cpp + app/organicmaps/sdk/LocationState.cpp + app/organicmaps/sdk/Map.cpp + app/organicmaps/sdk/MapManager.cpp + app/organicmaps/sdk/settings/UnitLocale.cpp + app/organicmaps/sdk/settings/MapLanguageCode.cpp + app/organicmaps/sdk/sound/tts.cpp + app/organicmaps/sdk/subway/SubwayManager.cpp + app/organicmaps/sdk/TrackRecorder.cpp + app/organicmaps/sdk/TrafficState.cpp + app/organicmaps/sdk/UserMarkHelper.cpp + app/organicmaps/sdk/opengl/android_gl_utils.cpp + app/organicmaps/sdk/opengl/androidoglcontext.cpp + app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp + app/organicmaps/sdk/opengl/gl3stub.cpp + app/organicmaps/sdk/platform/GuiThread.cpp + app/organicmaps/sdk/platform/HttpThread.cpp + app/organicmaps/sdk/platform/Language.cpp + app/organicmaps/sdk/platform/Localization.cpp + app/organicmaps/sdk/platform/AndroidPlatform.cpp + app/organicmaps/sdk/platform/PThreadImpl.cpp + app/organicmaps/sdk/platform/SecureStorage.cpp + app/organicmaps/sdk/platform/SocketImpl.cpp + app/organicmaps/sdk/util/Config.cpp + app/organicmaps/sdk/util/GeoUtils.cpp + app/organicmaps/sdk/util/HttpClient.cpp + app/organicmaps/sdk/util/Language.cpp + app/organicmaps/sdk/util/LogsManager.cpp + app/organicmaps/sdk/util/NetworkPolicy.cpp + app/organicmaps/sdk/util/StringUtils.cpp + app/organicmaps/sdk/util/UiThread.cpp + app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp ) omim_add_library(${PROJECT_NAME} SHARED ${SRC}) diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp index c6e37227b..cc49a4712 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/ChoosePositionMode.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp similarity index 92% rename from android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp index 1ac953548..da1cc89c5 100644 --- a/android/app/src/main/cpp/app/organicmaps/DownloadResourcesLegacyActivity.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp @@ -16,7 +16,7 @@ #include "base/logging.hpp" #include "base/string_utils.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include #include @@ -70,7 +70,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env, jclass clazz) { // clear all g_filesToDownload.clear(); @@ -149,7 +149,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(JNIEnv * env, jclass clazz, jobject listener) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(JNIEnv * env, jclass clazz, jobject listener) { if (g_filesToDownload.empty()) return ERR_NO_MORE_FILES; @@ -178,7 +178,7 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env, jclass clazz) { LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest)); g_currentRequest.reset(); diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp similarity index 82% rename from android/app/src/main/cpp/app/organicmaps/Framework.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp index 581986277..bda8a5ca7 100644 --- a/android/app/src/main/cpp/app/organicmaps/Framework.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.cpp @@ -1,19 +1,19 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/opengl/androidoglcontextfactory.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "app/organicmaps/sdk/routing/JunctionInfo.hpp" #include "app/organicmaps/sdk/routing/RouteMarkData.hpp" #include "app/organicmaps/sdk/routing/RouteMarkType.hpp" #include "app/organicmaps/sdk/routing/RouteRecommendationType.hpp" #include "app/organicmaps/sdk/routing/RoutingInfo.hpp" #include "app/organicmaps/sdk/routing/TransitRouteInfo.hpp" -#include "app/organicmaps/util/Distance.hpp" -#include "app/organicmaps/util/FeatureIdBuilder.hpp" -#include "app/organicmaps/util/NetworkPolicy.hpp" -#include "app/organicmaps/vulkan/android_vulkan_context_factory.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" +#include "app/organicmaps/sdk/util/FeatureIdBuilder.hpp" +#include "app/organicmaps/sdk/util/NetworkPolicy.hpp" +#include "app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp" #include "map/bookmark_helpers.hpp" #include "map/chart_generator.hpp" @@ -824,35 +824,35 @@ RoutingManager::LoadRouteHandler g_loadRouteHandler; /// @name JNI EXPORTS JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) { auto const info = frm()->GetAddressAtPoint(mercator::FromLatLon(lat, lon)); return jni::ToJavaString(env, info.FormatAddress()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz) { frm()->GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::API); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz, jstring url) +Java_app_organicmaps_sdk_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz, jstring url) { return static_cast(frm()->ParseAndSetApiURL(jni::ToNativeString(env, url))); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz) { using namespace url_scheme; - static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/api/RoutePoint"); + static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/RoutePoint"); // Java signature : RoutePoint(double lat, double lon, String name) static jmethodID const pointConstructor = jni::GetConstructorID(env, pointClazz, "(DDLjava/lang/String;)V"); - static jclass const routeDataClazz = jni::GetGlobalClassRef(env, "app/organicmaps/api/ParsedRoutingData"); + static jclass const routeDataClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedRoutingData"); // Java signature : ParsedRoutingData(RoutePoint[] points, int routerType) { - static jmethodID const routeDataConstructor = jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/api/RoutePoint;I)V"); + static jmethodID const routeDataConstructor = jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/sdk/api/RoutePoint;I)V"); auto const & routingData = frm()->GetParsedRoutingData(); jobjectArray points = jni::ToJavaArray(env, pointClazz, routingData.m_points, @@ -868,10 +868,10 @@ Java_app_organicmaps_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass c } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz) { using namespace url_scheme; - static jclass const cl = jni::GetGlobalClassRef(env, "app/organicmaps/api/ParsedSearchRequest"); + static jclass const cl = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedSearchRequest"); // Java signature : ParsedSearchRequest(String query, String locale, double lat, double lon, boolean isSearchOnMap) static jmethodID const ctor = jni::GetConstructorID(env, cl, "(Ljava/lang/String;Ljava/lang/String;DDZ)V"); auto const & r = frm()->GetParsedSearchRequest(); @@ -880,28 +880,28 @@ Java_app_organicmaps_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedAppName(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedAppName(JNIEnv * env, jclass) { std::string const & appName = frm()->GetParsedAppName(); return (appName.empty()) ? nullptr : jni::ToJavaString(env, appName); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass) { std::string const & code = frm()->GetParsedOAuth2Code(); return jni::ToJavaString(env, code); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass) { std::string const & backUrl = frm()->GetParsedBackUrl(); return (backUrl.empty()) ? nullptr : jni::ToJavaString(env, backUrl); } JNIEXPORT jdoubleArray JNICALL -Java_app_organicmaps_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) { ms::LatLon const center = frm()->GetParsedCenterLatLon(); if (!center.IsValid()) @@ -915,14 +915,14 @@ Java_app_organicmaps_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) +Java_app_organicmaps_sdk_Framework_nativePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) { LOG(LINFO, ("Set global map object listener")); g_placePageActivationListener = env->NewGlobalRef(jListener); // void onPlacePageActivated(MapObject object); jmethodID const activatedId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageActivated", - "(Lapp/organicmaps/widget/placepage/PlacePageData;)V"); + "(Lapp/organicmaps/sdk/widget/placepage/PlacePageData;)V"); // void onPlacePageDeactivated(); jmethodID const deactivateId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageDeactivated", "()V"); @@ -962,7 +962,7 @@ Java_app_organicmaps_Framework_nativePlacePageActivationListener(JNIEnv *env, jc } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemovePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) +Java_app_organicmaps_sdk_Framework_nativeRemovePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener) { if (g_placePageActivationListener == nullptr) return; @@ -977,7 +977,7 @@ Java_app_organicmaps_Framework_nativeRemovePlacePageActivationListener(JNIEnv *e } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) +Java_app_organicmaps_sdk_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) { ::Framework * fr = frm(); double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale()); @@ -986,7 +986,7 @@ Java_app_organicmaps_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) +Java_app_organicmaps_sdk_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name) { ::Framework * fr = frm(); double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale()); @@ -995,16 +995,16 @@ Java_app_organicmaps_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth( +Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth( JNIEnv * env, jclass, jdouble merX, jdouble merY, jdouble cLat, jdouble cLon, jdouble north) { platform::Distance distance; double azimut = -1.0; frm()->GetDistanceAndAzimut(m2::PointD(merX, merY), cLat, cLon, north, distance, azimut); - static jclass const daClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/DistanceAndAzimut"); + static jclass const daClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut"); // Java signature : DistanceAndAzimut(Distance distance, double azimuth) - static jmethodID const methodID = jni::GetConstructorID(env, daClazz, "(Lapp/organicmaps/util/Distance;D)V"); + static jmethodID const methodID = jni::GetConstructorID(env, daClazz, "(Lapp/organicmaps/sdk/util/Distance;D)V"); return env->NewObject(daClazz, methodID, ToJavaDistance(env, distance), @@ -1012,16 +1012,16 @@ Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth( } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuthFromLatLon( +Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuthFromLatLon( JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jdouble cLat, jdouble cLon, jdouble north) { double const merY = mercator::LatToY(lat); double const merX = mercator::LonToX(lon); - return Java_app_organicmaps_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north); + return Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat) +Java_app_organicmaps_sdk_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat) { switch (static_cast(coordsFormat)) { @@ -1054,13 +1054,13 @@ Java_app_organicmaps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt) +Java_app_organicmaps_sdk_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt) { return jni::ToJavaString(env, platform::Distance::FormatAltitude(alt)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed) +Java_app_organicmaps_sdk_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed) { auto const units = measurement_utils::GetMeasurementUnits(); return jni::ToJavaString(env, measurement_utils::FormatSpeedNumeric(speed, units) + " " + @@ -1069,13 +1069,13 @@ Java_app_organicmaps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble s /* JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetOutdatedCountriesString(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetOutdatedCountriesString(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_framework->GetOutdatedCountriesString()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) { vector countries; Storage const & storage = g_framework->GetStorage(); @@ -1089,44 +1089,44 @@ Java_app_organicmaps_Framework_nativeGetOutdatedCountries(JNIEnv * env, jclass) } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeToDoAfterUpdate(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeToDoAfterUpdate(JNIEnv * env, jclass) { return g_framework->ToDoAfterUpdate(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDataVersionChanged(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsDataVersionChanged(JNIEnv * env, jclass) { return frm()->IsDataVersionUpdated() ? JNI_TRUE : JNI_FALSE; } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeUpdateSavedDataVersion(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeUpdateSavedDataVersion(JNIEnv * env, jclass) { frm()->UpdateSavedDataVersion(); } */ JNIEXPORT jlong JNICALL -Java_app_organicmaps_Framework_nativeGetDataVersion(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDataVersion(JNIEnv * env, jclass) { return frm()->GetCurrentDataVersion(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetDrawScale(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDrawScale(JNIEnv * env, jclass) { return static_cast(frm()->GetDrawScale()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass) { frm()->GetSearchAPI().PokeSearchInViewport(); } JNIEXPORT jdoubleArray JNICALL -Java_app_organicmaps_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) { m2::PointD const center = frm()->GetViewportCenter(); @@ -1138,43 +1138,43 @@ Java_app_organicmaps_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track) +Java_app_organicmaps_sdk_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track) { frm()->ShowTrack(static_cast(track)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveRoute(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeSaveRoute(JNIEnv *, jclass) { frm()->SaveRoute(); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetWritableDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetWritableDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().WritableDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetSettingsDir(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetSettingsDir(JNIEnv * env, jclass) { return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetDataFileExt(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetDataFileExt(JNIEnv * env, jclass) { return jni::ToJavaString(env, DATA_FILE_EXTENSION); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) { vector exts = { DATA_FILE_EXTENSION, FONT_FILE_EXTENSION }; platform::CountryIndexes::GetIndexesExts(exts); @@ -1182,7 +1182,7 @@ Java_app_organicmaps_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) { static std::array const kBookmarkExtensions = { std::string{kKmzExtension}, @@ -1195,7 +1195,7 @@ Java_app_organicmaps_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath) +Java_app_organicmaps_sdk_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath) { string newPath = jni::ToNativeString(env, jNewPath); g_framework->RemoveLocalMaps(); @@ -1204,55 +1204,55 @@ Java_app_organicmaps_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jst } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRoutingActive(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRoutingActive(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRoutingActive(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteBuilding(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteBuilt(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeCloseRouting(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeCloseRouting(JNIEnv * env, jclass) { frm()->GetRoutingManager().CloseRouting(true /* remove route points */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeBuildRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeBuildRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().BuildRoute(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveRoute(false /* deactivateFollowing */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeFollowRoute(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeFollowRoute(JNIEnv * env, jclass) { frm()->GetRoutingManager().FollowRoute(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDisableFollowing(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDisableFollowing(JNIEnv * env, jclass) { frm()->GetRoutingManager().DisableFollowMode(); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets) +Java_app_organicmaps_sdk_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets) { ::Framework * fr = frm(); if (!fr->GetRoutingManager().IsRoutingActive()) @@ -1267,20 +1267,20 @@ Java_app_organicmaps_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode) +Java_app_organicmaps_sdk_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode) { frm()->GetRoutingManager().GetSpeedCamManager().SetMode( static_cast(mode)); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass) { return static_cast(frm()->GetRoutingManager().GetSpeedCamManager().GetMode()); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) { RoutingManager & rm = frm()->GetRoutingManager(); if (!rm.IsRoutingActive()) @@ -1295,7 +1295,7 @@ Java_app_organicmaps_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass) { vector junctionPoints; if (!frm()->GetRoutingManager().RoutingSession().GetRouteJunctionPoints(junctionPoints)) @@ -1308,7 +1308,7 @@ Java_app_organicmaps_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits) +Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits) { RoutingManager::DistanceAltitude altitudes; if (!frm()->GetRoutingManager().GetRouteAltitudesAndDistancesM(altitudes)) @@ -1398,13 +1398,13 @@ Java_app_organicmaps_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId, jboolean zoomToDownloadButton) +Java_app_organicmaps_sdk_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId, jboolean zoomToDownloadButton) { g_framework->ShowNode(jni::ToNativeString(env, countryId), (bool) zoomToDownloadButton); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener) +Java_app_organicmaps_sdk_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); frm()->GetRoutingManager().SetRouteBuildingListener( @@ -1414,7 +1414,7 @@ Java_app_organicmaps_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jo } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener) +Java_app_organicmaps_sdk_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); frm()->GetRoutingManager().SetRouteProgressListener( @@ -1422,7 +1422,7 @@ Java_app_organicmaps_Framework_nativeSetRouteProgressListener(JNIEnv * env, jcla } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); @@ -1431,7 +1431,7 @@ Java_app_organicmaps_Framework_nativeSetRoutingRecommendationListener(JNIEnv * e } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetRoutingLoadPointsListener( +Java_app_organicmaps_sdk_Framework_nativeSetRoutingLoadPointsListener( JNIEnv *, jclass, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); @@ -1442,19 +1442,19 @@ Java_app_organicmaps_Framework_nativeSetRoutingLoadPointsListener( } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeactivatePopup(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeactivatePopup(JNIEnv * env, jclass) { return g_framework->DeactivatePopup(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass) { return g_framework->DeactivateMapSelectionCircle(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title, +Java_app_organicmaps_sdk_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title, jstring subtitle, jobject markType, jint intermediateIndex, jboolean isMyPosition, @@ -1473,64 +1473,64 @@ Java_app_organicmaps_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex) +Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex) { frm()->GetRoutingManager().RemoveRoutePoint(GetRouteMarkType(env, markType), static_cast(intermediateIndex)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass) { frm()->GetRoutingManager().RemoveIntermediateRoutePoints(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass) { return frm()->GetRoutingManager().CouldAddIntermediatePoint(); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_Framework_nativeGetRoutePoints(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetRoutePoints(JNIEnv * env, jclass) { return CreateRouteMarkDataArray(env, frm()->GetRoutingManager().GetRoutePoints()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass, jint currentIndex, jint targetIndex) { frm()->GetRoutingManager().MoveRoutePoint(currentIndex, targetIndex); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass) { return CreateTransitRouteInfo(env, frm()->GetRoutingManager().GetTransitRouteInfo()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass) { g_framework->ReloadWorldMaps(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDayTime(JNIEnv * env, jclass, jlong utcTimeSeconds, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_Framework_nativeIsDayTime(JNIEnv * env, jclass, jlong utcTimeSeconds, jdouble lat, jdouble lon) { DayTimeType const dt = GetDayTime(static_cast(utcTimeSeconds), lat, lon); return (dt == DayTimeType::Day || dt == DayTimeType::PolarDay); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow, jboolean allowBuildings) +Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow, jboolean allowBuildings) { bool const allow3d = static_cast(allow); bool const allow3dBuildings = static_cast(allowBuildings); @@ -1540,7 +1540,7 @@ Java_app_organicmaps_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean al } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result) +Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result) { bool enabled; bool buildings; @@ -1556,7 +1556,7 @@ Java_app_organicmaps_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject res } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jboolean enabled) { bool const autoZoomEnabled = static_cast(enabled); frm()->SaveAutoZoom(autoZoomEnabled); @@ -1564,19 +1564,19 @@ Java_app_organicmaps_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jb } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->GetTransitManager().EnableTransitSchemeMode(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadTransitSchemeEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { auto const isolinesEnabled = static_cast(enabled); frm()->GetIsolinesManager().SetEnabled(isolinesEnabled); @@ -1584,44 +1584,44 @@ Java_app_organicmaps_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclas } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadIsolinesEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->SaveOutdoorsEnabled(enabled); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass) { return static_cast(frm()->LoadOutdoorsEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) +Java_app_organicmaps_sdk_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled) { frm()->SaveTransitSchemeEnabled(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass) { return frm()->LoadAutoZoom(); } // static void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate); JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jint zoom, jboolean animate) +Java_app_organicmaps_sdk_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jint zoom, jboolean animate) { g_framework->Scale(m2::PointD(mercator::FromLatLon(lat, lon)), zoom, animate); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass) { if (!frm()->HasPlacePageInfo()) return nullptr; @@ -1640,7 +1640,7 @@ Java_app_organicmaps_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, j } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint id) +Java_app_organicmaps_sdk_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint id) { auto const metaID = static_cast(id); string_view const value = g_framework->GetPlacePageInfo().GetMetadata(metaID); @@ -1650,14 +1650,14 @@ Java_app_organicmaps_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass) { ::Framework * fr = frm(); return storage::IsPointCoveredByDownloadedMaps(fr->GetViewportCenter(), fr->GetStorage(), fr->GetCountryInfoGetter()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -1667,75 +1667,75 @@ Java_app_organicmaps_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * en } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left, jint top, jint right, jint bottom) +Java_app_organicmaps_sdk_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left, jint top, jint right, jint bottom) { frm()->SetVisibleViewport(m2::RectD(left, top, right, bottom)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeIsRouteFinished(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeIsRouteFinished(JNIEnv * env, jclass) { return frm()->GetRoutingManager().IsRouteFinished(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass) { frm()->RunFirstLaunchAnimation(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass) { return frm()->GetRoutingManager().OpenRoutePointsTransaction(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass, jint transactionId) { frm()->GetRoutingManager().ApplyRoutePointsTransaction(transactionId); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass, jint transactionId) { frm()->GetRoutingManager().CancelRoutePointsTransaction(transactionId); } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass) { return frm()->GetRoutingManager().InvalidRoutePointsTransactionId(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass) { return frm()->GetRoutingManager().HasSavedRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeLoadRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeLoadRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().LoadRoutePoints(g_loadRouteHandler); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSaveRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeSaveRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().SaveRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass) { frm()->GetRoutingManager().DeleteSavedRoutePoints(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId) +Java_app_organicmaps_sdk_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId) { auto const f = g_framework->BuildFeatureId(env, featureId); @@ -1744,13 +1744,13 @@ Java_app_organicmaps_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject f } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMakeCrash(JNIEnv *env, jclass type) +Java_app_organicmaps_sdk_Framework_nativeMakeCrash(JNIEnv *env, jclass type) { CHECK(false, ("Diagnostic native crash!")); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, +Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, jint facilityType, jboolean state) { frm()->GetPowerManager().SetFacility(static_cast(facilityType), @@ -1758,32 +1758,32 @@ Java_app_organicmaps_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass, } JNIEXPORT jint JNICALL -Java_app_organicmaps_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass) { return static_cast(frm()->GetPowerManager().GetScheme()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType) +Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType) { frm()->GetPowerManager().SetScheme(static_cast(schemeType)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) +Java_app_organicmaps_sdk_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) { // isAnim = true because of previous nativeSetChoosePositionMode animations. frm()->SetViewportCenter(mercator::FromLatLon(lat, lon), static_cast(zoom), true /* isAnim */); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeStopLocationFollow(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeStopLocationFollow(JNIEnv *, jclass) { frm()->StopLocationFollow(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat, +Java_app_organicmaps_sdk_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom) { auto const center = mercator::FromLatLon(static_cast(lat), @@ -1793,13 +1793,13 @@ Java_app_organicmaps_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass) { return static_cast(frm()->HasPlacePageInfo()); } JNIEXPORT void JNICALL -Java_app_organicmaps_Framework_nativeMemoryWarning(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Framework_nativeMemoryWarning(JNIEnv *, jclass) { return frm()->MemoryWarning(); } diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/Framework.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/Framework.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Framework.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/LocationState.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp similarity index 77% rename from android/app/src/main/cpp/app/organicmaps/LocationState.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp index cd2864d70..8e12965b7 100644 --- a/android/app/src/main/cpp/app/organicmaps/LocationState.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/LocationState.cpp @@ -1,9 +1,9 @@ #include "Framework.hpp" #include "map/gps_tracker.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -18,7 +18,7 @@ static void LocationStateModeChanged(location::EMyPositionMode mode, // public static void nativeSwitchToNextMode(); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, jclass clazz) { ASSERT(g_framework, ()); g_framework->SwitchMyPositionNextMode(); @@ -26,7 +26,7 @@ Java_app_organicmaps_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, // private static int nativeGetMode(); JNIEXPORT jint JNICALL -Java_app_organicmaps_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz) { // GetMyPositionMode() is initialized only after drape creation. // https://github.com/organicmaps/organicmaps/issues/1128#issuecomment-1784435190 @@ -36,7 +36,7 @@ Java_app_organicmaps_location_LocationState_nativeGetMode(JNIEnv * env, jclass c // public static void nativeSetListener(ModeChangeListener listener); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) { ASSERT(g_framework, ()); @@ -46,21 +46,21 @@ Java_app_organicmaps_location_LocationState_nativeSetListener(JNIEnv * env, jcla // public static void nativeRemoveListener(); JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz) { ASSERT(g_framework, ()); g_framework->SetMyPositionModeListener(location::TMyPositionModeChanged()); } JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz, int errorCode) +Java_app_organicmaps_sdk_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz, int errorCode) { ASSERT(g_framework, ()); g_framework->OnLocationError(errorCode); } JNIEXPORT void JNICALL -Java_app_organicmaps_location_LocationState_nativeLocationUpdated(JNIEnv * env, jclass clazz, jlong time, +Java_app_organicmaps_sdk_location_LocationState_nativeLocationUpdated(JNIEnv * env, jclass clazz, jlong time, jdouble lat, jdouble lon, jfloat accuracy, jdouble altitude, jfloat speed, jfloat bearing) { diff --git a/android/app/src/main/cpp/app/organicmaps/Map.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp similarity index 67% rename from android/app/src/main/cpp/app/organicmaps/Map.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp index 2062ba8ab..f5332f3d9 100644 --- a/android/app/src/main/cpp/app/organicmaps/Map.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Map.cpp @@ -1,8 +1,8 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "storage/storage_defines.hpp" @@ -23,7 +23,7 @@ void OnRenderingInitializationFinished(std::shared_ptr const & listener extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeCreateEngine(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_Map_nativeCreateEngine(JNIEnv * env, jclass, jobject surface, jint density, jboolean firstLaunch, jboolean isLaunchByDeepLink, @@ -35,25 +35,25 @@ Java_app_organicmaps_Map_nativeCreateEngine(JNIEnv * env, jclass, } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeIsEngineCreated(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeIsEngineCreated(JNIEnv *, jclass) { return g_framework->IsDrapeEngineCreated(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi) +Java_app_organicmaps_sdk_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi) { return g_framework->UpdateDpi(dpi); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass) { return g_framework->ExecuteMapApiRequest(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSetRenderingInitializationFinishedListener( +Java_app_organicmaps_sdk_Map_nativeSetRenderingInitializationFinishedListener( JNIEnv *, jclass, jobject listener) { if (listener) @@ -68,68 +68,68 @@ Java_app_organicmaps_Map_nativeSetRenderingInitializationFinishedListener( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface) +Java_app_organicmaps_sdk_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface) { return g_framework->AttachSurface(env, surface); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface) +Java_app_organicmaps_sdk_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface) { g_framework->DetachSurface(destroySurface); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w, jint h) +Java_app_organicmaps_sdk_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w, jint h) { g_framework->Resize(env, surface, w, h); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass) { return g_framework->DestroySurfaceOnDetach(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativePauseSurfaceRendering(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativePauseSurfaceRendering(JNIEnv *, jclass) { g_framework->PauseSurfaceRendering(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass) { g_framework->ResumeSurfaceRendering(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz, int offsetY) +Java_app_organicmaps_sdk_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz, int offsetY) { g_framework->UpdateMyPositionRoutingOffset(offsetY); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeApplyWidgets(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeApplyWidgets(JNIEnv *, jclass) { g_framework->ApplyWidgets(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeCleanWidgets(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeCleanWidgets(JNIEnv *, jclass) { g_framework->CleanWidgets(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeSetupWidget( +Java_app_organicmaps_sdk_Map_nativeSetupWidget( JNIEnv *, jclass, jint widget, jfloat x, jfloat y, jint anchor) { g_framework->SetupWidget(static_cast(widget), x, y, static_cast(anchor)); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, jboolean forceRedraw) +Java_app_organicmaps_sdk_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, jboolean forceRedraw) { location::CompassInfo info; info.m_bearing = north; @@ -138,33 +138,33 @@ Java_app_organicmaps_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, j } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeScalePlus(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeScalePlus(JNIEnv *, jclass) { g_framework->Scale(::Framework::SCALE_MAG); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeScaleMinus(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeScaleMinus(JNIEnv *, jclass) { g_framework->Scale(::Framework::SCALE_MIN); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnScroll( +Java_app_organicmaps_sdk_Map_nativeOnScroll( JNIEnv *, jclass, jdouble distanceX, jdouble distanceY) { g_framework->Scroll(distanceX, distanceY); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnScale( +Java_app_organicmaps_sdk_Map_nativeOnScale( JNIEnv *, jclass, jdouble factor, jdouble focusX, jdouble focusY, jboolean isAnim) { g_framework->Scale(factor, {focusX, focusY}, isAnim); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeOnTouch(JNIEnv *, jclass, jint action, +Java_app_organicmaps_sdk_Map_nativeOnTouch(JNIEnv *, jclass, jint action, jint id1, jfloat x1, jfloat y1, jint id2, jfloat x2, jfloat y2, jint maskedPointer) @@ -175,14 +175,14 @@ Java_app_organicmaps_Map_nativeOnTouch(JNIEnv *, jclass, jint action, } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeStorageConnected(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeStorageConnected(JNIEnv *, jclass) { android::Platform::Instance().OnExternalStorageStatusChanged(true); g_framework->AddLocalMaps(); } JNIEXPORT void JNICALL -Java_app_organicmaps_Map_nativeStorageDisconnected(JNIEnv *, jclass) +Java_app_organicmaps_sdk_Map_nativeStorageDisconnected(JNIEnv *, jclass) { android::Platform::Instance().OnExternalStorageStatusChanged(false); g_framework->RemoveLocalMaps(); diff --git a/android/app/src/main/cpp/app/organicmaps/MapManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp similarity index 83% rename from android/app/src/main/cpp/app/organicmaps/MapManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp index 3b0a5bfc9..75083bb58 100644 --- a/android/app/src/main/cpp/app/organicmaps/MapManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/MapManager.cpp @@ -1,7 +1,7 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" #include "coding/internal/file_data.hpp" @@ -70,7 +70,7 @@ struct CountryItemBuilder CountryItemBuilder(JNIEnv *env) { - m_class = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/CountryItem"); + m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/CountryItem"); m_ctor = jni::GetConstructorID(env, m_class, "(Ljava/lang/String;)V"); m_Id = env->GetFieldID(m_class, "id", "Ljava/lang/String;"); @@ -112,55 +112,55 @@ extern "C" // static String nativeGetRoot(); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, GetStorage().GetRootId()); } // static boolean nativeMoveFile(String oldFile, String newFile); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz, jstring oldFile, jstring newFile) +Java_app_organicmaps_sdk_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz, jstring oldFile, jstring newFile) { return base::MoveFileX(jni::ToNativeString(env, oldFile), jni::ToNativeString(env, newFile)); } // static boolean nativeHasSpaceToDownloadAmount(long bytes); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes) { return storage::IsEnoughSpaceForDownload(bytes); } // static boolean nativeHasSpaceToDownloadCountry(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env, jclass clazz, jstring root) { return storage::IsEnoughSpaceForDownload(jni::ToNativeString(env, root), GetStorage()); } // static boolean nativeHasSpaceToUpdate(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env, jclass clazz, jstring root) { return IsEnoughSpaceForUpdate(jni::ToNativeString(env, root), GetStorage()); } // static int nativeGetDownloadedCount(); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz) { return static_cast(GetStorage().GetDownloadedFilesCount()); } // static @Nullable UpdateInfo nativeGetUpdateInfo(@Nullable String root); JNIEXPORT jobject JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz, jstring root) { storage::Storage::UpdateInfo info; if (!GetStorage().GetUpdateInfo(GetRootId(env, root), info)) return nullptr; - static jclass const infoClass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/UpdateInfo"); + static jclass const infoClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/UpdateInfo"); ASSERT(infoClass, (jni::DescribeException())); static jmethodID const ctor = jni::GetConstructorID(env, infoClass, "(IJ)V"); ASSERT(ctor, (jni::DescribeException())); @@ -269,7 +269,7 @@ static void PutItemsToList( // static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, boolean myMapsMode, List result); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result) +Java_app_organicmaps_sdk_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result) { if (hasLocation && !myMapsMode) { @@ -292,7 +292,7 @@ Java_app_organicmaps_downloader_MapManager_nativeListItems(JNIEnv * env, jclass // static void nativeUpdateItem(CountryItem item); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass, jobject item) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass, jobject item) { auto const & ciBuilder = CountryItemBuilder::Instance(env); jstring id = static_cast(env->GetObjectField(item, ciBuilder.m_Id)); @@ -305,7 +305,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jcl // static void nativeGetStatus(String root); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz, jstring root) { storage::NodeStatuses ns; GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns); @@ -314,7 +314,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass // static void nativeGetError(String root); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz, jstring root) { storage::NodeStatuses ns; GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns); @@ -323,21 +323,21 @@ Java_app_organicmaps_downloader_MapManager_nativeGetError(JNIEnv * env, jclass c // static String nativeGetName(String root); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz, jstring root) { return jni::ToJavaString(env, GetStorage().GetNodeLocalName(jni::ToNativeString(env, root))); } // static @Nullable String nativeFindCountry(double lat, double lon); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) +Java_app_organicmaps_sdk_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon) { return jni::ToJavaString(env, g_framework->NativeFramework()->GetCountryInfoGetter().GetRegionCountryId(mercator::FromLatLon(lat, lon))); } // static boolean nativeIsDownloading(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz) { return static_cast(GetStorage().IsDownloadInProgress()); } @@ -365,7 +365,7 @@ static void EndBatchingCallbacks(JNIEnv * env) for (TBatchedData const & dataItem : key.second) { // Create StorageCallbackData instance… - static jclass batchDataClass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/MapManager$StorageCallbackData"); + static jclass batchDataClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/MapManager$StorageCallbackData"); static jmethodID batchDataCtor = jni::GetConstructorID(env, batchDataClass, "(Ljava/lang/String;IIZ)V"); jni::TScopedLocalRef const id(env, jni::ToJavaString(env, dataItem.m_countryId)); @@ -388,7 +388,7 @@ static void EndBatchingCallbacks(JNIEnv * env) // static void nativeDownload(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().DownloadNode(jni::ToNativeString(env, root)); @@ -397,7 +397,7 @@ Java_app_organicmaps_downloader_MapManager_nativeDownload(JNIEnv * env, jclass c // static boolean nativeRetry(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().RetryDownloadNode(jni::ToNativeString(env, root)); @@ -406,7 +406,7 @@ Java_app_organicmaps_downloader_MapManager_nativeRetry(JNIEnv * env, jclass claz // static void nativeUpdate(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().UpdateNode(GetRootId(env, root)); @@ -415,7 +415,7 @@ Java_app_organicmaps_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass cla // static void nativeCancel(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); GetStorage().CancelDownloadNode(GetRootId(env, root)); @@ -424,7 +424,7 @@ Java_app_organicmaps_downloader_MapManager_nativeCancel(JNIEnv * env, jclass cla // static void nativeDelete(String root); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz, jstring root) { StartBatchingCallbacks(); auto const countryId = jni::ToNativeString(env, root); @@ -457,7 +457,7 @@ static void ProgressChangedCallback(std::shared_ptr const & listenerRef // static int nativeSubscribe(StorageCallback listener); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz, jobject listener) { return GetStorage().Subscribe(std::bind(&StatusChangedCallback, jni::make_global_ref(listener), std::placeholders::_1), std::bind(&ProgressChangedCallback, jni::make_global_ref(listener), std::placeholders::_1, std::placeholders::_2)); @@ -465,14 +465,14 @@ Java_app_organicmaps_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass // static void nativeUnsubscribe(int slot); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz, jint slot) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz, jint slot) { GetStorage().Unsubscribe(slot); } // static void nativeSubscribeOnCountryChanged(CurrentCountryChangedListener listener); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env, jclass clazz, jobject listener) { ASSERT(!g_countryChangedListener, ()); g_countryChangedListener = env->NewGlobalRef(listener); @@ -492,7 +492,7 @@ Java_app_organicmaps_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEn // static void nativeUnsubscribeOnCountryChanged(); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env, jclass clazz) { g_framework->NativeFramework()->SetCurrentCountryChangedListener(nullptr); @@ -502,14 +502,14 @@ Java_app_organicmaps_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNI // static boolean nativeHasUnsavedEditorChanges(String root); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env, jclass clazz, jstring root) +Java_app_organicmaps_sdk_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env, jclass clazz, jstring root) { return g_framework->NativeFramework()->HasUnsavedEdits(jni::ToNativeString(env, root)); } // static void nativeGetPathTo(String root, List result); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz, jstring root, jobject result) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz, jstring root, jobject result) { auto const listAddMethod = jni::ListBuilder::Instance(env).m_add; @@ -521,7 +521,7 @@ Java_app_organicmaps_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass // static int nativeGetOverallProgress(String[] countries); JNIEXPORT jint JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env, jclass clazz, jobjectArray jcountries) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env, jclass clazz, jobjectArray jcountries) { int const size = env->GetArrayLength(jcountries); storage::CountriesVec countries; @@ -544,28 +544,28 @@ Java_app_organicmaps_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env // static boolean nativeIsAutoretryFailed(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env, jclass clazz) { return g_framework->IsAutoRetryDownloadFailed(); } // static boolean nativeIsDownloadOn3gEnabled(); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env, jclass clazz) { return g_framework->IsDownloadOn3gEnabled(); } // static void nativeEnableDownloadOn3g(); JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env, jclass clazz) { g_framework->EnableDownloadOn3g(); } // static @Nullable String nativeGetSelectedCountry(); JNIEXPORT jstring JNICALL -Java_app_organicmaps_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz) { if (!g_framework->NativeFramework()->HasPlacePageInfo()) return nullptr; diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp index 5e51c9c50..6083134a1 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/MapStyle.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp index 8e676c733..a54c78142 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp @@ -1,8 +1,8 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" extern "C" { diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp index 656eebbc3..48e9a4673 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/Router.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "indexer/map_style.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp similarity index 53% rename from android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp index eaba5327d..66c2bcbe2 100644 --- a/android/app/src/main/cpp/app/organicmaps/TrackRecorder.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp @@ -9,7 +9,7 @@ extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz, jboolean enable) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz, jboolean enable) { GpsTracker::Instance().SetEnabled(enable); Framework * const f = frm(); @@ -22,37 +22,37 @@ extern "C" } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz) { return GpsTracker::Instance().IsEnabled(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env, jclass clazz) { frm()->StartTrackRecording(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env, jclass clazz) { frm()->StopTrackRecording(); } JNIEXPORT void JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env, jclass clazz, jstring name) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env, jclass clazz, jstring name) { frm()->SaveTrackRecordingWithName(jni::ToNativeString(env, name)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env, jclass clazz) { return frm()->IsTrackRecordingEmpty(); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env, jclass clazz) + Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env, jclass clazz) { return frm()->IsTrackRecordingEnabled(); } diff --git a/android/app/src/main/cpp/app/organicmaps/TrafficState.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp similarity index 63% rename from android/app/src/main/cpp/app/organicmaps/TrafficState.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp index 8f70c8141..6206f6d3e 100644 --- a/android/app/src/main/cpp/app/organicmaps/TrafficState.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp @@ -1,8 +1,8 @@ #include "Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -13,35 +13,35 @@ static void TrafficStateChanged(TrafficManager::TrafficState state, std::shared_ } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTrafficStateListener(std::bind(&TrafficStateChanged, std::placeholders::_1, jni::make_global_ref(listener))); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTrafficStateListener(TrafficManager::TrafficStateChangedFn()); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->EnableTraffic(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); return static_cast(g_framework->IsTrafficEnabled()); } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->DisableTraffic(); diff --git a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp index 32d2571ba..44d6424c3 100644 --- a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp @@ -49,7 +49,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje static jmethodID const ctorId = jni::GetConstructorID( env, g_mapObjectClazz, "(" - "Lapp/organicmaps/bookmarks/data/FeatureId;" // featureId + "Lapp/organicmaps/sdk/bookmarks/data/FeatureId;" // featureId "I" // mapObjectType "Ljava/lang/String;" // title "Ljava/lang/String;" // secondaryTitle @@ -104,7 +104,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, // @Nullable String[] rawTypes) static jmethodID const ctorId = jni::GetConstructorID(env, g_bookmarkClazz, - "(Lapp/organicmaps/bookmarks/data/FeatureId;JJLjava/lang/String;" + "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;JJLjava/lang/String;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;" "Lapp/organicmaps/sdk/routing/RoutePointInfo;" "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;" @@ -137,7 +137,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, jobject CreateElevationPoint(JNIEnv * env, ElevationInfo::Point const & point) { static jclass const pointClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo$Point"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point"); // public Point(double distance, int altitude) static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DI)V"); @@ -149,7 +149,7 @@ jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & p { CHECK(!points.empty(), ("Elevation points must be non empty!")); static jclass const pointClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo$Point"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point"); return jni::ToJavaArray(env, pointClass, points, [](JNIEnv * env, ElevationInfo::Point const & item) { @@ -164,7 +164,7 @@ jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info) // long m_duration) static jmethodID const ctorId = jni::GetConstructorID(env, g_elevationInfoClazz, "(JLjava/lang/String;Ljava/lang/String;" - "[Lapp/organicmaps/bookmarks/data/ElevationInfo$Point;" + "[Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;" "IIIIIJ)V"); jni::TScopedLocalObjectArrayRef jPoints(env, ToElevationPointArray(env, info.GetPoints())); // TODO (KK): elevation info should have only the elevation data - see the https://github.com/organicmaps/organicmaps/pull/10063 diff --git a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp index 9a56c4c2f..e67e0254d 100644 --- a/android/app/src/main/cpp/app/organicmaps/UserMarkHelper.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp @@ -2,8 +2,8 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include diff --git a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp similarity index 81% rename from android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp index f801f37b5..69c99079b 100644 --- a/android/app/src/main/cpp/app/organicmaps/bookmarks/data/BookmarkManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp @@ -1,7 +1,7 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "map/bookmark_helpers.hpp" #include "map/place_page_info.hpp" @@ -51,9 +51,9 @@ void PrepareClassRefs(JNIEnv * env) return; g_bookmarkManagerClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkManager"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkManager"); g_bookmarkManagerInstanceField = jni::GetStaticFieldID(env, g_bookmarkManagerClass, "INSTANCE", - "Lapp/organicmaps/bookmarks/data/BookmarkManager;"); + "Lapp/organicmaps/sdk/bookmarks/data/BookmarkManager;"); jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField); @@ -68,27 +68,27 @@ void PrepareClassRefs(JNIEnv * env) "(ZLjava/lang/String;Z)V"); g_onPreparedFileForSharingMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing", - "(Lapp/organicmaps/bookmarks/data/BookmarkSharingResult;)V"); + "(Lapp/organicmaps/sdk/bookmarks/data/BookmarkSharingResult;)V"); g_longClass = jni::GetGlobalClassRef(env,"java/lang/Long"); g_longConstructor = jni::GetConstructorID(env, g_longClass, "(J)V"); g_sortedBlockClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/SortedBlock"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/SortedBlock"); g_sortedBlockConstructor = jni::GetConstructorID(env, g_sortedBlockClass, "(Ljava/lang/String;[Ljava/lang/Long;[Ljava/lang/Long;)V"); g_onBookmarksSortingCompleted = jni::GetMethodID(env, bookmarkManagerInstance, - "onBookmarksSortingCompleted", "([Lapp/organicmaps/bookmarks/data/SortedBlock;J)V"); + "onBookmarksSortingCompleted", "([Lapp/organicmaps/sdk/bookmarks/data/SortedBlock;J)V"); g_onBookmarksSortingCancelled = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksSortingCancelled", "(J)V"); g_bookmarkInfoClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkInfo"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkInfo"); g_bookmarkInfoConstructor = jni::GetConstructorID(env, g_bookmarkInfoClass, "(JJ)V" ); g_bookmarkCategoryClass = - jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkCategory"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkCategory"); //public BookmarkCategory(long id, // String name, @@ -183,7 +183,7 @@ void OnAsyncLoadingFileError(JNIEnv * env, std::string const & fileName, bool is void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const & result) { - static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/BookmarkSharingResult"); + static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult"); // BookmarkSharingResult(long[] categoriesIds, @Code int code, @NonNull String sharingPath, @NonNull String mimeType, @NonNull String errorString) static jmethodID const ctorBookmarkSharingResult = jni::GetConstructorID(env, classBookmarkSharingResult, "([JILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); @@ -297,21 +297,21 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids) extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap( JNIEnv *, jobject, jlong bmkId) { frm()->ShowBookmark(static_cast(bmkId)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap( JNIEnv *, jobject, jlong catId) { frm()->ShowBookmarkCategory(static_cast(catId), true /* animated */); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass) { PrepareClassRefs(env); BookmarkManager::AsyncLoadingCallbacks callbacks; @@ -327,7 +327,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeCreateCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeCreateCategory( JNIEnv * env, jobject, jstring name) { auto const categoryId = frm()->GetBookmarkManager().CreateBookmarkCategory(ToNativeString(env, name)); @@ -336,7 +336,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeCreateCategory( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteCategory( JNIEnv *, jobject, jlong catId) { auto const categoryId = static_cast(catId); @@ -345,20 +345,20 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteCategory( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId) { frm()->GetBookmarkManager().GetEditSession().DeleteBookmark(static_cast(bmkId)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeDeleteTrack( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteTrack( JNIEnv *, jobject, jlong trkId) { frm()->GetBookmarkManager().GetEditSession().DeleteTrack(static_cast(trkId)); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory( JNIEnv * env, jobject, double lat, double lon) { if (!frm()->HasPlacePageInfo()) @@ -389,48 +389,48 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEdite } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory( JNIEnv *, jobject) { return static_cast(frm()->LastEditedBMCategory()); } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastEditedColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedColor( JNIEnv *, jobject) { return static_cast(frm()->LastEditedBMColor()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass, jstring path, jboolean isTemporaryFile) { frm()->AddBookmarksFile(ToNativeString(env, path), isTemporaryFile); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsAsyncBookmarksLoadingInProgress(JNIEnv *, jclass) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsAsyncBookmarksLoadingInProgress(JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().IsAsyncLoadingInProgress()); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsVisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsVisible( JNIEnv *, jobject, jlong catId) { return static_cast(frm()->GetBookmarkManager().IsVisible(static_cast(catId))); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetVisibility( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetVisibility( JNIEnv *, jobject, jlong catId, jboolean isVisible) { frm()->GetBookmarkManager().GetEditSession().SetIsVisible(static_cast(catId), isVisible); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryName( JNIEnv * env, jobject, jlong catId, jstring name) { frm()->GetBookmarkManager().GetEditSession().SetCategoryName(static_cast(catId), @@ -438,7 +438,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryName( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env, jobject, jlong catId, jstring desc) @@ -448,7 +448,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryDescription } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryTags( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryTags( JNIEnv * env, jobject, jlong catId, jobjectArray tagsIds) { auto const size = env->GetArrayLength(tagsIds); @@ -465,7 +465,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryTags( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules( JNIEnv *, jobject, jlong catId, jint accessRules) { frm()->GetBookmarkManager().GetEditSession().SetCategoryAccessRules( @@ -473,7 +473,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty( JNIEnv * env, jobject, jlong catId, jstring key, jstring value) { frm()->GetBookmarkManager().GetEditSession().SetCategoryCustomProperty( @@ -481,7 +481,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetCategoryCustomPrope } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage( JNIEnv * env, jobject, jlong bmkId) { if (!frm()->HasPlacePageInfo()) @@ -496,7 +496,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePag } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( JNIEnv * env, jobject, jlong bmkId) { auto const bookmark = frm()->GetBookmarkManager().GetBookmark(static_cast(bmkId)); @@ -508,7 +508,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo( } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition( JNIEnv *, jobject, jlong catId, jint positionInCategory) { auto const & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast(catId)); @@ -522,12 +522,12 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPositio static uint32_t shift(uint32_t v, uint8_t bitCount) { return v << bitCount; } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrack( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack( JNIEnv * env, jobject, jlong trackId, jclass trackClazz) { // Track(long trackId, long categoryId, String name, String lengthString, int color) static jmethodID const cId = jni::GetConstructorID(env, trackClazz, - "(JJLjava/lang/String;Lapp/organicmaps/util/Distance;I)V"); + "(JJLjava/lang/String;Lapp/organicmaps/sdk/util/Distance;I)V"); auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast(trackId)); ASSERT(nTrack, ("Track must not be null with id:)", trackId)); @@ -545,7 +545,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrack( } JNIEXPORT jlong JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( JNIEnv *, jobject, jlong catId, jint positionInCategory) { auto const & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast(catId)); @@ -557,42 +557,42 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName( JNIEnv * env, jclass, jstring name) { return static_cast(frm()->GetBookmarkManager().IsUsedCategoryName(ToNativeString(env, name))); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareForSearch( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareForSearch( JNIEnv *, jclass, jlong catId) { frm()->GetBookmarkManager().PrepareForSearch(static_cast(catId)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreAllCategoriesInvisible()); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreAllCategoriesVisible()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility( JNIEnv *, jclass, jboolean visible) { frm()->GetBookmarkManager().SetAllCategoriesVisibility(static_cast(visible)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(JNIEnv * env, jclass, jlong trackId, jint kmlFileType) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(JNIEnv * env, jclass, jlong trackId, jint kmlFileType) { frm()->GetBookmarkManager().PrepareTrackFileForSharing(static_cast(trackId), [env](BookmarkManager::SharingResult const & result) { @@ -601,7 +601,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSha } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType) { auto const size = env->GetArrayLength(catIds); kml::GroupIdCollection catIdsVector(size); @@ -614,7 +614,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativePrepareFileForSharing( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( JNIEnv *, jclass, jlong catId) { return static_cast(frm()->GetBookmarkManager().IsCategoryEmpty( @@ -622,27 +622,27 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled( JNIEnv *, jclass, jboolean enabled) { frm()->GetBookmarkManager().SetNotificationsEnabled(static_cast(enabled)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled( JNIEnv *, jclass) { return static_cast(frm()->GetBookmarkManager().AreNotificationsEnabled()); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id) { return MakeCategory(env, static_cast(id)); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject) { auto const & bm = frm()->GetBookmarkManager(); auto const & ids = bm.GetSortedBmGroupIdList(); @@ -651,7 +651,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv *env, jobject) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv *env, jobject) { auto const & bm = frm()->GetBookmarkManager(); auto const count = bm.GetBmGroupsCount(); @@ -660,7 +660,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesC } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId) +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId) { auto const & bm = frm()->GetBookmarkManager(); auto const ids = bm.GetChildrenCategories(static_cast(parentId)); @@ -669,7 +669,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetChildrenCategories( } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeHasLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeHasLastSortingType( JNIEnv *, jobject, jlong catId) { auto const & bm = frm()->GetBookmarkManager(); @@ -678,7 +678,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeHasLastSortingType( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastSortingType( JNIEnv *, jobject, jlong catId) { auto const & bm = frm()->GetBookmarkManager(); @@ -690,7 +690,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetLastSortingType( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetLastSortingType( JNIEnv *, jobject, jlong catId, jint type) { auto & bm = frm()->GetBookmarkManager(); @@ -699,7 +699,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetLastSortingType( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeResetLastSortingType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeResetLastSortingType( JNIEnv *, jobject, jlong catId) { auto & bm = frm()->GetBookmarkManager(); @@ -707,7 +707,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeResetLastSortingType( } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(JNIEnv *env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(JNIEnv *env, jobject, jlong catId, jboolean hasMyPosition) { auto const & bm = frm()->GetBookmarkManager(); @@ -724,7 +724,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTyp } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env, +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env, jobject, jlong catId, jint sortingType, jboolean hasMyPosition, jdouble lat, jdouble lon, jlong timestamp) { @@ -741,14 +741,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIE } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkName( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkName( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, getBookmark(bmk)->GetPreferredName()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, @@ -756,14 +756,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription( JNIEnv * env, jclass, jlong bmk) { return jni::ToJavaString(env, getBookmark(bmk)->GetDescription()); } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( JNIEnv *, jclass, jlong bmk) { auto const * mark = getBookmark(bmk); @@ -772,7 +772,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkColor( } JNIEXPORT jint JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( JNIEnv *, jclass, jlong bmk) { auto const * mark = getBookmark(bmk); @@ -781,7 +781,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( JNIEnv * env, jclass, jlong bmk, jstring name, jint color, jstring descr) { @@ -802,7 +802,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetBookmarkParams( constexpr static uint8_t ExtractByte(uint32_t number, uint8_t byteIdx) { return (number >> (8 * byteIdx)) & 0xFF; } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetTrackParams( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetTrackParams( JNIEnv * env, jclass, jlong trackId, jstring name, jint color, jstring descr) { @@ -821,14 +821,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetTrackParams( } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetTrackDescription( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackDescription( JNIEnv * env, jclass, jlong trackId) { return jni::ToJavaString(env, frm()->GetBookmarkManager().GetTrack(static_cast(trackId))->GetDescription()); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory( JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong bmk) { g_framework->MoveBookmark(static_cast(bmk), static_cast(oldCat), @@ -836,7 +836,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong trackId) { g_framework->MoveTrack(static_cast(trackId), static_cast(oldCat), @@ -844,7 +844,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackCategory( } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackColor( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackColor( JNIEnv *, jclass, jlong trackId, jint color) { uint8_t alpha = ExtractByte(color, 3); @@ -852,28 +852,28 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeChangeTrackColor( } JNIEXPORT jobject JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkXY( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkXY( JNIEnv * env, jclass, jlong bmk) { return jni::GetNewParcelablePointD(env, getBookmark(bmk)->GetPivot()); } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkScale( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkScale( JNIEnv *, jclass, jlong bmk) { return getBookmark(bmk)->GetScale(); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url( JNIEnv * env, jclass, jlong bmk, jboolean addName) { return jni::ToJavaString(env, frm()->CodeGe0url(getBookmark(bmk), addName)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( JNIEnv * env, jclass, jlong bmkId) { auto const address = frm()->GetAddressAtPoint(getBookmark(bmkId)->GetPivot()).FormatAddress(); @@ -881,7 +881,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress( } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance( JNIEnv *, jclass, jlong trackId) { auto const & bm = frm()->GetBookmarkManager(); @@ -889,7 +889,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationCurPositio } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener( JNIEnv * env, jclass) { frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback( @@ -897,14 +897,14 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPos } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener( JNIEnv *, jclass) { frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(nullptr); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint( JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters) { auto & bm = frm()->GetBookmarkManager(); @@ -914,7 +914,7 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActivePoin } JNIEXPORT jdouble JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance( JNIEnv *, jclass, jlong trackId) { auto & bm = frm()->GetBookmarkManager(); @@ -922,21 +922,21 @@ Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeGetElevationActivePoin } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener( JNIEnv *env, jclass) { frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(std::bind(&OnElevationActivePointChanged, env)); } JNIEXPORT void JNICALL -Java_app_organicmaps_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener( +Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener( JNIEnv *, jclass) { frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(nullptr); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_widget_placepage_PlacePageButtonFactory_nativeHasRecentlyDeletedBookmark(JNIEnv *, jclass) +Java_app_organicmaps_sdk_widget_placepage_PlacePageButtonFactory_nativeHasRecentlyDeletedBookmark(JNIEnv *, jclass) { return frm()->GetBookmarkManager().HasRecentlyDeletedBookmark(); } diff --git a/android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedEnv.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/ScopedEnv.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedEnv.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp index 8485ef1d6..9050f7823 100644 --- a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp @@ -52,17 +52,17 @@ JNI_OnLoad(JavaVM * jvm, void *) jni::InitAssertLog(); JNIEnv * env = jni::GetEnv(); - g_mapObjectClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/MapObject"); - g_featureIdClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/FeatureId"); - g_bookmarkClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/Bookmark"); - g_httpClientClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/HttpClient"); - g_httpParamsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/HttpClient$Params"); - g_platformSocketClazz = jni::GetGlobalClassRef(env, "app/organicmaps/location/PlatformSocket"); - g_utilsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/Utils"); - g_loggerClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/log/Logger"); - g_keyValueClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/KeyValue"); - g_networkPolicyClazz = jni::GetGlobalClassRef(env, "app/organicmaps/util/NetworkPolicy"); - g_elevationInfoClazz = jni::GetGlobalClassRef(env, "app/organicmaps/bookmarks/data/ElevationInfo"); + g_mapObjectClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/MapObject"); + g_featureIdClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/FeatureId"); + g_bookmarkClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/Bookmark"); + g_httpClientClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient"); + g_httpParamsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient$Params"); + g_platformSocketClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/location/PlatformSocket"); + g_utilsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Utils"); + g_loggerClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/log/Logger"); + g_keyValueClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/KeyValue"); + g_networkPolicyClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/NetworkPolicy"); + g_elevationInfoClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo"); return JNI_VERSION_1_6; } @@ -269,7 +269,7 @@ std::string DescribeException() jobject GetNewParcelablePointD(JNIEnv * env, m2::PointD const & point) { - jclass klass = env->FindClass("app/organicmaps/bookmarks/data/ParcelablePointD"); + jclass klass = env->FindClass("app/organicmaps/sdk/bookmarks/data/ParcelablePointD"); ASSERT ( klass, () ); jmethodID methodID = GetConstructorID(env, klass, "(DD)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/jni_java_methods.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/logging.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp similarity index 91% rename from android/app/src/main/cpp/app/organicmaps/core/logging.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp index abe1fcbd2..857d49aca 100644 --- a/android/app/src/main/cpp/app/organicmaps/core/logging.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.cpp @@ -3,9 +3,9 @@ #include "base/exception.hpp" #include "base/logging.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/logging.hpp" -#include "app/organicmaps/core/ScopedEnv.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/logging.hpp" +#include "app/organicmaps/sdk/core/ScopedEnv.hpp" #include #include diff --git a/android/app/src/main/cpp/app/organicmaps/core/logging.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/logging.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/logging.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/logging.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/render_context.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/render_context.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/core/render_context.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/core/render_context.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp similarity index 76% rename from android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp index fc0222f72..4efb0db64 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/Editor.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "editor/osm_editor.hpp" @@ -66,38 +66,38 @@ extern "C" using osm::Editor; JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeInit(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeInit(JNIEnv * env, jclass) { - g_localNameClazz = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/LocalizedName"); + g_localNameClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/LocalizedName"); // LocalizedName(int code, @NonNull String name, @NonNull String lang, @NonNull String langName) g_localNameCtor = jni::GetConstructorID(env, g_localNameClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V"); g_localNameFieldCode = env->GetFieldID(g_localNameClazz, "code", "I"); g_localNameFieldName = env->GetFieldID(g_localNameClazz, "name", "Ljava/lang/String;"); - g_localStreetClazz = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/LocalizedStreet"); + g_localStreetClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/LocalizedStreet"); // LocalizedStreet(@NonNull String defaultName, @NonNull String localizedName) g_localStreetCtor = jni::GetConstructorID(env, g_localStreetClazz, "(Ljava/lang/String;Ljava/lang/String;)V"); g_localStreetFieldDef = env->GetFieldID(g_localStreetClazz, "defaultName", "Ljava/lang/String;"); g_localStreetFieldLoc = env->GetFieldID(g_localStreetClazz, "localizedName", "Ljava/lang/String;"); - g_namesDataSourceClassID = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/NamesDataSource"); - g_namesDataSourceConstructorID = jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/editor/data/LocalizedName;I)V"); + g_namesDataSourceClassID = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/NamesDataSource"); + g_namesDataSourceConstructorID = jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/sdk/editor/data/LocalizedName;I)V"); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_editableMapObject.GetOpeningHours()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value) { g_editableMapObject.SetOpeningHours(jni::ToNativeString(env, value)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -113,7 +113,7 @@ Java_app_organicmaps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -121,7 +121,7 @@ Java_app_organicmaps_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, j } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value) +Java_app_organicmaps_sdk_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value) { auto const metaID = static_cast(id); ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); @@ -129,32 +129,32 @@ Java_app_organicmaps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStars(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStars(JNIEnv * env, jclass) { return g_editableMapObject.GetStars(); } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass) { return osm::EditableMapObject::kMaximumLevelsEditableByUsers; } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeHasWifi(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeHasWifi(JNIEnv *, jclass) { return g_editableMapObject.GetInternet() == feature::Internet::Wlan; } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi) +Java_app_organicmaps_sdk_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi) { if (hasWifi != (g_editableMapObject.GetInternet() == feature::Internet::Wlan)) g_editableMapObject.SetInternet(hasWifi ? feature::Internet::Wlan : feature::Internet::Unknown); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) { switch (g_framework->NativeFramework()->SaveEditedMapObject(g_editableMapObject)) { @@ -169,7 +169,7 @@ Java_app_organicmaps_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -179,7 +179,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -189,7 +189,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -199,7 +199,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -209,7 +209,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass) } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -219,7 +219,7 @@ Java_app_organicmaps_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass) } JNIEXPORT jintArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jclass clazz) { auto const & editable = g_editableMapObject.GetEditableProperties(); size_t const size = editable.size(); @@ -233,31 +233,31 @@ Java_app_organicmaps_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jcl } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsAddressEditable(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsNameEditable(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsPointType(); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz) { return g_editableMapObject.IsBuilding(); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass) { auto const namesDataSource = g_editableMapObject.GetNamesDataSource(); @@ -268,7 +268,7 @@ Java_app_organicmaps_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names) +Java_app_organicmaps_sdk_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names) { int const length = env->GetArrayLength(names); for (int i = 0; i < length; i++) @@ -280,29 +280,29 @@ Java_app_organicmaps_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectA } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStreet(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStreet(JNIEnv * env, jclass) { return ToJavaStreet(env, g_editableMapObject.GetStreet()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street) +Java_app_organicmaps_sdk_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street) { g_editableMapObject.SetStreet({jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldDef)), jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldLoc))}); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz) { return jni::ToJavaArray(env, g_localStreetClazz, g_editableMapObject.GetNearbyStreets(), ToJavaStreet); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jclass clazz, jboolean includeServiceLangs) +Java_app_organicmaps_sdk_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jclass clazz, jboolean includeServiceLangs) { using TLang = StringUtf8Multilang::Lang; //public Language(@NonNull String code, @NonNull String name) - static jclass const langClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Language"); + static jclass const langClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Language"); static jmethodID const langCtor = jni::GetConstructorID(env, langClass, "(Ljava/lang/String;Ljava/lang/String;)V"); return jni::ToJavaArray(env, langClass, StringUtf8Multilang::GetSupportedLanguages(includeServiceLangs), @@ -315,25 +315,25 @@ Java_app_organicmaps_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jcl } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass) { return jni::ToJavaString(env, g_editableMapObject.GetHouseNumber()); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass, jstring houseNumber) +Java_app_organicmaps_sdk_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass, jstring houseNumber) { g_editableMapObject.SetHouseNumber(jni::ToNativeString(env, houseNumber)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz) { return Editor::Instance().HaveMapEditsOrNotesToUpload(); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz, jstring token, jstring appVersion, jstring appId) +Java_app_organicmaps_sdk_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz, jstring token, jstring appVersion, jstring appId) { // TODO: Handle upload status in callback Editor::Instance().UploadChanges(jni::ToNativeString(env, token), @@ -342,7 +342,7 @@ Java_app_organicmaps_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass claz } JNIEXPORT jlongArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) { auto const stats = Editor::Instance().GetStats(); jlongArray result = env->NewLongArray(3); @@ -353,13 +353,13 @@ Java_app_organicmaps_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz) } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz) { Editor::Instance().ClearAllLocalEdits(); } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeStartEdit(JNIEnv *, jclass) +Java_app_organicmaps_sdk_editor_Editor_nativeStartEdit(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); if (!frm->HasPlacePageInfo()) @@ -374,7 +374,7 @@ Java_app_organicmaps_editor_Editor_nativeStartEdit(JNIEnv *, jclass) } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, +Java_app_organicmaps_sdk_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, jstring featureType) { ::Framework * frm = g_framework->NativeFramework(); @@ -385,7 +385,7 @@ Java_app_organicmaps_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass, // static void nativeCreateNote(String text); JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) +Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text) { g_framework->NativeFramework()->CreateNote( g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text)); @@ -393,7 +393,7 @@ Java_app_organicmaps_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, // static void nativePlaceDoesNotExist(String comment); JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) +Java_app_organicmaps_sdk_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment) { g_framework->NativeFramework()->CreateNote(g_editableMapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist, @@ -401,13 +401,13 @@ Java_app_organicmaps_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz) { g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring jLang) { std::string const & lang = jni::ToNativeString(env, jLang); @@ -418,7 +418,7 @@ Java_app_organicmaps_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * en } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz, jstring query, jstring jLang) { @@ -430,7 +430,7 @@ Java_app_organicmaps_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * en } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) { osm::AllCuisines const & cuisines = osm::Cuisines::Instance().AllSupportedCuisines(); std::vector keys; @@ -441,13 +441,13 @@ Java_app_organicmaps_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz) { return jni::ToJavaStringArray(env, g_editableMapObject.GetCuisines()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr) +Java_app_organicmaps_sdk_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr) { std::string const substr = jni::ToNativeString(env, jSubstr); bool const noFilter = substr.length() == 0; @@ -467,7 +467,7 @@ Java_app_organicmaps_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) +Java_app_organicmaps_sdk_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) { int const length = env->GetArrayLength(jKeys); auto const & cuisines = osm::Cuisines::Instance(); @@ -482,7 +482,7 @@ Java_app_organicmaps_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass } JNIEXPORT void JNICALL -Java_app_organicmaps_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) +Java_app_organicmaps_sdk_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys) { int const length = env->GetArrayLength(jKeys); std::vector cuisines; @@ -493,38 +493,38 @@ Java_app_organicmaps_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclas } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, g_editableMapObject.FormatCuisines()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz) { return jni::ToJavaString(env, g_editableMapObject.GetID().GetMwmName()); } JNIEXPORT jlong JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz) { return g_editableMapObject.GetID().GetMwmVersion(); } // static boolean nativeIsHouseValid(String houseNumber); JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber) +Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber) { return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name) +Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name) { return osm::EditableMapObject::ValidateName(jni::ToNativeString(env, name)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) { auto types = g_editableMapObject.GetTypes(); types.SortBySpec(); @@ -534,20 +534,20 @@ Java_app_organicmaps_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz) // @FeatureStatus // static native int nativeGetMapObjectStatus(); JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz) { return static_cast(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID())); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz) { return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index); } // static nativeMakeLocalizedName(String langCode, String name); JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz, jstring code, jstring name) +Java_app_organicmaps_sdk_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz, jstring code, jstring name) { osm::LocalizedName localizedName(jni::ToNativeString(env, code), jni::ToNativeString(env, name)); return ToJavaName(env, localizedName); diff --git a/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp similarity index 86% rename from android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp index ea9c13732..7802dde29 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/OpeningHours.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "editor/opening_hours_ui.hpp" #include "editor/ui2oh.hpp" @@ -44,7 +44,7 @@ jfieldID g_fidWeekdays; jobject JavaHoursMinutes(JNIEnv * env, jlong hours, jlong minutes) { static const jclass dateUtilsClass = jni::GetGlobalClassRef(env, - "app/organicmaps/util/DateUtils"); + "app/organicmaps/sdk/util/DateUtils"); static jmethodID const is24HourFormatMethod = jni::GetStaticMethodID(env, dateUtilsClass, @@ -182,9 +182,9 @@ TimeTableSet NativeTimetableSet(JNIEnv * env, jobjectArray jTimetables) extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) { - g_clazzHoursMinutes = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/HoursMinutes"); + g_clazzHoursMinutes = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/HoursMinutes"); // Java signature : HoursMinutes(@IntRange(from = 0, to = 24) long hours, @IntRange(from = 0, to = 60) long minutes) g_ctorHoursMinutes = env->GetMethodID(g_clazzHoursMinutes, "", "(JJZ)V"); ASSERT(g_ctorHoursMinutes, (jni::DescribeException())); @@ -193,24 +193,24 @@ Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) g_fidMinutes = env->GetFieldID(g_clazzHoursMinutes, "minutes", "J"); ASSERT(g_fidMinutes, (jni::DescribeException())); - g_clazzTimespan = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Timespan"); + g_clazzTimespan = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timespan"); // Java signature : Timespan(HoursMinutes start, HoursMinutes end) g_ctorTimespan = - env->GetMethodID(g_clazzTimespan, "","(Lapp/organicmaps/editor/data/HoursMinutes;Lapp/organicmaps/editor/data/HoursMinutes;)V"); + env->GetMethodID(g_clazzTimespan, "","(Lapp/organicmaps/sdk/editor/data/HoursMinutes;Lapp/organicmaps/sdk/editor/data/HoursMinutes;)V"); ASSERT(g_ctorTimespan, (jni::DescribeException())); - g_fidStart = env->GetFieldID(g_clazzTimespan, "start", "Lapp/organicmaps/editor/data/HoursMinutes;"); + g_fidStart = env->GetFieldID(g_clazzTimespan, "start", "Lapp/organicmaps/sdk/editor/data/HoursMinutes;"); ASSERT(g_fidStart, (jni::DescribeException())); - g_fidEnd = env->GetFieldID(g_clazzTimespan, "end", "Lapp/organicmaps/editor/data/HoursMinutes;"); + g_fidEnd = env->GetFieldID(g_clazzTimespan, "end", "Lapp/organicmaps/sdk/editor/data/HoursMinutes;"); ASSERT(g_fidEnd, (jni::DescribeException())); - g_clazzTimetable = jni::GetGlobalClassRef(env, "app/organicmaps/editor/data/Timetable"); + g_clazzTimetable = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timetable"); // Java signature : Timetable(Timespan workingTime, Timespan[] closedHours, boolean isFullday, int weekdays[]) g_ctorTimetable = - env->GetMethodID(g_clazzTimetable, "","(Lapp/organicmaps/editor/data/Timespan;[Lapp/organicmaps/editor/data/Timespan;Z[I)V"); + env->GetMethodID(g_clazzTimetable, "","(Lapp/organicmaps/sdk/editor/data/Timespan;[Lapp/organicmaps/sdk/editor/data/Timespan;Z[I)V"); ASSERT(g_ctorTimetable, (jni::DescribeException())); - g_fidWorkingTimespan = env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/editor/data/Timespan;"); + g_fidWorkingTimespan = env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/sdk/editor/data/Timespan;"); ASSERT(g_fidWorkingTimespan, (jni::DescribeException())); - g_fidClosedTimespans = env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/editor/data/Timespan;"); + g_fidClosedTimespans = env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/sdk/editor/data/Timespan;"); ASSERT(g_fidClosedTimespans, (jni::DescribeException())); g_fidIsFullday = env->GetFieldID(g_clazzTimetable, "isFullday", "Z"); ASSERT(g_fidIsFullday, (jni::DescribeException())); @@ -219,21 +219,21 @@ Java_app_organicmaps_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz) } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env, jclass clazz) { TimeTableSet tts; return JavaTimetables(env, tts); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeGetComplementTimetable(JNIEnv * env, jclass clazz, jobjectArray timetables) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetComplementTimetable(JNIEnv * env, jclass clazz, jobjectArray timetables) { TimeTableSet const tts = NativeTimetableSet(env, timetables); return JavaTimetable(env, tts.GetComplementTimeTable()); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex) { TimeTableSet tts = NativeTimetableSet(env, timetables); @@ -244,7 +244,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jc } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex) { TimeTableSet tts = NativeTimetableSet(env, timetables); @@ -255,7 +255,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclas } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz, jobject jTimetable, jboolean jIsFullday) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -270,7 +270,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz, jobject jTimetable, jobject jOpeningTime) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -279,7 +279,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jcla } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz, jobject jTimetable, jobject jClosedSpan) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -288,7 +288,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclas } JNIEXPORT jobject JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jclass clazz, jobject jTimetable, jint jClosedSpanIndex) { TimeTable tt = NativeTimetable(env, jTimetable); @@ -297,7 +297,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jc } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env, jclass clazz, jstring jSource) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env, jclass clazz, jstring jSource) { TimeTableSet tts; std::string const source = jni::ToNativeString(env, jSource); @@ -308,7 +308,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, jclass clazz, jobjectArray jTts) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, jclass clazz, jobjectArray jTts) { TimeTableSet tts = NativeTimetableSet(env, jTts); std::stringstream sstr; @@ -317,7 +317,7 @@ Java_app_organicmaps_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env, jclass clazz, jstring jSource) +Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env, jclass clazz, jstring jSource) { return OpeningHours(jni::ToNativeString(env, jSource)).IsValid(); } diff --git a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp similarity index 73% rename from android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp index 784d666ab..9ef2078af 100644 --- a/android/app/src/main/cpp/app/organicmaps/editor/OsmOAuth.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "base/logging.hpp" #include "base/string_utils.hpp" @@ -27,14 +27,14 @@ extern "C" { JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass) { auto const auth = OsmOAuth::ServerAuth(); return ToJavaString(env, auth.BuildOAuth2Url()); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz, +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz, jstring login, jstring password) { OsmOAuth auth = OsmOAuth::ServerAuth(); @@ -52,7 +52,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass, jstring oauth2code) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass, jstring oauth2code) { OsmOAuth auth = OsmOAuth::ServerAuth(); try @@ -73,7 +73,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jcla } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -82,7 +82,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, } JNIEXPORT jint JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -91,7 +91,7 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, j } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken) { UserPreferences prefs; if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs)) @@ -100,13 +100,13 @@ Java_app_organicmaps_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user) { return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetHistoryURL(jni::ToNativeString(env, user))); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user) +Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user) { return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetNotesURL(jni::ToNativeString(env, user))); } diff --git a/android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp similarity index 71% rename from android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp index a55179922..72c462f47 100644 --- a/android/app/src/main/cpp/app/organicmaps/isolines/IsolinesManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp @@ -1,7 +1,7 @@ #include -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" using namespace std::placeholders; @@ -19,7 +19,7 @@ static void IsolinesStateChanged(IsolinesManager::IsolinesState state, JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetIsolinesListener(std::bind(&IsolinesStateChanged, @@ -28,14 +28,14 @@ Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetIsolinesListener(nullptr); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv *env, +Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv *env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/android_gl_utils.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontext.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp similarity index 99% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp index 00f576dbe..0d7a73e31 100644 --- a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp @@ -1,7 +1,7 @@ #include "androidoglcontextfactory.hpp" #include "android_gl_utils.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp index 8f886a9c4..17e9e0b8a 100644 --- a/android/app/src/main/cpp/app/organicmaps/opengl/androidoglcontextfactory.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "androidoglcontext.hpp" #include "drape/graphics_context_factory.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h b/android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h rename to android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h diff --git a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp index b15c6d974..67754578e 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp @@ -1,9 +1,9 @@ -#include "app/organicmaps/platform/AndroidPlatform.hpp" -#include "app/organicmaps/platform/GuiThread.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" -#include "app/organicmaps/util/NetworkPolicy.hpp" +#include "app/organicmaps/sdk/util/NetworkPolicy.hpp" #include "platform/network_policy.hpp" #include "platform/settings.hpp" @@ -22,7 +22,7 @@ std::string Platform::GetMemoryInfo() const if (env == nullptr) return std::string(); - static std::shared_ptr classLogsManager = jni::make_global_ref(env->FindClass("app/organicmaps/util/log/LogsManager")); + static std::shared_ptr classLogsManager = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/log/LogsManager")); ASSERT(classLogsManager, ()); jobject context = android::Platform::Instance().GetContext(); @@ -79,7 +79,7 @@ Platform::EConnectionType Platform::ConnectionStatus() if (env == nullptr) return EConnectionType::CONNECTION_NONE; - static std::shared_ptr clazzConnectionState = jni::make_global_ref(env->FindClass("app/organicmaps/util/ConnectionState")); + static std::shared_ptr clazzConnectionState = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/ConnectionState")); ASSERT(clazzConnectionState, ()); static jmethodID const getConnectionMethodId = jni::GetStaticMethodID(env, static_cast(*clazzConnectionState), "getConnectionState", "()B"); @@ -93,7 +93,7 @@ Platform::ChargingStatus Platform::GetChargingStatus() return Platform::ChargingStatus::Unknown; static jclass const clazzBatteryState = - jni::GetGlobalClassRef(env, "app/organicmaps/util/BatteryState"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState"); ASSERT(clazzBatteryState, ()); static jmethodID const getChargingMethodId = @@ -110,7 +110,7 @@ uint8_t Platform::GetBatteryLevel() return 100; static auto const clazzBatteryState = - jni::GetGlobalClassRef(env, "app/organicmaps/util/BatteryState"); + jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState"); ASSERT(clazzBatteryState, ()); static auto const getLevelMethodId = @@ -197,7 +197,7 @@ void Platform::AndroidSecureStorage::Init(JNIEnv * env) if (m_secureStorageClass != nullptr) return; - m_secureStorageClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/SecureStorage"); + m_secureStorageClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/SecureStorage"); ASSERT(m_secureStorageClass, ()); } diff --git a/android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/AndroidPlatform.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp similarity index 83% rename from android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp index 4b6b7b30d..ae39ea14e 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/platform/GuiThread.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include @@ -10,7 +10,7 @@ GuiThread::GuiThread() { JNIEnv * env = jni::GetEnv(); - m_class = jni::GetGlobalClassRef(env, "app/organicmaps/util/concurrency/UiThread"); + m_class = GetGlobalClassRef(env, "app/organicmaps/sdk/util/concurrency/UiThread"); ASSERT(m_class, ()); m_method = env->GetStaticMethodID(m_class, "forwardToMainThread", "(J)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/GuiThread.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/GuiThread.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp similarity index 89% rename from android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp index 506949345..534f9414b 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/HttpThread.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp @@ -1,5 +1,5 @@ #include "AndroidPlatform.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "base/logging.hpp" #include "platform/http_thread_callback.hpp" @@ -19,7 +19,7 @@ public: std::string const & pb) { JNIEnv * env = jni::GetEnv(); - static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/downloader/ChunkTask"); + static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/ChunkTask"); m_klass = klass; // public ChunkTask(long httpCallbackID, String url, long beg, long end, // long expectedFileSize, byte[] postBody, String userAgent) @@ -80,7 +80,7 @@ namespace downloader extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong beg, jbyteArray data, jlong size) +Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong beg, jbyteArray data, jlong size) { downloader::IHttpThreadCallback * cb = reinterpret_cast(httpCallbackID); jbyte * buf = env->GetByteArrayElements(data, 0); @@ -101,7 +101,7 @@ Java_app_organicmaps_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass cla } JNIEXPORT void JNICALL -Java_app_organicmaps_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong httpCode, jlong beg, jlong end) +Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong httpCode, jlong beg, jlong end) { downloader::IHttpThreadCallback * cb = reinterpret_cast(httpCallbackID); cb->OnFinish(static_cast(httpCode), beg, end); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/platform/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp index 1cbe2d954..233877018 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp @@ -1,5 +1,5 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" -#include "android/app/src/main/cpp/app/organicmaps/core/ScopedLocalRef.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp" #include "platform/locale.hpp" @@ -21,7 +21,7 @@ std::string GetAndroidSystemLanguage() return DEFAULT_LANG; } - static jclass const languageClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/Language"); + static jclass const languageClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Language"); static jmethodID const getDefaultLocaleId = jni::GetStaticMethodID(env, languageClass, "getDefaultLocale", "()Ljava/lang/String;"); jni::TScopedLocalRef localeRef(env, env->CallStaticObjectMethod(languageClass, getDefaultLocaleId)); diff --git a/android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp similarity index 94% rename from android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp index cc32e532a..11229602c 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/Localization.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp @@ -1,8 +1,8 @@ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/ScopedLocalRef.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/ScopedLocalRef.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "platform/localization.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp similarity index 82% rename from android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp index 9529d29b9..d5a9571cd 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/PThreadImpl.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/PThreadImpl.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" /// Implements bodies of base/thread.hpp functions for Android diff --git a/android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SecureStorage.cpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/platform/SecureStorage.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/SecureStorage.cpp diff --git a/android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp similarity index 98% rename from android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp index 19073209f..e9c7e0f75 100644 --- a/android/app/src/main/cpp/app/organicmaps/platform/SocketImpl.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/socket.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp index 328b7d9fa..be93da80f 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/point_with_altitude.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp index f36a3d4f9..7599841b9 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/point2d.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp index 22008dd3c..aed7b3c86 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutePointInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "map/place_page_info.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp index c94417820..25d1f3231 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RouteRecommendationType.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" jobject GetRebuildAfterPointsLoading(JNIEnv * env) { diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp index fcf4c6a94..6f4fe6371 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "app/organicmaps/sdk/routing/SingleLaneInfo.hpp" #include "app/organicmaps/util/Distance.hpp" @@ -16,7 +16,7 @@ jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, Rou // int totalTime, SingleLaneInfo[] lanes) static jmethodID const ctorRouteInfoID = jni::GetConstructorID(env, klass, - "(Lapp/organicmaps/util/Distance;Lapp/organicmaps/util/Distance;" + "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;" "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII" "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp index 7befa3174..ecb5d5529 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/RoutingOptions.cpp @@ -1,6 +1,6 @@ #include -#include -#include +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "routing/routing_options.hpp" routing::RoutingOptions::Road makeValue(jint option) diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp index cea8ee643..8574e4c99 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "routing/following_info.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp index 1401fa2b4..c2ef0afb8 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "app/organicmaps/sdk/routing/TransitStepInfo.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp index 2cba3b102..37f3776e2 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "map/transit/transit_display.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp index 273934a45..65706b500 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp @@ -1,5 +1,5 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "search/displayed_categories.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp index afc5420a7..814ca5fa3 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp @@ -1,7 +1,7 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/UserMarkHelper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/UserMarkHelper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "map/bookmarks_search_params.hpp" #include "map/everywhere_search_params.hpp" @@ -253,8 +253,8 @@ extern "C" boolean hasPopularityHigherPriority) */ g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass, - "(Lapp/organicmaps/bookmarks/data/FeatureId;" - "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/util/Distance;" + "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;" + "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/sdk/util/Distance;" "Ljava/lang/String;IIIZ)V"); g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity"); diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp index 303303c15..7a2a1fd93 100644 --- a/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/search/SearchRecents.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" #include "search/result.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp similarity index 54% rename from android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp index 5436f3e96..fd3cf07d7 100644 --- a/android/app/src/main/cpp/app/organicmaps/settings/MapLanguageCode.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/settings.hpp" @@ -7,13 +7,13 @@ extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject, jstring languageCode) +Java_app_organicmaps_sdk_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject, jstring languageCode) { g_framework->SetMapLanguageCode(jni::ToNativeString(env, languageCode)); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject) +Java_app_organicmaps_sdk_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject) { return jni::ToJavaString(env, g_framework->GetMapLanguageCode()); } diff --git a/android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp similarity index 67% rename from android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp index 7214bff66..4c5dd801d 100644 --- a/android/app/src/main/cpp/app/organicmaps/settings/UnitLocale.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/measurement_utils.hpp" #include "platform/settings.hpp" @@ -6,7 +6,7 @@ extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units) + Java_app_organicmaps_sdk_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units) { measurement_utils::Units const u = static_cast(units); settings::Set(settings::kMeasurementUnits, u); @@ -14,7 +14,7 @@ extern "C" } JNIEXPORT jint JNICALL - Java_app_organicmaps_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz) + Java_app_organicmaps_sdk_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz) { measurement_utils::Units u; return static_cast( diff --git a/android/app/src/main/cpp/app/organicmaps/sound/tts.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp similarity index 51% rename from android/app/src/main/cpp/app/organicmaps/sound/tts.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp index 1c25d1828..3fabf7596 100644 --- a/android/app/src/main/cpp/app/organicmaps/sound/tts.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp @@ -1,29 +1,29 @@ -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/Framework.hpp" -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" extern "C" { JNIEXPORT void JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable) { return frm()->GetRoutingManager().EnableTurnNotifications(static_cast(enable)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass) { return static_cast(frm()->GetRoutingManager().AreTurnNotificationsEnabled()); } JNIEXPORT void JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale) { frm()->GetRoutingManager().SetTurnNotificationsLocale(jni::ToNativeString(env, jLocale)); } JNIEXPORT jstring JNICALL - Java_app_organicmaps_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass) + Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass) { return jni::ToJavaString(env, frm()->GetRoutingManager().GetTurnNotificationsLocale()); } diff --git a/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp similarity index 70% rename from android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp index d65c01892..fe70b9a58 100644 --- a/android/app/src/main/cpp/app/organicmaps/subway/SubwayManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp @@ -1,7 +1,7 @@ #include -#include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" extern "C" { @@ -15,7 +15,7 @@ static void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState sta } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) +Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTransitSchemeListener(std::bind(&TransitSchemeStateChanged, @@ -24,7 +24,7 @@ Java_app_organicmaps_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env } JNIEXPORT void JNICALL -Java_app_organicmaps_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz) +Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz) { CHECK(g_framework, ("Framework isn't created yet!")); g_framework->SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn()); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp similarity index 56% rename from android/app/src/main/cpp/app/organicmaps/util/Config.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp index 3794f7434..02a3b4e50 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Config.cpp @@ -1,24 +1,24 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/Framework.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/Framework.hpp" #include "platform/settings.hpp" extern "C" { JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name) + Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name) { std::string value; return settings::Get(jni::ToNativeString(env, name), value); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name) + Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name) { settings::Delete(jni::ToNativeString(env, name)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal) + Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal) { bool val; if (settings::Get(jni::ToNativeString(env, name), val)) @@ -28,13 +28,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val) + Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(val)); } JNIEXPORT jint JNICALL - Java_app_organicmaps_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue) { int32_t value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -44,13 +44,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value) + Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jlong JNICALL - Java_app_organicmaps_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue) { int64_t value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -60,13 +60,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value) + Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jdouble JNICALL - Java_app_organicmaps_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue) { double value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -76,13 +76,13 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value) + Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value) { (void)settings::Set(jni::ToNativeString(env, name), static_cast(value)); } JNIEXPORT jstring JNICALL - Java_app_organicmaps_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue) + Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue) { std::string value; if (settings::Get(jni::ToNativeString(env, name), value)) @@ -92,32 +92,32 @@ extern "C" } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value) + Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value) { (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value)); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz) + Java_app_organicmaps_sdk_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz) { return frm()->LoadLargeFontsSize(); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, + Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz, jboolean value) { frm()->SetLargeFontsSize(value); } JNIEXPORT jboolean JNICALL - Java_app_organicmaps_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz) + Java_app_organicmaps_sdk_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz) { return frm()->LoadTransliteration(); } JNIEXPORT void JNICALL - Java_app_organicmaps_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz, + Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz, jboolean value) { frm()->SaveTransliteration(value); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Distance.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp similarity index 85% rename from android/app/src/main/cpp/app/organicmaps/util/Distance.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp index 0b10e7f69..fbe8676a1 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Distance.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp @@ -1,12 +1,12 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/distance.hpp" inline jobject ToJavaDistance(JNIEnv * env, platform::Distance const & distance) { - static jclass const distanceClass = jni::GetGlobalClassRef(env, "app/organicmaps/util/Distance"); + static jclass const distanceClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Distance"); static jmethodID const distanceConstructor = jni::GetConstructorID(env, distanceClass, "(DLjava/lang/String;B)V"); diff --git a/android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp similarity index 85% rename from android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp index 0d08a5daa..b5c629ba3 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/FeatureIdBuilder.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/FeatureIdBuilder.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "indexer/feature_decl.hpp" @@ -9,7 +9,7 @@ class FeatureIdBuilder public: explicit FeatureIdBuilder(JNIEnv * env) { - jclass clazz = env->FindClass("app/organicmaps/bookmarks/data/FeatureId"); + jclass clazz = env->FindClass("app/organicmaps/sdk/bookmarks/data/FeatureId"); m_countryName = env->GetFieldID(clazz, "mMwmName", "Ljava/lang/String;"); ASSERT(m_countryName, ()); m_index = env->GetFieldID(clazz, "mFeatureIndex", "I"); diff --git a/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp similarity index 75% rename from android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp index 67518c336..b4ae14484 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/GeoUtils.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp @@ -1,11 +1,11 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" #include "geometry/mercator.hpp" extern "C" { JNIEXPORT jobject JNICALL - Java_app_organicmaps_util_GeoUtils_nativeToLatLon( + Java_app_organicmaps_sdk_util_GeoUtils_nativeToLatLon( JNIEnv * env, jobject thiz, jdouble mercX, jdouble mercY) { auto const mercPoint = m2::PointD(static_cast(mercX), static_cast(mercY)); diff --git a/android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp similarity index 96% rename from android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp index 8c98a6257..ca49c6354 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/HttpClient.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp @@ -23,9 +23,9 @@ SOFTWARE. *******************************************************************************/ #include -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/ScopedEnv.hpp" -#include "app/organicmaps/core/ScopedLocalRef.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/ScopedEnv.hpp" +#include "app/organicmaps/sdk/core/ScopedLocalRef.hpp" #include "platform/http_client.hpp" @@ -104,7 +104,7 @@ void SetHeaders(ScopedEnv & env, jobject const params, platform::HttpClient::Hea return; static jmethodID const setHeaders = env->GetMethodID( - g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/util/KeyValue;)V"); + g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/sdk/util/KeyValue;)V"); RethrowOnJniException(env); @@ -228,7 +228,7 @@ bool HttpClient::RunHttpRequest() static jmethodID const httpClientClassRun = env->GetStaticMethodID(g_httpClientClazz, "run", - "(Lapp/organicmaps/util/HttpClient$Params;)Lapp/organicmaps/util/HttpClient$Params;"); + "(Lapp/organicmaps/sdk/util/HttpClient$Params;)Lapp/organicmaps/sdk/util/HttpClient$Params;"); jni::ScopedLocalRef const response(env.get(), env->CallStaticObjectMethod(g_httpClientClazz, httpClientClassRun, httpParamsObject.get())); diff --git a/android/app/src/main/cpp/app/organicmaps/util/Language.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp similarity index 54% rename from android/app/src/main/cpp/app/organicmaps/util/Language.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp index 21aa697dc..3252ca5db 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/Language.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/Language.cpp @@ -1,10 +1,10 @@ -#include "android/app/src/main/cpp/app/organicmaps/core/jni_helper.hpp" +#include "android/app/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp" #include "platform/preferred_languages.hpp" extern "C" { JNIEXPORT jstring JNICALL -Java_app_organicmaps_util_Language_nativeNormalize(JNIEnv *env, jclass type, jstring lang) +Java_app_organicmaps_sdk_util_Language_nativeNormalize(JNIEnv *env, jclass type, jstring lang) { std::string locale = languages::Normalize(jni::ToNativeString(env, lang)); return jni::ToJavaString(env, locale); diff --git a/android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp similarity index 57% rename from android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp index 802221ebc..272c94eda 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/LogsManager.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp @@ -1,9 +1,9 @@ #include -#include "app/organicmaps/core/logging.hpp" +#include "app/organicmaps/sdk/core/logging.hpp" extern "C" { JNIEXPORT void JNICALL -Java_app_organicmaps_util_log_LogsManager_nativeToggleCoreDebugLogs( +Java_app_organicmaps_sdk_util_log_LogsManager_nativeToggleCoreDebugLogs( JNIEnv * /*env*/, jclass /*clazz*/, jboolean enabled) { jni::ToggleDebugLogs(enabled); diff --git a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp similarity index 91% rename from android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp index 405b2d3a8..585bf6837 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp @@ -1,4 +1,4 @@ -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" namespace network_policy { diff --git a/android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp similarity index 100% rename from android/app/src/main/cpp/app/organicmaps/util/NetworkPolicy.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp diff --git a/android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp similarity index 66% rename from android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp index 833f2fa23..a72f9e2d2 100644 --- a/android/app/src/main/cpp/app/organicmaps/util/StringUtils.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp @@ -1,6 +1,6 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/core/jni_java_methods.hpp" -#include "app/organicmaps/util/Distance.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_java_methods.hpp" +#include "app/organicmaps/sdk/util/Distance.hpp" #include "indexer/search_string_utils.hpp" @@ -21,19 +21,19 @@ jobject MakeJavaPair(JNIEnv * env, std::string const & first, std::string const extern "C" { JNIEXPORT jboolean JNICALL -Java_app_organicmaps_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz, jstring text) +Java_app_organicmaps_sdk_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz, jstring text) { return strings::IsHTML(jni::ToNativeString(env, text)); } JNIEXPORT jboolean JNICALL -Java_app_organicmaps_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz, jstring str, jstring substr) +Java_app_organicmaps_sdk_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz, jstring str, jstring substr) { return search::ContainsNormalized(jni::ToNativeString(env, str), jni::ToNativeString(env, substr)); } JNIEXPORT jobjectArray JNICALL -Java_app_organicmaps_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr) +Java_app_organicmaps_sdk_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr) { std::string const substr = jni::ToNativeString(env, jSubstr); int const length = env->GetArrayLength(src); @@ -49,13 +49,13 @@ Java_app_organicmaps_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * en return jni::ToJavaStringArray(env, filtered); } -JNIEXPORT jint JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeed( +JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeed( JNIEnv * env, jclass thiz, jdouble metersPerSecond) { return measurement_utils::FormatSpeed(metersPerSecond, measurement_utils::GetMeasurementUnits()); } -JNIEXPORT jobject JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpeedAndUnits( +JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeedAndUnits( JNIEnv * env, jclass thiz, jdouble metersPerSecond) { auto const units = measurement_utils::GetMeasurementUnits(); @@ -64,27 +64,27 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_util_StringUtils_nativeFormatSpee } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass, jdouble distanceInMeters) +Java_app_organicmaps_sdk_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass, jdouble distanceInMeters) { return ToJavaDistance(env, platform::Distance::CreateFormatted(distanceInMeters)); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env, jclass) { auto const localizedUnits = platform::GetLocalizedDistanceUnits(); return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low); } JNIEXPORT jobject JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env, jclass) { auto const localizedUnits = platform::GetLocalizedAltitudeUnits(); return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low); } JNIEXPORT jstring JNICALL -Java_app_organicmaps_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass) +Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass) { return jni::ToJavaString(env, platform::GetLocalizedSpeedUnits()); } diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp new file mode 100644 index 000000000..a6c313620 --- /dev/null +++ b/android/app/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp @@ -0,0 +1,12 @@ +#include "app/organicmaps/sdk/core/jni_helper.hpp" +#include "app/organicmaps/sdk/platform/GuiThread.hpp" + +extern "C" +{ +// static void nativeProcessTask(long taskPointer); +JNIEXPORT void JNICALL +Java_app_organicmaps_sdk_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz, jlong taskPointer) +{ + android::GuiThread::ProcessTask(taskPointer); +} +} diff --git a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp similarity index 98% rename from android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp rename to android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp index 84b922063..07551d254 100644 --- a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.cpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp @@ -1,6 +1,6 @@ #include "android_vulkan_context_factory.hpp" -#include "app/organicmaps/platform/AndroidPlatform.hpp" +#include "app/organicmaps/sdk/platform/AndroidPlatform.hpp" #include "base/assert.hpp" #include "base/logging.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp similarity index 93% rename from android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp rename to android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp index b98dc4c04..99de315e7 100644 --- a/android/app/src/main/cpp/app/organicmaps/vulkan/android_vulkan_context_factory.hpp +++ b/android/app/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.hpp @@ -1,6 +1,6 @@ #pragma once -#include "app/organicmaps/core/jni_helper.hpp" +#include "app/organicmaps/sdk/core/jni_helper.hpp" #include "drape/vulkan/vulkan_context_factory.hpp" diff --git a/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp b/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp deleted file mode 100644 index bd54eec30..000000000 --- a/android/app/src/main/cpp/app/organicmaps/util/UiThread.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include "app/organicmaps/core/jni_helper.hpp" -#include "app/organicmaps/platform/GuiThread.hpp" - -extern "C" -{ -// static void nativeProcessTask(long taskPointer); -JNIEXPORT void JNICALL -Java_app_organicmaps_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz, jlong taskPointer) -{ - android::GuiThread::ProcessTask(taskPointer); -} -} diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java index 89141b7b2..7c3056c58 100644 --- a/android/app/src/main/java/app/organicmaps/ChartController.java +++ b/android/app/src/main/java/app/organicmaps/ChartController.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java index c7aff32ba..9505280cd 100644 --- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java +++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java @@ -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(); } diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java index 58f8e9fcc..1c00e8fdf 100644 --- a/android/app/src/main/java/app/organicmaps/MapFragment.java +++ b/android/app/src/main/java/app/organicmaps/MapFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java b/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java index 0d0a0db50..880239f8c 100644 --- a/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java +++ b/android/app/src/main/java/app/organicmaps/MapPlaceholderActivity.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java index 096fbe6fa..a946cd946 100644 --- a/android/app/src/main/java/app/organicmaps/MwmActivity.java +++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java index a3623632c..cb7f6c6d4 100644 --- a/android/app/src/main/java/app/organicmaps/MwmApplication.java +++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java @@ -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(); } } } diff --git a/android/app/src/main/java/app/organicmaps/PanelAnimator.java b/android/app/src/main/java/app/organicmaps/PanelAnimator.java index 48fb8a37d..b2c8dc136 100644 --- a/android/app/src/main/java/app/organicmaps/PanelAnimator.java +++ b/android/app/src/main/java/app/organicmaps/PanelAnimator.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java index 14a7dfa91..db058a4c4 100644 --- a/android/app/src/main/java/app/organicmaps/SplashActivity.java +++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java index 322018633..84f5951ab 100644 --- a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java +++ b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java index 52bc6ad2d..2c459e670 100644 --- a/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java +++ b/android/app/src/main/java/app/organicmaps/background/OsmUploadWork.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java index 8073bf27f..554c14a6d 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java index 1de268d25..406a83cb9 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java index 320690b13..ae6d3b3de 100644 --- a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java +++ b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java index 2b45a429f..26770e5c1 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BaseBookmarkCategoryAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java index a15a30f1b..810077d35 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java index 2495b9ed6..033b2e848 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java index e27be1c1c..86124ce76 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java index e96c65bdc..217de687b 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsActivity.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java index 65fd18b25..ced30ffcd 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategorySettingsFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java index 3d3749939..802033f2e 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java index 353df2963..f08d9e6a5 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java index 0fa81c1f3..a96d4658f 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java index 3ea364a17..687625ccb 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java @@ -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 iconsCache = new HashMap<>(); for (final BookmarkInfo bookmarkInfo : bookmarks) diff --git a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java index 126359678..07437e7ae 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/BookmarksScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java index 0771c0937..5de62152c 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/bookmarks/SortingScreen.java @@ -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); } diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java index 6085838cb..3c35505c1 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsForFirstLaunchScreen.java @@ -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()); diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java index 75afad4d3..dc8249f6f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloadMapsScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java index 7c899f88f..08fb2647f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderHelpers.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java index 1eabac471..11364553c 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java index c8e934d03..f1c00c707 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsActivity.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java index 3b90a793b..662f7fd89 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenBuilder.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java index 8cd3a641e..f2a516d92 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithApi.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java index b916deaa7..1d1933069 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/permissions/RequestPermissionsScreenWithNotification.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java index 92710669b..fa8779cc9 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchOnMapScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java index e4dc95dac..72f1f676f 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java index 0143983da..542d8a434 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/DrivingOptionsScreen.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java index 2079f3e03..fed44a0d5 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/HelpScreen.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java index 2749d1ce9..962166016 100644 --- a/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java +++ b/android/app/src/main/java/app/organicmaps/car/screens/settings/SettingsScreen.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java b/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java index b8c9a68c3..03585309a 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java +++ b/android/app/src/main/java/app/organicmaps/car/util/CarSensorsManager.java @@ -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); } } diff --git a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java index 86ec576ba..442bbbd3f 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java index 93e4a87da..45384cc14 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java index d6829617c..5018c9360 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingHelpers.java @@ -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) { diff --git a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java index ff88b958e..9b3d8d852 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/RoutingUtils.java @@ -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) diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java index 957c73cd5..5abea9162 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java index dc63b14b9..843043839 100644 --- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java +++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java @@ -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(); }); diff --git a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java index d317e955c..9f17f6968 100644 --- a/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/dialog/EditTextDialogFragment.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java b/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java index 277d5b622..a8e1c9b8a 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java +++ b/android/app/src/main/java/app/organicmaps/downloader/Android7RootCertificateWorkaround.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java index c3710c084..bc93f7a49 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java +++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java index ccf8ed8b4..7806148ae 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java +++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java @@ -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()); diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java index f265e91c1..6b1d0cce4 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java +++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java index 92cc82c2a..292452b0c 100644 --- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java index 261eff5df..26caecd95 100644 --- a/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/LanguagesFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java index 1d781f56b..97cd905a0 100644 --- a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java index 761a40d27..7494f6ccb 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java index a49084391..a0890ebb3 100644 --- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java index 2db1f724e..e7ec88a6a 100644 --- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java index 995d91656..eb1686f47 100644 --- a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java index e9810e3d6..9203e23de 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceAdapter.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java b/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java index dc03c79cd..f668a6e67 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/SelfServiceFragment.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java index f019b941b..95720a6d1 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java index 0f8032bd8..482286e5e 100644 --- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableFragment.java @@ -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 implements TimetableProvider, diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java index 2ccc6bbf6..4ca4b43dc 100644 --- a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java +++ b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java b/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java index cc5966be0..23b7243dc 100644 --- a/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/StreetFragment.java @@ -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 { diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java index 9b01da328..b4478cb07 100644 --- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java +++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java index 38f3d0737..b07b1f045 100644 --- a/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/CopyrightFragment.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java index b0c329c44..ac4f26b8c 100644 --- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java index 34b805550..458d59a7a 100644 --- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java +++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java index 0fd3c867e..acc862a52 100644 --- a/android/app/src/main/java/app/organicmaps/intent/Factory.java +++ b/android/app/src/main/java/app/organicmaps/intent/Factory.java @@ -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; diff --git a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java index dc2d564db..23d9e66f5 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java +++ b/android/app/src/main/java/app/organicmaps/location/TrackRecordingService.java @@ -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); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java index 5ac9eb47d..167a5485a 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java @@ -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 diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java index 7f2d02876..eeef5f9c4 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java @@ -9,8 +9,8 @@ import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java index ad022fd86..414dbaccf 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersUtils.java @@ -1,5 +1,7 @@ package app.organicmaps.maplayer; +import app.organicmaps.sdk.maplayer.Mode; + import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java index c80f397e0..2fc6851c0 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java @@ -24,21 +24,21 @@ import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.R; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.downloader.UpdateInfo; -import app.organicmaps.location.TrackRecorder; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.downloader.UpdateInfo; +import app.organicmaps.sdk.location.TrackRecorder; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.routing.RoutingController; import app.organicmaps.leftbutton.LeftButton; import app.organicmaps.leftbutton.LeftToggleButton; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.util.Config; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.menu.MyPositionButton; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java index ab3bf73de..61ed9c633 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsViewModel.java @@ -3,7 +3,7 @@ package app.organicmaps.maplayer; import androidx.annotation.Nullable; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.location.TrackRecorder; public class MapButtonsViewModel extends ViewModel { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java index 077534ab8..69a11d194 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java @@ -18,8 +18,8 @@ import app.organicmaps.R; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.util.Graphics; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; public class SearchWheel implements View.OnClickListener { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java index 84ded9f3b..4998a1617 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java @@ -11,9 +11,11 @@ import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; + +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.util.SharedPropertiesUtils; +import app.organicmaps.sdk.maplayer.Mode; +import app.organicmaps.sdk.util.SharedPropertiesUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment; import app.organicmaps.widget.recycler.SpanningLinearLayoutManager; @@ -74,7 +76,7 @@ public class ToggleMapLayerFragment extends Fragment mode.setEnabled(context, !mode.isEnabled(context)); mAdapter.notifyDataSetChanged(); mMapButtonsController.updateLayerButton(); - if (IsolinesManager.from(context).shouldShowNotification()) + if (MwmApplication.from(context).getIsolinesManager().shouldShowNotification()) Utils.showSnackbar(context, v.getRootView(), R.string.isolines_toast_zooms_1_10); } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java index edfd31a18..4d269c61d 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java @@ -13,7 +13,7 @@ import androidx.core.content.res.ResourcesCompat; import app.organicmaps.R; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java index a39e74c25..138551c74 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java +++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButtonController.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.R; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.util.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java index 830271a0e..d63c2ad3f 100644 --- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java @@ -17,9 +17,9 @@ import androidx.appcompat.app.AlertDialog; import app.organicmaps.R; import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter; import app.organicmaps.base.BaseMwmDialogFragment; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java index b8976aced..dcd89472c 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java +++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java @@ -16,11 +16,11 @@ import androidx.appcompat.content.res.AppCompatResources; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; -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.ArrayList; import java.util.Arrays; diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java index 9456259bf..b751eebf2 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java +++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java @@ -16,12 +16,12 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -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.sdk.routing.RouteMarkData; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.bottomsheet.BottomSheetDialog; import com.google.android.material.bottomsheet.BottomSheetDialogFragment; diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java index c3d5a9fb3..9ef0d3fc8 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java @@ -13,16 +13,16 @@ import androidx.core.graphics.Insets; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.maplayer.MapButtonsViewModel; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.sdk.Router; import app.organicmaps.sdk.routing.CarDirection; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.LanesView; @@ -261,7 +261,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, private void updateSpeedLimit(@NonNull final RoutingInfo info) { - final Location location = LocationHelper.from(mFrame.getContext()).getSavedLocation(); + final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation(); if (location == null) { mSpeedLimit.setSpeedLimit(0, false); return; diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java index 4bec7926d..d00207432 100644 --- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java +++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java @@ -4,7 +4,7 @@ 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.util.Constants.Vendor.XIAOMI; +import static app.organicmaps.sdk.util.Constants.Vendor.XIAOMI; import android.annotation.SuppressLint; import android.app.ForegroundServiceStartNotAllowedException; @@ -31,19 +31,19 @@ import androidx.core.app.NotificationManagerCompat; import androidx.core.app.ServiceCompat; import androidx.core.content.ContextCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.sound.MediaPlayerWrapper; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.sound.TtsPlayer; -import app.organicmaps.util.Config; +import app.organicmaps.sdk.sound.MediaPlayerWrapper; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.sound.TtsPlayer; +import app.organicmaps.sdk.util.Config; import app.organicmaps.util.Graphics; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; public class NavigationService extends Service implements LocationListener { @@ -179,7 +179,7 @@ public class NavigationService extends Service implements LocationListener mNotificationBuilder = null; mCarNotificationExtender = null; - LocationHelper.from(this).removeListener(this); + MwmApplication.from(this).getLocationHelper().removeListener(this); TtsPlayer.INSTANCE.stop(); // The notification is cancelled automatically by the system. @@ -247,7 +247,7 @@ public class NavigationService 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); @@ -288,7 +288,7 @@ public class NavigationService extends Service implements LocationListener if (Framework.nativeIsRouteFinished()) { routingController.cancel(); - LocationHelper.from(this).restartWithNewMode(); + MwmApplication.from(this).getLocationHelper().restartWithNewMode(); stopSelf(); return; } diff --git a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java index cda873245..f6bcf80b4 100644 --- a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java +++ b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java @@ -9,45 +9,27 @@ import androidx.annotation.StringRes; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.routing.ResultCodes; import java.util.ArrayList; import java.util.List; public class ResultCodesHelper { - // Codes correspond to native routing::RouterResultCode in routing/routing_callbacks.hpp - static final int NO_ERROR = 0; - static final int CANCELLED = 1; - static final int NO_POSITION = 2; - private static final int INCONSISTENT_MWM_ROUTE = 3; - private static final int ROUTING_FILE_NOT_EXIST = 4; - private static final int START_POINT_NOT_FOUND = 5; - private static final int END_POINT_NOT_FOUND = 6; - private static final int DIFFERENT_MWM = 7; - private static final int ROUTE_NOT_FOUND = 8; - private static final int NEED_MORE_MAPS = 9; - private static final int INTERNAL_ERROR = 10; - private static final int FILE_TOO_OLD = 11; - private static final int INTERMEDIATE_POINT_NOT_FOUND = 12; - private static final int TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK = 13; - private static final int TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN = 14; - private static final int ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR = 15; - static final int HAS_WARNINGS = 16; @NonNull public static ResourcesHolder getDialogTitleSubtitle(@NonNull Context context, - int errorCode, int missingCount) + int errorCode, int missingCount) { - Resources resources = MwmApplication.from(context).getResources(); + Resources resources = context.getResources(); int titleRes = 0; List messages = new ArrayList<>(); @StringRes int cancelBtnResId = android.R.string.cancel; switch (errorCode) { - case NO_POSITION: - if (!LocationHelper.from(context).isActive()) + case ResultCodes.NO_POSITION: + if (!MwmApplication.from(context).getLocationHelper().isActive()) { titleRes = R.string.dialog_routing_location_turn_on; messages.add(resources.getString(R.string.dialog_routing_location_unknown_turn_on)); @@ -59,42 +41,42 @@ public class ResultCodesHelper messages.add(resources.getString(R.string.dialog_routing_location_turn_wifi)); } break; - case INCONSISTENT_MWM_ROUTE: - case ROUTING_FILE_NOT_EXIST: + case ResultCodes.INCONSISTENT_MWM_ROUTE: + case ResultCodes.ROUTING_FILE_NOT_EXIST: titleRes = R.string.routing_download_maps_along; messages.add(resources.getString(R.string.routing_requires_all_map)); break; - case START_POINT_NOT_FOUND: + case ResultCodes.START_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_start; messages.add(resources.getString(R.string.dialog_routing_start_not_determined)); messages.add(resources.getString(R.string.dialog_routing_select_closer_start)); break; - case END_POINT_NOT_FOUND: + case ResultCodes.END_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_end; messages.add(resources.getString(R.string.dialog_routing_end_not_determined)); messages.add(resources.getString(R.string.dialog_routing_select_closer_end)); break; - case INTERMEDIATE_POINT_NOT_FOUND: + case ResultCodes.INTERMEDIATE_POINT_NOT_FOUND: titleRes = R.string.dialog_routing_change_intermediate; messages.add(resources.getString(R.string.dialog_routing_intermediate_not_determined)); break; - case DIFFERENT_MWM: + case ResultCodes.DIFFERENT_MWM: messages.add(resources.getString(R.string.routing_failed_cross_mwm_building)); break; - case FILE_TOO_OLD: + case ResultCodes.FILE_TOO_OLD: titleRes = R.string.downloader_update_maps; messages.add(resources.getString(R.string.downloader_mwm_migration_dialog)); break; - case TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK: + case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK: messages.add(resources.getString(R.string.transit_not_found)); break; - case TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN: + case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN: titleRes = R.string.dialog_pedestrian_route_is_long_header; messages.add(resources.getString(R.string.dialog_pedestrian_route_is_long_message)); cancelBtnResId = R.string.ok; break; - case ROUTE_NOT_FOUND: - case ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR: + case ResultCodes.ROUTE_NOT_FOUND: + case ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR: if (missingCount == 0) { titleRes = R.string.dialog_routing_unable_locate_route; @@ -107,12 +89,12 @@ public class ResultCodesHelper messages.add(resources.getString(R.string.routing_requires_all_map)); } break; - case INTERNAL_ERROR: + case ResultCodes.INTERNAL_ERROR: titleRes = R.string.dialog_routing_system_error; messages.add(resources.getString(R.string.dialog_routing_application_error)); messages.add(resources.getString(R.string.dialog_routing_try_again)); break; - case NEED_MORE_MAPS: + case ResultCodes.NEED_MORE_MAPS: titleRes = R.string.dialog_routing_download_and_build_cross_route; messages.add(resources.getString(R.string.dialog_routing_download_cross_route)); break; @@ -139,20 +121,19 @@ public class ResultCodesHelper return switch (resultCode) { - case INCONSISTENT_MWM_ROUTE, - ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR, - ROUTING_FILE_NOT_EXIST, - NEED_MORE_MAPS, - ROUTE_NOT_FOUND, - FILE_TOO_OLD -> - true; + case ResultCodes.INCONSISTENT_MWM_ROUTE, + ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR, + ResultCodes.ROUTING_FILE_NOT_EXIST, + ResultCodes.NEED_MORE_MAPS, + ResultCodes.ROUTE_NOT_FOUND, + ResultCodes.FILE_TOO_OLD -> true; default -> false; }; } public static boolean isMoreMapsNeeded(int resultCode) { - return resultCode == NEED_MORE_MAPS; + return resultCode == ResultCodes.NEED_MORE_MAPS; } public static class ResourcesHolder diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java index faf2b85b2..30b176790 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java @@ -31,19 +31,19 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.sdk.routing.TransitStepInfo; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; import app.organicmaps.util.Graphics; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.widget.recycler.DotDividerItemDecoration; import app.organicmaps.widget.recycler.MultilineLayoutManager; @@ -266,7 +266,7 @@ final class RoutingBottomMenuController implements View.OnClickListener UiUtils.show(mActionFrame); mActionMessage.setText(R.string.routing_add_start_point); mActionMessage.setTag(RouteMarkType.Start); - if (LocationHelper.from(mContext).getMyPosition() != null) + if (MwmApplication.from(mContext).getLocationHelper().getMyPosition() != null) { UiUtils.show(mActionButton); Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair); diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java index 04ee5ca15..f725b9636 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingController.java @@ -11,12 +11,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.util.Pair; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.location.LocationHelper; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.Router; +import app.organicmaps.sdk.routing.ResultCodes; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutePointInfo; @@ -28,10 +29,10 @@ import app.organicmaps.sdk.routing.RoutingOptions; import app.organicmaps.sdk.routing.RoutingProgressListener; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.widget.placepage.CoordinatesFormat; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; 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 java.time.LocalTime; import java.util.concurrent.TimeUnit; @@ -118,12 +119,12 @@ public class RoutingController mLastMissingMaps = missingMaps; mContainsCachedResult = true; - if (mLastResultCode == ResultCodesHelper.NO_ERROR + if (mLastResultCode == ResultCodes.NO_ERROR || ResultCodesHelper.isMoreMapsNeeded(mLastResultCode)) { onBuiltRoute(); } - else if (mLastResultCode == ResultCodesHelper.HAS_WARNINGS) + else if (mLastResultCode == ResultCodes.HAS_WARNINGS) { onBuiltRoute(); if (mContainer != null) @@ -172,13 +173,13 @@ public class RoutingController if (isDrivingOptionsBuildError()) mContainer.onDrivingOptionsWarning(); - if (mLastResultCode == ResultCodesHelper.NO_ERROR || mLastResultCode == ResultCodesHelper.HAS_WARNINGS) + if (mLastResultCode == ResultCodes.NO_ERROR || mLastResultCode == ResultCodes.HAS_WARNINGS) { updatePlan(); return; } - if (mLastResultCode == ResultCodesHelper.CANCELLED) + if (mLastResultCode == ResultCodes.CANCELLED) { setBuildState(BuildState.NONE); updatePlan(); @@ -264,7 +265,7 @@ public class RoutingController Framework.nativeSetRouteProgressListener(mRoutingProgressListener); Framework.nativeSetRoutingRecommendationListener(recommendation -> UiThread.run(() -> { if (recommendation == RouteRecommendationType.RebuildAfterPointsLoading) - setStartPoint(LocationHelper.from(context).getMyPosition()); + setStartPoint(MwmApplication.from(context).getLocationHelper().getMyPosition()); })); Framework.nativeSetRoutingLoadPointsListener(mRoutingLoadPointsListener); } diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java index bb5370cbe..6a7005007 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java @@ -17,9 +17,9 @@ import androidx.fragment.app.FragmentFactory; import androidx.fragment.app.FragmentManager; import app.organicmaps.R; -import app.organicmaps.downloader.CountryItem; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.downloader.CountryItem; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.util.UiUtils; public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java index 976fe7a9d..4cb6f304d 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java @@ -11,10 +11,10 @@ import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.FragmentFactory; import app.organicmaps.R; -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.widget.WheelProgressView; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import java.util.HashSet; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java index 418ba01b3..a3c6ef7c7 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java @@ -15,7 +15,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.sdk.Router; @@ -23,7 +23,7 @@ import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.RoutingOptions; import app.organicmaps.sdk.routing.TransitRouteInfo; import app.organicmaps.settings.DrivingOptionsActivity; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.widget.RoutingToolbarButton; import app.organicmaps.widget.ToolbarController; diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java index d71c97332..7ae606f64 100644 --- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java +++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java @@ -11,7 +11,7 @@ import androidx.annotation.Nullable; import app.organicmaps.MwmActivity; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class RoutingPlanInplaceController extends RoutingPlanController { diff --git a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java new file mode 100644 index 000000000..58c2558c2 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java @@ -0,0 +1,30 @@ +package app.organicmaps.sdk; + +import androidx.annotation.Keep; + +public class DownloadResourcesLegacyActivity +{ + // Error codes, should match the same codes in JNI + public static final int ERR_DOWNLOAD_SUCCESS = 0; + public static final int ERR_DISK_ERROR = -1; + public static final int ERR_NOT_ENOUGH_FREE_SPACE = -2; + public static final int ERR_STORAGE_DISCONNECTED = -3; + public static final int ERR_DOWNLOAD_ERROR = -4; + public static final int ERR_NO_MORE_FILES = -5; + public static final int ERR_FILE_IN_PROGRESS = -6; + + public interface Listener + { + // Called by JNI. + @Keep + void onProgress(int percent); + + // Called by JNI. + @Keep + void onFinish(int errorCode); + } + + public static native int nativeGetBytesToDownload(); + public static native int nativeStartNextFileDownload(Listener listener); + public static native void nativeCancelCurrentFile(); +} diff --git a/android/app/src/main/java/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/sdk/Framework.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/Framework.java rename to android/app/src/main/java/app/organicmaps/sdk/Framework.java index fabb98bdd..6724e6f83 100644 --- a/android/app/src/main/java/app/organicmaps/Framework.java +++ b/android/app/src/main/java/app/organicmaps/sdk/Framework.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import android.graphics.Bitmap; @@ -7,24 +7,23 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.Size; -import app.organicmaps.api.ParsedRoutingData; -import app.organicmaps.api.ParsedSearchRequest; -import app.organicmaps.api.RequestType; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -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.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.JunctionInfo; import app.organicmaps.sdk.routing.RouteMarkData; import app.organicmaps.sdk.routing.RouteMarkType; import app.organicmaps.sdk.routing.RoutingInfo; import app.organicmaps.sdk.routing.TransitRouteInfo; -import app.organicmaps.sdk.PlacePageActivationListener; import app.organicmaps.sdk.routing.RoutingListener; import app.organicmaps.sdk.routing.RoutingLoadPointsListener; import app.organicmaps.sdk.routing.RoutingProgressListener; import app.organicmaps.sdk.routing.RoutingRecommendationListener; -import app.organicmaps.settings.SettingsPrefsFragment; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.settings.SpeedCameraMode; +import app.organicmaps.sdk.util.Constants; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -88,7 +87,7 @@ public class Framework return Bitmap.createBitmap(altitudeChartBits, width, height, Bitmap.Config.ARGB_8888); } - public static void setSpeedCamerasMode(@NonNull SettingsPrefsFragment.SpeedCameraMode mode) + public static void setSpeedCamerasMode(@NonNull SpeedCameraMode mode) { nativeSetSpeedCamManagerMode(mode.ordinal()); } diff --git a/android/app/src/main/java/app/organicmaps/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/Map.java rename to android/app/src/main/java/app/organicmaps/sdk/Map.java index 96d4da028..a8821327d 100644 --- a/android/app/src/main/java/app/organicmaps/Map.java +++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import android.content.Context; import android.graphics.Rect; @@ -7,13 +7,16 @@ import android.view.Surface; import androidx.annotation.Nullable; -import app.organicmaps.display.DisplayType; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.util.Config; -import app.organicmaps.util.ROMUtils; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.BuildConfig; +import app.organicmaps.MwmApplication; +import app.organicmaps.R; +import app.organicmaps.sdk.display.DisplayType; +import app.organicmaps.sdk.location.LocationHelper; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.ROMUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; public final class Map { @@ -168,7 +171,7 @@ public final class Map mRequireResize = false; setupWidgets(context, surfaceFrame.width(), surfaceFrame.height()); - final LocationHelper locationHelper = LocationHelper.from(context); + final LocationHelper locationHelper = MwmApplication.from(context).getLocationHelper(); final boolean firstStart = locationHelper.isInFirstRun(); if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, @@ -267,7 +270,7 @@ public final class Map nativeResumeSurfaceRendering(); } - boolean isContextCreated() + public boolean isContextCreated() { return mSurfaceCreated; } diff --git a/android/app/src/main/java/app/organicmaps/MapRenderingListener.java b/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/MapRenderingListener.java rename to android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java index 779e661db..7ee808eb1 100644 --- a/android/app/src/main/java/app/organicmaps/MapRenderingListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java @@ -1,4 +1,4 @@ -package app.organicmaps; +package app.organicmaps.sdk; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java index a4fdf61b2..36219c8e3 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java +++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java @@ -8,20 +8,22 @@ import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.location.SensorHelper; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; import app.organicmaps.routing.RoutingController; +import app.organicmaps.sdk.location.LocationHelper; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.settings.StoragePathManager; -import app.organicmaps.sound.TtsPlayer; -import app.organicmaps.util.Config; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.StorageUtils; -import app.organicmaps.util.ThemeSwitcher; -import app.organicmaps.util.UiUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.sound.TtsPlayer; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.ThemeSwitcher; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.log.Logger; import java.io.IOException; @@ -32,9 +34,43 @@ public final class OrganicMaps implements DefaultLifecycleObserver @NonNull private final Context mContext; + @NonNull + private final IsolinesManager mIsolinesManager; + @NonNull + private final SubwayManager mSubwayManager; + + @NonNull + private final LocationHelper mLocationHelper; + @NonNull + private final SensorHelper mSensorHelper; + private volatile boolean mFrameworkInitialized; private volatile boolean mPlatformInitialized; + @NonNull + public LocationHelper getLocationHelper() + { + return mLocationHelper; + } + + @NonNull + public SensorHelper getSensorHelper() + { + return mSensorHelper; + } + + @NonNull + public SubwayManager getSubwayManager() + { + return mSubwayManager; + } + + @NonNull + public IsolinesManager getIsolinesManager() + { + return mIsolinesManager; + } + public OrganicMaps(@NonNull Context context) { mContext = context.getApplicationContext(); @@ -48,6 +84,11 @@ public final class OrganicMaps implements DefaultLifecycleObserver nativeSetSettingsDir(settingsPath); Config.init(mContext); + + mLocationHelper = new LocationHelper(mContext); + mSensorHelper = new SensorHelper(mContext); + mIsolinesManager = new IsolinesManager(mContext); + mSubwayManager = new SubwayManager(mContext); } /** @@ -128,8 +169,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver ThemeSwitcher.INSTANCE.restart(false); RoutingController.get().initialize(mContext); TrafficManager.INSTANCE.initialize(); - SubwayManager.from(mContext).initialize(); - IsolinesManager.from(mContext).initialize(); + mSubwayManager.initialize(); + mIsolinesManager.initialize(); ProcessLifecycleOwner.get().getLifecycle().addObserver(this); Logger.i(TAG, "Framework initialized"); diff --git a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java b/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java index 0d7779d18..d801500dd 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java @@ -3,7 +3,7 @@ package app.organicmaps.sdk; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; public interface PlacePageActivationListener { diff --git a/android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java rename to android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java index 485ccdb02..c57a4c0dc 100644 --- a/android/app/src/main/java/app/organicmaps/api/ParsedRoutingData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java rename to android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java index 2b98aed59..057cbc647 100644 --- a/android/app/src/main/java/app/organicmaps/api/ParsedSearchRequest.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/api/RequestType.java b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/api/RequestType.java rename to android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java index a60f5dc55..d2e9e5a54 100644 --- a/android/app/src/main/java/app/organicmaps/api/RequestType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.IntDef; diff --git a/android/app/src/main/java/app/organicmaps/api/RoutePoint.java b/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/api/RoutePoint.java rename to android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java index 0c6f8876b..cdf4c30a0 100644 --- a/android/app/src/main/java/app/organicmaps/api/RoutePoint.java +++ b/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java @@ -1,4 +1,4 @@ -package app.organicmaps.api; +package app.organicmaps.sdk.api; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java index ddb4b22f8..66d44a327 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Bookmark.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.annotation.SuppressLint; import android.os.Parcel; @@ -9,10 +9,10 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.os.ParcelCompat; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.sdk.routing.RoutePointInfo; import app.organicmaps.sdk.search.Popularity; -import app.organicmaps.util.Constants; +import app.organicmaps.sdk.util.Constants; // TODO consider refactoring to remove hack with MapObject unmarshalling itself and Bookmark at the same time. // Used by JNI. diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java similarity index 88% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java index 3415aca60..401cbda1d 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java index a4cca225d..0b89b2741 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkCategory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java index e5db93b57..3137b9386 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java @@ -1,12 +1,12 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.IntRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.util.Distance; -import app.organicmaps.util.GeoUtils; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.util.Distance; +import app.organicmaps.sdk.util.GeoUtils; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java index 29fc2e813..b622e06f7 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.content.ContentResolver; import android.database.Cursor; @@ -12,12 +12,12 @@ import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.bookmarks.DataChangedListener; -import app.organicmaps.util.KeyValue; -import app.organicmaps.util.StorageUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.KeyValue; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.io.File; import java.io.IOException; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java index 9727fc4a5..84edd7a59 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/BookmarkSharingResult.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.IntDef; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java index dcf2d20bd..064b1c812 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CacheBookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java index 48399dd34..0d142e770 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CategoryDataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java @@ -1,9 +1,9 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.content.DataSource; +import app.organicmaps.sdk.content.DataSource; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java index 136769594..8b4513364 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/CoreBookmarkCategoriesDataProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java similarity index 83% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java index a2abb600c..a2b12c47c 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/DistanceAndAzimut.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java @@ -1,8 +1,8 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Used by JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java index 8693dfe92..8777ae809 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/ElevationInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; @@ -6,7 +6,7 @@ import android.os.Parcelable; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.util.ArrayList; import java.util.Arrays; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java index b7c2aa9ab..71bb0cc27 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Error.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java index cafa66568..448d83c7b 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/FeatureId.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java index bbb3f356e..e631dfbdd 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java index 0866fb872..2d7df8321 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/IconClickListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import com.google.android.material.imageview.ShapeableImageView; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java similarity index 73% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java index 61e7ff31c..08840d0c4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/KmlFileType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; // Need to be in sync with KmlFileType (map/bookmark_helpers.hpp) public enum KmlFileType { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java index 8da50e0e7..f645137ca 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.net.Uri; import android.os.Parcel; @@ -12,7 +12,7 @@ import androidx.core.os.ParcelCompat; import app.organicmaps.sdk.routing.RoutePointInfo; import app.organicmaps.sdk.search.Popularity; -import app.organicmaps.widget.placepage.PlacePageData; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java index d7f6aa7a6..ed021334f 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java index 36e778b54..33f3b3730 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/ParcelablePointD.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java index 97095c4b0..363f65197 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Result.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java similarity index 62% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java index 23164de84..3dd4d9ab4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/RoadWarningMarkType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; public enum RoadWarningMarkType { diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java index be1ed9e25..e51186ce4 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/SortedBlock.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java @@ -1,4 +1,4 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java rename to android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java index 8646c700f..4e84c4ac7 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Track.java +++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java @@ -1,8 +1,8 @@ -package app.organicmaps.bookmarks.data; +package app.organicmaps.sdk.bookmarks.data; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/content/DataSource.java b/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java similarity index 76% rename from android/app/src/main/java/app/organicmaps/content/DataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java index de246bb6b..1cfe996ea 100644 --- a/android/app/src/main/java/app/organicmaps/content/DataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java @@ -1,4 +1,4 @@ -package app.organicmaps.content; +package app.organicmaps.sdk.content; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java similarity index 87% rename from android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java index ba0c656e9..391effdcc 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayManager.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/display/DisplayManager.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java index 14e810e2b..9d8796639 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; import android.content.Context; import android.os.Handler; @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.MwmApplication; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/display/DisplayType.java b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java similarity index 54% rename from android/app/src/main/java/app/organicmaps/display/DisplayType.java rename to android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java index 478e90f25..36fb54463 100644 --- a/android/app/src/main/java/app/organicmaps/display/DisplayType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java @@ -1,4 +1,4 @@ -package app.organicmaps.display; +package app.organicmaps.sdk.display; public enum DisplayType { diff --git a/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java index 610f41400..c4e01c471 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/ChunkTask.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java @@ -1,14 +1,15 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.os.AsyncTask; import android.util.Base64; import androidx.annotation.Keep; -import app.organicmaps.util.Constants; -import app.organicmaps.util.StringUtils; +import app.organicmaps.downloader.Android7RootCertificateWorkaround; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.io.BufferedInputStream; import java.io.DataOutputStream; diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountryItem.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/downloader/CountryItem.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java index 8f0e27662..822f3bdaf 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/CountryItem.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.text.TextUtils; @@ -6,7 +6,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; /** * Class representing a single item in countries hierarchy. @@ -20,10 +20,10 @@ public final class CountryItem implements Comparable private static String sRootId; // Must correspond to ItemCategory in MapManager.cpp - static final int CATEGORY_NEAR_ME = 0; - static final int CATEGORY_DOWNLOADED = 1; - static final int CATEGORY_AVAILABLE = 2; - static final int CATEGORY__LAST = CATEGORY_AVAILABLE; + public static final int CATEGORY_NEAR_ME = 0; + public static final int CATEGORY_DOWNLOADED = 1; + public static final int CATEGORY_AVAILABLE = 2; + public static final int CATEGORY__LAST = CATEGORY_AVAILABLE; // Must correspond to NodeStatus in storage_defines.hpp public static final int STATUS_UNKNOWN = 0; @@ -71,10 +71,10 @@ public final class CountryItem implements Comparable public long bytesToDownload; // Internal ID for grouping under headers in the list - int headerId; + public int headerId; // Internal field to store search result name @Nullable - String searchResultName; + public String searchResultName; private static void ensureRootIdKnown() { diff --git a/android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java index c931f04be..757547aec 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/ExpandRetryConfirmationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import androidx.annotation.Nullable; diff --git a/android/app/src/main/java/app/organicmaps/downloader/MapManager.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/downloader/MapManager.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java index 266baa9cd..db1409d34 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/MapManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import android.app.Activity; import android.app.Application; @@ -12,7 +12,8 @@ import androidx.annotation.UiThread; import androidx.appcompat.app.AlertDialog; import app.organicmaps.R; -import app.organicmaps.util.ConnectionState; +import app.organicmaps.downloader.DownloaderService; +import app.organicmaps.sdk.util.ConnectionState; import app.organicmaps.util.Utils; import com.google.android.material.dialog.MaterialAlertDialogBuilder; @@ -180,7 +181,7 @@ public final class MapManager return true; } - static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) + public static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) { //noinspection SimplifiableIfStatement if (TextUtils.isEmpty(countryId) || !notifyNoSpaceToUpdate(activity, countryId)) @@ -189,7 +190,7 @@ public final class MapManager return true; } - static boolean warnOn3g(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) + public static boolean warnOn3g(Activity activity, @Nullable String countryId, @NonNull final Runnable onAcceptListener) { //noinspection SimplifiableIfStatement if (TextUtils.isEmpty(countryId) || !notifyNoSpace(activity, countryId)) @@ -212,7 +213,7 @@ public final class MapManager }); } - static boolean warn3gAndRetry(Activity activity, final String countryId, @Nullable final Runnable onAcceptListener) + public static boolean warn3gAndRetry(Activity activity, final String countryId, @Nullable final Runnable onAcceptListener) { return warnOn3g(activity, countryId, () -> { if (onAcceptListener != null) diff --git a/android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java b/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java rename to android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java index f52d3249b..244a983cd 100644 --- a/android/app/src/main/java/app/organicmaps/downloader/UpdateInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java @@ -1,4 +1,4 @@ -package app.organicmaps.downloader; +package app.organicmaps.sdk.downloader; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/Editor.java b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/editor/Editor.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java index fe84ed490..daa6895ec 100644 --- a/android/app/src/main/java/app/organicmaps/editor/Editor.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import android.content.Context; @@ -8,13 +8,13 @@ import androidx.annotation.Size; import androidx.annotation.WorkerThread; import app.organicmaps.BuildConfig; -import app.organicmaps.Framework; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.editor.data.FeatureCategory; -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.Framework; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.editor.data.FeatureCategory; +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 java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/editor/OpeningHours.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java index b196fae91..c2d970773 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OpeningHours.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java @@ -1,11 +1,11 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import androidx.annotation.IntRange; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; public final class OpeningHours { diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java index 264be509b..afd54de33 100644 --- a/android/app/src/main/java/app/organicmaps/editor/OsmOAuth.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor; +package app.organicmaps.sdk.editor; import android.content.Context; import android.content.SharedPreferences; @@ -11,7 +11,7 @@ import androidx.annotation.WorkerThread; import androidx.fragment.app.FragmentManager; import app.organicmaps.MwmApplication; -import app.organicmaps.util.NetworkPolicy; +import app.organicmaps.sdk.util.NetworkPolicy; public final class OsmOAuth { diff --git a/android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java index cb845e6ab..a5742a7fd 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/FeatureCategory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.os.Parcel; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java index ca5a35a29..2e56d921d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/HoursMinutes.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.os.Parcel; import android.os.Parcelable; @@ -7,7 +7,7 @@ import androidx.annotation.IntRange; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Language.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/editor/data/Language.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java index c3a42004e..fd07444f6 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Language.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java index 764301721..555c4553c 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedName.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java index 6be310969..31a23a412 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/LocalizedStreet.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java index afc6f9a90..c1676112d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/NamesDataSource.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java index d9a40d894..57823cc88 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/TimeFormatUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/TimeFormatUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import android.content.res.Resources; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Timespan.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/editor/data/Timespan.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java index bbd6c0ce7..4deae058e 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Timespan.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/editor/data/Timetable.java b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/editor/data/Timetable.java rename to android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java index 27e43cd27..f2d6d623d 100644 --- a/android/app/src/main/java/app/organicmaps/editor/data/Timetable.java +++ b/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java @@ -1,4 +1,4 @@ -package app.organicmaps.editor.data; +package app.organicmaps.sdk.editor.data; import androidx.annotation.IntRange; import androidx.annotation.Keep; diff --git a/android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java similarity index 93% rename from android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java index 2b171b014..d69a5f3b1 100644 --- a/android/app/src/main/java/app/organicmaps/location/AndroidNativeProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java @@ -1,8 +1,8 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; -import static app.organicmaps.util.concurrency.UiThread.runLater; +import static app.organicmaps.sdk.util.concurrency.UiThread.runLater; import android.content.Context; import android.location.Location; @@ -16,8 +16,7 @@ import androidx.core.location.LocationListenerCompat; import androidx.core.location.LocationManagerCompat; import androidx.core.location.LocationRequestCompat; -import app.organicmaps.MwmApplication; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.HashSet; import java.util.Set; @@ -68,7 +67,7 @@ class AndroidNativeProvider extends BaseLocationProvider AndroidNativeProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener) { super(listener); - mLocationManager = (LocationManager) MwmApplication.from(context).getSystemService(Context.LOCATION_SERVICE); + mLocationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE); mProviders = new HashSet<>(); // This service is always available on all versions of Android if (mLocationManager == null) diff --git a/android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java index cc996b056..185e6a041 100644 --- a/android/app/src/main/java/app/organicmaps/location/BaseLocationProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; diff --git a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/location/LocationHelper.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java index 4cb376f38..7f8e6a759 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationHelper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; @@ -20,17 +20,17 @@ import androidx.core.location.LocationManagerCompat; import org.chromium.base.ObserverList; -import app.organicmaps.Framework; -import app.organicmaps.Map; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.Map; import app.organicmaps.MwmApplication; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.sdk.routing.JunctionInfo; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.Config; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.NetworkPolicy; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.NetworkPolicy; +import app.organicmaps.sdk.util.log.Logger; public class LocationHelper implements BaseLocationProvider.Listener { @@ -99,12 +99,6 @@ public class LocationHelper implements BaseLocationProvider.Listener } }; - @NonNull - public static LocationHelper from(@NonNull Context context) - { - return MwmApplication.from(context).getLocationHelper(); - } - public LocationHelper(@NonNull Context context) { mContext = context; @@ -372,7 +366,7 @@ public class LocationHelper implements BaseLocationProvider.Listener checkForAgpsUpdates(); if (LocationUtils.checkFineLocationPermission(mContext)) - SensorHelper.from(mContext).start(); + MwmApplication.from(mContext).getSensorHelper().start(); final long oldInterval = mInterval; mInterval = calcLocationUpdatesInterval(); @@ -398,7 +392,7 @@ public class LocationHelper implements BaseLocationProvider.Listener Logger.i(TAG); mLocationProvider.stop(); unsubscribeFromGnssStatusUpdates(); - SensorHelper.from(mContext).stop(); + MwmApplication.from(mContext).getSensorHelper().stop(); mHandler.removeCallbacks(mLocationTimeoutRunnable); mActive = false; } diff --git a/android/app/src/main/java/app/organicmaps/location/LocationListener.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/location/LocationListener.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java index b05ab8ffb..9a92fba6e 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.app.PendingIntent; import android.location.Location; diff --git a/android/app/src/main/java/app/organicmaps/location/LocationState.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/location/LocationState.java rename to android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java index 0ee6d3b8d..aa2461a68 100644 --- a/android/app/src/main/java/app/organicmaps/location/LocationState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java @@ -1,10 +1,10 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import androidx.annotation.IntDef; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.Map; +import app.organicmaps.sdk.Map; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/android/app/src/main/java/app/organicmaps/location/PlatformSocket.java b/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/location/PlatformSocket.java rename to android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java index 406bff5c0..9642d39f0 100644 --- a/android/app/src/main/java/app/organicmaps/location/PlatformSocket.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.annotation.SuppressLint; import android.net.SSLCertificateSocketFactory; @@ -8,7 +8,7 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.organicmaps.BuildConfig; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import javax.net.SocketFactory; import javax.net.ssl.SSLSocketFactory; diff --git a/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java b/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java similarity index 89% rename from android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java rename to android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java index 037c1abb9..20603bba2 100644 --- a/android/app/src/main/java/app/organicmaps/location/RouteSimulationProvider.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import android.location.Location; @@ -7,9 +7,9 @@ import android.os.SystemClock; import androidx.annotation.NonNull; import app.organicmaps.sdk.routing.JunctionInfo; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; class RouteSimulationProvider extends BaseLocationProvider { diff --git a/android/app/src/main/java/app/organicmaps/location/SensorHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/location/SensorHelper.java rename to android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java index 57d11c8ed..7bca12691 100644 --- a/android/app/src/main/java/app/organicmaps/location/SensorHelper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; import android.content.Context; import android.hardware.Sensor; @@ -11,9 +11,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.UiThread; -import app.organicmaps.MwmApplication; -import app.organicmaps.util.LocationUtils; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.LocationUtils; +import app.organicmaps.sdk.util.log.Logger; import java.util.LinkedHashSet; import java.util.Set; @@ -37,12 +36,6 @@ public class SensorHelper implements SensorEventListener @NonNull private final Set mListeners = new LinkedHashSet<>(); - @NonNull - public static SensorHelper from(@NonNull Context context) - { - return MwmApplication.from(context).getSensorHelper(); - } - @Override public void onSensorChanged(SensorEvent event) { diff --git a/android/app/src/main/java/app/organicmaps/location/SensorListener.java b/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java similarity index 85% rename from android/app/src/main/java/app/organicmaps/location/SensorListener.java rename to android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java index 92350acd3..712546959 100644 --- a/android/app/src/main/java/app/organicmaps/location/SensorListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; public interface SensorListener { diff --git a/android/app/src/main/java/app/organicmaps/location/TrackRecorder.java b/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java similarity index 90% rename from android/app/src/main/java/app/organicmaps/location/TrackRecorder.java rename to android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java index a20847ca8..f12e2fe35 100644 --- a/android/app/src/main/java/app/organicmaps/location/TrackRecorder.java +++ b/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java @@ -1,4 +1,4 @@ -package app.organicmaps.location; +package app.organicmaps.sdk.location; public class TrackRecorder { diff --git a/android/app/src/main/java/app/organicmaps/maplayer/Mode.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java similarity index 84% rename from android/app/src/main/java/app/organicmaps/maplayer/Mode.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java index 7b69e5ed5..bdd366811 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/Mode.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java @@ -1,14 +1,14 @@ -package app.organicmaps.maplayer; +package app.organicmaps.sdk.maplayer; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.maplayer.isolines.IsolinesManager; -import app.organicmaps.maplayer.subway.SubwayManager; -import app.organicmaps.maplayer.traffic.TrafficManager; -import app.organicmaps.util.ThemeSwitcher; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.maplayer.isolines.IsolinesManager; +import app.organicmaps.sdk.maplayer.subway.SubwayManager; +import app.organicmaps.sdk.maplayer.traffic.TrafficManager; +import app.organicmaps.sdk.util.ThemeSwitcher; public enum Mode { @@ -70,7 +70,7 @@ public enum Mode ThemeSwitcher.INSTANCE.restart(true); } }; - + public abstract boolean isEnabled(@NonNull Context context); public abstract void setEnabled(@NonNull Context context, boolean isEnabled); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java similarity index 74% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java index 1e77d6ba4..5fb1ea738 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesErrorDialogListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java similarity index 70% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java index 1957bbae0..d7c2269df 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java @@ -1,21 +1,19 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; -import android.app.Application; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.MwmApplication; +import app.organicmaps.sdk.Framework; public class IsolinesManager { @NonNull private final OnIsolinesChangedListener mListener; - public IsolinesManager(@NonNull Application application) + public IsolinesManager(@NonNull Context context) { - mListener = new OnIsolinesChangedListener(application); + mListener = new OnIsolinesChangedListener(context); } static public boolean isEnabled() @@ -41,13 +39,6 @@ public class IsolinesManager registerListener(); } - @NonNull - public static IsolinesManager from(@NonNull Context context) - { - MwmApplication app = (MwmApplication) context.getApplicationContext(); - return app.getIsolinesManager(); - } - private static native void nativeAddListener(@NonNull OnIsolinesChangedListener listener); private static native void nativeRemoveListener(@NonNull OnIsolinesChangedListener listener); private static native boolean nativeShouldShowNotification(); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java index 86b03a514..22e595e7a 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/IsolinesState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; import android.content.Context; import android.view.View; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java similarity index 72% rename from android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java index 54a4fd570..98d1ddf44 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/isolines/OnIsolinesChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java @@ -1,6 +1,6 @@ -package app.organicmaps.maplayer.isolines; +package app.organicmaps.sdk.maplayer.isolines; -import android.app.Application; +import android.content.Context; import androidx.annotation.Keep; import androidx.annotation.NonNull; @@ -8,12 +8,12 @@ import androidx.annotation.NonNull; class OnIsolinesChangedListener { @NonNull - private final Application mApp; + private final Context mContext; private IsolinesErrorDialogListener mListener; - OnIsolinesChangedListener(@NonNull Application app) + OnIsolinesChangedListener(@NonNull Context app) { - mApp = app; + mContext = app; } // Called from JNI. @@ -24,7 +24,7 @@ class OnIsolinesChangedListener IsolinesState state = IsolinesState.values()[type]; if (mListener == null) { - state.activate(mApp, null, null); + state.activate(mContext, null, null); return; } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java index 35de4534f..a5e06f6f3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/OnTransitSchemeChangedListener.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java @@ -1,6 +1,6 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; -import android.app.Application; +import android.content.Context; import androidx.annotation.Keep; import androidx.annotation.MainThread; @@ -17,9 +17,9 @@ interface OnTransitSchemeChangedListener class Default implements OnTransitSchemeChangedListener { @NonNull - private final Application mContext; + private final Context mContext; - Default(@NonNull Application context) + Default(@NonNull Context context) { mContext = context; } diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java similarity index 68% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java index e2f506261..312e2a011 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/SubwayManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java @@ -1,20 +1,18 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; -import android.app.Application; import android.content.Context; import androidx.annotation.NonNull; -import app.organicmaps.Framework; -import app.organicmaps.MwmApplication; +import app.organicmaps.sdk.Framework; public class SubwayManager { @NonNull private final OnTransitSchemeChangedListener mSchemeChangedListener; - public SubwayManager(@NonNull Application application) { - mSchemeChangedListener = new OnTransitSchemeChangedListener.Default(application); + public SubwayManager(@NonNull Context context) { + mSchemeChangedListener = new OnTransitSchemeChangedListener.Default(context); } static public void setEnabled(boolean isEnabled) @@ -41,12 +39,6 @@ public class SubwayManager nativeAddListener(mSchemeChangedListener); } - @NonNull - public static SubwayManager from(@NonNull Context context) - { - MwmApplication app = (MwmApplication) context.getApplicationContext(); - return app.getSubwayManager(); - } private static native void nativeAddListener(@NonNull OnTransitSchemeChangedListener listener); private static native void nativeRemoveListener(@NonNull OnTransitSchemeChangedListener listener); diff --git a/android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java similarity index 91% rename from android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java index 705b2af16..13dae9be3 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/subway/TransitSchemeState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.subway; +package app.organicmaps.sdk.maplayer.subway; import android.content.Context; import android.widget.Toast; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java index 9ef1d9fe7..c2899c7a9 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java @@ -1,9 +1,9 @@ -package app.organicmaps.maplayer.traffic; +package app.organicmaps.sdk.maplayer.traffic; import androidx.annotation.MainThread; import androidx.annotation.NonNull; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java rename to android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java index b0ced15f8..36617a9c1 100644 --- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/TrafficState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java @@ -1,4 +1,4 @@ -package app.organicmaps.maplayer.traffic; +package app.organicmaps.sdk.maplayer.traffic; import androidx.annotation.Keep; import androidx.annotation.MainThread; diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java b/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java new file mode 100644 index 000000000..266edcec7 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java @@ -0,0 +1,23 @@ +package app.organicmaps.sdk.routing; + +public interface ResultCodes +{ + // Codes correspond to native routing::RouterResultCode in routing/routing_callbacks.hpp + int NO_ERROR = 0; + int CANCELLED = 1; + int NO_POSITION = 2; + int INCONSISTENT_MWM_ROUTE = 3; + int ROUTING_FILE_NOT_EXIST = 4; + int START_POINT_NOT_FOUND = 5; + int END_POINT_NOT_FOUND = 6; + int DIFFERENT_MWM = 7; + int ROUTE_NOT_FOUND = 8; + int NEED_MORE_MAPS = 9; + int INTERNAL_ERROR = 10; + int FILE_TOO_OLD = 11; + int INTERMEDIATE_POINT_NOT_FOUND = 12; + int TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK = 13; + int TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN = 14; + int ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR = 15; + int HAS_WARNINGS = 16; +} diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java index 842c1c421..c0b40f91c 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java @@ -2,7 +2,7 @@ package app.organicmaps.sdk.routing; import androidx.annotation.Keep; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.util.Distance; // Called from JNI. @Keep diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java index 57d58a97b..0634583ef 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java +++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java @@ -2,7 +2,7 @@ package app.organicmaps.sdk.routing; import androidx.annotation.NonNull; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import java.util.HashSet; import java.util.Set; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java index 582e5a2ca..8e8ee4f60 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java @@ -8,9 +8,9 @@ import androidx.annotation.Nullable; import org.chromium.base.ObserverList; -import app.organicmaps.Framework; -import app.organicmaps.util.Language; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.Framework; +import app.organicmaps.sdk.util.Language; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.nio.charset.StandardCharsets; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java index e11e528e7..938dfde83 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java @@ -5,7 +5,7 @@ import android.text.TextUtils; import androidx.annotation.NonNull; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; import java.util.ArrayList; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java b/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java index 2fdcf6861..5729a674b 100644 --- a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java +++ b/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java @@ -11,8 +11,8 @@ import android.text.style.StyleSpan; import androidx.annotation.Keep; import androidx.annotation.NonNull; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.util.Distance; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.util.Distance; /** * Class instances are created from native code. diff --git a/android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java b/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java similarity index 79% rename from android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java index 385d6d8dd..a712790b7 100644 --- a/android/app/src/main/java/app/organicmaps/settings/MapLanguageCode.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; public class MapLanguageCode { diff --git a/android/app/src/main/java/app/organicmaps/settings/RoadType.java b/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java similarity index 65% rename from android/app/src/main/java/app/organicmaps/settings/RoadType.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java index ebe4a69a6..e74f08aed 100644 --- a/android/app/src/main/java/app/organicmaps/settings/RoadType.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; public enum RoadType { diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java b/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java new file mode 100644 index 000000000..badf5e6d8 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java @@ -0,0 +1,8 @@ +package app.organicmaps.sdk.settings; + +public enum SpeedCameraMode +{ + AUTO, + ALWAYS, + NEVER +} diff --git a/android/app/src/main/java/app/organicmaps/settings/UnitLocale.java b/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/settings/UnitLocale.java rename to android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java index caeb9407d..c1c298f35 100644 --- a/android/app/src/main/java/app/organicmaps/settings/UnitLocale.java +++ b/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java @@ -1,4 +1,4 @@ -package app.organicmaps.settings; +package app.organicmaps.sdk.settings; import java.util.Locale; diff --git a/android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java b/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java index babffb24d..b8ddd7ee2 100644 --- a/android/app/src/main/java/app/organicmaps/sound/AudioFocusManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.media.AudioAttributes; diff --git a/android/app/src/main/java/app/organicmaps/sound/LanguageData.java b/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/LanguageData.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java index 6cf8b6281..65f15533f 100644 --- a/android/app/src/main/java/app/organicmaps/sound/LanguageData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.speech.tts.TextToSpeech; diff --git a/android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java b/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java index 224309589..9633bfdbb 100644 --- a/android/app/src/main/java/app/organicmaps/sound/MediaPlayerWrapper.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.media.MediaPlayer; diff --git a/android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java rename to android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java index b6eb5b3f9..be5a89581 100644 --- a/android/app/src/main/java/app/organicmaps/sound/TtsPlayer.java +++ b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java @@ -1,4 +1,4 @@ -package app.organicmaps.sound; +package app.organicmaps.sdk.sound; import android.content.Context; import android.content.res.Resources; @@ -13,11 +13,10 @@ import android.text.TextUtils; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.Config; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; import java.util.ArrayList; import java.util.List; @@ -286,7 +285,7 @@ public enum TtsPlayer private boolean getUsableLanguages(List outList) { - Resources resources = MwmApplication.from(mContext).getResources(); + Resources resources = mContext.getResources(); String[] codes = resources.getStringArray(R.array.tts_languages_supported); String[] names = resources.getStringArray(R.array.tts_language_names); diff --git a/android/app/src/main/java/app/organicmaps/util/BatteryState.java b/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/BatteryState.java rename to android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java index e1d819988..f277af4af 100644 --- a/android/app/src/main/java/app/organicmaps/util/BatteryState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.Intent; diff --git a/android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java b/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java index 43abb72c0..fcc9fc5db 100644 --- a/android/app/src/main/java/app/organicmaps/util/ClientCertTLSSocketFactory.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java @@ -1,8 +1,10 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import app.organicmaps.util.Utils; + import java.io.ByteArrayInputStream; import java.io.InputStream; import java.security.KeyStore; diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/Config.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Config.java index f9378334b..ce34decbc 100644 --- a/android/app/src/main/java/app/organicmaps/util/Config.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.SharedPreferences; @@ -9,6 +9,7 @@ import androidx.preference.PreferenceManager; import app.organicmaps.BuildConfig; import app.organicmaps.MwmApplication; import app.organicmaps.R; +import app.organicmaps.util.ThemeUtils; public final class Config { diff --git a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java b/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java similarity index 96% rename from android/app/src/main/java/app/organicmaps/util/ConnectionState.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java index 07af068c1..d4c8a2d03 100644 --- a/android/app/src/main/java/app/organicmaps/util/ConnectionState.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java @@ -1,6 +1,6 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; -import static app.organicmaps.util.ConnectionState.Type.NONE; +import static app.organicmaps.sdk.util.ConnectionState.Type.NONE; import android.content.Context; import android.net.ConnectivityManager; diff --git a/android/app/src/main/java/app/organicmaps/util/Constants.java b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/Constants.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Constants.java index 2efb04472..d8d49111f 100644 --- a/android/app/src/main/java/app/organicmaps/util/Constants.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import app.organicmaps.BuildConfig; diff --git a/android/app/src/main/java/app/organicmaps/util/DateUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/DateUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java index 82a8c4775..f086e5676 100644 --- a/android/app/src/main/java/app/organicmaps/util/DateUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; diff --git a/android/app/src/main/java/app/organicmaps/util/Distance.java b/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/Distance.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Distance.java index 0848fb9bf..0ba798381 100644 --- a/android/app/src/main/java/app/organicmaps/util/Distance.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; diff --git a/android/app/src/main/java/app/organicmaps/util/GeoUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java similarity index 75% rename from android/app/src/main/java/app/organicmaps/util/GeoUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java index 8155ec9ae..93f905d51 100644 --- a/android/app/src/main/java/app/organicmaps/util/GeoUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java @@ -1,8 +1,8 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.NonNull; -import app.organicmaps.bookmarks.data.ParcelablePointD; +import app.organicmaps.sdk.bookmarks.data.ParcelablePointD; public class GeoUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/HttpClient.java b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/HttpClient.java rename to android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java index 256f76d41..f66dcf80d 100644 --- a/android/app/src/main/java/app/organicmaps/util/HttpClient.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java @@ -22,7 +22,7 @@ * SOFTWARE. *******************************************************************************/ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.text.TextUtils; @@ -30,7 +30,8 @@ import androidx.annotation.Keep; import androidx.annotation.NonNull; import app.organicmaps.downloader.Android7RootCertificateWorkaround; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.sdk.util.Utils; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/android/app/src/main/java/app/organicmaps/util/KeyValue.java b/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java similarity index 89% rename from android/app/src/main/java/app/organicmaps/util/KeyValue.java rename to android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java index 50cf3859e..534518efe 100644 --- a/android/app/src/main/java/app/organicmaps/util/KeyValue.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java @@ -1,8 +1,9 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.Keep; import androidx.annotation.NonNull; +import java.io.Serial; import java.io.Serializable; // Used from JNI. @@ -10,6 +11,7 @@ import java.io.Serializable; @SuppressWarnings("unused") public final class KeyValue implements Serializable { + @Serial private static final long serialVersionUID = -3079360274128509979L; @NonNull private final String mKey; diff --git a/android/app/src/main/java/app/organicmaps/util/Language.java b/android/app/src/main/java/app/organicmaps/sdk/util/Language.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/Language.java rename to android/app/src/main/java/app/organicmaps/sdk/util/Language.java index 4a367ded7..0bdfa6ed1 100644 --- a/android/app/src/main/java/app/organicmaps/util/Language.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Language.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.text.TextUtils; diff --git a/android/app/src/main/java/app/organicmaps/util/LocationUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/LocationUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java index 735b427ef..412c738c6 100644 --- a/android/app/src/main/java/app/organicmaps/util/LocationUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import static android.Manifest.permission.ACCESS_COARSE_LOCATION; import static android.Manifest.permission.ACCESS_FINE_LOCATION; diff --git a/android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java rename to android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java index 8583fb320..dba1da0cc 100644 --- a/android/app/src/main/java/app/organicmaps/util/NetworkPolicy.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import androidx.annotation.Keep; import androidx.annotation.NonNull; diff --git a/android/app/src/main/java/app/organicmaps/util/PowerManagment.java b/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java similarity index 92% rename from android/app/src/main/java/app/organicmaps/util/PowerManagment.java rename to android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java index 2a443d8b5..325e06c52 100644 --- a/android/app/src/main/java/app/organicmaps/util/PowerManagment.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.ComponentName; import android.content.Context; @@ -11,13 +11,14 @@ import androidx.annotation.IntDef; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; +import app.organicmaps.util.Utils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -import static app.organicmaps.util.Constants.Vendor.HUAWEI; -import static app.organicmaps.util.Constants.Vendor.XIAOMI; +import static app.organicmaps.sdk.util.Constants.Vendor.HUAWEI; +import static app.organicmaps.sdk.util.Constants.Vendor.XIAOMI; public final class PowerManagment { diff --git a/android/app/src/main/java/app/organicmaps/util/ROMUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/ROMUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java index 7a0ac7ba8..7297d4062 100644 --- a/android/app/src/main/java/app/organicmaps/util/ROMUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.util.Log; diff --git a/android/app/src/main/java/app/organicmaps/util/SecureStorage.java b/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/SecureStorage.java rename to android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java index 426002008..adf642673 100644 --- a/android/app/src/main/java/app/organicmaps/util/SecureStorage.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.content.SharedPreferences; @@ -6,7 +6,7 @@ import android.content.SharedPreferences; import androidx.annotation.Keep; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; public final class SecureStorage { diff --git a/android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java index 12ad4059a..5908f06f1 100644 --- a/android/app/src/main/java/app/organicmaps/util/SharedPropertiesUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java @@ -1,6 +1,6 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; -import static app.organicmaps.util.Config.KEY_PREF_STATISTICS; +import static app.organicmaps.sdk.util.Config.KEY_PREF_STATISTICS; import android.content.Context; import android.content.SharedPreferences; @@ -10,7 +10,7 @@ import androidx.preference.PreferenceManager; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.maplayer.Mode; +import app.organicmaps.sdk.maplayer.Mode; import java.io.IOException; import java.util.Locale; diff --git a/android/app/src/main/java/app/organicmaps/util/StorageUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/StorageUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java index 7c40483e9..cad055e8b 100644 --- a/android/app/src/main/java/app/organicmaps/util/StorageUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.app.Activity; import android.content.ContentResolver; @@ -14,7 +14,8 @@ import androidx.core.content.FileProvider; import androidx.documentfile.provider.DocumentFile; import app.organicmaps.BuildConfig; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.util.Utils; import java.io.File; import java.io.FileInputStream; diff --git a/android/app/src/main/java/app/organicmaps/util/StringUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/StringUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java index 00129f810..24eaf3254 100644 --- a/android/app/src/main/java/app/organicmaps/util/StringUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.content.Context; import android.text.Editable; diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java similarity index 94% rename from android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java rename to android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java index b90dddc03..9bbe825dc 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.app.Activity; import android.app.UiModeManager; @@ -11,15 +11,15 @@ import androidx.appcompat.app.AppCompatDelegate; import java.util.Calendar; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayManager; import app.organicmaps.downloader.DownloaderStatusIcon; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.MapStyle; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.util.ThemeUtils; public enum ThemeSwitcher { @@ -151,13 +151,14 @@ public enum ThemeSwitcher /** * Determine light/dark theme based on time and location, * or fall back to time-based (06:00-18:00) when there's no location fix + * * @return theme_light/dark string */ private String calcAutoTheme() { String defaultTheme = mContext.getResources().getString(R.string.theme_default); String nightTheme = mContext.getResources().getString(R.string.theme_night); - Location last = LocationHelper.from(mContext).getSavedLocation(); + Location last = MwmApplication.from(mContext).getLocationHelper().getSavedLocation(); boolean day; if (last != null) diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/UiUtils.java rename to android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java index 97c985990..394f73772 100644 --- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java @@ -1,4 +1,4 @@ -package app.organicmaps.util; +package app.organicmaps.sdk.util; import android.animation.Animator; import android.app.Activity; @@ -34,8 +34,9 @@ import androidx.core.view.WindowCompat; import androidx.core.view.WindowInsetsCompat; import androidx.core.view.WindowInsetsControllerCompat; import androidx.recyclerview.widget.RecyclerView; -import app.organicmaps.MwmApplication; import app.organicmaps.R; +import app.organicmaps.util.ThemeUtils; +import app.organicmaps.util.WindowInsetUtils; import com.google.android.material.appbar.MaterialToolbar; import com.google.android.material.textfield.TextInputLayout; @@ -201,7 +202,7 @@ public final class UiUtils public static boolean isTablet(@NonNull Context context) { - return MwmApplication.from(context).getResources().getBoolean(R.bool.tabletLayout); + return context.getResources().getBoolean(R.bool.tabletLayout); } public static int dimen(@NonNull Context context, @DimenRes int id) @@ -228,7 +229,7 @@ public final class UiUtils { setInputError(layout, error == 0 ? null : layout.getContext().getString(error)); } - + public static void setInputError(@NonNull TextInputLayout layout, String error) { layout.getEditText().setError(error); diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java new file mode 100644 index 000000000..5747b7869 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java @@ -0,0 +1,274 @@ +package app.organicmaps.sdk.util; + +import android.annotation.SuppressLint; +import android.content.Context; +import android.content.res.Resources; +import android.os.Build; +import android.text.TextUtils; +import android.text.format.DateUtils; +import android.view.View; +import android.widget.Toast; + +import androidx.annotation.Keep; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; + +import app.organicmaps.BuildConfig; +import app.organicmaps.sdk.util.log.Logger; + +import java.text.DecimalFormatSymbols; +import java.util.Currency; +import java.util.Locale; + +@Keep +public class Utils +{ + private static final String TAG = Utils.class.getSimpleName(); + + @StringRes + private static final int INVALID_ID = 0; + + static String makeUrlSafe(@NonNull final String url) + { + return url.replaceAll("(token|password|key)=([^&]+)", "***"); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @Nullable + public static String getCurrencyCode() + { + Locale[] locales = { Locale.getDefault(), Locale.US }; + for (Locale locale : locales) + { + Currency currency = getCurrencyForLocale(locale); + if (currency != null) + return currency.getCurrencyCode(); + } + return null; + } + + @Nullable + private static Currency getCurrencyForLocale(@NonNull Locale locale) + { + try + { + return Currency.getInstance(locale); + } + catch (Throwable e) + { + Logger.e(TAG, "Failed to obtain a currency for locale: " + locale, e); + return null; + } + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getCountryCode() + { + return Locale.getDefault().getCountry(); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLanguageCode() + { + return Locale.getDefault().getLanguage(); + } + + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getDecimalSeparator() + { + return String.valueOf(DecimalFormatSymbols.getInstance().getDecimalSeparator()); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getGroupingSeparator() + { + return String.valueOf(DecimalFormatSymbols.getInstance().getGroupingSeparator()); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getCurrencySymbol(@NonNull String currencyCode) + { + try + { + return Currency.getInstance(currencyCode).getSymbol(Locale.getDefault()); + } + catch (Throwable e) + { + Logger.e(TAG, "Failed to obtain currency symbol by currency code = " + currencyCode, e); + } + + return currencyCode; + } + + /** + * Returns a string value for the specified key. If the value is not found then its key will be + * returned. + * + * @return string value or its key if there is no string for the specified key. + */ + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getStringValueByKey(@NonNull Context context, @NonNull String key) + { + try + { + return context.getString(getStringIdByKey(context, key)); + } + catch (Resources.NotFoundException e) + { + Logger.e(TAG, "Failed to get value for string '" + key + "'", e); + } + return key; + } + + @StringRes + @SuppressLint("DiscouragedApi") + public static int getStringIdByKey(@NonNull Context context, @NonNull String key) + { + try + { + Resources res = context.getResources(); + @StringRes + int nameId = res.getIdentifier(key, "string", context.getPackageName()); + if (nameId == INVALID_ID || nameId == View.NO_ID) + throw new Resources.NotFoundException("String id '" + key + "' is not found"); + return nameId; + } + catch (RuntimeException e) + { + Logger.e(TAG, "Failed to get string with id '" + key + "'", e); + if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta")) + { + Toast.makeText(context, "Add string id for '" + key + "'!", Toast.LENGTH_LONG).show(); + } + } + return INVALID_ID; + } + + /** + * Returns a name for a new bookmark created off the current GPS location. + * The name includes current time and date in locale-specific format. + * + * @return bookmark name with time and date. + */ + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getMyPositionBookmarkName(@NonNull Context context) + { + return DateUtils.formatDateTime(context, System.currentTimeMillis(), + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR); + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getDeviceName() + { + return Build.MANUFACTURER; + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getDeviceModel() + { + return Build.MODEL; + } + + // Called from JNI. + @NonNull + @Keep + @SuppressWarnings("unused") + public static String getVersion() + { + return BuildConfig.VERSION_NAME; + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + public static int getIntVersion() + { + // Please sync with getVersion() in build.gradle + // - % 100000000 removes prefix for special markets, e.g Huawei. + // - / 100 removes the number of commits in the current day. + return (BuildConfig.VERSION_CODE % 1_00_00_00_00) / 100; + } + + @NonNull + public static String getTagValueLocalized(@NonNull Context context, @Nullable String tagKey, @Nullable String value) + { + if (TextUtils.isEmpty(tagKey) || TextUtils.isEmpty(value)) + return ""; + + return getLocalizedFeatureType(context, tagKey + "-" + value); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type) + { + if (TextUtils.isEmpty(type)) + return ""; + + String key = "type." + type.replace('-', '.') + .replace(':', '_'); + return getLocalizedFeatureByKey(context, key); + } + + @NonNull + private static String getLocalizedFeatureByKey(@NonNull Context context, @NonNull String key) + { + return getStringValueByKey(context, key); + } + + // Called from JNI. + @Keep + @SuppressWarnings("unused") + @NonNull + public static String getLocalizedBrand(@NonNull Context context, @Nullable String brand) + { + if (TextUtils.isEmpty(brand)) + return ""; + + try + { + @StringRes + int nameId = context.getResources().getIdentifier("brand." + brand, "string", context.getPackageName()); + if (nameId == INVALID_ID || nameId == View.NO_ID) + return brand; + return context.getString(nameId); + } + catch (Resources.NotFoundException e) + { + } + return brand; + } +} diff --git a/android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java similarity index 95% rename from android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java rename to android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java index 216310432..c37383ca3 100644 --- a/android/app/src/main/java/app/organicmaps/util/concurrency/ThreadPool.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.concurrency; +package app.organicmaps.sdk.util.concurrency; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; diff --git a/android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java similarity index 97% rename from android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java rename to android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java index 21177b1d0..ed461b755 100644 --- a/android/app/src/main/java/app/organicmaps/util/concurrency/UiThread.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.concurrency; +package app.organicmaps.sdk.util.concurrency; import android.os.Handler; import android.os.Looper; diff --git a/android/app/src/main/java/app/organicmaps/util/log/Logger.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/log/Logger.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java index ebe6b90f7..e48e77526 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/Logger.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import android.util.Log; diff --git a/android/app/src/main/java/app/organicmaps/util/log/LogsManager.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java similarity index 98% rename from android/app/src/main/java/app/organicmaps/util/log/LogsManager.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java index 1fa9907c0..473ff02b8 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/LogsManager.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import android.Manifest; import android.app.ActivityManager; @@ -22,8 +22,8 @@ import androidx.core.content.ContextCompat; import app.organicmaps.BuildConfig; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.ROMUtils; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.ROMUtils; +import app.organicmaps.sdk.util.StringUtils; import net.jcip.annotations.ThreadSafe; diff --git a/android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java similarity index 99% rename from android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java rename to android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java index 6a51dd40d..af7f02e35 100644 --- a/android/app/src/main/java/app/organicmaps/util/log/ZipLogsTask.java +++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java @@ -1,4 +1,4 @@ -package app.organicmaps.util.log; +package app.organicmaps.sdk.util.log; import androidx.annotation.NonNull; import androidx.annotation.Nullable; diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java new file mode 100644 index 000000000..59069ebc1 --- /dev/null +++ b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java @@ -0,0 +1,6 @@ +package app.organicmaps.sdk.widget.placepage; + +public class PlacePageButtonFactory +{ + public native static boolean nativeHasRecentlyDeletedBookmark(); +} diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java similarity index 78% rename from android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java rename to android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java index 002c0126f..065283897 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageData.java +++ b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java @@ -1,4 +1,4 @@ -package app.organicmaps.widget.placepage; +package app.organicmaps.sdk.widget.placepage; import android.os.Parcelable; diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java index b6fccbd98..d15299a59 100644 --- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java @@ -20,7 +20,7 @@ import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; import app.organicmaps.sdk.search.DisplayedCategories; -import app.organicmaps.util.Language; +import app.organicmaps.sdk.util.Language; import app.organicmaps.util.ThemeUtils; import java.lang.annotation.Retention; diff --git a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java index 85dd55fca..f87d1a4d3 100644 --- a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java @@ -10,7 +10,7 @@ import androidx.core.view.ViewCompat; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import app.organicmaps.widget.SearchToolbarController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class FloatingSearchToolbarController extends SearchToolbarController { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java index 261d86c44..920838fb5 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java @@ -16,7 +16,7 @@ import app.organicmaps.R; import app.organicmaps.sdk.search.SearchResult; import app.organicmaps.util.Graphics; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; class SearchAdapter extends RecyclerView.Adapter { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java index 0fab74c08..6b256d62c 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java @@ -22,25 +22,25 @@ import androidx.fragment.app.FragmentManager; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmFragment; -import app.organicmaps.bookmarks.data.FeatureId; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.FeatureId; +import app.organicmaps.sdk.bookmarks.data.MapObject; import app.organicmaps.downloader.CountrySuggestFragment; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.location.LocationListener; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchEngine; import app.organicmaps.sdk.search.SearchListener; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.sdk.search.SearchResult; -import app.organicmaps.util.Config; -import app.organicmaps.util.SharedPropertiesUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.Language; +import app.organicmaps.sdk.util.SharedPropertiesUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.util.WindowInsetUtils; import app.organicmaps.widget.PlaceholderView; @@ -330,7 +330,7 @@ public class SearchFragment extends BaseMwmFragment public void onResume() { super.onResume(); - LocationHelper.from(requireContext()).addListener(mLocationListener); + MwmApplication.from(requireContext()).getLocationHelper().addListener(mLocationListener); if (mInitialQuery != null) { setQuery(mInitialQuery, false); mInitialQuery = null; @@ -340,7 +340,7 @@ public class SearchFragment extends BaseMwmFragment @Override public void onPause() { - LocationHelper.from(requireContext()).removeListener(mLocationListener); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(mLocationListener); super.onPause(); } @@ -444,7 +444,7 @@ public class SearchFragment extends BaseMwmFragment SearchEngine.INSTANCE.searchInteractive( query, isCategory(), !TextUtils.isEmpty(mInitialLocale) - ? mInitialLocale : app.organicmaps.util.Language.getKeyboardLocale(requireContext()), + ? mInitialLocale : Language.getKeyboardLocale(requireContext()), mLastQueryTimestamp, false /* isMapAndTable */); SearchEngine.INSTANCE.setQuery(query); @@ -504,8 +504,6 @@ public class SearchFragment extends BaseMwmFragment updateFrames(); } - // Called from JNI. - @SuppressWarnings("unused") @Override public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp) { @@ -515,8 +513,6 @@ public class SearchFragment extends BaseMwmFragment refreshSearchResults(results); } - // Called from JNI. - @SuppressWarnings("unused") @Override public void onResultsEnd(long timestamp) { diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java index b405b66ae..5925a6844 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java @@ -8,8 +8,8 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.sdk.search.SearchRecents; import app.organicmaps.widget.SearchToolbarController; @@ -67,7 +67,7 @@ class SearchHistoryAdapter extends RecyclerView.Adapter { - RoutingController.get().onPoiSelected(LocationHelper.from(viewGroup.getContext()).getMyPosition()); + RoutingController.get().onPoiSelected(MwmApplication.from(viewGroup.getContext()).getLocationHelper().getMyPosition()); mSearchToolbarController.onUpClick(); }); break; diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java index b1ea928de..4281cbe03 100644 --- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java +++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java @@ -9,13 +9,13 @@ import androidx.annotation.Nullable; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmRecyclerFragment; -import app.organicmaps.location.LocationHelper; import app.organicmaps.routing.RoutingController; import app.organicmaps.widget.PlaceholderView; import app.organicmaps.widget.SearchToolbarController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class SearchHistoryFragment extends BaseMwmRecyclerFragment { @@ -32,7 +32,7 @@ public class SearchHistoryFragment extends BaseMwmRecyclerFragment { final String speedCamModeValue = (String) newValue; - final SettingsPrefsFragment.SpeedCameraMode newCamMode = SettingsPrefsFragment.SpeedCameraMode.valueOf(speedCamModeValue); + final SpeedCameraMode newCamMode = SpeedCameraMode.valueOf(speedCamModeValue); final CharSequence summary = pref.getEntries()[newCamMode.ordinal()]; pref.setSummary(summary); if (pref.getValue().equals(newValue)) @@ -354,7 +355,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment }); } - private void onSpeedCamerasPrefChanged(@NonNull SettingsPrefsFragment.SpeedCameraMode newCamMode) + private void onSpeedCamerasPrefChanged(@NonNull SpeedCameraMode newCamMode) { Framework.setSpeedCamerasMode(newCamMode); } diff --git a/android/app/src/main/java/app/organicmaps/util/InputUtils.java b/android/app/src/main/java/app/organicmaps/util/InputUtils.java index 6ca34a74c..89e7d4c50 100644 --- a/android/app/src/main/java/app/organicmaps/util/InputUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/InputUtils.java @@ -9,7 +9,7 @@ import android.widget.EditText; import androidx.annotation.NonNull; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java index 076890872..1a457570a 100644 --- a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java @@ -22,12 +22,14 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.SplashActivity; -import app.organicmaps.bookmarks.data.BookmarkInfo; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.util.log.Logger; +import app.organicmaps.sdk.bookmarks.data.BookmarkInfo; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.util.StorageUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.log.Logger; public class SharingUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java index c121c8d31..45f761554 100644 --- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java @@ -10,6 +10,7 @@ import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import app.organicmaps.R; +import app.organicmaps.sdk.util.Config; public final class ThemeUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java index aadb5c76e..4cd3f5afc 100644 --- a/android/app/src/main/java/app/organicmaps/util/Utils.java +++ b/android/app/src/main/java/app/organicmaps/util/Utils.java @@ -1,6 +1,5 @@ package app.organicmaps.util; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.ClipData; @@ -10,7 +9,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.content.res.Resources; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -19,7 +17,6 @@ import android.text.Spannable; import android.text.SpannableStringBuilder; import android.text.Spanned; import android.text.TextUtils; -import android.text.format.DateUtils; import android.text.style.AbsoluteSizeSpan; import android.util.AndroidRuntimeException; import android.view.View; @@ -42,17 +39,17 @@ import app.organicmaps.BuildConfig; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.util.concurrency.UiThread; -import app.organicmaps.util.log.Logger; -import app.organicmaps.util.log.LogsManager; +import app.organicmaps.sdk.util.Constants; +import app.organicmaps.sdk.util.Distance; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.util.concurrency.UiThread; +import app.organicmaps.sdk.util.log.Logger; +import app.organicmaps.sdk.util.log.LogsManager; import com.google.android.material.snackbar.Snackbar; import java.io.Closeable; import java.io.IOException; import java.lang.ref.WeakReference; -import java.text.DecimalFormatSymbols; -import java.util.Currency; -import java.util.Locale; import java.util.Map; @Keep @@ -389,197 +386,6 @@ public class Utils } } - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @Nullable - public static String getCurrencyCode() - { - Locale[] locales = { Locale.getDefault(), Locale.US }; - for (Locale locale : locales) - { - Currency currency = getCurrencyForLocale(locale); - if (currency != null) - return currency.getCurrencyCode(); - } - return null; - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getCountryCode() - { - return Locale.getDefault().getCountry(); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLanguageCode() - { - return Locale.getDefault().getLanguage(); - } - - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getDecimalSeparator() - { - return String.valueOf(DecimalFormatSymbols.getInstance().getDecimalSeparator()); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getGroupingSeparator() - { - return String.valueOf(DecimalFormatSymbols.getInstance().getGroupingSeparator()); - } - - @Nullable - public static Currency getCurrencyForLocale(@NonNull Locale locale) - { - try - { - return Currency.getInstance(locale); - } - catch (Throwable e) - { - Logger.e(TAG, "Failed to obtain a currency for locale: " + locale, e); - return null; - } - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getCurrencySymbol(@NonNull String currencyCode) - { - try - { - return Currency.getInstance(currencyCode).getSymbol(Locale.getDefault()); - } - catch (Throwable e) - { - Logger.e(TAG, "Failed to obtain currency symbol by currency code = " + currencyCode, e); - } - - return currencyCode; - } - - static String makeUrlSafe(@NonNull final String url) - { - return url.replaceAll("(token|password|key)=([^&]+)", "***"); - } - - @StringRes - @SuppressLint("DiscouragedApi") - public static int getStringIdByKey(@NonNull Context context, @NonNull String key) - { - try - { - Resources res = context.getResources(); - @StringRes - int nameId = res.getIdentifier(key, "string", context.getPackageName()); - if (nameId == INVALID_ID || nameId == View.NO_ID) - throw new Resources.NotFoundException("String id '" + key + "' is not found"); - return nameId; - } - catch (RuntimeException e) - { - Logger.e(TAG, "Failed to get string with id '" + key + "'", e); - if (BuildConfig.BUILD_TYPE.equals("debug") || BuildConfig.BUILD_TYPE.equals("beta")) - { - Toast.makeText(context, "Add string id for '" + key + "'!", Toast.LENGTH_LONG).show(); - } - } - return INVALID_ID; - } - - /** - * Returns a string value for the specified key. If the value is not found then its key will be - * returned. - * - * @return string value or its key if there is no string for the specified key. - */ - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getStringValueByKey(@NonNull Context context, @NonNull String key) - { - try - { - return context.getString(getStringIdByKey(context, key)); - } - catch (Resources.NotFoundException e) - { - Logger.e(TAG, "Failed to get value for string '" + key + "'", e); - } - return key; - } - - /** - * Returns a name for a new bookmark created off the current GPS location. - * The name includes current time and date in locale-specific format. - * - * @return bookmark name with time and date. - */ - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getMyPositionBookmarkName(@NonNull Context context) - { - return DateUtils.formatDateTime(context, System.currentTimeMillis(), - DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR); - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getDeviceName() - { - return Build.MANUFACTURER; - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getDeviceModel() - { - return Build.MODEL; - } - - // Called from JNI. - @NonNull - @Keep - @SuppressWarnings("unused") - public static String getVersion() - { - return BuildConfig.VERSION_NAME; - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - public static int getIntVersion() - { - // Please sync with getVersion() in build.gradle - // - % 100000000 removes prefix for special markets, e.g Huawei. - // - / 100 removes the number of commits in the current day. - return (BuildConfig.VERSION_CODE % 1_00_00_00_00) / 100; - } - public static void detachFragmentIfCoreNotInitialized(@NonNull Context context, @NonNull Fragment fragment) { @@ -620,59 +426,6 @@ public class Utils void invoke(@NonNull T param); } - @NonNull - private static String getLocalizedFeatureByKey(@NonNull Context context, @NonNull String key) - { - return getStringValueByKey(context, key); - } - - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getTagValueLocalized(@NonNull Context context, @Nullable String tagKey, @Nullable String value) - { - if (TextUtils.isEmpty(tagKey) || TextUtils.isEmpty(value)) - return ""; - - return getLocalizedFeatureType(context, tagKey + "-" + value); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLocalizedFeatureType(@NonNull Context context, @Nullable String type) - { - if (TextUtils.isEmpty(type)) - return ""; - - String key = "type." + type.replace('-', '.') - .replace(':', '_'); - return getLocalizedFeatureByKey(context, key); - } - - // Called from JNI. - @Keep - @SuppressWarnings("unused") - @NonNull - public static String getLocalizedBrand(@NonNull Context context, @Nullable String brand) - { - if (TextUtils.isEmpty(brand)) - return ""; - - try - { - @StringRes - int nameId = context.getResources().getIdentifier("brand." + brand, "string", context.getPackageName()); - if (nameId == INVALID_ID || nameId == View.NO_ID) - return brand; - return context.getString(nameId); - } - catch (Resources.NotFoundException e) - { - } - return brand; - } public static String getLocalizedLevel(@NonNull Context context, @Nullable String level) { diff --git a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java index f36656222..5f66eaf46 100644 --- a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java +++ b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java @@ -9,6 +9,7 @@ import androidx.core.graphics.Insets; import androidx.core.view.OnApplyWindowInsetsListener; import androidx.core.view.WindowInsetsCompat; import app.organicmaps.R; +import app.organicmaps.sdk.util.UiUtils; public final class WindowInsetUtils { diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java index 8f9cdeac5..23f5358e9 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuAdapter.java @@ -13,7 +13,8 @@ import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.location.TrackRecorder; +import app.organicmaps.sdk.location.TrackRecorder; +import app.organicmaps.sdk.util.Config; import java.util.ArrayList; diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java index 56c5626e7..a3a508dd0 100644 --- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java +++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java @@ -25,7 +25,7 @@ import java.util.ArrayList; import java.util.Objects; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MenuBottomSheetFragment extends BottomSheetDialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java index 0c3c9fe97..e10894654 100644 --- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java +++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java @@ -16,7 +16,7 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class PlaceholderView extends LinearLayout { diff --git a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java index 434d71438..d3f680955 100644 --- a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java @@ -17,8 +17,8 @@ import androidx.annotation.StringRes; import app.organicmaps.R; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.textfield.TextInputEditText; public class SearchToolbarController extends ToolbarController implements View.OnClickListener diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java index 33c7178ba..6e1580264 100644 --- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java @@ -10,8 +10,8 @@ import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentTransaction; import app.organicmaps.R; -import app.organicmaps.util.Config; -import app.organicmaps.util.NetworkPolicy; +import app.organicmaps.sdk.util.Config; +import app.organicmaps.sdk.util.NetworkPolicy; public class StackedButtonDialogFragment extends DialogFragment { diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java index 0aed8e974..505770cc2 100644 --- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java +++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java @@ -12,7 +12,7 @@ import androidx.annotation.StringRes; import androidx.appcompat.app.AppCompatDialog; import app.organicmaps.R; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class StackedButtonsDialog extends AppCompatDialog implements View.OnClickListener { diff --git a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java index c93362b4e..f261fb572 100644 --- a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java +++ b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java @@ -14,7 +14,7 @@ import androidx.core.view.ViewCompat; 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; diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java index 5213c5c1b..3ceb8895f 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java @@ -2,7 +2,7 @@ package app.organicmaps.widget.menu; import android.view.View; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MainMenu { diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java index 42ede08cd..b897c541e 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java @@ -18,11 +18,11 @@ import androidx.core.content.res.ResourcesCompat; import androidx.core.widget.ImageViewCompat; import com.google.android.material.floatingactionbutton.FloatingActionButton; -import app.organicmaps.Map; +import app.organicmaps.sdk.Map; import app.organicmaps.R; -import app.organicmaps.location.LocationState; +import app.organicmaps.sdk.location.LocationState; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; public class MyPositionButton { diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java index 855f364cd..a7ac779d7 100644 --- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java +++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java @@ -12,14 +12,15 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.core.content.ContextCompat; import com.google.android.material.bottomsheet.BottomSheetBehavior; + +import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.location.LocationHelper; import app.organicmaps.sdk.routing.RoutingInfo; -import app.organicmaps.sound.TtsPlayer; +import app.organicmaps.sdk.sound.TtsPlayer; import app.organicmaps.util.Graphics; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import com.google.android.material.progressindicator.LinearProgressIndicator; import java.time.LocalTime; @@ -208,7 +209,7 @@ public class NavMenu private void updateSpeedView(@NonNull RoutingInfo info) { - final Location last = LocationHelper.from(mActivity).getSavedLocation(); + final Location last = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation(); if (last == null) return; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java index a96706f51..a5adb67ba 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import com.github.mikephil.charting.charts.BarLineChartBase; import com.github.mikephil.charting.formatter.DefaultValueFormatter; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; public class AxisValueFormatter extends DefaultValueFormatter { diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java index f9e1c0028..9a97db669 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java @@ -12,8 +12,8 @@ import androidx.annotation.NonNull; import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.bookmarks.IconsAdapter; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.Icon; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.Icon; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java index 28af2112b..36580a9af 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java @@ -10,18 +10,17 @@ import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; +import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.SensorListener; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.SensorListener; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.ArrowView; @@ -102,8 +101,8 @@ public class DirectionFragment extends BaseMwmDialogFragment public void onResume() { super.onResume(); - LocationHelper.from(requireContext()).addListener(this); - SensorHelper.from(requireContext()).addListener(this); + MwmApplication.from(requireContext()).getLocationHelper().addListener(this); + MwmApplication.from(requireContext()).getSensorHelper().addListener(this); ((MwmActivity) requireActivity()).hideOrShowUIWithoutClosingPlacePage(true); refreshViews(); } @@ -112,8 +111,8 @@ public class DirectionFragment extends BaseMwmDialogFragment public void onPause() { super.onPause(); - LocationHelper.from(requireContext()).removeListener(this); - SensorHelper.from(requireContext()).removeListener(this); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(this); + MwmApplication.from(requireContext()).getSensorHelper().removeListener(this); } @Override @@ -138,7 +137,7 @@ public class DirectionFragment extends BaseMwmDialogFragment @Override public void onCompassUpdated(double north) { - final Location last = LocationHelper.from(requireContext()).getSavedLocation(); + final Location last = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (last == null || mMapObject == null) return; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java index 35a925ca2..6f3f6eb86 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java @@ -21,14 +21,14 @@ import app.organicmaps.R; import app.organicmaps.base.BaseMwmDialogFragment; import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment; import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment.Listener; -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.Track; +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.Track; import app.organicmaps.util.Graphics; import app.organicmaps.util.InputUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener; import com.google.android.material.appbar.MaterialToolbar; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java index 7a7fba5fd..768984fac 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java @@ -11,11 +11,12 @@ import androidx.annotation.Nullable; import androidx.core.widget.NestedScrollView; import app.organicmaps.ChartController; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.ElevationInfo; +import app.organicmaps.sdk.bookmarks.data.ElevationInfo; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; +import app.organicmaps.sdk.widget.placepage.PlacePageData; import java.util.Objects; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java index b965b17d4..a4b820841 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java @@ -18,9 +18,9 @@ import com.github.mikephil.charting.components.IMarker; import com.github.mikephil.charting.data.Entry; import com.github.mikephil.charting.highlight.Highlight; import com.github.mikephil.charting.utils.MPPointF; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; -import app.organicmaps.util.StringUtils; +import app.organicmaps.sdk.util.StringUtils; @SuppressLint("ViewConstructor") public class FloatingMarkerView extends RelativeLayout implements IMarker diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java index 5168ad5df..e39c478aa 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java @@ -1,10 +1,13 @@ package app.organicmaps.widget.placepage; +import static app.organicmaps.sdk.widget.placepage.PlacePageButtonFactory.nativeHasRecentlyDeletedBookmark; + import android.content.Context; import androidx.annotation.DrawableRes; import androidx.annotation.NonNull; import androidx.annotation.StringRes; + import app.organicmaps.MwmApplication; import app.organicmaps.R; import app.organicmaps.util.ThemeUtils; @@ -74,6 +77,4 @@ public class PlacePageButtonFactory }; return new PlacePageButton(titleId, iconId, buttonType); } - - private native static boolean nativeHasRecentlyDeletedBookmark(); } diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java index cbd1fe347..93522c10a 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java @@ -22,21 +22,21 @@ import androidx.fragment.app.FragmentManager; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.R; import app.organicmaps.api.Const; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.RoadWarningMarkType; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType; import app.organicmaps.intent.Factory; import app.organicmaps.routing.RoutingController; -import app.organicmaps.settings.RoadType; +import app.organicmaps.sdk.settings.RoadType; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; 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 com.google.android.material.bottomsheet.BottomSheetBehavior; import com.google.android.material.shape.MaterialShapeDrawable; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java index 0073d6275..3e1020ba8 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageUtils.java @@ -8,10 +8,10 @@ import android.view.View; import android.widget.PopupMenu; import androidx.annotation.NonNull; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.R; import app.organicmaps.util.Utils; -import app.organicmaps.display.DisplayManager; +import app.organicmaps.sdk.display.DisplayManager; import com.google.android.material.bottomsheet.BottomSheetBehavior; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java index 14e8db52a..5c5e623f2 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java @@ -22,32 +22,30 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; import app.organicmaps.MwmActivity; import app.organicmaps.MwmApplication; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.DistanceAndAzimut; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.downloader.CountryItem; +import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.downloader.CountryItem; import app.organicmaps.downloader.DownloaderStatusIcon; -import app.organicmaps.downloader.MapManager; -import app.organicmaps.editor.Editor; -import app.organicmaps.editor.OhState; -import app.organicmaps.editor.OpeningHours; -import app.organicmaps.editor.data.HoursMinutes; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.location.LocationHelper; -import app.organicmaps.location.LocationListener; -import app.organicmaps.location.SensorHelper; -import app.organicmaps.location.SensorListener; +import app.organicmaps.sdk.downloader.MapManager; +import app.organicmaps.sdk.editor.Editor; +import app.organicmaps.editor.OhState; //pastk: move? +import app.organicmaps.sdk.editor.OpeningHours; //pastk: a part of Editor? +import app.organicmaps.sdk.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.Timetable; +import app.organicmaps.sdk.location.LocationListener; +import app.organicmaps.sdk.location.SensorListener; import app.organicmaps.routing.RoutingController; -import app.organicmaps.util.DateUtils; +import app.organicmaps.sdk.util.DateUtils; import app.organicmaps.util.SharingUtils; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; -import app.organicmaps.util.concurrency.UiThread; +import app.organicmaps.sdk.util.concurrency.UiThread; import app.organicmaps.widget.ArrowView; import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment; import app.organicmaps.widget.placepage.sections.PlacePageLinksFragment; @@ -69,6 +67,9 @@ import java.util.List; import static android.view.View.GONE; import static android.view.View.VISIBLE; +import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType; +import static app.organicmaps.sdk.util.Utils.getTagValueLocalized; + public class PlacePageView extends Fragment implements View.OnClickListener, View.OnLongClickListener, LocationListener, @@ -312,8 +313,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { super.onStart(); mViewModel.getMapObject().observe(requireActivity(), this); - LocationHelper.from(requireContext()).addListener(this); - SensorHelper.from(requireContext()).addListener(this); + MwmApplication.from(requireContext()).getLocationHelper().addListener(this); + MwmApplication.from(requireContext()).getSensorHelper().addListener(this); } @Override @@ -321,8 +322,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { super.onStop(); mViewModel.getMapObject().removeObserver(this); - LocationHelper.from(requireContext()).removeListener(this); - SensorHelper.from(requireContext()).removeListener(this); + MwmApplication.from(requireContext()).getLocationHelper().removeListener(this); + MwmApplication.from(requireContext()).getSensorHelper().removeListener(this); UiThread.cancelDelayedTasks(updateOpenState); detachCountry(); } @@ -340,7 +341,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, { refreshPreview(); refreshDetails(); - final Location loc = LocationHelper.from(requireContext()).getSavedLocation(); + final Location loc = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (mMapObject.isMyPosition()) refreshMyPosition(loc); else @@ -455,14 +456,14 @@ public class PlacePageView extends Fragment implements View.OnClickListener, refreshMetadataOrHide(mMapObject.hasAtm() ? getString(R.string.type_amenity_atm) : "", mAtm, mTvAtm); - final String wheelchair = Utils.getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR)); + final String wheelchair = getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR)); refreshMetadataOrHide(wheelchair, mWheelchair, mTvWheelchair); final String driveThrough = mMapObject.getMetadata(Metadata.MetadataType.FMD_DRIVE_THROUGH); refreshMetadataOrHide(driveThrough.equals("yes") ? getString(R.string.drive_through) : "", mDriveThrough, mTvDriveThrough); final String selfService = mMapObject.getMetadata(Metadata.MetadataType.FMD_SELF_SERVICE); - refreshMetadataOrHide(Utils.getTagValueLocalized(getContext(), "self_service", selfService), mSelfService, mTvSelfService); + refreshMetadataOrHide(getTagValueLocalized(getContext(), "self_service", selfService), mSelfService, mTvSelfService); final String outdoorSeating = mMapObject.getMetadata(Metadata.MetadataType.FMD_OUTDOOR_SEATING); refreshMetadataOrHide(outdoorSeating.equals("yes") ? getString(R.string.outdoor_seating) : "", mOutdoorSeating, mTvOutdoorSeating); @@ -821,7 +822,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, if (mMapObject == null || mMapObject.isMyPosition()) return; - final Location location = LocationHelper.from(requireContext()).getSavedLocation(); + final Location location = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation(); if (location == null) { UiUtils.hide(mAvDirection); diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java index fa8ed2f3d..25b6d5667 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java @@ -3,7 +3,7 @@ package app.organicmaps.widget.placepage; import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; -import app.organicmaps.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.MapObject; import java.util.List; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java index f4df69956..c64c55490 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java @@ -7,9 +7,9 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.recyclerview.widget.RecyclerView; import app.organicmaps.R; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; -import app.organicmaps.util.UiUtils; +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; @@ -17,8 +17,8 @@ import java.util.Calendar; import java.util.Collections; import java.util.List; -import static app.organicmaps.editor.data.TimeFormatUtils.formatNonBusinessTime; -import static app.organicmaps.editor.data.TimeFormatUtils.formatWeekdaysRange; +import static app.organicmaps.sdk.editor.data.TimeFormatUtils.formatNonBusinessTime; +import static app.organicmaps.sdk.editor.data.TimeFormatUtils.formatWeekdaysRange; import com.google.android.material.textview.MaterialTextView; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java index 146efd757..5405be434 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java @@ -24,11 +24,11 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.Bookmark; -import app.organicmaps.bookmarks.data.BookmarkManager; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.util.StringUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.bookmarks.data.Bookmark; +import app.organicmaps.sdk.bookmarks.data.BookmarkManager; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.util.StringUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.EditBookmarkFragment; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java index 796e0f3ee..45c401389 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java @@ -12,10 +12,10 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import app.organicmaps.Framework; +import app.organicmaps.sdk.Framework; 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.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java index 8842fea8b..d29798e8b 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java @@ -18,14 +18,14 @@ import androidx.recyclerview.widget.RecyclerView; import com.google.android.material.textview.MaterialTextView; import app.organicmaps.R; -import app.organicmaps.bookmarks.data.MapObject; -import app.organicmaps.bookmarks.data.Metadata; -import app.organicmaps.editor.OpeningHours; -import app.organicmaps.editor.data.TimeFormatUtils; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.bookmarks.data.MapObject; +import app.organicmaps.sdk.bookmarks.data.Metadata; +import app.organicmaps.sdk.editor.OpeningHours; +import app.organicmaps.sdk.editor.data.TimeFormatUtils; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; import app.organicmaps.util.ThemeUtils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java index fe4dacc56..07a658e28 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePagePhoneFragment.java @@ -12,8 +12,8 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; import androidx.recyclerview.widget.RecyclerView; 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.widget.placepage.PlacePageViewModel; public class PlacePagePhoneFragment extends Fragment implements Observer diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java index b86c395ed..dd0b778c4 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java @@ -17,10 +17,10 @@ import androidx.lifecycle.ViewModelProvider; import com.google.android.material.textview.MaterialTextView; 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.util.Utils; -import app.organicmaps.util.UiUtils; +import app.organicmaps.sdk.util.UiUtils; import app.organicmaps.widget.placepage.PlaceDescriptionActivity; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; diff --git a/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java b/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java index b1a28f4f1..3ae0b45a4 100644 --- a/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java +++ b/android/app/src/test/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapterTest.java @@ -1,8 +1,8 @@ package app.organicmaps.widget.placepage.sections; -import app.organicmaps.editor.data.HoursMinutes; -import app.organicmaps.editor.data.Timespan; -import app.organicmaps.editor.data.Timetable; +import app.organicmaps.sdk.editor.data.HoursMinutes; +import app.organicmaps.sdk.editor.data.Timespan; +import app.organicmaps.sdk.editor.data.Timetable; import app.organicmaps.widget.placepage.sections.PlaceOpeningHoursAdapter.WeekScheduleData; import org.junit.Before; import org.junit.Test; diff --git a/android/app/src/web/java/app/organicmaps/location b/android/app/src/web/java/app/organicmaps/location deleted file mode 120000 index c3bacf635..000000000 --- a/android/app/src/web/java/app/organicmaps/location +++ /dev/null @@ -1 +0,0 @@ -../../../../google/java/app/organicmaps/location \ No newline at end of file diff --git a/android/app/src/web/java/app/organicmaps/sdk/location b/android/app/src/web/java/app/organicmaps/sdk/location new file mode 120000 index 000000000..f41d2255b --- /dev/null +++ b/android/app/src/web/java/app/organicmaps/sdk/location @@ -0,0 +1 @@ +../../../../../google/java/app/organicmaps/sdk/location \ No newline at end of file diff --git a/drape/gl_includes.hpp b/drape/gl_includes.hpp index 308138b30..0be148247 100644 --- a/drape/gl_includes.hpp +++ b/drape/gl_includes.hpp @@ -19,7 +19,7 @@ #define GL_GLEXT_PROTOTYPES #include #include - #include "android/app/src/main/cpp/app/organicmaps/opengl/gl3stub.h" + #include "android/app/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h" #include #elif defined(OMIM_OS_LINUX) #define GL_GLEXT_PROTOTYPES