From aa98701320bc8a94e045c15e47f09fd660b5a670 Mon Sep 17 00:00:00 2001
From: Harry Bond <endim8@pm.me>
Date: Tue, 22 Nov 2022 15:27:36 +0000
Subject: [PATCH] [android] add Mastodon to FAQ

(included regenerated file in this commit)
Signed-off-by: Harry Bond <endim8@pm.me>
---
 android/res/drawable/ic_mastodon.xml              | 12 ++++++++++++
 android/res/layout/about.xml                      | 15 ++++++++++-----
 android/res/values/strings.xml                    |  2 ++
 .../src/app/organicmaps/help/HelpFragment.java    |  3 +++
 android/src/app/organicmaps/util/Constants.java   |  1 +
 data/strings/strings.txt                          |  5 +++++
 6 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 android/res/drawable/ic_mastodon.xml

diff --git a/android/res/drawable/ic_mastodon.xml b/android/res/drawable/ic_mastodon.xml
new file mode 100644
index 0000000000..4834c4a25c
--- /dev/null
+++ b/android/res/drawable/ic_mastodon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="240"
+    android:viewportHeight="240">
+  <path
+      android:pathData="M211.81,139.09c-3.18,16.37 -28.49,34.28 -57.56,37.75 -15.16,1.81 -30.08,3.47 -46,2.74 -26.03,-1.19 -46.56,-6.21 -46.56,-6.21 0,2.53 0.16,4.95 0.47,7.2 3.38,25.69 25.47,27.23 46.39,27.94 21.12,0.72 39.92,-5.21 39.92,-5.21l0.87,19.09s-14.77,7.93 -41.08,9.39c-14.51,0.8 -32.52,-0.37 -53.51,-5.92C9.23,213.82 1.41,165.31 0.21,116.09c-0.37,-14.61 -0.14,-28.39 -0.14,-39.92 0,-50.33 32.98,-65.08 32.98,-65.08C49.67,3.45 78.2,0.24 107.86,0h0.73c29.66,0.24 58.21,3.45 74.84,11.09 0,0 32.97,14.75 32.97,65.08 0,0 0.41,37.13 -4.6,62.92"
+      android:fillColor="#2b90d9"/>
+  <path
+      android:pathData="M177.51,80.08v60.94h-24.14v-59.15c0,-12.47 -5.25,-18.8 -15.74,-18.8 -11.6,0 -17.42,7.51 -17.42,22.35v32.38H96.21V85.42c0,-14.85 -5.82,-22.35 -17.42,-22.35 -10.49,0 -15.74,6.33 -15.74,18.8v59.15H38.9V80.08c0,-12.45 3.17,-22.35 9.54,-29.67 6.57,-7.32 15.17,-11.08 25.85,-11.08 12.35,0 21.71,4.75 27.9,14.25l6.01,10.08 6.01,-10.08c6.18,-9.5 15.54,-14.25 27.9,-14.25 10.68,0 19.28,3.75 25.85,11.08 6.37,7.32 9.54,17.22 9.54,29.67"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml
index 1e9b51586d..2e27c3debc 100644
--- a/android/res/layout/about.xml
+++ b/android/res/layout/about.xml
@@ -121,6 +121,16 @@
                 android:text="@string/email"
                 app:drawableStartCompat="@drawable/ic_email"/>
 
+      <TextView android:id="@+id/matrix"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/matrix"
+                app:drawableStartCompat="@drawable/ic_matrix"/>
+
+      <TextView android:id="@+id/mastodon"
+                style="@style/MwmWidget.TextView.Item"
+                android:text="@string/mastodon"
+                app:drawableStartCompat="@drawable/ic_mastodon"/>
+
       <TextView android:id="@+id/facebook"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/facebook"
@@ -136,11 +146,6 @@
                 android:text="@string/instagram"
                 app:drawableStartCompat="@drawable/ic_instagram"/>
 
-      <TextView android:id="@+id/matrix"
-                style="@style/MwmWidget.TextView.Item"
-                android:text="@string/matrix"
-                app:drawableStartCompat="@drawable/ic_matrix"/>
-
       <TextView android:id="@+id/openstreetmap"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/openstreetmap"
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 401a08ddbc..610eeb6ebd 100644
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -237,6 +237,8 @@
 	<!-- Text in menu -->
 	<string name="matrix">[matrix]</string>
 	<!-- Text in menu -->
+	<string name="mastodon">Mastodon</string>
+	<!-- Text in menu -->
 	<string name="facebook">Facebook</string>
 	<!-- Text in menu -->
 	<string name="twitter">Twitter</string>
diff --git a/android/src/app/organicmaps/help/HelpFragment.java b/android/src/app/organicmaps/help/HelpFragment.java
index 154820853f..0649d5a240 100644
--- a/android/src/app/organicmaps/help/HelpFragment.java
+++ b/android/src/app/organicmaps/help/HelpFragment.java
@@ -73,6 +73,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
     setupItem(R.id.facebook, false, root);
     setupItem(R.id.twitter, false, root);
     setupItem(R.id.matrix, true, root);
+    setupItem(R.id.mastodon, false, root);
     setupItem(R.id.openstreetmap, true, root);
     setupItem(R.id.faq, true, root);
     setupItem(R.id.report, true, root);
@@ -138,6 +139,8 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
       openLink(Constants.Url.TWITTER);
     else if (id == R.id.matrix)
       openLink(Constants.Url.MATRIX);
+    else if (id == R.id.mastodon)
+      openLink(Constants.Url.MASTODON);
     else if (id == R.id.openstreetmap)
       openLink(Constants.Url.OSM_ABOUT);
     else if (id == R.id.faq)
diff --git a/android/src/app/organicmaps/util/Constants.java b/android/src/app/organicmaps/util/Constants.java
index f646624483..4e1acc9567 100644
--- a/android/src/app/organicmaps/util/Constants.java
+++ b/android/src/app/organicmaps/util/Constants.java
@@ -24,6 +24,7 @@ public final class Constants
     public static final String FB_OM_COMMUNITY_NATIVE = "fb://profile/102378968471811";
     public static final String TWITTER = "https://twitter.com/OrganicMapsApp";
     public static final String MATRIX = "https://matrix.to/#/%23organicmaps:matrix.org";
+    public static final String MASTODON = "https://fosstodon.org/@organicmaps";
 
     public static final String GITHUB = "https://github.com/organicmaps/organicmaps";
 
diff --git a/data/strings/strings.txt b/data/strings/strings.txt
index 74db89c0a9..b006b8c579 100644
--- a/data/strings/strings.txt
+++ b/data/strings/strings.txt
@@ -5259,6 +5259,11 @@
     tags = android,ios
     en = [matrix]
 
+  [mastodon]
+    comment = Text in menu
+    tags = android
+    en = Mastodon
+
   [facebook]
     comment = Text in menu
     tags = android,ios