diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index e9e552ccd..e4f86fe97 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -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);
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index bb1ab5d57..d87b87173 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -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)
diff --git a/android/app/src/main/res/drawable/ic_bluesky.xml b/android/app/src/main/res/drawable/ic_bluesky.xml
new file mode 100644
index 000000000..682eec450
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_bluesky.xml
@@ -0,0 +1,11 @@
+
+
+
diff --git a/android/app/src/main/res/drawable/ic_bluesky_white.xml b/android/app/src/main/res/drawable/ic_bluesky_white.xml
deleted file mode 100644
index c4471a56d..000000000
--- a/android/app/src/main/res/drawable/ic_bluesky_white.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/android/app/src/main/res/drawable/ic_codeberg.xml b/android/app/src/main/res/drawable/ic_codeberg.xml
index 9a1a85e9e..f0056006d 100644
--- a/android/app/src/main/res/drawable/ic_codeberg.xml
+++ b/android/app/src/main/res/drawable/ic_codeberg.xml
@@ -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">
+ 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">
-
-
-
-
+
+
+
+ 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"/>
diff --git a/android/app/src/main/res/drawable/ic_github.xml b/android/app/src/main/res/drawable/ic_github.xml
deleted file mode 100644
index d97f1dfd1..000000000
--- a/android/app/src/main/res/drawable/ic_github.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/android/app/src/main/res/drawable/ic_lemmy.xml b/android/app/src/main/res/drawable/ic_lemmy.xml
new file mode 100644
index 000000000..473e70078
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_lemmy.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
diff --git a/android/app/src/main/res/drawable/ic_mastodon.xml b/android/app/src/main/res/drawable/ic_mastodon.xml
index ad988c994..8bdab1a53 100644
--- a/android/app/src/main/res/drawable/ic_mastodon.xml
+++ b/android/app/src/main/res/drawable/ic_mastodon.xml
@@ -1,26 +1,11 @@
+ android:width="72dp"
+ android:height="72dp"
+ android:viewportWidth="72"
+ android:viewportHeight="72"
+ android:tint="?colorControlNormal">
-
-
-
-
-
-
-
-
+ 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"/>
diff --git a/android/app/src/main/res/drawable/ic_mastodon_white.xml b/android/app/src/main/res/drawable/ic_mastodon_white.xml
deleted file mode 100644
index d3dc1b2c6..000000000
--- a/android/app/src/main/res/drawable/ic_mastodon_white.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
diff --git a/android/app/src/main/res/drawable/ic_matrix.xml b/android/app/src/main/res/drawable/ic_matrix.xml
index 8ae88ce1c..f4ead5f8c 100644
--- a/android/app/src/main/res/drawable/ic_matrix.xml
+++ b/android/app/src/main/res/drawable/ic_matrix.xml
@@ -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">
diff --git a/android/app/src/main/res/drawable/ic_openstreetmap.xml b/android/app/src/main/res/drawable/ic_openstreetmap.xml
index bbb123017..991b55a35 100644
--- a/android/app/src/main/res/drawable/ic_openstreetmap.xml
+++ b/android/app/src/main/res/drawable/ic_openstreetmap.xml
@@ -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">
diff --git a/android/app/src/main/res/drawable/ic_pixelfed.xml b/android/app/src/main/res/drawable/ic_pixelfed.xml
new file mode 100644
index 000000000..7e15392ec
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_pixelfed.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
diff --git a/android/app/src/main/res/drawable/ic_website.xml b/android/app/src/main/res/drawable/ic_website.xml
index 134ddfa7b..11d112ce9 100644
--- a/android/app/src/main/res/drawable/ic_website.xml
+++ b/android/app/src/main/res/drawable/ic_website.xml
@@ -2,7 +2,8 @@
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
- android:viewportHeight="24">
+ android:viewportHeight="24"
+ android:tint="?colorControlNormal">
diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index 4a7d639f1..3402dd064 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -225,11 +225,11 @@
app:drawableStartCompat="@drawable/ic_rate" />
+ android:text="@string/website"
+ app:drawableStartCompat="@drawable/ic_website" />
-
-
+ android:text="@string/mastodon"
+ app:drawableStartCompat="@drawable/ic_mastodon" />
+ android:text="@string/lemmy"
+ app:drawableStartCompat="@drawable/ic_lemmy" />
-
-
+ android:text="@string/pixelfed"
+ app:drawableStartCompat="@drawable/ic_pixelfed" />
+
+
+ app:drawableStartCompat="@drawable/ic_website" />
-
-
+ app:drawableStartCompat="@drawable/ic_mastodon" />
+ app:drawableStartCompat="@drawable/ic_lemmy" />
-
-
+ app:drawableStartCompat="@drawable/ic_pixelfed" />
+
+
Telegram
X (Twitter)
VK
+ Lemmy
+ Pixelfed
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
index 6a3ef828e..6df95ab0b 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
@@ -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";