kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[android] Add website:menu tag

Browse source 
Signed-off-by: Arthur-GYT <a.gayot@posteo.com>
This commit is contained in:
Arthur-GYT 2024-05-01 14:40:45 +02:00 • committed by Viktor Havaka
parent c90446d8af
commit 2e720d046e
6 changed files with 72 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
android/app/src/main/java/app/organicmaps/bookmarks/data/MapObject.java
View file

@ -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 class MapObject implements PlacePageData
}
@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)
{

3
android/app/src/main/java/app/organicmaps/bookmarks/data/Metadata.java
View file

@ -63,7 +63,8 @@ public class Metadata implements Parcelable
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)

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

@ -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 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
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 class PlacePageLinksFragment extends Fragment implements Observer<MapObje
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 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
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 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
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);

9
android/app/src/main/res/drawable/ic_website_menu.xml Normal file
View file

@ -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>

1
android/app/src/main/res/layout/place_page_links_fragment.xml
View file

@ -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" />

39
android/app/src/main/res/layout/place_page_website_menu.xml Normal file
View file

@ -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>