mirror of
https://codeberg.org/comaps/comaps
synced 2025-12-21 13:53:37 +00:00
[android] Reorganize socials networks on about screen
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
committed by
Konstantin Pastbin
Konstantin Pastbin
parent
79a1ee1769
commit
ebb2d13047
@@ -470,7 +470,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
||||
View levelBlock = initBlock(view, Metadata.MetadataType.FMD_LEVEL, R.id.block_level, R.drawable.ic_level_white,
|
||||
R.string.editor_level, InputType.TYPE_CLASS_NUMBER);
|
||||
View fediverseContactBlock =
|
||||
initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse, R.drawable.ic_mastodon_white,
|
||||
initBlock(view, Metadata.MetadataType.FMD_CONTACT_FEDIVERSE, R.id.block_fediverse, R.drawable.ic_mastodon,
|
||||
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,
|
||||
@@ -487,7 +487,7 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
|
||||
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,
|
||||
initBlock(view, Metadata.MetadataType.FMD_CONTACT_BLUESKY, R.id.block_bluesky, R.drawable.ic_bluesky,
|
||||
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);
|
||||
|
||||
@@ -57,18 +57,16 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
||||
Linkify.addLinks(osmPresentationView, Linkify.WEB_URLS);
|
||||
}
|
||||
|
||||
setupItem(R.id.faq, true, root);
|
||||
setupItem(R.id.news, true, root);
|
||||
setupItem(R.id.web, true, root);
|
||||
setupItem(R.id.email, true, root);
|
||||
setupItem(R.id.code_repo, false, root);
|
||||
setupItem(R.id.telegram, false, root);
|
||||
setupItem(R.id.instagram, false, root);
|
||||
setupItem(R.id.facebook, false, root);
|
||||
// setupItem(R.id.twitter, true, root);
|
||||
setupItem(R.id.code_repo, true, root);
|
||||
setupItem(R.id.mastodon, true, root);
|
||||
setupItem(R.id.matrix, true, root);
|
||||
setupItem(R.id.mastodon, false, root);
|
||||
setupItem(R.id.lemmy, true, root);
|
||||
setupItem(R.id.bluesky, true, root);
|
||||
setupItem(R.id.openstreetmap, true, root);
|
||||
setupItem(R.id.faq, true, root);
|
||||
setupItem(R.id.email, true, root);
|
||||
setupItem(R.id.report, isLandscape, root);
|
||||
setupItem(R.id.copyright, false, root);
|
||||
|
||||
@@ -119,18 +117,14 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
|
||||
Utils.sendTo(requireContext(), BuildConfig.SUPPORT_MAIL, getString(R.string.project_name));
|
||||
else if (id == R.id.code_repo)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.CODE_REPO);
|
||||
else if (id == R.id.telegram)
|
||||
Utils.openUrl(requireActivity(), getString(R.string.telegram_url));
|
||||
else if (id == R.id.instagram)
|
||||
Utils.openUrl(requireActivity(), getString(R.string.instagram_url));
|
||||
else if (id == R.id.facebook)
|
||||
Utils.showFacebookPage(requireActivity());
|
||||
// else if (id == R.id.twitter)
|
||||
// Utils.openUrl(requireActivity(), Constants.Url.TWITTER);
|
||||
else if (id == R.id.matrix)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.MATRIX);
|
||||
else if (id == R.id.mastodon)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.MASTODON);
|
||||
else if (id == R.id.matrix)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.MATRIX);
|
||||
else if (id == R.id.lemmy)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.LEMMY);
|
||||
else if (id == R.id.pixelfed)
|
||||
Utils.openUrl(requireActivity(), Constants.Url.PIXELFED);
|
||||
else if (id == R.id.openstreetmap)
|
||||
Utils.openUrl(requireActivity(), getString(R.string.osm_wiki_about_url));
|
||||
else if (id == R.id.faq)
|
||||
|
||||
11
android/app/src/main/res/drawable/ic_bluesky.xml
Normal file
11
android/app/src/main/res/drawable/ic_bluesky.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="72dp"
|
||||
android:height="72dp"
|
||||
android:viewportWidth="72"
|
||||
android:viewportHeight="72"
|
||||
android:tint="?colorControlNormal">
|
||||
<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>
|
||||
@@ -1,10 +0,0 @@
|
||||
<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>
|
||||
@@ -2,24 +2,25 @@
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
android:viewportWidth="1024"
|
||||
android:viewportHeight="1024"
|
||||
android:tint="?colorControlNormal">
|
||||
<path
|
||||
android:pathData="m12.2,6.09a0.105,0.078 0,0 0,-0.102 0.093l4.62,17.3a12,12 0,0 0,5.42 -4.65l-9.85,-12.7a0.105,0.078 0,0 0,-0.091 -0.038z">
|
||||
android:pathData="m521.6,239c-1.3,0 -2.6,0.5 -3.4,1.2s-1.2,1.8 -0.9,2.7l197.2,739.3c95.4,-41.1 176.1,-110.3 231.3,-198.3l-420.3,-543.3c-0.8,-1 -2.3,-1.7 -3.9,-1.6z">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startX="26.622"
|
||||
android:startY="4.098"
|
||||
android:endX="34.35"
|
||||
android:endY="19.554"
|
||||
<gradient
|
||||
android:startX="661.7"
|
||||
android:startY="239"
|
||||
android:endX="771.2"
|
||||
android:endY="895.9"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#002185D0"/>
|
||||
<item android:offset="0.495" android:color="#4C2185D0"/>
|
||||
<item android:offset="1" android:color="#4C2185D0"/>
|
||||
<item android:offset="0" android:color="#00000000"/>
|
||||
<item android:offset="0.5" android:color="#4C000000"/>
|
||||
<item android:offset="1" android:color="#4C000000"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="m12,0.488c-6.63,0 -12,5.37 -12,12 0,2.25 0.635,4.46 1.83,6.37l10,-12.9c0.072,-0.093 0.253,-0.093 0.325,0l10,12.9c1.2,-1.91 1.83,-4.12 1.83,-6.37 0,-6.63 -5.37,-12 -12,-12z"
|
||||
android:fillColor="#2185d0"/>
|
||||
android:pathData="m512,0c-282.8,0 -512,229.2 -512,512 0,96.2 27.1,190.4 78.2,271.9l426.9,-551.9c3.1,-4 10.8,-4 13.9,0l426.9,551.9c51.1,-81.5 78.2,-175.8 78.2,-272 0,-282.8 -229.2,-512 -512,-512z"
|
||||
android:fillColor="#000"/>
|
||||
</vector>
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="6.35"
|
||||
android:viewportHeight="6.3500004">
|
||||
<path
|
||||
android:pathData="m3.16795,0.10381c-1.7446,0 -3.15945,1.41465 -3.15945,3.15984 0,1.39584 0.90527,2.58024 2.16087,2.99826 0.15809,0.0289 0.2157,-0.06867 0.2157,-0.15246 0,-0.07507 -0.00275,-0.2737 -0.0044,-0.53731C1.50177,5.76301 1.31634,5.1485 1.31634,5.1485 1.1726,4.78344 0.96544,4.68626 0.96544,4.68626 0.67855,4.49034 0.98715,4.49422 0.98715,4.49422 1.3043,4.51653 1.47112,4.81991 1.47112,4.81991 1.75297,5.30271 2.21074,5.16324 2.39075,5.08235 2.41945,4.87829 2.50112,4.73902 2.59132,4.66007 1.88972,4.58015 1.15203,4.30917 1.15203,3.09839c0,-0.34508 0.12318,-0.62692 0.3253,-0.84786 -0.03261,-0.07992 -0.14102,-0.40114 0.03101,-0.83622 0,0 0.26516,-0.08496 0.86881,0.32374 0.25197,-0.07002 0.52237,-0.10494 0.79103,-0.1063 0.26846,0.00138 0.53866,0.03627 0.79102,0.1063 0.60326,-0.4087 0.86803,-0.32374 0.86803,-0.32374 0.17244,0.43508 0.06401,0.7563 0.03162,0.83622 0.20251,0.22094 0.32471,0.50278 0.32471,0.84786 0,1.21389 -0.73885,1.48099 -1.44259,1.55916 0.11328,0.09757 0.21434,0.29038 0.21434,0.58522 0,0.42228 -0.00384,0.76309 -0.00384,0.86668 0,0.08457 0.05703,0.18292 0.21725,0.15208 1.25463,-0.41879 2.15913,-1.60223 2.15913,-2.99787 0,-1.74518 -1.41485,-3.15984 -3.16003,-3.15984"
|
||||
android:strokeWidth="0.0193975"
|
||||
android:fillColor="#111" />
|
||||
</vector>
|
||||
11
android/app/src/main/res/drawable/ic_lemmy.xml
Normal file
11
android/app/src/main/res/drawable/ic_lemmy.xml
Normal file
@@ -0,0 +1,11 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="15.5859375dp"
|
||||
android:viewportWidth="1024"
|
||||
android:viewportHeight="665">
|
||||
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="m1004,60.5c41.2,69.5 18.3,147 -57.5,198.3 -0.2,0.2 -0.5,0.3 -0.7,0.4 -32.3,19.5 -63.5,32.1 -96.6,38.7 0.6,14.1 0.4,28.6 -0.8,43.5 -3.3,43.2 -19,84.7 -44.5,122.7l82.6,33.8c9.1,3.7 13.4,14.1 9.7,23.1 -3.7,9.1 -14.1,13.4 -23.1,9.7l-91.5,-37.4c-16.8,19.7 -36.5,38.2 -58.5,55.1l-1.1,0.9 55.9,74.1c5.9,7.8 4.3,19 -3.5,24.9 -7.8,5.9 -19,4.3 -24.9,-3.5l-56.7,-75.1c-30.2,19.2 -62.4,34.4 -94.2,44.7 -16.4,30 -48.9,50.6 -86.4,50.6 -38.8,0 -70.7,-19.3 -86.7,-49.9 -32,-10.1 -64.4,-25.2 -94.8,-44.4l-55.9,74.1c-5.9,7.8 -17,9.4 -24.9,3.5s-9.4,-17 -3.5,-24.9l55,-72.9c-0.8,-0.6 -1.7,-1.3 -2.5,-1.9 -22.3,-17.2 -42.1,-36 -59,-56.1l-93.8,38.4c-9.1,3.7 -19.4,-0.6 -23.1,-9.7 -3.7,-9.1 0.6,-19.4 9.7,-23.1l85.4,-34.9c-24.7,-37.7 -39.6,-78.9 -42.2,-121.8 -0.9,-14.8 -1,-29.2 -0.2,-43.1 -33.3,-6.6 -64.8,-19.2 -97.2,-38.8 -0.2,-0.1 -0.5,-0.3 -0.7,-0.4 -75.7,-51.3 -98.7,-128.8 -57.5,-198.3 40.6,-68.4 126.8,-78.3 209.7,-30.4 24.6,14.2 48.6,37.1 67.5,63.6 0.1,0.2 0.3,0.4 0.4,0.6 54.4,-30.9 126,-47.4 213.8,-48.8 88.4,-1.4 161.1,14.3 216.4,46 18.7,-25.5 42,-47.5 65.9,-61.4 82.9,-47.9 169.2,-37.9 209.7,30.4zM512.3,507c-40.7,0 -67.6,26.8 -66.7,63 1,38.1 28.2,63.8 66.7,63.8 36.9,0 66.6,-29 66.7,-63.5 0.1,-36.9 -26.3,-63.4 -66.7,-63.4zM512.5,76.6c-185.6,3 -287.2,75.5 -303.7,202.8 -1.5,14.9 0,0 -1.5,14.9 -1.1,14.4 -1.2,29.4 -0.2,45 4.2,68.6 45.2,133.9 111,184.6 30,23.1 63.5,41.7 96.9,54.5 -0.2,-2.5 -0.4,-5 -0.5,-7.6 -1.4,-53.9 39.8,-94.9 97.7,-94.9 57.6,0 97.9,40.5 97.7,94.5 -0,2.3 -0.1,4.6 -0.3,6.9 32.6,-12.8 65.2,-31.1 94.6,-53.6 66.1,-50.7 107.9,-116.1 113.2,-184.7 1.2,-15.1 1.3,-29.8 0.5,-43.8 -1.6,-17.3 0,0 -1.6,-17.3 -6.4,-52.6 -27.5,-96.6 -62.9,-129.7 -51.5,-48.2 -132.7,-73.4 -241,-71.6zM357.1,368.2c25.8,0 46.8,21 46.8,46.9 0,25.9 -20.9,46.9 -46.8,46.9 -25.8,0 -46.8,-21 -46.8,-46.9 0,-25.9 20.9,-46.9 46.8,-46.9zM667.8,368.7c25.6,0 46.3,20.8 46.3,46.5 0,25.7 -20.7,46.5 -46.3,46.5 -25.6,0 -46.3,-20.8 -46.3,-46.5 0,-25.7 20.7,-46.5 46.3,-46.5zM116,32.2c-29.7,3.4 -53.5,18.4 -68.7,44.1 -32,54 -15,112.9 46.3,155.4l1.6,1.1 0.9,0.5c28.1,16.8 55,27.7 83.3,33.7 8.8,-55.5 32.7,-102.3 71.6,-138.4 6.7,-6.2 13.7,-12 21.2,-17.5l0.4,0.6c-16.5,-23.1 -37.3,-42.9 -57.8,-54.8 -34,-19.7 -68.8,-28.2 -98.7,-24.8zM809.8,57c-19.6,11.3 -39.3,29.9 -55.4,51.5 7.1,5.3 13.9,11 20.3,17 39.3,36.8 63.3,84.9 71.5,141.3 27.9,-5.9 54.4,-16.8 82.2,-33.4l1,-0.6 1.6,-1.1c60.7,-42.1 78,-100.3 47.3,-153.8l-1,-1.6c-15.3,-25.8 -39.1,-40.7 -68.7,-44.1 -30,-3.5 -64.7,5.1 -98.7,24.8z" />
|
||||
|
||||
</vector>
|
||||
@@ -1,26 +1,11 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:aapt="http://schemas.android.com/aapt"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="32"
|
||||
android:viewportHeight="32">
|
||||
android:width="72dp"
|
||||
android:height="72dp"
|
||||
android:viewportWidth="72"
|
||||
android:viewportHeight="72"
|
||||
android:tint="?colorControlNormal">
|
||||
<path
|
||||
android:pathData="m30.894,7.084c-0.463,-3.438 -3.459,-6.148 -7.012,-6.673 -0.599,-0.089 -2.87,-0.412 -8.13,-0.412h-0.039c-5.262,0 -6.39,0.323 -6.99,0.412 -3.453,0.511 -6.607,2.945 -7.372,6.424 -0.368,1.713 -0.407,3.613 -0.339,5.355 0.097,2.499 0.116,4.993 0.343,7.482 0.157,1.653 0.431,3.293 0.819,4.907 0.727,2.982 3.672,5.463 6.556,6.475 3.088,1.056 6.41,1.231 9.592,0.506 0.35,-0.081 0.696,-0.176 1.037,-0.284 0.774,-0.246 1.68,-0.521 2.346,-1.004 0.009,-0.007 0.017,-0.016 0.022,-0.026 0.005,-0.01 0.008,-0.021 0.009,-0.033v-2.411c-0,-0.011 -0.003,-0.021 -0.007,-0.031 -0.005,-0.009 -0.012,-0.018 -0.02,-0.024 -0.008,-0.007 -0.018,-0.011 -0.028,-0.013 -0.01,-0.002 -0.021,-0.002 -0.031,0 -2.039,0.487 -4.128,0.731 -6.225,0.727 -3.608,0 -4.578,-1.712 -4.856,-2.425 -0.223,-0.616 -0.365,-1.258 -0.422,-1.911 -0.001,-0.011 0.001,-0.022 0.006,-0.032 0.004,-0.01 0.011,-0.019 0.02,-0.026 0.009,-0.007 0.019,-0.012 0.029,-0.014 0.011,-0.002 0.022,-0.002 0.032,0.001 2.005,0.484 4.06,0.728 6.123,0.727 0.496,0 0.991,0 1.487,-0.013 2.074,-0.058 4.261,-0.164 6.302,-0.563 0.051,-0.01 0.102,-0.019 0.145,-0.032 3.219,-0.618 6.283,-2.558 6.594,-7.471 0.012,-0.193 0.041,-2.026 0.041,-2.227 0.001,-0.682 0.22,-4.839 -0.032,-7.393z"
|
||||
android:strokeWidth=".405063">
|
||||
<aapt:attr name="android:fillColor">
|
||||
<gradient
|
||||
android:startX="16"
|
||||
android:startY="0"
|
||||
android:endX="16"
|
||||
android:endY="32"
|
||||
android:type="linear">
|
||||
<item android:offset="0" android:color="#FF6364FF"/>
|
||||
<item android:offset="1" android:color="#FF563ACC"/>
|
||||
</gradient>
|
||||
</aapt:attr>
|
||||
</path>
|
||||
<path
|
||||
android:pathData="m25.794,10.947v8.542h-3.385v-8.29c0,-1.745 -0.727,-2.635 -2.207,-2.635 -1.626,0 -2.441,1.053 -2.441,3.133v4.538h-3.365v-4.538c0,-2.08 -0.816,-3.133 -2.442,-3.133 -1.471,0 -2.205,0.89 -2.205,2.635v8.29h-3.384v-8.542c0,-1.745 0.446,-3.132 1.337,-4.16 0.919,-1.025 2.125,-1.552 3.622,-1.552 1.733,0 3.042,0.666 3.915,1.997l0.842,1.414 0.844,-1.414c0.873,-1.331 2.182,-1.997 3.912,-1.997 1.495,0 2.701,0.527 3.624,1.552 0.89,1.027 1.335,2.413 1.334,4.16z"
|
||||
android:strokeWidth=".405063"
|
||||
android:fillColor="#ffffff"/>
|
||||
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>
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
<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>
|
||||
@@ -2,7 +2,8 @@
|
||||
android:height="24dp"
|
||||
android:width="22.95dp"
|
||||
android:viewportHeight="336.807"
|
||||
android:viewportWidth="322.008">
|
||||
android:viewportWidth="322.008"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path android:fillColor="#FF000000" android:pathData="m8.876,7.71v321.386h23.13v7.711H0V0h32.006v7.71z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="m97.989,109.594v16.264h0.463c4.338,-6.191 9.563,-10.998 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869v80.385h-32.993v-68.074c0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035v66.91h-32.991v-67.375c0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.099,-5.304 -5.809,-7.088 -2.711,-1.775 -6.699,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287v69.701H66.858V109.594Z"/>
|
||||
<path android:fillColor="#FF000000" android:pathData="M313.13,329.096V7.71H290V0h32.008V336.807H290v-7.711z"/>
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
android:height="24dp"
|
||||
android:width="23.95dp"
|
||||
android:viewportHeight="256.56815"
|
||||
android:viewportWidth="256.0111">
|
||||
android:viewportWidth="256.0111"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path android:fillAlpha="0.5043478" android:fillColor="#00000000"
|
||||
android:pathData="m221.354,448.341c0,0 -24.25,9 -31.75,10.5 -7.5,1.5 -21,5.25 -21,5.25 0,0 -9.75,-4.25 -22,-8.5 -12.25,-4.25 -29.75,-5.5 -29.75,-5.5 0,0 -3.25,3.5 -22,8 -18.75,4.5 -27.5,5.75 -27.5,5.75 0,0 -18.5,-9 -31.5,-11.5 -13,-2.5 -24,-2 -24.75,-1.75 0,0 7.5,13 11.75,27.75C27.104,493.091 29.104,503.841 29.104,503.841l51.469,5.125 48.969,-4 52.25,12.031C192.178,512.58 233.909,512.097 237.104,503.841c0,0 -4.75,-15.25 -7.5,-29.75C226.854,459.591 221.354,448.341 221.354,448.341z"
|
||||
android:strokeAlpha="0.5043478" android:strokeColor="#000000" android:strokeWidth="1"/>
|
||||
|
||||
12
android/app/src/main/res/drawable/ic_pixelfed.xml
Normal file
12
android/app/src/main/res/drawable/ic_pixelfed.xml
Normal file
@@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="1024"
|
||||
android:viewportHeight="1024"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
|
||||
<path
|
||||
android:fillColor="#fff"
|
||||
android:pathData="m511.5,1023.5c-282.8,0 -512,-229.2 -512,-512s229.2,-512 512,-512 512,229.2 512,512 -229.2,512 -512,512zM470.9,623.3h93.9c88.5,0 160.2,-69.8 160.2,-156 0,-86.1 -71.7,-156 -160.2,-156h-135.6c-51,0 -92.4,40.3 -92.4,90v350.2z" />
|
||||
|
||||
</vector>
|
||||
@@ -2,7 +2,8 @@
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
android:viewportHeight="24"
|
||||
android:tint="?colorControlNormal">
|
||||
<path
|
||||
android:pathData="M16.3607,13.998c0.082,-0.6569 0.139,-1.3209 0.139,-2 0,-0.679 -0.057,-1.343 -0.139,-2h3.376c0.166,0.64 0.263,1.308 0.263,2 0,0.6921 -0.097,1.36 -0.263,2m-5.144,5.561c0.6,-1.113 1.056,-2.311 1.379,-3.561h2.949c-0.959,1.654 -2.491,2.93 -4.328,3.561ZM14.3387,13.998h-4.679c-0.095,-0.655 -0.16,-1.3189 -0.16,-2 0,-0.681 0.065,-1.3449 0.16,-2h4.679c0.095,0.655 0.161,1.319 0.161,2 0,0.6811 -0.066,1.345 -0.161,2ZM11.9977,19.962c-0.832,-1.2 -1.482,-2.5329 -1.909,-3.964h3.821c-0.428,1.4311 -1.078,2.764 -1.912,3.964ZM8.0257,7.9981h-2.949c0.958,-1.656 2.49,-2.934 4.328,-3.563 -0.6,1.113 -1.056,2.311 -1.379,3.563ZM5.0767,15.9981h2.949c0.323,1.251 0.779,2.4501 1.379,3.563 -1.838,-0.6289 -3.37,-1.9069 -4.328,-3.563ZM4.2607,13.9981c-0.165,-0.64 -0.261,-1.3079 -0.261,-2 0,-0.692 0.096,-1.3599 0.261,-2h3.377c-0.082,0.6569 -0.138,1.321 -0.138,2 0,0.6791 0.056,1.3431 0.138,2m4.36,-9.9639c0.834,1.2 1.484,2.533 1.912,3.964h-3.821c0.427,-1.431 1.077,-2.764 1.909,-3.964ZM18.9207,7.9981h-2.949c-0.323,-1.25 -0.779,-2.448 -1.379,-3.561 1.837,0.631 3.369,1.907 4.328,3.561ZM11.9937,1.9981c-5.526,0 -9.994,4.477 -9.994,10 0,5.5231 4.468,10 9.994,10 5.527,0 10.006,-4.4769 10.006,-10 0,-5.523 -4.479,-10 -10.006,-10Z"
|
||||
android:fillColor="#FFF"/>
|
||||
|
||||
@@ -225,11 +225,11 @@
|
||||
app:drawableStartCompat="@drawable/ic_rate" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/telegram"
|
||||
android:id="@+id/web"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/telegram"
|
||||
app:drawableStartCompat="@drawable/ic_telegram" />
|
||||
android:text="@string/website"
|
||||
app:drawableStartCompat="@drawable/ic_website" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/code_repo"
|
||||
@@ -239,18 +239,11 @@
|
||||
app:drawableStartCompat="@drawable/ic_codeberg" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/web"
|
||||
android:id="@+id/mastodon"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/website"
|
||||
app:drawableStartCompat="@drawable/ic_website" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/email"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/email"
|
||||
app:drawableStartCompat="@drawable/ic_email" />
|
||||
android:text="@string/mastodon"
|
||||
app:drawableStartCompat="@drawable/ic_mastodon" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/matrix"
|
||||
@@ -260,32 +253,25 @@
|
||||
app:drawableStartCompat="@drawable/ic_matrix" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/mastodon"
|
||||
android:id="@+id/lemmy"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/mastodon"
|
||||
app:drawableStartCompat="@drawable/ic_mastodon" />
|
||||
android:text="@string/lemmy"
|
||||
app:drawableStartCompat="@drawable/ic_lemmy" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/facebook"
|
||||
android:id="@+id/bluesky"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/facebook"
|
||||
app:drawableStartCompat="@drawable/ic_facebook" />
|
||||
<!--
|
||||
android:text="@string/bluesky"
|
||||
app:drawableStartCompat="@drawable/ic_bluesky" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/twitter"
|
||||
android:id="@+id/pixelfed"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/twitter"
|
||||
app:drawableStartCompat="@drawable/ic_twitterx" />
|
||||
-->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/instagram"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/instagram"
|
||||
app:drawableStartCompat="@drawable/ic_instagram" />
|
||||
android:text="@string/pixelfed"
|
||||
app:drawableStartCompat="@drawable/ic_pixelfed" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/openstreetmap"
|
||||
@@ -294,6 +280,13 @@
|
||||
android:text="@string/openstreetmap"
|
||||
app:drawableStartCompat="@drawable/ic_openstreetmap" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/email"
|
||||
android:textAlignment="viewStart"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/email"
|
||||
app:drawableStartCompat="@drawable/ic_email" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
|
||||
@@ -156,11 +156,11 @@
|
||||
app:drawableStartCompat="@drawable/ic_rate" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/telegram"
|
||||
android:id="@+id/web"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/telegram"
|
||||
android:text="@string/website"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_telegram" />
|
||||
app:drawableStartCompat="@drawable/ic_website" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/code_repo"
|
||||
@@ -170,18 +170,11 @@
|
||||
app:drawableStartCompat="@drawable/ic_codeberg" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/web"
|
||||
android:id="@+id/mastodon"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/website"
|
||||
android:text="@string/mastodon"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_website" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/email"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/email"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_email" />
|
||||
app:drawableStartCompat="@drawable/ic_mastodon" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/matrix"
|
||||
@@ -191,32 +184,25 @@
|
||||
app:drawableStartCompat="@drawable/ic_matrix" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/mastodon"
|
||||
android:id="@+id/lemmy"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/mastodon"
|
||||
android:text="@string/lemmy"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_mastodon" />
|
||||
app:drawableStartCompat="@drawable/ic_lemmy" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/facebook"
|
||||
android:id="@+id/bluesky"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/facebook"
|
||||
android:text="@string/bluesky"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_facebook" />
|
||||
<!--
|
||||
app:drawableStartCompat="@drawable/ic_bluesky" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/twitter"
|
||||
android:id="@+id/pixelfed"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/twitter"
|
||||
android:text="@string/pixelfed"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_twitterx" />
|
||||
-->
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/instagram"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/instagram"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_instagram" />
|
||||
app:drawableStartCompat="@drawable/ic_pixelfed" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/openstreetmap"
|
||||
@@ -225,6 +211,13 @@
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_openstreetmap" />
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/email"
|
||||
style="@style/MwmWidget.TextView.Item"
|
||||
android:text="@string/email"
|
||||
android:textAlignment="viewStart"
|
||||
app:drawableStartCompat="@drawable/ic_email" />
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/iv__place_bluesky"
|
||||
style="@style/PlacePageMetadataIcon"
|
||||
app:srcCompat="@drawable/ic_bluesky_white"
|
||||
app:srcCompat="@drawable/ic_bluesky"
|
||||
app:tint="?colorSecondary"/>
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<com.google.android.material.imageview.ShapeableImageView
|
||||
android:id="@+id/iv__place_fediverse"
|
||||
style="@style/PlacePageMetadataIcon"
|
||||
app:srcCompat="@drawable/ic_mastodon_white"
|
||||
app:srcCompat="@drawable/ic_mastodon"
|
||||
app:tint="?colorSecondary"/>
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
|
||||
@@ -96,4 +96,6 @@
|
||||
<string name="telegram" translatable="false">Telegram</string>
|
||||
<string name="twitter" translatable="false">X (Twitter)</string>
|
||||
<string name="vk" translatable="false">VK</string>
|
||||
<string name="lemmy" translatable="false">Lemmy</string>
|
||||
<string name="pixelfed" translatable="false">Pixelfed</string>
|
||||
</resources>
|
||||
|
||||
@@ -19,6 +19,8 @@ public final class Constants
|
||||
|
||||
public static final String MATRIX = "https://matrix.to/#/%23comaps:matrix.org";
|
||||
public static final String MASTODON = "https://floss.social/@comaps";
|
||||
public static final String LEMMY = "https://sopuli.xyz/c/CoMaps";
|
||||
public static final String PIXELFED = "https://pixelfed.social/comaps";
|
||||
public static final String FB_OM_COMMUNITY_HTTP = "https://www.facebook.com/profile.php?id=61575286559965";
|
||||
public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/61575286559965";
|
||||
|
||||
|
||||
Reference in New Issue
Block a user