diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java b/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java index fa8687dfaf..0486253cfa 100644 --- a/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java +++ b/android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java @@ -59,7 +59,8 @@ public class Metadata implements Parcelable FMD_DESTINATION_REF(38), FMD_JUNCTION_REF(39), FMD_BUILDING_MIN_LEVEL(40), - FMD_WIKIMEDIA_COMMONS(41); + FMD_WIKIMEDIA_COMMONS(41), + FMD_CAPACITY(42); private final int mMetaType; MetadataType(int metadataType) 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 06dd20c4ab..56c111afbc 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 @@ -99,6 +99,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, private TextView mTvLevel; private View mAtm; private TextView mTvAtm; + private View mCapacity; + private TextView mTvCapacity; private View mCuisine; private TextView mTvCuisine; private View mEntrance; @@ -235,6 +237,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, mTvLevel = mFrame.findViewById(R.id.tv__place_level); mAtm = mFrame.findViewById(R.id.ll__place_atm); mTvAtm = mFrame.findViewById(R.id.tv__place_atm); + mCapacity = mFrame.findViewById(R.id.ll__place_capacity); + mTvCapacity = mFrame.findViewById(R.id.tv__place_capacity); mCuisine = mFrame.findViewById(R.id.ll__place_cuisine); mTvCuisine = mFrame.findViewById(R.id.tv__place_cuisine); mEntrance = mFrame.findViewById(R.id.ll__place_entrance); @@ -251,6 +255,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, mOperator.setOnLongClickListener(this); mLevel.setOnLongClickListener(this); mAtm.setOnLongClickListener(this); + mCapacity.setOnLongClickListener(this); mDownloaderIcon = new DownloaderStatusIcon(mPreview.findViewById(R.id.downloader_status_frame)); @@ -390,6 +395,7 @@ public class PlacePageView extends Fragment implements View.OnClickListener, refreshWiFi(); refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_FLATS), mEntrance, mTvEntrance); refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_LEVEL), mLevel, mTvLevel); + refreshMetadataOrHide(mMapObject.getMetadata(Metadata.MetadataType.FMD_CAPACITY), mCapacity, mTvCapacity); refreshMetadataOrHide(mMapObject.hasAtm() ? getString(R.string.type_amenity_atm) : "", mAtm, mTvAtm); // showTaxiOffer(mapObject); @@ -559,6 +565,8 @@ public class PlacePageView extends Fragment implements View.OnClickListener, items.add(mTvLevel.getText().toString()); else if (id == R.id.ll__place_atm) items.add(mTvAtm.getText().toString()); + else if (id == R.id.ll__place_capacity) + items.add(mTvCapacity.getText().toString()); final Context context = requireContext(); if (items.size() == 1) diff --git a/android/app/src/main/res/drawable/ic_capacity_white.xml b/android/app/src/main/res/drawable/ic_capacity_white.xml new file mode 100644 index 0000000000..b6eb10e1cc --- /dev/null +++ b/android/app/src/main/res/drawable/ic_capacity_white.xml @@ -0,0 +1,11 @@ + + + \ No newline at end of file diff --git a/android/app/src/main/res/layout/place_page_capacity.xml b/android/app/src/main/res/layout/place_page_capacity.xml new file mode 100644 index 0000000000..4eafb9c2bb --- /dev/null +++ b/android/app/src/main/res/layout/place_page_capacity.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file 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 f3312d0db6..b5ba2308bf 100644 --- a/android/app/src/main/res/layout/place_page_details.xml +++ b/android/app/src/main/res/layout/place_page_details.xml @@ -59,6 +59,8 @@ + +