forked from organicmaps/organicmaps
[android] Handle Mastodon and Bluesky
Signed-off-by: Harry Bond <me@hbond.xyz>
This commit is contained in:
parent
445dbc8264
commit
5cd6340616
9 changed files with 111 additions and 2 deletions
|
|
@ -67,7 +67,9 @@ public class Metadata implements Parcelable
|
|||
FMD_WEBSITE_MENU(46),
|
||||
FMD_SELF_SERVICE(47),
|
||||
FMD_OUTDOOR_SEATING(48),
|
||||
FMD_NETWORK(49);
|
||||
FMD_NETWORK(49),
|
||||
FMD_CONTACT_FEDIVERSE(50),
|
||||
FMD_CONTACT_BLUESKY(51);
|
||||
private final int mMetaType;
|
||||
|
||||
MetadataType(int metadataType)
|
||||
|
|
|
|||
|
|
@ -189,11 +189,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
|||
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_FEDIVERSE, R.string.error_enter_correct_fediverse_page);
|
||||
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);
|
||||
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_TWITTER, R.string.error_enter_correct_twitter_page);
|
||||
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_VK, R.string.error_enter_correct_vk_page);
|
||||
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_LINE, R.string.error_enter_correct_line_page);
|
||||
initMetadataEntry(Metadata.MetadataType.FMD_CONTACT_BLUESKY, R.string.error_enter_correct_bluesky_page);
|
||||
|
||||
mCuisine.setText(Editor.nativeGetFormattedCuisine());
|
||||
String selfServiceMetadata = Editor.nativeGetMetadata(Metadata.MetadataType.FMD_SELF_SERVICE.toInt());
|
||||
|
|
@ -444,6 +446,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
|||
R.drawable.ic_website_menu, R.string.website_menu, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View emailBlock = initBlock(view, Metadata.MetadataType.FMD_EMAIL, R.id.block_email,
|
||||
R.drawable.ic_email, R.string.email, InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
|
||||
View fediverseContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse,
|
||||
R.drawable.ic_mastodon_white, R.string.mastodon, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View facebookContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_FACEBOOK, R.id.block_facebook,
|
||||
R.drawable.ic_facebook_white, R.string.facebook, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View instagramContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, R.id.block_instagram,
|
||||
|
|
@ -454,6 +458,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
|||
R.drawable.ic_vk_white, R.string.vk, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View lineContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_LINE, R.id.block_line,
|
||||
R.drawable.ic_line_white, R.string.editor_line_social_network, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View blueskyContactBlock = initBlock(view, Metadata.MetadataType.FMD_CONTACT_BLUESKY, R.id.block_bluesky,
|
||||
R.drawable.ic_bluesky_white, R.string.bluesky, InputType.TYPE_TEXT_VARIATION_URI);
|
||||
View operatorBlock = initBlock(view, Metadata.MetadataType.FMD_OPERATOR, R.id.block_operator,
|
||||
R.drawable.ic_operator, R.string.editor_operator, 0);
|
||||
|
||||
|
|
@ -499,11 +505,13 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
|||
mDetailsBlocks.put(Metadata.MetadataType.FMD_EMAIL, emailBlock);
|
||||
mDetailsBlocks.put(Metadata.MetadataType.FMD_OPERATOR, operatorBlock);
|
||||
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, fediverseContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_FACEBOOK, facebookContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM, instagramContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_TWITTER, twitterContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_VK, vkContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_LINE, lineContactBlock);
|
||||
mSocialMediaBlocks.put(Metadata.MetadataType.FMD_CONTACT_BLUESKY, blueskyContactBlock);
|
||||
}
|
||||
|
||||
private static TextInputEditText findInput(View blockWithInput)
|
||||
|
|
|
|||
|
|
@ -41,6 +41,10 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||
private TextView mTvInstagramPage;
|
||||
private View mTwitterPage;
|
||||
private TextView mTvTwitterPage;
|
||||
private View mFediversePage;
|
||||
private TextView mTvFediversePage;
|
||||
private View mBlueskyPage;
|
||||
private TextView mTvBlueskyPage;
|
||||
private View mVkPage;
|
||||
private TextView mTvVkPage;
|
||||
private View mLinePage;
|
||||
|
|
@ -81,7 +85,8 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||
mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE);
|
||||
case FMD_WEBSITE_MENU ->
|
||||
mMapObject.getWebsiteUrl(false /* strip */, Metadata.MetadataType.FMD_WEBSITE_MENU);
|
||||
case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER, FMD_CONTACT_VK, FMD_CONTACT_LINE ->
|
||||
case FMD_CONTACT_FACEBOOK, FMD_CONTACT_INSTAGRAM, FMD_CONTACT_TWITTER,
|
||||
FMD_CONTACT_FEDIVERSE, FMD_CONTACT_BLUESKY, FMD_CONTACT_VK, FMD_CONTACT_LINE ->
|
||||
{
|
||||
if (TextUtils.isEmpty(mMapObject.getMetadata(type)))
|
||||
yield "";
|
||||
|
|
@ -153,6 +158,16 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||
mInstagramPage.setOnClickListener((v) -> openUrl(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM));
|
||||
mInstagramPage.setOnLongClickListener((v) -> copyUrl(mInstagramPage, Metadata.MetadataType.FMD_CONTACT_INSTAGRAM));
|
||||
|
||||
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));
|
||||
|
||||
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));
|
||||
|
||||
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));
|
||||
|
|
@ -216,6 +231,12 @@ public class PlacePageLinksFragment extends Fragment implements Observer<MapObje
|
|||
final String instagram = mMapObject.getMetadata(Metadata.MetadataType.FMD_CONTACT_INSTAGRAM);
|
||||
refreshMetadataOrHide(instagram, mInstagramPage, mTvInstagramPage);
|
||||
|
||||
final String fediverse = mMapObject.getMetadata(Metadata.MetadataType.FMD_CONTACT_FEDIVERSE);
|
||||
refreshMetadataOrHide(fediverse, mFediversePage, mTvFediversePage);
|
||||
|
||||
final String bluesky = mMapObject.getMetadata(Metadata.MetadataType.FMD_CONTACT_BLUESKY);
|
||||
refreshMetadataOrHide(bluesky, mBlueskyPage, mTvBlueskyPage);
|
||||
|
||||
final String twitter = mMapObject.getMetadata(Metadata.MetadataType.FMD_CONTACT_TWITTER);
|
||||
refreshMetadataOrHide(twitter, mTwitterPage, mTvTwitterPage);
|
||||
|
||||
|
|
|
|||
10
android/app/src/main/res/drawable/ic_bluesky_white.xml
Normal file
10
android/app/src/main/res/drawable/ic_bluesky_white.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="72dp"
|
||||
android:height="72dp"
|
||||
android:viewportWidth="72"
|
||||
android:viewportHeight="72">
|
||||
<path
|
||||
android:pathData="m15.607,8.57c8.255,6.197 17.133,18.762 20.393,25.505 3.26,-6.743 12.138,-19.308 20.393,-25.505 5.956,-4.471 15.607,-7.931 15.607,3.078 0,2.199 -1.261,18.47 -2,21.112 -2.57,9.184 -11.935,11.527 -20.265,10.109 14.561,2.478 18.266,10.687 10.266,18.896 -15.193,15.59 -21.837,-3.912 -23.54,-8.909 -0.312,-0.916 -0.458,-1.345 -0.46,-0.98 -0.002,-0.364 -0.148,0.064 -0.46,0.98 -1.702,4.997 -8.346,24.5 -23.54,8.909 -8,-8.209 -4.296,-16.418 10.266,-18.896 -8.331,1.418 -17.696,-0.925 -20.265,-10.109 -0.739,-2.642 -2,-18.914 -2,-21.112 0,-11.009 9.651,-7.549 15.607,-3.078z"
|
||||
android:strokeWidth=".12414"
|
||||
android:fillColor="#fff"/>
|
||||
</vector>
|
||||
10
android/app/src/main/res/drawable/ic_mastodon_white.xml
Normal file
10
android/app/src/main/res/drawable/ic_mastodon_white.xml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="72dp"
|
||||
android:height="72dp"
|
||||
android:viewportWidth="72"
|
||||
android:viewportHeight="72">
|
||||
<path
|
||||
android:pathData="m35.355,-0c-11.839,0 -14.38,0.726 -15.728,0.926 -7.77,1.149 -14.866,6.626 -16.587,14.454 -0.828,3.855 -0.915,8.13 -0.762,12.051 0.219,5.622 0.262,11.233 0.772,16.832 0.353,3.719 0.969,7.41 1.843,11.042 1.637,6.709 8.26,12.291 14.751,14.569 6.949,2.375 14.422,2.769 21.583,1.138 0.788,-0.183 1.566,-0.396 2.334,-0.638 1.741,-0.553 3.78,-1.17 5.279,-2.257 0.021,-0.015 0.038,-0.036 0.05,-0.058 0.012,-0.023 0.019,-0.048 0.019,-0.074v-5.426c-0,-0.024 -0.007,-0.046 -0.017,-0.067 -0.011,-0.021 -0.027,-0.042 -0.045,-0.056s-0.042,-0.025 -0.065,-0.03c-0.023,-0.005 -0.046,-0.005 -0.069,0 -4.588,1.096 -9.29,1.646 -14.006,1.638 -8.117,0 -10.3,-3.853 -10.926,-5.456 -0.503,-1.386 -0.82,-2.83 -0.948,-4.299 -0.001,-0.025 0.003,-0.051 0.013,-0.074 0.01,-0.022 0.024,-0.043 0.043,-0.058 0.019,-0.016 0.043,-0.025 0.067,-0.03 0.024,-0.005 0.047,-0.006 0.071,0 4.511,1.088 9.136,1.639 13.777,1.638 1.116,0 2.229,-0.001 3.345,-0.03 4.667,-0.131 9.587,-0.369 14.179,-1.266 0.115,-0.023 0.229,-0.044 0.327,-0.074 7.243,-1.391 14.137,-5.756 14.837,-16.81 0.026,-0.435 0.091,-4.559 0.091,-5.011 0.003,-1.535 0.495,-10.886 -0.071,-16.633 -1.041,-7.736 -7.783,-13.833 -15.776,-15.015 -1.349,-0.2 -6.457,-0.926 -18.292,-0.926zM25.479,11.78c3.898,0 6.846,1.499 8.81,4.494l1.893,3.18 1.9,-3.18c1.964,-2.994 4.909,-4.494 8.801,-4.494 3.365,0 6.079,1.185 8.154,3.492 2.003,2.31 3.003,5.43 3.001,9.359v19.22h-7.618v-18.654c0,-3.927 -1.636,-5.93 -4.965,-5.93 -3.659,0 -5.491,2.369 -5.491,7.049v10.212h-7.57v-10.212c0,-4.68 -1.838,-7.049 -5.497,-7.049 -3.309,0 -4.961,2.003 -4.961,5.93v18.654h-7.613v-19.22c0,-3.927 1.002,-7.047 3.007,-9.359 2.069,-2.307 4.782,-3.492 8.15,-3.492z"
|
||||
android:strokeWidth="1.1077"
|
||||
android:fillColor="#fff"/>
|
||||
</vector>
|
||||
|
|
@ -331,6 +331,9 @@
|
|||
android:textAppearance="@style/MwmTextAppearance.Body3"
|
||||
tools:ignore="UnusedAttribute"/>
|
||||
|
||||
<include
|
||||
android:id="@+id/block_fediverse"
|
||||
layout="@layout/item_editor_input"/>
|
||||
<include
|
||||
android:id="@+id/block_facebook"
|
||||
layout="@layout/item_editor_input"/>
|
||||
|
|
@ -346,6 +349,9 @@
|
|||
<include
|
||||
android:id="@+id/block_line"
|
||||
layout="@layout/item_editor_input"/>
|
||||
<include
|
||||
android:id="@+id/block_bluesky"
|
||||
layout="@layout/item_editor_input"/>
|
||||
</LinearLayout>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
|
|
|
|||
25
android/app/src/main/res/layout/place_page_bluesky.xml
Normal file
25
android/app/src/main/res/layout/place_page_bluesky.xml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?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_bluesky"
|
||||
style="@style/PlacePageItemFrame"
|
||||
android:tag="website"
|
||||
tools:background="#20FF0000"
|
||||
tools:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv__place_bluesky"
|
||||
style="@style/PlacePageMetadataIcon"
|
||||
app:srcCompat="@drawable/ic_bluesky_white"
|
||||
app:tint="?colorAccent"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__place_bluesky_page"
|
||||
android:textAlignment="viewStart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
|
||||
tools:text="@string/bluesky"/>
|
||||
</LinearLayout>
|
||||
25
android/app/src/main/res/layout/place_page_fediverse.xml
Normal file
25
android/app/src/main/res/layout/place_page_fediverse.xml
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
<?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_fediverse"
|
||||
style="@style/PlacePageItemFrame"
|
||||
android:tag="website"
|
||||
tools:background="#20FF0000"
|
||||
tools:visibility="visible">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/iv__place_fediverse"
|
||||
style="@style/PlacePageMetadataIcon"
|
||||
app:srcCompat="@drawable/ic_mastodon_white"
|
||||
app:tint="?colorAccent"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/tv__place_fediverse_page"
|
||||
android:textAlignment="viewStart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="@style/MwmTextAppearance.PlacePage.Accent"
|
||||
tools:text="@string/mastodon"/>
|
||||
</LinearLayout>
|
||||
|
|
@ -13,11 +13,13 @@
|
|||
android:layout_height="wrap_content"
|
||||
tools:layout="@layout/place_page_phone_fragment" />
|
||||
<include layout="@layout/place_page_email" />
|
||||
<include layout="@layout/place_page_fediverse" />
|
||||
<include layout="@layout/place_page_facebook" />
|
||||
<include layout="@layout/place_page_instagram" />
|
||||
<include layout="@layout/place_page_twitter" />
|
||||
<include layout="@layout/place_page_vk" />
|
||||
<include layout="@layout/place_page_line" />
|
||||
<include layout="@layout/place_page_bluesky" />
|
||||
<include layout="@layout/place_page_wikimedia" />
|
||||
<include layout="@layout/place_page_kayak" />
|
||||
</LinearLayout>
|
||||
Loading…
Add table
Reference in a new issue