[android] Add website:menu tag support

android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java

@@ -1,5 +1,6 @@
 package app.organicmaps.bookmarks.data;
 
+import android.net.Uri;
 import android.os.Parcel;
 import android.text.TextUtils;
 
@@ -269,9 +270,9 @@ public String getMetadata(Metadata.MetadataType type)
  }
 
  @NonNull
- public String getWebsiteUrl(boolean strip)
+ public String getWebsiteUrl(boolean strip, @NonNull Metadata.MetadataType type)
  {
- final String website = getMetadata(Metadata.MetadataType.FMD_WEBSITE);
+ final String website = Uri.decode(getMetadata(type));
  final int len = website.length();
  if (strip && len > 1)
  {

android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java

@@ -63,7 +63,8 @@ public enum MetadataType
  FMD_CAPACITY(42),
  FMD_WHEELCHAIR(43),
  FMD_LOCAL_REF(44),
- FMD_DRIVE_THROUGH(45);
+ FMD_DRIVE_THROUGH(45),
+ FMD_WEBSITE_MENU(46);
  private final int mMetaType;
 
  MetadataType(int metadataType)

android/app/src/main/java/app/organicmaps/editor/EditorFragment.java

@@ -183,6 +183,7 @@ public void onTextChanged(CharSequence s, int start, int before, int count)
  mPhone.setText(Editor.nativeGetPhone());
 
  initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE, R.string.error_enter_correct_web);
+ initMetadataEntry(Metadata.MetadataType.FMD_WEBSITE_MENU, R.string.error_enter_correct_web);
  initMetadataEntry(Metadata.MetadataType.FMD_EMAIL, R.string.error_enter_correct_email);
  initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.string.error_enter_correct_facebook_page);
  initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.string.error_enter_correct_instagram_page);
@@ -427,6 +428,8 @@ private void initViews(View view)
  mPhone.setOnClickListener(this);
  initBlock(view, Metadata.MetadataType.FMD_WEBSITE, R.id.block_website,
  R.drawable.ic_website, R.string.website, InputType.TYPE_TEXT_VARIATION_URI);
+ initBlock(view, Metadata.MetadataType.FMD_WEBSITE_MENU, R.id.block_website_menu,
+ R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI);
  initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
  R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
  initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,

android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java

@@ -48,6 +48,8 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
  private View mKayak;
  private View mWebsite;
  private TextView mTvWebsite;
+ private View mWebsiteMenu;
+ private TextView mTvWebsiteMenuSubsite;
  private View mEmail;
  private TextView mTvEmail;
  private View mWikimedia;
@@ -76,7 +78,9 @@ private String getLink(@NonNull Metadata.MetadataType type)
  case FMD_EXTERNAL_URI:
  return mMapObject.getKayakUrl();
  case FMD_WEBSITE:
- return mMapObject.getWebsiteUrl(false /* strip */);
+ return mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
+ case FMD_WEBSITE_MENU:
+ return mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
  case FMD_CONTACT_FACEBOOK:
  case FMD_CONTACT_INSTAGRAM:
  case FMD_CONTACT_TWITTER:
@@ -123,6 +127,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
  mWebsite.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_WEBSITE));
  mWebsite.setOnLongClickListener((v) -> copyUrl(mWebsite, Metadata.MetadataType.FMD_WEBSITE));
 
+ mWebsiteMenu = mFrame.findViewById(R.id.ll__place_website_menu);
+ mTvWebsiteMenuSubsite = mFrame.findViewById(R.id.tv__place_website_menu_subtitle);
+ mWebsiteMenu.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_WEBSITE_MENU));
+ mWebsiteMenu.setOnLongClickListener((v) -> copyUrl(mWebsiteMenu, Metadata.MetadataType.FMD_WEBSITE_MENU));
+
  mEmail = mFrame.findViewById(R.id.ll__place_email);
  mTvEmail = mFrame.findViewById(R.id.tv__place_email);
  mEmail.setOnClickListener(v -> {
@@ -178,8 +187,11 @@ private boolean copyUrl(View view, Metadata.MetadataType type)
  final List<String> items = new ArrayList<>();
  items.add(url);
 
- final String title = type == Metadata.MetadataType.FMD_WEBSITE ?
- mMapObject.getWebsiteUrl(false /* strip */) : mMapObject.getMetadata(type);
+ final String title = switch (type){
+ case FMD_WEBSITE -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
+ case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
+ default -> mMapObject.getMetadata(type);
+ };
  // Add user names for social media if available
  if (!TextUtils.isEmpty(title) && !title.equals(url) && !title.contains("/"))
  items.add(title);
@@ -194,7 +206,9 @@ private boolean copyUrl(View view, Metadata.MetadataType type)
  private void refreshLinks()
  {
  UiUtils.showIf(!TextUtils.isEmpty(mMapObject.getKayakUrl()), mKayak);
- refreshMetadataOrHide(mMapObject.getWebsiteUrl(true /* strip */), mWebsite, mTvWebsite);
+
+ refreshMetadataOrHide(mMapObject.getWebsiteUrl(true /* strip */, Metadata.MetadataType.FMD_WEBSITE), mWebsite, mTvWebsite);
+ refreshMetadataOrHide(mMapObject.getWebsiteUrl(true /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU), mWebsiteMenu, mTvWebsiteMenuSubsite);
 
  String wikimedia_commons = mMapObject.getMetadata(Metadata.MetadataType.FMD_WIKIMEDIA_COMMONS);
  String wikimedia_commons_text = TextUtils.isEmpty(wikimedia_commons) ? "" : getResources().getString(R.string.wikimedia_commons);

android/app/src/main/res/drawable/ic_website_menu.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="960"
+ android:viewportHeight="960">
+ <path
+ android:pathData="M560,396v-68q33,-14 67.5,-21t72.5,-7q26,0 51,4t49,10v64q-24,-9 -48.5,-13.5T700,360q-38,0 -73,9.5T560,396ZM560,616v-68q33,-14 67.5,-21t72.5,-7q26,0 51,4t49,10v64q-24,-9 -48.5,-13.5T700,580q-38,0 -73,9t-67,27ZM560,506v-68q33,-14 67.5,-21t72.5,-7q26,0 51,4t49,10v64q-24,-9 -48.5,-13.5T700,470q-38,0 -73,9.5T560,506ZM260,640q47,0 91.5,10.5T440,682v-394q-41,-24 -87,-36t-93,-12q-36,0 -71.5,7T120,268v396q35,-12 69.5,-18t70.5,-6ZM520,682q44,-21 88.5,-31.5T700,640q36,0 70.5,6t69.5,18v-396q-33,-14 -68.5,-21t-71.5,-7q-47,0 -93,12t-87,36v394ZM480,800q-48,-38 -104,-59t-116,-21q-42,0 -82.5,11T100,762q-21,11 -40.5,-1T40,726v-482q0,-11 5.5,-21T62,208q46,-24 96,-36t102,-12q58,0 113.5,15T480,220q51,-30 106.5,-45T700,160q52,0 102,12t96,36q11,5 16.5,15t5.5,21v482q0,23 -19.5,35t-40.5,1q-37,-20 -77.5,-31T700,720q-60,0 -116,21t-104,59ZM280,466Z"
+ android:fillColor="#e8eaed"/>
+</vector>

android/app/src/main/res/layout/fragment_editor.xml

@@ -176,6 +176,10 @@
  android:background="?dividerHorizontal"/>
  </RelativeLayout>
 
+ <include
+ android:id="@+id/block_website_menu"
+ layout="@layout/item_editor_input"/>
+
  <RelativeLayout
  android:id="@+id/block_phone"
  style="@style/MwmWidget.Editor.MetadataBlock.Clickable">

android/app/src/main/res/layout/place_page_links_fragment.xml

@@ -5,6 +5,7 @@
  android:layout_height="match_parent"
  android:orientation="vertical">
  <include layout="@layout/place_page_website" />
+ <include layout="@layout/place_page_website_menu" />
  <include layout="@layout/place_page_email" />
  <include layout="@layout/place_page_facebook" />
  <include layout="@layout/place_page_instagram" />

android/app/src/main/res/layout/place_page_website_menu.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:id="@+id/ll__place_website_menu"
+ style="@style/PlacePageItemFrame"
+ android:tag="website"
+ tools:background="#20FF0000"
+ tools:visibility="visible">
+
+ <ImageView
+ android:id="@+id/iv__place_website_menu"
+ style="@style/PlacePageMetadataIcon"
+ app:srcCompat="@drawable/ic_website_menu"
+ app:tint="?colorAccent"/>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ android:id="@+id/tv__place_website_menu"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/view_menu"
+ android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent" />
+
+ <TextView
+ android:id="@+id/tv__place_website_menu_subtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
+ android:textSize="12sp"
+ tools:text="osm.org" />
+ </LinearLayout>
+
+</LinearLayout>

android/app/src/main/res/values-ar/strings.xml

@@ -822,6 +822,10 @@
  <string name="zoom_in">تكبير</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">تصغير</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">رابط القائمة</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">عرض القائمة</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">العنوان / البلوك</string>

android/app/src/main/res/values-az/strings.xml

@@ -791,6 +791,10 @@
  <string name="zoom_in">Yaxınlaşdırma</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Küçült</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Menyu keçidi</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Menyuya baxın</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Ünvan/Blok</string>

android/app/src/main/res/values-be/strings.xml

@@ -804,6 +804,10 @@
  <string name="zoom_in">Наблізіць</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Аддаліць</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Спасылка на меню</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Паглядзець меню</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Адрас/Блок</string>

android/app/src/main/res/values-bg/strings.xml

@@ -731,6 +731,10 @@
  <string name="zoom_in">Увеличаване на мащаба</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Увеличаване на мащаба</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Връзка към менюто</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Преглед на менюто</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Адрес/Блок</string>

android/app/src/main/res/values-ca/strings.xml

@@ -808,6 +808,10 @@
  <string name="zoom_in">Ampliar</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Disminuir el zoom</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Enllaç del menú</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Veure menú</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Adreça/Bloc</string>

android/app/src/main/res/values-cs/strings.xml

@@ -776,6 +776,10 @@
  <string name="zoom_in">Přiblížení</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Zvětšení</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Odkaz na menu</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Zobrazit menu</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Adresa/blok</string>

android/app/src/main/res/values-da/strings.xml

@@ -766,6 +766,10 @@
  <string name="zoom_in">Zoom ind</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Zoom ud</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Link til menu</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Vis menu</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Adresse/blok</string>

android/app/src/main/res/values-de/strings.xml

@@ -811,6 +811,10 @@
  <string name="zoom_in">Vergrößern</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Herauszoomen</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Link zur Speisekarte</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Speisekarte</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Adresse/Block</string>

android/app/src/main/res/values-el/strings.xml

@@ -809,6 +809,10 @@
  <string name="zoom_in">Μεγέθυνση</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Σμίκρυνση</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Σύνδεσμος μενού</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Προβολή μενού</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Διεύθυνση/Μπλοκ</string>

android/app/src/main/res/values-es/strings.xml

@@ -815,6 +815,10 @@
  <string name="zoom_in">Ampliar</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Alejar</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Enlace al menú</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Ver Menú</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Dirección/Bloque</string>

android/app/src/main/res/values-et/strings.xml

@@ -802,6 +802,10 @@
  <string name="zoom_in">Suurendage</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Suurenda välja</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Menüü link</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Menüü vaatamine</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Aadress/plokk</string>

android/app/src/main/res/values-eu/strings.xml

@@ -811,6 +811,10 @@
  <string name="zoom_in">Handitu</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Txikiagotu</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Menuaren esteka</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Ikusi menua</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Helbidea/Blokea</string>

android/app/src/main/res/values-fa/strings.xml

@@ -766,6 +766,10 @@
  <string name="zoom_in">بزرگنمایی</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">کوچک نمایی</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">لینک منو</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">مشاهده منو</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">آدرس/بلاک</string>

android/app/src/main/res/values-fi/strings.xml

@@ -813,6 +813,10 @@
  <string name="zoom_in">Suurenna</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Pienennä</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Valikkolinkki</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Näytä valikko</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Osoite/lohko</string>

android/app/src/main/res/values-fr/strings.xml

@@ -816,6 +816,10 @@
  <string name="zoom_in">Zoom avant</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Zoom arrière</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Lien vers le menu</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Voir le menu</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Adresse/Bloc</string>

android/app/src/main/res/values-hi/strings.xml

@@ -550,6 +550,10 @@
  <string name="zoom_in">ज़ूम इन</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">ज़ूम आउट</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">मेनू लिंक</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">मेनू देखें</string>
 
  <!-- SECTION: Types -->
  <string name="type.aerialway.cable_car">आकाशीय रज्जुमार्ग</string>

android/app/src/main/res/values-hu/strings.xml

@@ -784,6 +784,10 @@
  <string name="zoom_in">Nagyítás</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Kicsinyítés</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Menü link</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Menü megtekintése</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Cím/blokk</string>

android/app/src/main/res/values-in/strings.xml

@@ -766,6 +766,10 @@
  <string name="zoom_in">Memperbesar</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Perkecil</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Tautan menu</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Lihat Menu</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Alamat/Blokir</string>

android/app/src/main/res/values-it/strings.xml

@@ -794,6 +794,10 @@
  <string name="zoom_in">Ingrandisci</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">Rimpicciolisci</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">Link al menu</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">Visualizza menu</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">Indirizzo/Blocco</string>

android/app/src/main/res/values-iw/strings.xml

@@ -802,6 +802,10 @@
  <string name="zoom_in">לְהִתְמַקֵד</string>
  <!-- Accessibility text for the zoom-out button on the map -->
  <string name="zoom_out">להקטין את התצוגה</string>
+ <!-- Restaurant or other food place's menu URL field in the Editor -->
+ <string name="website_menu">קישור לתפריט</string>
+ <!-- Button in the Place Page which opens a restaurant or other food place's menu in a browser -->
+ <string name="view_menu">תפריט תצוגה</string>
 
  <!-- SECTION: Types -->
  <string name="type.addr_interpolation">כתובת/חסימה</string>