mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-19 13:03:36 +00:00
Compare commits
3 Commits
hb0nd-url-
...
2025.07.23
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
20c9fc5f45 | ||
|
|
be3e3d773b | ||
|
|
0fd7f8d573 |
@@ -1 +1 @@
|
|||||||
version: 2025.03.02-7-FDroid+25030207
|
version: 2025.07.23-4-FDroid+25072304
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||||||
case FMD_WEBSITE_MENU ->
|
case FMD_WEBSITE_MENU ->
|
||||||
mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
|
mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
|
||||||
case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER,
|
case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER,
|
||||||
FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE ->
|
FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE, FMD_PANORAMAX ->
|
||||||
{
|
{
|
||||||
if (TextUtils.isEmpty(mMapObject.getMetadata(type)))
|
if (TextUtils.isEmpty(mMapObject.getMetadata(type)))
|
||||||
yield "";
|
yield "";
|
||||||
@@ -171,7 +171,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||||||
mPanoramax = mFrame.findViewById(R.id.ll__place_panoramax);
|
mPanoramax = mFrame.findViewById(R.id.ll__place_panoramax);
|
||||||
mTvPanoramax = mFrame.findViewById(R.id.tv__place_panoramax);
|
mTvPanoramax = mFrame.findViewById(R.id.tv__place_panoramax);
|
||||||
mPanoramax.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_PANORAMAX));
|
mPanoramax.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_PANORAMAX));
|
||||||
mTvPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
|
mPanoramax.setOnLongClickListener((v) -> copyUrl(mPanoramax, Metadata.MetadataType.FMD_PANORAMAX));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void openUrl(Metadata.MetadataType type)
|
private void openUrl(Metadata.MetadataType type)
|
||||||
@@ -192,6 +192,7 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||||||
final String title = switch (type){
|
final String title = switch (type){
|
||||||
case FMD_WEBSITE -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
|
case FMD_WEBSITE -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
|
||||||
case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
|
case FMD_WEBSITE_MENU -> mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
|
||||||
|
case FMD_PANORAMAX -> null; // Don't add raw ID to list, as it's useless for users.
|
||||||
default -> mMapObject.getMetadata(type);
|
default -> mMapObject.getMetadata(type);
|
||||||
};
|
};
|
||||||
// Add user names for social media if available
|
// Add user names for social media if available
|
||||||
@@ -237,7 +238,8 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||||||
refreshMetadataOrHide(line, mLinePage, mTvLinePage);
|
refreshMetadataOrHide(line, mLinePage, mTvLinePage);
|
||||||
|
|
||||||
final String panoramax = mMapObject.getMetadata(Metadata.MetadataType.FMD_PANORAMAX);
|
final String panoramax = mMapObject.getMetadata(Metadata.MetadataType.FMD_PANORAMAX);
|
||||||
refreshMetadataOrHide(panoramax, mPanoramax, mTvPanoramax);
|
final String panoramaxTitle = TextUtils.isEmpty(panoramax) ? "" : getResources().getString(R.string.panoramax);
|
||||||
|
refreshMetadataOrHide(panoramaxTitle, mPanoramax, mTvPanoramax);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ constexpr string_view kVk{"contact:vk"};
|
|||||||
constexpr string_view kLine{"contact:line"};
|
constexpr string_view kLine{"contact:line"};
|
||||||
constexpr string_view kFediverse{"contact:mastodon"};
|
constexpr string_view kFediverse{"contact:mastodon"};
|
||||||
constexpr string_view kBluesky{"contact:bluesky"};
|
constexpr string_view kBluesky{"contact:bluesky"};
|
||||||
|
constexpr string_view kPanoramax{"panoramax"};
|
||||||
|
|
||||||
constexpr string_view kProfilePhp{"profile.php"};
|
constexpr string_view kProfilePhp{"profile.php"};
|
||||||
|
|
||||||
@@ -608,7 +609,7 @@ bool ValidateBlueskyPage(string const & page)
|
|||||||
|
|
||||||
bool isSocialContactTag(string_view tag)
|
bool isSocialContactTag(string_view tag)
|
||||||
{
|
{
|
||||||
return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky;
|
return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky || tag == kPanoramax;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool isSocialContactTag(MapObject::MetadataID const metaID)
|
bool isSocialContactTag(MapObject::MetadataID const metaID)
|
||||||
@@ -619,7 +620,8 @@ bool isSocialContactTag(MapObject::MetadataID const metaID)
|
|||||||
metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
|
metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
|
||||||
metaID == MapObject::MetadataID::FMD_CONTACT_LINE ||
|
metaID == MapObject::MetadataID::FMD_CONTACT_LINE ||
|
||||||
metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
|
metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
|
||||||
metaID == MapObject::MetadataID ::FMD_CONTACT_BLUESKY;
|
metaID == MapObject::MetadataID::FMD_CONTACT_BLUESKY ||
|
||||||
|
metaID == MapObject::MetadataID::FMD_PANORAMAX;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Functions ValidateAndFormat_{facebook,instagram,twitter,vk}(...) by default strip domain name
|
// Functions ValidateAndFormat_{facebook,instagram,twitter,vk}(...) by default strip domain name
|
||||||
@@ -647,6 +649,8 @@ string socialContactToURL(string_view tag, string_view value)
|
|||||||
else // 'value' is an URL.
|
else // 'value' is an URL.
|
||||||
return string{kHttps}.append(value);
|
return string{kHttps}.append(value);
|
||||||
}
|
}
|
||||||
|
if (tag == kPanoramax)
|
||||||
|
return string{kUrlPanoramax}.append(value);
|
||||||
|
|
||||||
return string{value};
|
return string{value};
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user