From ffea67a2b3ce33b9ee571944e56b460c41c6bceb Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Date: Fri, 14 Nov 2025 23:32:48 +0100 Subject: [PATCH] [android] Rework socials networks on the place page Signed-off-by: Jean-Baptiste --- .../sections/PlacePageLinksFragment.java | 99 ++++++++++--------- .../main/res/layout/place_page_bluesky.xml | 25 ----- .../main/res/layout/place_page_facebook.xml | 23 ----- .../main/res/layout/place_page_fediverse.xml | 25 ----- .../main/res/layout/place_page_instagram.xml | 24 ----- .../src/main/res/layout/place_page_line.xml | 23 ----- .../res/layout/place_page_links_fragment.xml | 8 +- .../src/main/res/layout/place_page_social.xml | 76 ++++++++++++++ .../main/res/layout/place_page_twitter.xml | 24 ----- .../app/src/main/res/layout/place_page_vk.xml | 24 ----- 10 files changed, 127 insertions(+), 224 deletions(-) delete mode 100644 android/app/src/main/res/layout/place_page_bluesky.xml delete mode 100644 android/app/src/main/res/layout/place_page_facebook.xml delete mode 100644 android/app/src/main/res/layout/place_page_fediverse.xml delete mode 100644 android/app/src/main/res/layout/place_page_instagram.xml delete mode 100644 android/app/src/main/res/layout/place_page_line.xml create mode 100644 android/app/src/main/res/layout/place_page_social.xml delete mode 100644 android/app/src/main/res/layout/place_page_twitter.xml delete mode 100644 android/app/src/main/res/layout/place_page_vk.xml diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java index 9a3c15aaa..92d50cf08 100644 --- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java +++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageLinksFragment.java @@ -20,6 +20,8 @@ import app.organicmaps.sdk.bookmarks.data.Metadata; import app.organicmaps.util.Utils; import app.organicmaps.widget.placepage.PlacePageUtils; import app.organicmaps.widget.placepage.PlacePageViewModel; + +import com.google.android.material.imageview.ShapeableImageView; import com.google.android.material.textview.MaterialTextView; import java.util.ArrayList; import java.util.List; @@ -29,21 +31,15 @@ public class PlacePageLinksFragment extends Fragment implements Observer openUrl(Metadata.MetadataType.FMD_WIKIMEDIA_COMMONS)); mWikimedia.setOnLongClickListener((v) -> copyUrl(mWikimedia, Metadata.MetadataType.FMD_WIKIMEDIA_COMMONS)); - mFacebookPage = mFrame.findViewById(R.id.ll__place_facebook); - mTvFacebookPage = mFrame.findViewById(R.id.tv__place_facebook_page); - mFacebookPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_FACEBOOK)); - mFacebookPage.setOnLongClickListener((v) -> copyUrl(mFacebookPage, Metadata.MetadataType.FMD_CONTACT_FACEBOOK)); + mSocial = mFrame.findViewById(R.id.ll__place_social); - mInstagramPage = mFrame.findViewById(R.id.ll__place_instagram); - mTvInstagramPage = mFrame.findViewById(R.id.tv__place_instagram_page); - mInstagramPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM)); - mInstagramPage.setOnLongClickListener((v) -> copyUrl(mInstagramPage, Metadata.MetadataType.FMD_CONTACT_INSTAGRAM)); + mFacebookIv = mSocial.findViewById(R.id.iv__place_facebook); + mFacebookIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_FACEBOOK)); + mFacebookIv.setOnLongClickListener((v) -> copyUrl(mFacebookIv, Metadata.MetadataType.FMD_CONTACT_FACEBOOK)); - mFediversePage = mFrame.findViewById(R.id.ll__place_fediverse); - mTvFediversePage = mFrame.findViewById(R.id.tv__place_fediverse_page); - mFediversePage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE)); - mFediversePage.setOnLongClickListener((v) -> copyUrl(mFediversePage, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE)); + mInstagramIv = mSocial.findViewById(R.id.iv__place_instagram); + mInstagramIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM)); + mInstagramIv.setOnLongClickListener((v) -> copyUrl(mInstagramIv, Metadata.MetadataType.FMD_CONTACT_INSTAGRAM)); - mBlueskyPage = mFrame.findViewById(R.id.ll__place_bluesky); - mTvBlueskyPage = mFrame.findViewById(R.id.tv__place_bluesky_page); - mBlueskyPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_BLUESKY)); - mBlueskyPage.setOnLongClickListener((v) -> copyUrl(mBlueskyPage, Metadata.MetadataType.FMD_CONTACT_BLUESKY)); + mFediverseIv = mSocial.findViewById(R.id.iv__place_fediverse); + mFediverseIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE)); + mFediverseIv.setOnLongClickListener((v) -> copyUrl(mFediverseIv, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE)); - mTwitterPage = mFrame.findViewById(R.id.ll__place_twitter); - mTvTwitterPage = mFrame.findViewById(R.id.tv__place_twitter_page); - mTwitterPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_TWITTER)); - mTwitterPage.setOnLongClickListener((v) -> copyUrl(mTwitterPage, Metadata.MetadataType.FMD_CONTACT_TWITTER)); + mBlueskyIv = mSocial.findViewById(R.id.iv__place_bluesky); + mBlueskyIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_BLUESKY)); + mBlueskyIv.setOnLongClickListener((v) -> copyUrl(mBlueskyIv, Metadata.MetadataType.FMD_CONTACT_BLUESKY)); - mVkPage = mFrame.findViewById(R.id.ll__place_vk); - mTvVkPage = mFrame.findViewById(R.id.tv__place_vk_page); - mVkPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_VK)); - mVkPage.setOnLongClickListener((v) -> copyUrl(mVkPage, Metadata.MetadataType.FMD_CONTACT_VK)); + mTwitterIv = mSocial.findViewById(R.id.iv__place_twitter); + mTwitterIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_TWITTER)); + mTwitterIv.setOnLongClickListener((v) -> copyUrl(mTwitterIv, Metadata.MetadataType.FMD_CONTACT_TWITTER)); - mLinePage = mFrame.findViewById(R.id.ll__place_line); - mTvLinePage = mFrame.findViewById(R.id.tv__place_line_page); - mLinePage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_LINE)); - mLinePage.setOnLongClickListener((v) -> copyUrl(mLinePage, Metadata.MetadataType.FMD_CONTACT_LINE)); + mVkIv = mSocial.findViewById(R.id.iv__place_vk); + mVkIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_VK)); + mVkIv.setOnLongClickListener((v) -> copyUrl(mVkIv, Metadata.MetadataType.FMD_CONTACT_VK)); + + mLineIv = mSocial.findViewById(R.id.iv__place_line); + mLineIv.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_LINE)); + mLineIv.setOnLongClickListener((v) -> copyUrl(mLineIv, Metadata.MetadataType.FMD_CONTACT_LINE)); mPanoramax = mFrame.findViewById(R.id.ll__place_panoramax); mTvPanoramax = mFrame.findViewById(R.id.tv__place_panoramax); @@ -215,25 +216,25 @@ public class PlacePageLinksFragment extends Fragment implements Observer - - - - - - diff --git a/android/app/src/main/res/layout/place_page_facebook.xml b/android/app/src/main/res/layout/place_page_facebook.xml deleted file mode 100644 index dd0984d83..000000000 --- a/android/app/src/main/res/layout/place_page_facebook.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/layout/place_page_fediverse.xml b/android/app/src/main/res/layout/place_page_fediverse.xml deleted file mode 100644 index b48516a72..000000000 --- a/android/app/src/main/res/layout/place_page_fediverse.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/layout/place_page_instagram.xml b/android/app/src/main/res/layout/place_page_instagram.xml deleted file mode 100644 index 890a228ad..000000000 --- a/android/app/src/main/res/layout/place_page_instagram.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/layout/place_page_line.xml b/android/app/src/main/res/layout/place_page_line.xml deleted file mode 100644 index b0499dc8c..000000000 --- a/android/app/src/main/res/layout/place_page_line.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/layout/place_page_links_fragment.xml b/android/app/src/main/res/layout/place_page_links_fragment.xml index 36b5ee2b7..3415c2dd4 100644 --- a/android/app/src/main/res/layout/place_page_links_fragment.xml +++ b/android/app/src/main/res/layout/place_page_links_fragment.xml @@ -13,13 +13,7 @@ android:layout_height="wrap_content" tools:layout="@layout/place_page_phone_fragment" /> - - - - - - - + \ No newline at end of file diff --git a/android/app/src/main/res/layout/place_page_social.xml b/android/app/src/main/res/layout/place_page_social.xml new file mode 100644 index 000000000..23eca5ffa --- /dev/null +++ b/android/app/src/main/res/layout/place_page_social.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/layout/place_page_twitter.xml b/android/app/src/main/res/layout/place_page_twitter.xml deleted file mode 100644 index aa6a115da..000000000 --- a/android/app/src/main/res/layout/place_page_twitter.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - diff --git a/android/app/src/main/res/layout/place_page_vk.xml b/android/app/src/main/res/layout/place_page_vk.xml deleted file mode 100644 index 5c8b64b1b..000000000 --- a/android/app/src/main/res/layout/place_page_vk.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - -