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 e4c86bc19..8b83c371b 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 @@ -146,7 +146,6 @@ public class PlacePageView extends Fragment private MaterialTextView mTvEntrance; private MaterialTextView mTvLastChecked; private View mEditPlace; - private View mAddOrganisation; private View mAddPlace; private View mEditTopSpace; private ShapeableImageView mColorIcon; @@ -311,7 +310,6 @@ public class PlacePageView extends Fragment mTvEntrance = mEntrance.findViewById(R.id.tv__place_entrance); mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked); mEditPlace = mFrame.findViewById(R.id.ll__place_editor); - mAddOrganisation = mFrame.findViewById(R.id.ll__add_organisation); mAddPlace = mFrame.findViewById(R.id.ll__place_add); mEditTopSpace = mFrame.findViewById(R.id.edit_top_space); latlon.setOnLongClickListener(this); @@ -672,21 +670,17 @@ public class PlacePageView extends Fragment if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning()) { - UiUtils.hide(mEditPlace, mAddOrganisation, mAddPlace, mEditTopSpace); + UiUtils.hide(mEditPlace, mAddPlace, mEditTopSpace); } else { UiUtils.showIf(Editor.nativeShouldShowEditPlace(), mEditPlace); - UiUtils.showIf(Editor.nativeShouldShowAddBusiness(), mAddOrganisation); UiUtils.showIf(Editor.nativeShouldShowAddPlace(), mAddPlace); MaterialButton mTvEditPlace = mEditPlace.findViewById(R.id.mb__place_editor); - MaterialButton mTvAddBusiness = mAddOrganisation.findViewById(R.id.mb__add_organisation); MaterialButton mTvAddPlace = mAddPlace.findViewById(R.id.mb__place_add); mTvEditPlace.setOnClickListener(this); - mTvAddBusiness.setOnClickListener(this); mTvAddPlace.setOnClickListener(this); mTvEditPlace.setEnabled(Editor.nativeShouldEnableEditPlace()); - mTvAddBusiness.setEnabled(Editor.nativeShouldEnableAddPlace()); mTvAddPlace.setEnabled(Editor.nativeShouldEnableAddPlace()); final int editPlaceButtonColor = Editor.nativeShouldEnableEditPlace() @@ -695,13 +689,11 @@ public class PlacePageView extends Fragment UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary)) : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled); mTvEditPlace.setTextColor(editPlaceButtonColor); - mTvAddBusiness.setTextColor(editPlaceButtonColor); mTvAddPlace.setTextColor(editPlaceButtonColor); mTvEditPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor)); - mTvAddBusiness.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor)); mTvAddPlace.setStrokeColor(ColorStateList.valueOf(editPlaceButtonColor)); UiUtils.showIf( - UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddOrganisation) || UiUtils.isVisible(mAddPlace), + UiUtils.isVisible(mEditPlace) || UiUtils.isVisible(mAddPlace), mEditTopSpace); } updateLinksView(); @@ -837,11 +829,6 @@ public class PlacePageView extends Fragment UiUtils.hide(mTvOpenState); } - private void addOrganisation() - { - ((MwmActivity) requireActivity()).showPositionChooserForEditor(true, true); - } - private void addPlace() { ((MwmActivity) requireActivity()).showPositionChooserForEditor(false, true); @@ -859,8 +846,6 @@ public class PlacePageView extends Fragment } else if (id == R.id.mb__place_editor) ((MwmActivity) requireActivity()).showEditor(); - else if (id == R.id.mb__add_organisation) - addOrganisation(); else if (id == R.id.mb__place_add) addPlace(); else if (id == R.id.ll__place_latlon) diff --git a/android/app/src/main/res/layout/place_page_add_business.xml b/android/app/src/main/res/layout/place_page_add_business.xml deleted file mode 100644 index 38e87b3db..000000000 --- a/android/app/src/main/res/layout/place_page_add_business.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml index a3d1e9e88..ec3f9f88f 100644 --- a/android/app/src/main/res/layout/place_page_details.xml +++ b/android/app/src/main/res/layout/place_page_details.xml @@ -85,8 +85,6 @@ - - Category Detailed description of the issue Different problem - Add business No object can be located here Community-created OpenStreetMap data as of %s. Learn more about how to edit and update the map at OpenStreetMap.org diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp index 6c3f573b4..c0f345930 100644 --- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp +++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp @@ -167,15 +167,6 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldSh return g_framework->GetPlacePageInfo().ShouldShowEditPlace(); } -JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass) -{ - ::Framework * frm = g_framework->NativeFramework(); - if (!frm->HasPlacePageInfo()) - return static_cast(false); - - return g_framework->GetPlacePageInfo().ShouldShowAddBusiness(); -} - JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass) { ::Framework * frm = g_framework->NativeFramework(); diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java index f736fbb6e..920cbc8ba 100644 --- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java +++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java @@ -49,7 +49,6 @@ public final class Editor } public static native boolean nativeShouldShowEditPlace(); - public static native boolean nativeShouldShowAddBusiness(); public static native boolean nativeShouldShowAddPlace(); public static native boolean nativeShouldEnableEditPlace(); public static native boolean nativeShouldEnableAddPlace(); diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp index fcf6ce687..2f1fd33e5 100644 --- a/libs/map/place_page_info.cpp +++ b/libs/map/place_page_info.cpp @@ -30,8 +30,7 @@ bool Info::IsBookmark() const bool Info::ShouldShowAddPlace() const { - auto const isPointOrBuilding = IsPointType() || IsBuilding(); - return !IsTrack() && !(IsFeature() && isPointOrBuilding); + return !IsTrack() && !(IsFeature() && IsPointType()); } void Info::SetFromFeatureType(FeatureType & ft) diff --git a/libs/map/place_page_info.hpp b/libs/map/place_page_info.hpp index 3ea5e3aa1..783cf1563 100644 --- a/libs/map/place_page_info.hpp +++ b/libs/map/place_page_info.hpp @@ -105,7 +105,7 @@ public: /// Edit and add bool ShouldShowAddPlace() const; - bool ShouldShowAddBusiness() const { return IsBuilding(); } + bool ShouldShowAddBusiness() const { return false; } //TODO: delete function when not used in iOS any more bool ShouldShowEditPlace() const; bool ShouldEnableAddPlace() const { return m_canEditOrAdd; }