diff --git a/.gitignore b/.gitignore index 17f0fd2d32..7e95da1d91 100644 --- a/.gitignore +++ b/.gitignore @@ -154,7 +154,7 @@ designer_version.h *.sw? # Build version -platform/platform_qt_version.cpp +build_version.hpp #python modules building tools/python/*/build diff --git a/CMakeLists.txt b/CMakeLists.txt index 47c02e373f..8b3ed0a1bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,6 +279,27 @@ if (USE_PCH) ${OMIM_PCH_TARGET_NAME} ) endif() + +# Generate version header file. +execute_process(COMMAND tools/unix/version.sh android_name + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE OM_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE +) +execute_process(COMMAND tools/unix/version.sh android_code + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE OM_VERSION_CODE + OUTPUT_STRIP_TRAILING_WHITESPACE +) +execute_process(COMMAND tools/unix/version.sh git_hash + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + OUTPUT_VARIABLE OM_GIT_HASH + OUTPUT_STRIP_TRAILING_WHITESPACE +) +# TODO: Does it run on every build or only on configure step? +# TODO: Run only when dependent targets are built. +configure_file(build_version.hpp.in ${CMAKE_SOURCE_DIR}/build_version.hpp @ONLY) + # Include 3party dependencies. # Configure expat library. @@ -295,14 +316,7 @@ set(EXPAT_SHARED_LIBS OFF) add_subdirectory(3party/expat/expat) add_subdirectory(3party/agg) add_subdirectory(3party/bsdiff-courgette) - add_subdirectory(3party/gflags) -# Not needed for the usual build process, but it fixes QtCreator editor, -# that doesn't see gflags/gflags.h in binary dir (gflags has tricky cmake configuration). -if (PLATFORM_DESKTOP) - include_directories("${PROJECT_BINARY_DIR}/3party/gflags/include") -endif() - if (LINUX_DETECTED) find_package(ICU COMPONENTS uc i18n data REQUIRED) find_package(Freetype REQUIRED) diff --git a/README.md b/README.md index fa33cc7d2f..f6055a841b 100644 --- a/README.md +++ b/README.md @@ -115,7 +115,7 @@ See [GOVERNANCE](docs/GOVERNANCE.md). ## Contributing -See [CONTRIBUTING](docs/CONTRIBUTING.md) and read everything in the [docs folder](docs/) of the repository. +See [CONTRIBUTING](docs/CONTRIBUTING.md). ## Beta diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index a6f668f580..ce2381cd9a 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -739,8 +739,7 @@ android:name="com.mapswithme.maps.editor.EditorActivity" android:configChanges="orientation|screenLayout|screenSize" android:label="@string/edit_place" - android:parentActivityName="com.mapswithme.maps.MwmActivity" - android:windowSoftInputMode="adjustResize" /> + android:parentActivityName="com.mapswithme.maps.MwmActivity" /> GetStorage(); downloader->SetDataVersion(storage.GetCurrentDataVersion()); - downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener)]() + downloader->EnsureServersListReady([&storage, ptr = jni::make_global_ref(listener)]() { auto const & curFile = g_filesToDownload.back(); auto const fileName = curFile.GetFileName(MapFileType::Map); diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index fa612abe0c..68b1be6883 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -920,7 +920,7 @@ Java_com_mapswithme_maps_Framework_nativeGetDistanceAndAzimuthFromLatLon( return Java_com_mapswithme_maps_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north); } -JNIEXPORT jstring JNICALL +JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat) { switch (static_cast(coordsFormat)) @@ -937,14 +937,15 @@ Java_com_mapswithme_maps_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdou } } -JNIEXPORT jstring JNICALL +JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt) { auto const localizedUnits = platform::GetLocalizedAltitudeUnits(); - return jni::ToJavaString(env, measurement_utils::FormatAltitudeWithLocalization(alt, localizedUnits.m_low)); + return jni::ToJavaString(env, measurement_utils::FormatAltitudeWithLocalization(alt, + localizedUnits.m_low)); } -JNIEXPORT jstring JNICALL +JNIEXPORT jobject JNICALL Java_com_mapswithme_maps_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed) { return jni::ToJavaString(env, measurement_utils::FormatSpeed(speed)); @@ -1346,7 +1347,7 @@ Java_com_mapswithme_maps_Framework_nativeSetMapStyle(JNIEnv * env, jclass, jint } JNIEXPORT jint JNICALL -Java_com_mapswithme_maps_Framework_nativeGetMapStyle(JNIEnv * env, jclass) +Java_com_mapswithme_maps_Framework_nativeGetMapStyle(JNIEnv * env, jclass, jint mapStyle) { return g_framework->GetMapStyle(); } @@ -1705,25 +1706,25 @@ Java_com_mapswithme_maps_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv } JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass) +Java_com_mapswithme_maps_Framework_nativeHasSavedRoutePoints() { return frm()->GetRoutingManager().HasSavedRoutePoints(); } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeLoadRoutePoints(JNIEnv *, jclass) +Java_com_mapswithme_maps_Framework_nativeLoadRoutePoints() { frm()->GetRoutingManager().LoadRoutePoints(g_loadRouteHandler); } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeSaveRoutePoints(JNIEnv *, jclass) +Java_com_mapswithme_maps_Framework_nativeSaveRoutePoints() { frm()->GetRoutingManager().SaveRoutePoints(); } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass) +Java_com_mapswithme_maps_Framework_nativeDeleteSavedRoutePoints() { frm()->GetRoutingManager().DeleteSavedRoutePoints(); } diff --git a/android/jni/com/mapswithme/maps/SearchEngine.cpp b/android/jni/com/mapswithme/maps/SearchEngine.cpp index 71e3ee4331..3c7e61c849 100644 --- a/android/jni/com/mapswithme/maps/SearchEngine.cpp +++ b/android/jni/com/mapswithme/maps/SearchEngine.cpp @@ -1,3 +1,4 @@ +#include "com/mapswithme/maps/SearchEngine.hpp" #include "com/mapswithme/maps/Framework.hpp" #include "com/mapswithme/maps/UserMarkHelper.hpp" #include "com/mapswithme/platform/Platform.hpp" @@ -65,8 +66,8 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters) return !hasPosition || distanceInMeters > search::Result::kPopularityHighPriorityMinDistance; } -jobject ToJavaResult(Result const & result, search::ProductInfo const & productInfo, - bool hasPosition, double lat, double lon) +jobject ToJavaResult(Result & result, search::ProductInfo const & productInfo, bool hasPosition, + double lat, double lon) { JNIEnv * env = jni::GetEnv(); @@ -145,22 +146,7 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI return ret; } -jobjectArray BuildSearchResults(vector const & productInfo, - bool hasPosition, double lat, double lon) -{ - JNIEnv * env = jni::GetEnv(); - - auto const count = static_cast(g_results.GetCount()); - jobjectArray const jResults = env->NewObjectArray(count, g_resultClass, nullptr); - for (jsize i = 0; i < count; i++) - { - jni::TScopedLocalRef jRes(env, ToJavaResult(g_results[i], productInfo[i], hasPosition, lat, lon)); - env->SetObjectArrayElement(jResults, i, jRes.get()); - } - return jResults; -} - -void OnResults(Results results, vector productInfo, +void OnResults(Results const & results, vector const & productInfo, jlong timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon) { // Ignore results from obsolete searches. @@ -171,8 +157,8 @@ void OnResults(Results results, vector productInfo, if (!results.IsEndMarker() || results.IsEndedNormal()) { - g_results = std::move(results); - jni::TScopedLocalObjectArrayRef jResults(env, BuildSearchResults(productInfo, hasPosition, lat, lon)); + jni::TScopedLocalObjectArrayRef jResults( + env, BuildSearchResults(results, productInfo, hasPosition, lat, lon)); env->CallVoidMethod(g_javaListener, g_updateResultsId, jResults.get(), timestamp); } @@ -213,7 +199,12 @@ void OnMapSearchResults(storage::DownloaderSearchResults const & results, long l static_cast(timestamp), results.m_endMarker); } -void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results, +void OnBookmarksSearchStarted() +{ + // Dummy. +} + +void OnBookmarksSearchResults(search::BookmarksSearchParams::Results const & results, search::BookmarksSearchParams::Status status, long long timestamp) { // Ignore results from obsolete searches. @@ -222,9 +213,11 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results, JNIEnv * env = jni::GetEnv(); - g_framework->NativeFramework()->GetBookmarkManager().FilterInvalidBookmarks(results); - jni::ScopedLocalRef jResults(env, env->NewLongArray(static_cast(results.size()))); - vector const tmp(results.cbegin(), results.cend()); + auto filteredResults = results; + g_framework->NativeFramework()->GetBookmarkManager().FilterInvalidBookmarks(filteredResults); + jni::ScopedLocalRef jResults( + env, env->NewLongArray(static_cast(filteredResults.size()))); + vector const tmp(filteredResults.cbegin(), filteredResults.cend()); env->SetLongArrayRegion(jResults.get(), 0, static_cast(tmp.size()), tmp.data()); auto const method = (status == search::BookmarksSearchParams::Status::InProgress) ? @@ -232,9 +225,28 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results, env->CallVoidMethod(g_javaListener, method, jResults.get(), static_cast(timestamp)); } - } // namespace +jobjectArray BuildSearchResults(Results const & results, + vector const & productInfo, bool hasPosition, + double lat, double lon) +{ + JNIEnv * env = jni::GetEnv(); + + g_results = results; + + auto const count = static_cast(g_results.GetCount()); + jobjectArray const jResults = env->NewObjectArray(count, g_resultClass, nullptr); + + for (jsize i = 0; i < count; i++) + { + jni::TScopedLocalRef jRes(env, + ToJavaResult(g_results[i], productInfo[i], hasPosition, lat, lon)); + env->SetObjectArrayElement(jResults, i, jRes.get()); + } + return jResults; +} + extern "C" { JNIEXPORT void JNICALL @@ -283,14 +295,12 @@ extern "C" JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory, jstring lang, jlong timestamp, jboolean hasPosition, jdouble lat, jdouble lon) { - search::EverywhereSearchParams params{ - jni::ToNativeString(env, bytes), - jni::ToNativeString(env, lang), - {}, // default timeout - static_cast(isCategory), - bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon) - }; - bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(params)); + search::EverywhereSearchParams params; + params.m_query = jni::ToNativeString(env, bytes); + params.m_inputLocale = jni::ToNativeString(env, lang); + params.m_isCategory = isCategory; + params.m_onResults = bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon); + bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(params); if (searchStarted) g_queryTimestamp = timestamp; return searchStarted; @@ -300,30 +310,24 @@ extern "C" JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory, jstring lang, jlong timestamp, jboolean isMapAndTable) { - search::ViewportSearchParams vparams{ - jni::ToNativeString(env, bytes), - jni::ToNativeString(env, lang), - {}, // default timeout - static_cast(isCategory) - }; + search::ViewportSearchParams vparams; + vparams.m_query = jni::ToNativeString(env, bytes); + vparams.m_inputLocale = jni::ToNativeString(env, lang); + vparams.m_isCategory = isCategory; // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use // HotelsClassifier for hotel queries detection. - // Don't move vparams here, because it's used below. g_framework->NativeFramework()->GetSearchAPI().SearchInViewport(vparams); if (isMapAndTable) { - search::EverywhereSearchParams eparams{ - std::move(vparams.m_query), - std::move(vparams.m_inputLocale), - {}, // default timeout - static_cast(isCategory), - bind(&OnResults, _1, _2, timestamp, isMapAndTable, - false /* hasPosition */, 0.0 /* lat */, 0.0 /* lon */) - }; + search::EverywhereSearchParams eparams; + eparams.m_query = vparams.m_query; + eparams.m_inputLocale = vparams.m_inputLocale; + eparams.m_onResults = bind(&OnResults, _1, _2, timestamp, isMapAndTable, + false /* hasPosition */, 0.0 /* lat */, 0.0 /* lon */); - if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams))) + if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(eparams)) g_queryTimestamp = timestamp; } } @@ -331,26 +335,25 @@ extern "C" JNIEXPORT void JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunSearchMaps( JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp) { - storage::DownloaderSearchParams params{ - jni::ToNativeString(env, bytes), - jni::ToNativeString(env, lang), - bind(&OnMapSearchResults, _1, timestamp) - }; + storage::DownloaderSearchParams params; + params.m_query = jni::ToNativeString(env, bytes); + params.m_inputLocale = jni::ToNativeString(env, lang); + params.m_onResults = bind(&OnMapSearchResults, _1, timestamp); - if (g_framework->NativeFramework()->GetSearchAPI().SearchInDownloader(std::move(params))) + if (g_framework->NativeFramework()->GetSearchAPI().SearchInDownloader(params)) g_queryTimestamp = timestamp; } JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_search_SearchEngine_nativeRunSearchInBookmarks( JNIEnv * env, jclass clazz, jbyteArray query, jlong catId, jlong timestamp) { - search::BookmarksSearchParams params{ - jni::ToNativeString(env, query), - static_cast(catId), - bind(&OnBookmarksSearchResults, _1, _2, timestamp) - }; + search::BookmarksSearchParams params; + params.m_query = jni::ToNativeString(env, query); + params.m_groupId = static_cast(catId); + params.m_onStarted = bind(&OnBookmarksSearchStarted); + params.m_onResults = bind(&OnBookmarksSearchResults, _1, _2, timestamp); - bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchInBookmarks(std::move(params)); + bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchInBookmarks(params); if (searchStarted) g_queryTimestamp = timestamp; return searchStarted; diff --git a/android/jni/com/mapswithme/maps/SearchEngine.hpp b/android/jni/com/mapswithme/maps/SearchEngine.hpp new file mode 100644 index 0000000000..968aa0a9a6 --- /dev/null +++ b/android/jni/com/mapswithme/maps/SearchEngine.hpp @@ -0,0 +1,13 @@ +#pragma once + +#include "com/mapswithme/core/jni_helper.hpp" + +#include "map/everywhere_search_callback.hpp" + +#include "search/result.hpp" + +#include + +jobjectArray BuildSearchResults(search::Results const & results, + std::vector const & productInfo, + bool hasPosition, double lat, double lon); diff --git a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp index 3852b490cb..d42db74742 100644 --- a/android/jni/com/mapswithme/maps/UserMarkHelper.cpp +++ b/android/jni/com/mapswithme/maps/UserMarkHelper.cpp @@ -7,22 +7,31 @@ namespace usermark_helper { +using feature::Metadata; -void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, osm::MapObject const & src) +void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, Metadata const & metadata) { static jmethodID const addId = env->GetMethodID(clazz, "addMetadata", "(ILjava/lang/String;)V"); ASSERT(addId, ()); - using MetadataID = osm::MapObject::MetadataID; - src.ForEachMetadataReadable([env, &mapObject](MetadataID id, std::string const & meta) + for (auto const t : metadata.GetPresentTypes()) { // TODO: It is not a good idea to pass raw strings to UI. Calling separate getters should be a better way. - if (id != MetadataID::FMD_DESCRIPTION && !meta.empty()) + + std::string meta; + switch (t) + { + case Metadata::FMD_WIKIPEDIA: meta = metadata.GetWikiURL(); break; + case Metadata::FMD_DESCRIPTION: break; + default: meta = metadata.Get(static_cast(t)); break; + } + + if (!meta.empty()) { jni::TScopedLocalRef metaString(env, jni::ToJavaString(env, meta)); - env->CallVoidMethod(mapObject, addId, static_cast(id), metaString.get()); + env->CallVoidMethod(mapObject, addId, t, metaString.get()); } - }); + } } jobject CreatePopularity(JNIEnv * env, place_page::Info const & info) @@ -35,9 +44,14 @@ jobject CreatePopularity(JNIEnv * env, place_page::Info const & info) return env->NewObject(popularityClass, popularityConstructor, static_cast(popularityValue)); } -jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObjectType, - double lat, double lon, bool parseMeta, bool parseApi, - jobject const & routingPointInfo, jobject const & popularity, jobjectArray jrawTypes) +jobject CreateMapObject(JNIEnv * env, std::string const & mwmName, int64_t mwmVersion, + uint32_t featureIndex, int mapObjectType, std::string const & title, + std::string const & secondaryTitle, std::string const & subtitle, double lat, + double lon, std::string const & address, Metadata const & metadata, + std::string const & apiId, + jobject const & routingPointInfo, place_page::OpeningMode openingMode, + jobject const & popularity, std::string const & description, + RoadWarningMarkType roadWarningMarkType, jobjectArray jrawTypes) { // public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title, // @Nullable String secondaryTitle, String subtitle, String address, @@ -67,26 +81,24 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V"); - auto const fID = info.GetID(); - jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, fID.GetMwmName())); + jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, mwmName)); jni::TScopedLocalRef jFeatureId( - env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(), (jlong)fID.GetMwmVersion(), - (jint)fID.m_index)); - jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle())); - jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, info.GetSecondaryTitle())); - jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, info.GetSubtitle())); - jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, info.GetAddress())); - jni::TScopedLocalRef jApiId(env, jni::ToJavaString(env, parseApi ? info.GetApiUrl() : "")); - jni::TScopedLocalRef jDescription(env, jni::ToJavaString(env, info.GetDescription())); + env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(), (jlong)mwmVersion, + (jint)featureIndex)); + jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, title)); + jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, secondaryTitle)); + jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, subtitle)); + jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, address)); + jni::TScopedLocalRef jApiId(env, jni::ToJavaString(env, apiId)); + jni::TScopedLocalRef jDescription(env, jni::ToJavaString(env, description)); jobject mapObject = env->NewObject(g_mapObjectClazz, ctorId, jFeatureId.get(), mapObjectType, jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, lon, jApiId.get(), routingPointInfo, - static_cast(info.GetOpeningMode()), popularity, jDescription.get(), - static_cast(info.GetRoadType()), jrawTypes); + static_cast(openingMode), popularity, jDescription.get(), + static_cast(roadWarningMarkType), jrawTypes); - if (parseMeta) - InjectMetadata(env, g_mapObjectClazz, mapObject, info); + InjectMetadata(env, g_mapObjectClazz, mapObject, metadata); return mapObject; } @@ -128,7 +140,7 @@ jobject CreateBookmark(JNIEnv *env, const place_page::Info &info, jDescription.get(), jrawTypes.get()); if (info.HasMetadata()) - InjectMetadata(env, g_mapObjectClazz, mapObject, info); + InjectMetadata(env, g_mapObjectClazz, mapObject, info.GetMetadata()); return mapObject; } @@ -196,21 +208,31 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info) // TODO(yunikkk): Should we pass localized strings here and in other methods as byte arrays? if (info.IsMyPosition()) { - return CreateMapObject(env, info, kMyPosition, ll.m_lat, ll.m_lon, - false /* parseMeta */, false /* parseApi */, - routingPointInfo.get(), popularity.get(), jrawTypes.get()); + return CreateMapObject(env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), + info.GetID().m_index, kMyPosition, info.GetTitle(), + info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, + info.GetAddress(), {}, "", + routingPointInfo.get(), info.GetOpeningMode(), + popularity.get(), info.GetDescription(), info.GetRoadType(), + jrawTypes.get()); } if (info.HasApiUrl()) { - return CreateMapObject(env, info, kApiPoint, ll.m_lat, ll.m_lon, - true /* parseMeta */, true /* parseApi */, - routingPointInfo.get(), popularity.get(), jrawTypes.get()); + return CreateMapObject( + env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, + kApiPoint, info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, + info.GetAddress(), info.GetMetadata(), info.GetApiUrl(), + routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), info.GetDescription(), + info.GetRoadType(), jrawTypes.get()); } - return CreateMapObject(env, info, kPoi, ll.m_lat, ll.m_lon, - true /* parseMeta */, false /* parseApi */, - routingPointInfo.get(), popularity.get(), jrawTypes.get()); + return CreateMapObject( + env, info.GetID().GetMwmName(), info.GetID().GetMwmVersion(), info.GetID().m_index, kPoi, + info.GetTitle(), info.GetSecondaryTitle(), info.GetSubtitle(), ll.m_lat, ll.m_lon, + info.GetAddress(), info.HasMetadata() ? info.GetMetadata() : Metadata(), "", + routingPointInfo.get(), info.GetOpeningMode(), popularity.get(), info.GetDescription(), + info.GetRoadType(), jrawTypes.get()); } jobject CreateRoutePointInfo(JNIEnv * env, place_page::Info const & info) diff --git a/android/jni/com/mapswithme/maps/editor/Editor.cpp b/android/jni/com/mapswithme/maps/editor/Editor.cpp index 26dd1af967..1305bd0a9f 100644 --- a/android/jni/com/mapswithme/maps/editor/Editor.cpp +++ b/android/jni/com/mapswithme/maps/editor/Editor.cpp @@ -96,27 +96,99 @@ Java_com_mapswithme_maps_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclas } JNIEXPORT jstring JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id) +Java_com_mapswithme_maps_editor_Editor_nativeGetPhone(JNIEnv * env, jclass) { - auto const metaID = static_cast(id); - ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); - return jni::ToJavaString(env, g_editableMapObject.GetMetadata(metaID)); -} - -JNIEXPORT jboolean JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value) -{ - auto const metaID = static_cast(id); - ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); - return osm::EditableMapObject::IsValidMetadata(metaID, jni::ToNativeString(env, value)); + return jni::ToJavaString(env, g_editableMapObject.GetPhone()); } JNIEXPORT void JNICALL -Java_com_mapswithme_maps_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value) +Java_com_mapswithme_maps_editor_Editor_nativeSetPhone(JNIEnv * env, jclass, jstring value) { - auto const metaID = static_cast(id); - ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ()); - g_editableMapObject.SetMetadata(metaID, jni::ToNativeString(env, value)); + g_editableMapObject.SetPhone(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetWebsite(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetWebsite()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetWebsite(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetWebsite(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetFacebookPage(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetFacebookPage()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetFacebookPage(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetFacebookPage(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetInstagramPage(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetInstagramPage()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetInstagramPage(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetInstagramPage(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetTwitterPage(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetTwitterPage()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetTwitterPage(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetTwitterPage(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetVkPage(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetVkPage()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetVkPage(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetVkPage(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetLinePage(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetLinePage()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetLinePage(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetLinePage(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetEmail(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetEmail()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetEmail(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetEmail(jni::ToNativeString(env, value)); } JNIEXPORT jint JNICALL @@ -125,6 +197,85 @@ Java_com_mapswithme_maps_editor_Editor_nativeGetStars(JNIEnv * env, jclass) return g_editableMapObject.GetStars(); } +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetStars(JNIEnv * env, jclass, jint value) +{ + g_editableMapObject.SetStars(value); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetOperator(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetOperator()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetOperator(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetOperator(jni::ToNativeString(env, value)); +} + +JNIEXPORT jdouble JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetElevation(JNIEnv * env, jclass) +{ + double elevation; + return g_editableMapObject.GetElevation(elevation) ? elevation : -1; +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetElevation(JNIEnv * env, jclass, jdouble value) +{ + g_editableMapObject.SetElevation(value); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetWikipedia(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetWikipedia()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetWikipedia(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetWikipedia(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetFlats(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetFlats()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetFlats(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetFlats(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetBuildingLevels(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetBuildingLevels()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetBuildingLevels(JNIEnv * env, jclass, jstring value) +{ + g_editableMapObject.SetBuildingLevels(jni::ToNativeString(env, value)); +} + +JNIEXPORT jstring JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeGetZipCode(JNIEnv * env, jclass) +{ + return jni::ToJavaString(env, g_editableMapObject.GetPostcode()); +} + +JNIEXPORT void JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeSetZipCode(JNIEnv * env, jclass clazz, jstring value) +{ + g_editableMapObject.SetPostcode(jni::ToNativeString(env, value)); +} + JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_editor_Editor_nativeHasWifi(JNIEnv *, jclass) { @@ -487,6 +638,83 @@ Java_com_mapswithme_maps_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass c return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber)); } +// static boolean nativeIsLevelValid(String level); +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsLevelValid(JNIEnv * env, jclass clazz, jstring level) +{ + return osm::EditableMapObject::ValidateBuildingLevels(jni::ToNativeString(env, level)); +} + +// static boolean nativeIsFlatValid(String flats) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsFlatValid(JNIEnv * env, jclass clazz, jstring flats) +{ + return osm::EditableMapObject::ValidateFlats(jni::ToNativeString(env, flats)); +} + +// static boolean nativeIsPostCodeValid(String zipCode) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsZipcodeValid(JNIEnv * env, jclass clazz, jstring zipCode) +{ + return osm::EditableMapObject::ValidatePostCode(jni::ToNativeString(env, zipCode)); +} + +// static boolean nativeIsPhoneValid(String phone) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsPhoneValid(JNIEnv * env, jclass clazz, jstring phone) +{ + return osm::EditableMapObject::ValidatePhoneList(jni::ToNativeString(env, phone)); +} + +// static boolean nativeIsWebsiteValid(String website) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsWebsiteValid(JNIEnv * env, jclass clazz, jstring website) +{ + return osm::EditableMapObject::ValidateWebsite(jni::ToNativeString(env, website)); +} + +// static boolean nativeIsFacebookPageValid(String facebookPage) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsFacebookPageValid(JNIEnv * env, jclass, jstring facebookPage) +{ + return osm::ValidateFacebookPage(jni::ToNativeString(env, facebookPage)); +} + +// static boolean nativeIsInstagramPageValid(String instagramPage) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsInstagramPageValid(JNIEnv * env, jclass, jstring instagramPage) +{ + return osm::ValidateInstagramPage(jni::ToNativeString(env, instagramPage)); +} + +// static boolean nativeIsTwitterPageValid(String twitterPage) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsTwitterPageValid(JNIEnv * env, jclass, jstring twitterPage) +{ + return osm::ValidateTwitterPage(jni::ToNativeString(env, twitterPage)); +} + +// static boolean nativeIsVkPageValid(String vkPage) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsVkPageValid(JNIEnv * env, jclass, jstring vkPage) +{ + return osm::ValidateVkPage(jni::ToNativeString(env, vkPage)); +} + +// static boolean nativeIsLinePageValid(String linePage) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsLinePageValid(JNIEnv * env, jclass, jstring linePage) +{ + return osm::ValidateLinePage(jni::ToNativeString(env, linePage)); +} + +// static boolean nativeIsEmailValid(String email) +JNIEXPORT jboolean JNICALL +Java_com_mapswithme_maps_editor_Editor_nativeIsEmailValid(JNIEnv * env, jclass clazz, jstring email) +{ + return osm::EditableMapObject::ValidateEmail(jni::ToNativeString(env, email)); +} + JNIEXPORT jboolean JNICALL Java_com_mapswithme_maps_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name) { diff --git a/android/jni/com/mapswithme/platform/Platform.cpp b/android/jni/com/mapswithme/platform/Platform.cpp index 324b5fa1ee..28d17923a3 100644 --- a/android/jni/com/mapswithme/platform/Platform.cpp +++ b/android/jni/com/mapswithme/platform/Platform.cpp @@ -58,21 +58,6 @@ std::string Platform::DeviceModel() const return jni::ToNativeString(env, deviceModel); } -std::string Platform::Version() const -{ - JNIEnv * env = jni::GetEnv(); - static jmethodID const getVersionId = jni::GetStaticMethodID(env, g_utilsClazz, "getVersion", "()Ljava/lang/String;"); - auto const version = static_cast(env->CallStaticObjectMethod(g_utilsClazz, getVersionId)); - return jni::ToNativeString(env, version); -} - -int32_t Platform::IntVersion() const -{ - JNIEnv * env = jni::GetEnv(); - static jmethodID const getIntVersionId = jni::GetStaticMethodID(env, g_utilsClazz, "getIntVersion", "()I"); - return env->CallStaticIntMethod(g_utilsClazz, getIntVersionId); -} - Platform::EConnectionType Platform::ConnectionStatus() { JNIEnv * env = jni::GetEnv(); diff --git a/android/res/drawable-hdpi/bg_circle.webp b/android/res/drawable-hdpi/bg_circle.webp deleted file mode 100644 index 107d1b5231..0000000000 Binary files a/android/res/drawable-hdpi/bg_circle.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/bg_circle_night.webp b/android/res/drawable-hdpi/bg_circle_night.webp deleted file mode 100644 index ee7e84a073..0000000000 Binary files a/android/res/drawable-hdpi/bg_circle_night.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/bg_circle_pressed.webp b/android/res/drawable-hdpi/bg_circle_pressed.webp deleted file mode 100644 index 96db3152c0..0000000000 Binary files a/android/res/drawable-hdpi/bg_circle_pressed.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/bg_circle_pressed_night.webp b/android/res/drawable-hdpi/bg_circle_pressed_night.webp deleted file mode 100644 index bb339eb663..0000000000 Binary files a/android/res/drawable-hdpi/bg_circle_pressed_night.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_follow.webp b/android/res/drawable-hdpi/ic_follow.webp deleted file mode 100644 index 5b926848ae..0000000000 Binary files a/android/res/drawable-hdpi/ic_follow.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_follow_and_rotate.webp b/android/res/drawable-hdpi/ic_follow_and_rotate.webp deleted file mode 100644 index 219c36e628..0000000000 Binary files a/android/res/drawable-hdpi/ic_follow_and_rotate.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_layers_dark_on.webp b/android/res/drawable-hdpi/ic_layers_dark_on.webp deleted file mode 100644 index c89260c043..0000000000 Binary files a/android/res/drawable-hdpi/ic_layers_dark_on.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_layers_light_on.webp b/android/res/drawable-hdpi/ic_layers_light_on.webp deleted file mode 100644 index f74d495021..0000000000 Binary files a/android/res/drawable-hdpi/ic_layers_light_on.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_layers_off.webp b/android/res/drawable-hdpi/ic_layers_off.webp deleted file mode 100644 index 3ef2468d32..0000000000 Binary files a/android/res/drawable-hdpi/ic_layers_off.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_layers_off_night.webp b/android/res/drawable-hdpi/ic_layers_off_night.webp deleted file mode 100644 index d8ec975e57..0000000000 Binary files a/android/res/drawable-hdpi/ic_layers_off_night.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_logout.webp b/android/res/drawable-hdpi/ic_logout.webp new file mode 100644 index 0000000000..e53b189087 Binary files /dev/null and b/android/res/drawable-hdpi/ic_logout.webp differ diff --git a/android/res/drawable-hdpi/ic_not_follow.webp b/android/res/drawable-hdpi/ic_not_follow.webp deleted file mode 100644 index e56bdbc15d..0000000000 Binary files a/android/res/drawable-hdpi/ic_not_follow.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_zoom_in.webp b/android/res/drawable-hdpi/ic_zoom_in.webp deleted file mode 100644 index b3742e0499..0000000000 Binary files a/android/res/drawable-hdpi/ic_zoom_in.webp and /dev/null differ diff --git a/android/res/drawable-hdpi/ic_zoom_out.webp b/android/res/drawable-hdpi/ic_zoom_out.webp deleted file mode 100644 index 026174529b..0000000000 Binary files a/android/res/drawable-hdpi/ic_zoom_out.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_circle.webp b/android/res/drawable-mdpi/bg_circle.webp deleted file mode 100644 index 3e0939b4aa..0000000000 Binary files a/android/res/drawable-mdpi/bg_circle.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_circle_night.webp b/android/res/drawable-mdpi/bg_circle_night.webp deleted file mode 100644 index 600e5bc8b5..0000000000 Binary files a/android/res/drawable-mdpi/bg_circle_night.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_circle_pressed.webp b/android/res/drawable-mdpi/bg_circle_pressed.webp deleted file mode 100644 index 09beb717b7..0000000000 Binary files a/android/res/drawable-mdpi/bg_circle_pressed.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/bg_circle_pressed_night.webp b/android/res/drawable-mdpi/bg_circle_pressed_night.webp deleted file mode 100644 index abb207b774..0000000000 Binary files a/android/res/drawable-mdpi/bg_circle_pressed_night.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_follow.webp b/android/res/drawable-mdpi/ic_follow.webp deleted file mode 100644 index f57a1f63f8..0000000000 Binary files a/android/res/drawable-mdpi/ic_follow.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_follow_and_rotate.webp b/android/res/drawable-mdpi/ic_follow_and_rotate.webp deleted file mode 100644 index a4c0462d0d..0000000000 Binary files a/android/res/drawable-mdpi/ic_follow_and_rotate.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_layers_dark_on.webp b/android/res/drawable-mdpi/ic_layers_dark_on.webp deleted file mode 100644 index 19190eb265..0000000000 Binary files a/android/res/drawable-mdpi/ic_layers_dark_on.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_layers_light_on.webp b/android/res/drawable-mdpi/ic_layers_light_on.webp deleted file mode 100644 index 198a14a48f..0000000000 Binary files a/android/res/drawable-mdpi/ic_layers_light_on.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_layers_off.webp b/android/res/drawable-mdpi/ic_layers_off.webp deleted file mode 100644 index 613dfd5aa7..0000000000 Binary files a/android/res/drawable-mdpi/ic_layers_off.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_layers_off_night.webp b/android/res/drawable-mdpi/ic_layers_off_night.webp deleted file mode 100644 index a769774931..0000000000 Binary files a/android/res/drawable-mdpi/ic_layers_off_night.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_logout.webp b/android/res/drawable-mdpi/ic_logout.webp new file mode 100644 index 0000000000..27c1f048de Binary files /dev/null and b/android/res/drawable-mdpi/ic_logout.webp differ diff --git a/android/res/drawable-mdpi/ic_not_follow.webp b/android/res/drawable-mdpi/ic_not_follow.webp deleted file mode 100644 index 19e5b8ae90..0000000000 Binary files a/android/res/drawable-mdpi/ic_not_follow.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_zoom_in.webp b/android/res/drawable-mdpi/ic_zoom_in.webp deleted file mode 100644 index eabcf867cb..0000000000 Binary files a/android/res/drawable-mdpi/ic_zoom_in.webp and /dev/null differ diff --git a/android/res/drawable-mdpi/ic_zoom_out.webp b/android/res/drawable-mdpi/ic_zoom_out.webp deleted file mode 100644 index 2d4bfe13b0..0000000000 Binary files a/android/res/drawable-mdpi/ic_zoom_out.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_circle.webp b/android/res/drawable-xhdpi/bg_circle.webp deleted file mode 100644 index df56ca79bf..0000000000 Binary files a/android/res/drawable-xhdpi/bg_circle.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_circle_night.webp b/android/res/drawable-xhdpi/bg_circle_night.webp deleted file mode 100644 index 4b5c20f07e..0000000000 Binary files a/android/res/drawable-xhdpi/bg_circle_night.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_circle_pressed.webp b/android/res/drawable-xhdpi/bg_circle_pressed.webp deleted file mode 100644 index a975d911b3..0000000000 Binary files a/android/res/drawable-xhdpi/bg_circle_pressed.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/bg_circle_pressed_night.webp b/android/res/drawable-xhdpi/bg_circle_pressed_night.webp deleted file mode 100644 index c5a7a04baa..0000000000 Binary files a/android/res/drawable-xhdpi/bg_circle_pressed_night.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_follow.webp b/android/res/drawable-xhdpi/ic_follow.webp deleted file mode 100644 index 43cdf0b63b..0000000000 Binary files a/android/res/drawable-xhdpi/ic_follow.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_follow_and_rotate.webp b/android/res/drawable-xhdpi/ic_follow_and_rotate.webp deleted file mode 100644 index fac546e970..0000000000 Binary files a/android/res/drawable-xhdpi/ic_follow_and_rotate.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_layers_dark_on.webp b/android/res/drawable-xhdpi/ic_layers_dark_on.webp deleted file mode 100644 index 3f79a9845b..0000000000 Binary files a/android/res/drawable-xhdpi/ic_layers_dark_on.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_layers_light_on.webp b/android/res/drawable-xhdpi/ic_layers_light_on.webp deleted file mode 100644 index ce607ff901..0000000000 Binary files a/android/res/drawable-xhdpi/ic_layers_light_on.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_layers_off.webp b/android/res/drawable-xhdpi/ic_layers_off.webp deleted file mode 100644 index 3e7c3167ec..0000000000 Binary files a/android/res/drawable-xhdpi/ic_layers_off.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_layers_off_night.webp b/android/res/drawable-xhdpi/ic_layers_off_night.webp deleted file mode 100644 index b2bb431c4a..0000000000 Binary files a/android/res/drawable-xhdpi/ic_layers_off_night.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_logout.webp b/android/res/drawable-xhdpi/ic_logout.webp new file mode 100644 index 0000000000..f1a725e252 Binary files /dev/null and b/android/res/drawable-xhdpi/ic_logout.webp differ diff --git a/android/res/drawable-xhdpi/ic_not_follow.webp b/android/res/drawable-xhdpi/ic_not_follow.webp deleted file mode 100644 index 55fcbe7eda..0000000000 Binary files a/android/res/drawable-xhdpi/ic_not_follow.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_zoom_in.webp b/android/res/drawable-xhdpi/ic_zoom_in.webp deleted file mode 100644 index 030a0acdf1..0000000000 Binary files a/android/res/drawable-xhdpi/ic_zoom_in.webp and /dev/null differ diff --git a/android/res/drawable-xhdpi/ic_zoom_out.webp b/android/res/drawable-xhdpi/ic_zoom_out.webp deleted file mode 100644 index c26c5c88b5..0000000000 Binary files a/android/res/drawable-xhdpi/ic_zoom_out.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_circle.webp b/android/res/drawable-xxhdpi/bg_circle.webp deleted file mode 100644 index c1db049973..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_circle.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_circle_night.webp b/android/res/drawable-xxhdpi/bg_circle_night.webp deleted file mode 100644 index 8ac17f7eb3..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_circle_night.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_circle_pressed.webp b/android/res/drawable-xxhdpi/bg_circle_pressed.webp deleted file mode 100644 index 1d601095b5..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_circle_pressed.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/bg_circle_pressed_night.webp b/android/res/drawable-xxhdpi/bg_circle_pressed_night.webp deleted file mode 100644 index ea4e41641b..0000000000 Binary files a/android/res/drawable-xxhdpi/bg_circle_pressed_night.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_follow.webp b/android/res/drawable-xxhdpi/ic_follow.webp deleted file mode 100644 index 805c3bc658..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_follow.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_follow_and_rotate.webp b/android/res/drawable-xxhdpi/ic_follow_and_rotate.webp deleted file mode 100644 index d607c07685..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_follow_and_rotate.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_layers_dark_on.webp b/android/res/drawable-xxhdpi/ic_layers_dark_on.webp deleted file mode 100644 index 0593bc86c3..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_layers_dark_on.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_layers_light_on.webp b/android/res/drawable-xxhdpi/ic_layers_light_on.webp deleted file mode 100644 index aac290fa29..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_layers_light_on.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_layers_off.webp b/android/res/drawable-xxhdpi/ic_layers_off.webp deleted file mode 100644 index 650d3958a2..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_layers_off.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_layers_off_night.webp b/android/res/drawable-xxhdpi/ic_layers_off_night.webp deleted file mode 100644 index 942859f524..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_layers_off_night.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_logout.webp b/android/res/drawable-xxhdpi/ic_logout.webp new file mode 100644 index 0000000000..67ce39a5c8 Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_logout.webp differ diff --git a/android/res/drawable-xxhdpi/ic_not_follow.webp b/android/res/drawable-xxhdpi/ic_not_follow.webp deleted file mode 100644 index 5bb259728d..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_not_follow.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_zoom_in.webp b/android/res/drawable-xxhdpi/ic_zoom_in.webp deleted file mode 100644 index 597617af57..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_zoom_in.webp and /dev/null differ diff --git a/android/res/drawable-xxhdpi/ic_zoom_out.webp b/android/res/drawable-xxhdpi/ic_zoom_out.webp deleted file mode 100644 index 72d47d7c87..0000000000 Binary files a/android/res/drawable-xxhdpi/ic_zoom_out.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_follow.webp b/android/res/drawable-xxxhdpi/ic_follow.webp deleted file mode 100644 index ef3563cb1f..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_follow.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_follow_and_rotate.webp b/android/res/drawable-xxxhdpi/ic_follow_and_rotate.webp deleted file mode 100644 index 46ab6efd34..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_follow_and_rotate.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_layers_dark_on.webp b/android/res/drawable-xxxhdpi/ic_layers_dark_on.webp deleted file mode 100644 index 24de4812ba..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_layers_dark_on.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_layers_light_on.webp b/android/res/drawable-xxxhdpi/ic_layers_light_on.webp deleted file mode 100644 index 776492c365..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_layers_light_on.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_layers_off.webp b/android/res/drawable-xxxhdpi/ic_layers_off.webp deleted file mode 100644 index 7171c36d84..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_layers_off.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_layers_off_night.webp b/android/res/drawable-xxxhdpi/ic_layers_off_night.webp deleted file mode 100644 index 2bdaf649d5..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_layers_off_night.webp and /dev/null differ diff --git a/android/res/drawable-xxxhdpi/ic_logout.webp b/android/res/drawable-xxxhdpi/ic_logout.webp new file mode 100644 index 0000000000..210486a128 Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_logout.webp differ diff --git a/android/res/drawable-xxxhdpi/ic_not_follow.webp b/android/res/drawable-xxxhdpi/ic_not_follow.webp deleted file mode 100644 index a0d85501fa..0000000000 Binary files a/android/res/drawable-xxxhdpi/ic_not_follow.webp and /dev/null differ diff --git a/android/res/drawable/bg_crown.xml b/android/res/drawable/bg_crown.xml deleted file mode 100644 index df34356d6c..0000000000 --- a/android/res/drawable/bg_crown.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_crown_night.xml b/android/res/drawable/bg_crown_night.xml deleted file mode 100644 index 8e39462ade..0000000000 --- a/android/res/drawable/bg_crown_night.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_light.xml b/android/res/drawable/bg_iso_lines_light.xml deleted file mode 100644 index 083c4dceaf..0000000000 --- a/android/res/drawable/bg_iso_lines_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_iso_lines_light_default.xml b/android/res/drawable/bg_iso_lines_light_default.xml deleted file mode 100644 index 47077bcee5..0000000000 --- a/android/res/drawable/bg_iso_lines_light_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_light_pressed.xml b/android/res/drawable/bg_iso_lines_light_pressed.xml deleted file mode 100644 index 83d11f1a6e..0000000000 --- a/android/res/drawable/bg_iso_lines_light_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_light_selected.xml b/android/res/drawable/bg_iso_lines_light_selected.xml deleted file mode 100644 index c54873625d..0000000000 --- a/android/res/drawable/bg_iso_lines_light_selected.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_night.xml b/android/res/drawable/bg_iso_lines_night.xml deleted file mode 100644 index c75218c86e..0000000000 --- a/android/res/drawable/bg_iso_lines_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_iso_lines_night_default.xml b/android/res/drawable/bg_iso_lines_night_default.xml deleted file mode 100644 index d4f2f26962..0000000000 --- a/android/res/drawable/bg_iso_lines_night_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_night_pressed.xml b/android/res/drawable/bg_iso_lines_night_pressed.xml deleted file mode 100644 index 4bb4fa9b1c..0000000000 --- a/android/res/drawable/bg_iso_lines_night_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_iso_lines_night_selected.xml b/android/res/drawable/bg_iso_lines_night_selected.xml deleted file mode 100644 index 1a00348b7a..0000000000 --- a/android/res/drawable/bg_iso_lines_night_selected.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/android/res/drawable-land/bg_circle_panel.xml b/android/res/drawable/bg_search_wheel_background_rect.xml similarity index 100% rename from android/res/drawable-land/bg_circle_panel.xml rename to android/res/drawable/bg_search_wheel_background_rect.xml diff --git a/android/res/drawable-land/bg_circle_panel_night.xml b/android/res/drawable/bg_search_wheel_background_rect_night.xml similarity index 100% rename from android/res/drawable-land/bg_circle_panel_night.xml rename to android/res/drawable/bg_search_wheel_background_rect_night.xml diff --git a/android/res/drawable/bg_circle_panel.xml b/android/res/drawable/bg_search_wheel_background_round.xml similarity index 100% rename from android/res/drawable/bg_circle_panel.xml rename to android/res/drawable/bg_search_wheel_background_round.xml diff --git a/android/res/drawable/bg_circle_panel_night.xml b/android/res/drawable/bg_search_wheel_background_round_night.xml similarity index 100% rename from android/res/drawable/bg_circle_panel_night.xml rename to android/res/drawable/bg_search_wheel_background_round_night.xml diff --git a/android/res/drawable/bg_subway_light.xml b/android/res/drawable/bg_subway_light.xml deleted file mode 100644 index 850c414abc..0000000000 --- a/android/res/drawable/bg_subway_light.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_subway_light_default.xml b/android/res/drawable/bg_subway_light_default.xml deleted file mode 100644 index 47077bcee5..0000000000 --- a/android/res/drawable/bg_subway_light_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_subway_light_pressed.xml b/android/res/drawable/bg_subway_light_pressed.xml deleted file mode 100644 index 83d11f1a6e..0000000000 --- a/android/res/drawable/bg_subway_light_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_subway_light_selected.xml b/android/res/drawable/bg_subway_light_selected.xml deleted file mode 100644 index c54873625d..0000000000 --- a/android/res/drawable/bg_subway_light_selected.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_subway_night.xml b/android/res/drawable/bg_subway_night.xml deleted file mode 100644 index 91ddbee2d5..0000000000 --- a/android/res/drawable/bg_subway_night.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_subway_night_default.xml b/android/res/drawable/bg_subway_night_default.xml deleted file mode 100644 index 710471fb42..0000000000 --- a/android/res/drawable/bg_subway_night_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_subway_night_pressed.xml b/android/res/drawable/bg_subway_night_pressed.xml deleted file mode 100644 index 4bb4fa9b1c..0000000000 --- a/android/res/drawable/bg_subway_night_pressed.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_subway_night_selected.xml b/android/res/drawable/bg_subway_night_selected.xml deleted file mode 100644 index 1a00348b7a..0000000000 --- a/android/res/drawable/bg_subway_night_selected.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn.xml b/android/res/drawable/bg_toggle_map_layer_btn.xml deleted file mode 100644 index 4e5902d83e..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_dark.xml deleted file mode 100644 index 28f87e62b8..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_dark.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default.xml b/android/res/drawable/bg_toggle_map_layer_btn_default.xml deleted file mode 100644 index 47077bcee5..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_default.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml deleted file mode 100644 index 710471fb42..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_default_dark.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml b/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml deleted file mode 100644 index 0daccd2693..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_pressed.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml deleted file mode 100644 index 4bb4fa9b1c..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_pressed_dark.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected.xml deleted file mode 100644 index c54873625d..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_selected.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml b/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml deleted file mode 100644 index 1a00348b7a..0000000000 --- a/android/res/drawable/bg_toggle_map_layer_btn_selected_dark.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - diff --git a/android/res/drawable/button_navigation_circle.xml b/android/res/drawable/button_navigation_circle.xml deleted file mode 100644 index 96536e113e..0000000000 --- a/android/res/drawable/button_navigation_circle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/res/drawable/button_navigation_circle_night.xml b/android/res/drawable/button_navigation_circle_night.xml deleted file mode 100644 index 64e1bcd58c..0000000000 --- a/android/res/drawable/button_navigation_circle_night.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/android/res/drawable/ic_bookmarks.xml b/android/res/drawable/ic_bookmarks.xml new file mode 100644 index 0000000000..954e7723b3 --- /dev/null +++ b/android/res/drawable/ic_bookmarks.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_contribute.xml b/android/res/drawable/ic_contribute.xml index de15bb484c..4ba64b5beb 100644 --- a/android/res/drawable/ic_contribute.xml +++ b/android/res/drawable/ic_contribute.xml @@ -1,9 +1,15 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M1,11h4v11h-4z" + android:fillColor="#000000"/> + + diff --git a/android/res/drawable/ic_donate.xml b/android/res/drawable/ic_donate.xml deleted file mode 100644 index 4ba64b5beb..0000000000 --- a/android/res/drawable/ic_donate.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_follow.xml b/android/res/drawable/ic_follow.xml new file mode 100644 index 0000000000..e14a53b610 --- /dev/null +++ b/android/res/drawable/ic_follow.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_follow_and_rotate.xml b/android/res/drawable/ic_follow_and_rotate.xml new file mode 100644 index 0000000000..d9510afe89 --- /dev/null +++ b/android/res/drawable/ic_follow_and_rotate.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_layers.xml b/android/res/drawable/ic_layers.xml new file mode 100644 index 0000000000..90dd2540fa --- /dev/null +++ b/android/res/drawable/ic_layers.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_layers_clear.xml b/android/res/drawable/ic_layers_clear.xml new file mode 100644 index 0000000000..4f2190296c --- /dev/null +++ b/android/res/drawable/ic_layers_clear.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_logout.xml b/android/res/drawable/ic_logout.xml deleted file mode 100644 index bc4265a4b1..0000000000 --- a/android/res/drawable/ic_logout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/android/res/drawable/ic_menu_bookmarks.xml b/android/res/drawable/ic_menu_bookmarks.xml deleted file mode 100644 index 14e3bdb725..0000000000 --- a/android/res/drawable/ic_menu_bookmarks.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_menu_search.xml b/android/res/drawable/ic_menu_search.xml deleted file mode 100644 index b0504a6f7a..0000000000 --- a/android/res/drawable/ic_menu_search.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_menu_share.xml b/android/res/drawable/ic_menu_share.xml deleted file mode 100644 index 5c36e6ea4d..0000000000 --- a/android/res/drawable/ic_menu_share.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/android/res/drawable/ic_minus.xml b/android/res/drawable/ic_minus.xml new file mode 100644 index 0000000000..128a7430fd --- /dev/null +++ b/android/res/drawable/ic_minus.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_not_follow.xml b/android/res/drawable/ic_not_follow.xml new file mode 100644 index 0000000000..859760018c --- /dev/null +++ b/android/res/drawable/ic_not_follow.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/drawable/ic_openstreetmap_color.webp b/android/res/drawable/ic_openstreetmap_color.webp deleted file mode 100644 index 4ad65765a6..0000000000 Binary files a/android/res/drawable/ic_openstreetmap_color.webp and /dev/null differ diff --git a/android/res/drawable/ic_search.xml b/android/res/drawable/ic_search.xml new file mode 100644 index 0000000000..e2dd96c6d0 --- /dev/null +++ b/android/res/drawable/ic_search.xml @@ -0,0 +1,5 @@ + + + diff --git a/android/res/layout-h400dp/map_buttons_layout_navigation.xml b/android/res/layout-h400dp/map_buttons_layout_navigation.xml new file mode 100644 index 0000000000..46ee0141c8 --- /dev/null +++ b/android/res/layout-h400dp/map_buttons_layout_navigation.xml @@ -0,0 +1,79 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/res/layout-h400dp/map_buttons_layout_planning.xml b/android/res/layout-h400dp/map_buttons_layout_planning.xml new file mode 100644 index 0000000000..b80f476643 --- /dev/null +++ b/android/res/layout-h400dp/map_buttons_layout_planning.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/android/res/layout-h400dp/map_buttons_layout_regular.xml b/android/res/layout-h400dp/map_buttons_layout_regular.xml new file mode 100644 index 0000000000..58add5ad9c --- /dev/null +++ b/android/res/layout-h400dp/map_buttons_layout_regular.xml @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/android/res/layout-h400dp/map_buttons_search_frame.xml b/android/res/layout-h400dp/map_buttons_search_frame.xml new file mode 100644 index 0000000000..7a83602d99 --- /dev/null +++ b/android/res/layout-h400dp/map_buttons_search_frame.xml @@ -0,0 +1,63 @@ + + + + + + + + + + diff --git a/android/res/layout-land/fragment_osm_login.xml b/android/res/layout-land/fragment_osm_login.xml deleted file mode 100644 index 84ea06ba57..0000000000 --- a/android/res/layout-land/fragment_osm_login.xml +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - - - - - - - -