From 89f85fa8ff9188a5bcc665375b262bf9f23e42f4 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Wed, 1 Feb 2023 18:18:02 +0100
Subject: [PATCH] [Help section] Add Mastodon, remove Twitter

---
 .../github/libretube/constants/Constants.kt   |  4 +-
 app/src/main/res/drawable/ic_mastodon.xml     | 12 +++++
 app/src/main/res/drawable/ic_twitter.xml      | 10 -----
 app/src/main/res/layout/activity_help.xml     | 45 +++++++++++--------
 4 files changed, 40 insertions(+), 31 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_mastodon.xml
 delete mode 100644 app/src/main/res/drawable/ic_twitter.xml

diff --git a/app/src/main/java/com/github/libretube/constants/Constants.kt b/app/src/main/java/com/github/libretube/constants/Constants.kt
index 0cb67f250..1b3d36c96 100644
--- a/app/src/main/java/com/github/libretube/constants/Constants.kt
+++ b/app/src/main/java/com/github/libretube/constants/Constants.kt
@@ -18,11 +18,11 @@ const val FAQ_URL = "https://libre-tube.github.io/#faq"
 /**
  * Social media links for the community fragment
  */
-const val TELEGRAM_URL = "https://t.me/libretube"
 const val MATRIX_URL = "https://matrix.to/#/#LibreTube:matrix.org"
+const val MASTODON_URL = "https://fosstodon.org/@libretube"
+const val TELEGRAM_URL = "https://t.me/libretube"
 const val DISCORD_URL = "https://discord.com/invite/Qc34xCj2GV"
 const val REDDIT_URL = "https://www.reddit.com/r/Libretube/"
-const val TWITTER_URL = "https://twitter.com/libretube"
 
 /**
  * Share Dialog
diff --git a/app/src/main/res/drawable/ic_mastodon.xml b/app/src/main/res/drawable/ic_mastodon.xml
new file mode 100644
index 000000000..87be939df
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mastodon.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="25.72888dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="216.41"
+    android:viewportHeight="232.01">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M107.87,0C78.2,0.24 49.67,3.45 33.05,11.09C33.05,11.09 0.07,25.84 0.07,76.17C0.07,87.7 -0.16,101.48 0.21,116.09C1.41,165.31 9.23,213.82 54.74,225.86C75.72,231.42 93.74,232.58 108.25,231.78C134.56,230.33 149.33,222.39 149.33,222.39L148.46,203.3C148.46,203.3 129.66,209.23 108.54,208.51C87.62,207.79 65.53,206.25 62.15,180.57C61.84,178.31 61.68,175.9 61.68,173.36C61.68,173.36 82.22,178.38 108.25,179.58C124.16,180.31 139.09,178.64 154.24,176.84C183.31,173.36 208.63,155.45 211.81,139.09C216.82,113.31 216.41,76.17 216.41,76.17C216.41,25.84 183.43,11.09 183.43,11.09C166.81,3.45 138.26,0.24 108.59,0L107.87,0zM74.3,39.33C86.65,39.33 96.01,44.07 102.19,53.57L108.21,63.65L114.22,53.57C120.41,44.07 129.76,39.33 142.12,39.33C152.8,39.33 161.4,43.08 167.97,50.4C174.34,57.72 177.51,67.62 177.51,80.08L177.51,141.02L153.37,141.02L153.37,81.87C153.37,69.4 148.12,63.07 137.63,63.07C126.02,63.07 120.21,70.58 120.21,85.42L120.21,117.8L96.21,117.8L96.21,85.42C96.21,70.58 90.39,63.07 78.79,63.07C68.29,63.07 63.05,69.4 63.05,81.87L63.05,141.02L38.9,141.02L38.9,80.08C38.9,67.62 42.08,57.72 48.45,50.4C55.01,43.08 63.62,39.33 74.3,39.33z"
+        tools:ignore="VectorPath" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml
deleted file mode 100644
index b27dbedcf..000000000
--- a/app/src/main/res/drawable/ic_twitter.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="310"
-    android:viewportHeight="310">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M302.97,57.39c-4.87,2.16 -9.88,3.98 -14.99,5.46c6.06,-6.85 10.68,-14.91 13.49,-23.73c0.63,-1.98 -0.02,-4.14 -1.65,-5.43c-1.62,-1.29 -3.88,-1.45 -5.66,-0.39c-10.86,6.44 -22.59,11.07 -34.88,13.78c-12.38,-12.1 -29.2,-18.98 -46.58,-18.98c-36.69,0 -66.55,29.85 -66.55,66.55c0,2.89 0.18,5.76 0.55,8.6C101.16,99.24 58.83,76.86 29.76,41.2c-1.04,-1.27 -2.63,-1.96 -4.27,-1.83c-1.63,0.13 -3.1,1.05 -3.93,2.47c-5.9,10.12 -9.01,21.69 -9.01,33.46c0,16.03 5.72,31.25 15.84,43.14c-3.08,-1.07 -6.06,-2.4 -8.91,-3.98c-1.53,-0.85 -3.39,-0.84 -4.91,0.03c-1.52,0.87 -2.47,2.47 -2.51,4.22c-0.01,0.29 -0.01,0.59 -0.01,0.89c0,23.93 12.88,45.48 32.58,57.23c-1.69,-0.17 -3.38,-0.41 -5.06,-0.74c-1.73,-0.33 -3.51,0.28 -4.68,1.6c-1.17,1.32 -1.56,3.16 -1.02,4.84c7.29,22.76 26.06,39.5 48.75,44.6c-18.82,11.79 -40.34,17.96 -62.93,17.96c-4.71,0 -9.45,-0.28 -14.1,-0.83c-2.31,-0.27 -4.51,1.09 -5.29,3.28c-0.79,2.19 0.05,4.64 2.01,5.89c29.02,18.61 62.58,28.44 97.05,28.44c67.75,0 110.14,-31.95 133.76,-58.75c29.46,-33.42 46.36,-77.66 46.36,-121.37c0,-1.83 -0.03,-3.67 -0.08,-5.51c11.62,-8.76 21.63,-19.35 29.77,-31.54c1.24,-1.85 1.1,-4.3 -0.33,-6C307.39,57.04 305.01,56.49 302.97,57.39z" />
-</vector>
diff --git a/app/src/main/res/layout/activity_help.xml b/app/src/main/res/layout/activity_help.xml
index f3b5559d2..b806269f7 100644
--- a/app/src/main/res/layout/activity_help.xml
+++ b/app/src/main/res/layout/activity_help.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView 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:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -42,8 +43,22 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/matrix"
-                app:drawableStartCompat="@drawable/ic_matrix" />
+                android:text="Matrix"
+                app:drawableStartCompat="@drawable/ic_matrix"
+                tools:ignore="HardcodedText" />
+
+        </com.google.android.material.card.MaterialCardView>
+
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/mastodon"
+            style="@style/AboutCard">
+
+            <androidx.appcompat.widget.AppCompatTextView
+                style="@style/AboutItem"
+                android:text="Mastodon"
+                app:drawableStartCompat="@drawable/ic_mastodon"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -53,8 +68,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/telegram"
-                app:drawableStartCompat="@drawable/ic_telegram" />
+                android:text="Telegram"
+                app:drawableStartCompat="@drawable/ic_telegram"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -64,8 +80,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/discord"
-                app:drawableStartCompat="@drawable/ic_discord" />
+                android:text="Discord"
+                app:drawableStartCompat="@drawable/ic_discord"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -75,19 +92,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/reddit"
-                app:drawableStartCompat="@drawable/ic_reddit" />
-
-        </com.google.android.material.card.MaterialCardView>
-
-        <com.google.android.material.card.MaterialCardView
-            android:id="@+id/twitter"
-            style="@style/AboutCard">
-
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AboutItem"
-                android:text="@string/twitter"
-                app:drawableStartCompat="@drawable/ic_twitter" />
+                android:text="Reddit"
+                app:drawableStartCompat="@drawable/ic_reddit"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>