Merge pull request #2937 from Bnyro/master

[Help section] Add Mastodon, remove Twitter
libre-tube · Feb 1, 2023 · fa2c2f3 · fa2c2f3
2 parents f266367 + 2cd8e7f
commit fa2c2f3
Show file tree

Hide file tree

Showing 44 changed files with 38 additions and 218 deletions.
diff --git 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/java/com/github/libretube/ui/activities/HelpActivity.kt b/app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt
@@ -5,10 +5,10 @@ import android.net.Uri
 import android.os.Bundle
 import com.github.libretube.constants.DISCORD_URL
 import com.github.libretube.constants.FAQ_URL
+import com.github.libretube.constants.MASTODON_URL
 import com.github.libretube.constants.MATRIX_URL
 import com.github.libretube.constants.REDDIT_URL
 import com.github.libretube.constants.TELEGRAM_URL
-import com.github.libretube.constants.TWITTER_URL
 import com.github.libretube.databinding.ActivityHelpBinding
 import com.github.libretube.ui.base.BaseActivity
 
@@ -45,8 +45,8 @@ class HelpActivity : BaseActivity() {
             openLinkFromHref(REDDIT_URL)
         }
 
-        binding.twitter.setOnClickListener {
-            openLinkFromHref(TWITTER_URL)
+        binding.mastodon.setOnClickListener {
+            openLinkFromHref(MASTODON_URL)
         }
     }
 

diff --git a/app/src/main/res/drawable/ic_mastodon.xml 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
diff --git 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,52 +43,58 @@
 
             <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/telegram"
+            android:id="@+id/mastodon"
             style="@style/AboutCard">
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/telegram"
-                app:drawableStartCompat="@drawable/ic_telegram" />
+                android:text="Mastodon"
+                app:drawableStartCompat="@drawable/ic_mastodon"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.card.MaterialCardView
-            android:id="@+id/discord"
+            android:id="@+id/telegram"
             style="@style/AboutCard">
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/discord"
-                app:drawableStartCompat="@drawable/ic_discord" />
+                android:text="Telegram"
+                app:drawableStartCompat="@drawable/ic_telegram"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.card.MaterialCardView
-            android:id="@+id/reddit"
+            android:id="@+id/discord"
             style="@style/AboutCard">
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/reddit"
-                app:drawableStartCompat="@drawable/ic_reddit" />
+                android:text="Discord"
+                app:drawableStartCompat="@drawable/ic_discord"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
         <com.google.android.material.card.MaterialCardView
-            android:id="@+id/twitter"
+            android:id="@+id/reddit"
             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>
 

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -216,11 +216,6 @@
     <string name="landscape">افقي</string>
     <string name="portrait">عمودي</string>
     <string name="community">المجتمع</string>
-    <string name="discord">ديسكورد</string>
-    <string name="matrix">المصفوفة</string>
-    <string name="telegram">تيليجرام</string>
-    <string name="reddit">ريديت</string>
-    <string name="twitter">تويتر</string>
     <string name="turnInternetOn">يرجى تشغيل Wi-Fi أو بيانات الجوال للاتصال بالإنترنت.</string>
     <string name="open">فتح …</string>
     <string name="chapters">الفصول</string>

diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
@@ -216,11 +216,6 @@
     <string name="portrait">Portret</string>
     <string name="landscape">Landşaft</string>
     <string name="community">Cəmiyyət</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
-    <string name="discord">Discord</string>
     <string name="open">Aç…</string>
     <string name="turnInternetOn">Zəhmət olmasa, İnternetə qoşulmaq üçün Wi-Fi və ya mobil məlumatı açın.</string>
     <string name="chapters">Bölmələr</string>

diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
@@ -3,8 +3,6 @@
     <string name="clonePlaylist">Клониране на плейлист</string>
     <string name="deleteAccount">Изтриване на регистрацията</string>
     <string name="community">Общност</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="reset_watch_positions">Нулиране</string>
     <string name="startpage">Начало</string>
     <string name="subscriptions">Абонаменти</string>
@@ -83,9 +81,6 @@
     <string name="github">GitHub</string>
     <string name="audio_video">Звук и видео</string>
     <string name="portrait">Портрет</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="selected">Избрано</string>
     <string name="never">Никога</string>
     <string name="library">Библиотека</string>

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -204,24 +204,19 @@
     <string name="turnInternetOn">দয়া করেন ওয়াই-ফাই অথবা মোবাইল ডেটা অন করুন ইন্টারনেটের সাথে যুক্ত হতে।</string>
     <string name="open">খুলুন…</string>
     <string name="auth_instance_summary">অথেনটিকেশনের জন্য ভিন্ন ইন্সটেন্স ব্যবহার করুন।</string>
-    <string name="reddit">রেডিট</string>
     <string name="always">সবসময়</string>
     <string name="never">কখনই না</string>
-    <string name="telegram">টেলিগ্রাম</string>
-    <string name="discord">ডিস্কর্ড</string>
     <string name="watch_history">দেখার ইতিহাস</string>
     <string name="watch_positions">পজিশন মনে রাখুন</string>
     <string name="hls">HLS</string>
     <string name="auto_rotation">স্বয়ংক্রিয়-রোটেশন</string>
     <string name="landscape">ল্যান্ডস্কেপ</string>
     <string name="portrait">পোর্টেইট</string>
-    <string name="twitter">টুইটার</string>
     <string name="watch_positions_summary">শেষ প্লেব্যাক পজিশন থেকে শুরু করুন</string>
     <string name="auth_instances">অথেনটিকেশনের জন্য ইন্সটেন্স বাছাই করুন</string>
     <string name="github">গিটহাব</string>
     <string name="audio_video">অডিও এবং ভিডিও</string>
     <string name="community">কমিউনিটি</string>
-    <string name="matrix">ম্যাট্রিক্স</string>
     <string name="change_playback_speed">প্লে-ব্যাকের গতি</string>
     <string name="selected">বাছাইকৃত</string>
     <string name="require_restart_message">এই পরিবর্তনটি কার্যকর করতে হলে রিস্টার্ট করুন।</string>

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
@@ -188,12 +188,7 @@
     <string name="auto_rotation">Automatické otáčení</string>
     <string name="landscape">Na šířku</string>
     <string name="portrait">Na výšku</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Komunita</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="update_available">Je dostupná verze %1$s</string>
     <string name="update_available_text">Přejít na vydání na GitHubu a stáhnout ji\?</string>
     <string name="appearance">Vzhled</string>

diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
@@ -208,12 +208,7 @@
     <string name="auto_rotation">Automatisk rotation</string>
     <string name="landscape">Landskab</string>
     <string name="portrait">Portræt</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Fællesskab</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="downloading">Downloader…</string>
     <string name="no_audio">Ingen lyd</string>
     <string name="no_video">Ingen video</string>

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -211,11 +211,6 @@
     <string name="landscape">Landschaft</string>
     <string name="portrait">Porträt</string>
     <string name="community">Community</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="legacyIcon">Verlorenes Vermächtnis</string>
     <string name="category_filler">Füllungstangente/Witze</string>
     <string name="none">Keine</string>

diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
@@ -215,12 +215,7 @@
     <string name="auto_rotation">Αυτόματη περιστροφή</string>
     <string name="landscape">Τοπίο</string>
     <string name="portrait">Πορτρέτο</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="community">Κοινότητα</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="twitter">Twitter</string>
     <string name="system_caption_style">Στυλ λεζάντας συστήματος</string>
     <string name="always">Πάντα</string>
     <string name="selected">Επιλεγμένα</string>

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -215,12 +215,7 @@
     <string name="portrait">Vertical</string>
     <string name="aspect_ratio">Relación de aspecto del vídeo</string>
     <string name="auto_rotation">Rotación automática</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="community">Comunidad</string>
-    <string name="discord">Discord</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Por favor, active la WiFi o los datos móviles para conectarse a Internet.</string>
     <string name="open">Abrir…</string>
     <string name="chapters">Capítulos</string>

diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
@@ -216,11 +216,6 @@
     <string name="landscape">Paisaia</string>
     <string name="portrait">Erretratua</string>
     <string name="community">Komunitatea</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="reddit">Reddit</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="open">Ireki…</string>
     <string name="chapters">Kapituluak</string>
     <string name="change_playback_speed">Erreprodukzio abiadura</string>

diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -215,12 +215,7 @@
     <string name="landscape">Paysage</string>
     <string name="portrait">Portrait</string>
     <string name="aspect_ratio">Rapport d\'aspect vidéo</string>
-    <string name="matrix">Matrix</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
-    <string name="telegram">Telegram</string>
     <string name="community">Communauté</string>
-    <string name="discord">Discord</string>
     <string name="open">Ouvrir …</string>
     <string name="turnInternetOn">Veuillez activer le Wi-Fi ou les données mobiles pour vous connecter à internet.</string>
     <string name="chapters">Chapitres</string>

diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
@@ -112,11 +112,6 @@
     <string name="audio_video">ઓડિયો અને વિડિયો</string>
     <string name="fullscreen_orientation">સંપૂર્ણસ્ક્રીન દિશા</string>
     <string name="aspect_ratio">વિડિયો એસ્પેક્ટ રેશિયો</string>
-    <string name="discord">ઝઘડો</string>
-    <string name="matrix">મેટ્રિક્સ</string>
-    <string name="telegram">ટેલિગ્રામ</string>
-    <string name="reddit">રેડિટ</string>
-    <string name="twitter">Twitter</string>
     <string name="chapters">પ્રકરણો</string>
     <string name="require_restart">એપ્લિકેશન પુનઃપ્રારંભ જરૂરી</string>
     <string name="navLabelVisibility">લેબલ દૃશ્યતા</string>

diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -345,11 +345,6 @@
     <string name="github">गिटहब</string>
     <string name="fullscreen_orientation">फुलस्क्रीन ओरिएंटेशन</string>
     <string name="community">समुदाय</string>
-    <string name="discord">डिसकौरड</string>
-    <string name="matrix">मैट्रिक्स</string>
-    <string name="telegram">टेलीग्राम</string>
-    <string name="reddit">रैडिट</string>
-    <string name="twitter">ट्विटर</string>
     <string name="open">खोलें…</string>
     <string name="chapters">अध्याय</string>
     <string name="change_playback_speed">प्लेबैक गति</string>

diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
@@ -200,11 +200,6 @@
     <string name="hls">HLS</string>
     <string name="github">GitHub</string>
     <string name="community">Közösség</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="chapters">Fejezetek</string>
     <string name="change_playback_speed">Lejátszási sebesség</string>
     <string name="require_restart">Alkalmazás újraindítása szükséges</string>

diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
@@ -224,11 +224,6 @@
     <string name="aspect_ratio">Rasio aspek video</string>
     <string name="auto_rotation">Putar secara otomatis</string>
     <string name="community">Komunitas</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="misc">Lainnya</string>
     <string name="break_reminder">Pengingat istirahat</string>
     <string name="take_a_break">Waktunya istirahat</string>

diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -214,13 +214,8 @@
     <string name="auto_rotation">Rotazione automatica</string>
     <string name="landscape">Orizzontale</string>
     <string name="community">Comunità</string>
-    <string name="discord">Discord</string>
-    <string name="twitter">Twitter</string>
     <string name="aspect_ratio">Rapporto d\'aspetto del video</string>
     <string name="portrait">Verticale</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
     <string name="turnInternetOn">Connettiti a Internet attivando Wi-Fi o dati mobili.</string>
     <string name="open">Apri…</string>
     <string name="chapters">Capitoli</string>