Merge branch 'libre-tube:master' into master

app/build.gradle

@@ -46,7 +46,6 @@ android {
         }
 
         debug {
-            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             debuggable true
             applicationIdSuffix ".debug"

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

app/src/main/java/com/github/libretube/helpers/IntentHelper.kt

@@ -0,0 +1,13 @@
+package com.github.libretube.helpers
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+
+object IntentHelper {
+    fun openLinkFromHref(context: Context, link: String) {
+        val uri = Uri.parse(link)
+        val launchIntent = Intent(Intent.ACTION_VIEW).setData(uri)
+        context.startActivity(launchIntent)
+    }
+}

app/src/main/java/com/github/libretube/ui/activities/AboutActivity.kt

@@ -4,7 +4,6 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import androidx.core.text.HtmlCompat
@@ -16,7 +15,9 @@ import com.github.libretube.constants.PIPED_GITHUB_URL
 import com.github.libretube.constants.WEBLATE_URL
 import com.github.libretube.constants.WEBSITE_URL
 import com.github.libretube.databinding.ActivityAboutBinding
+import com.github.libretube.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 
@@ -34,7 +35,7 @@ class AboutActivity : BaseActivity() {
         }
 
         binding.appIcon.setOnClickListener {
-            val sendIntent: Intent = Intent().apply {
+            val sendIntent = Intent().apply {
                 action = Intent.ACTION_SEND
                 putExtra(Intent.EXTRA_TEXT, GITHUB_URL)
                 type = "text/plain"
@@ -44,37 +45,10 @@ class AboutActivity : BaseActivity() {
             startActivity(shareIntent)
         }
 
-        binding.website.setOnClickListener {
+        setupCard(binding.website, WEBSITE_URL)
-            openLinkFromHref(WEBSITE_URL)
+        setupCard(binding.piped, PIPED_GITHUB_URL)
-        }
+        setupCard(binding.translate, WEBLATE_URL)
-        binding.website.setOnLongClickListener {
+        setupCard(binding.github, GITHUB_URL)
-            onLongClick(WEBSITE_URL)
-            true
-        }
-
-        binding.piped.setOnClickListener {
-            openLinkFromHref(PIPED_GITHUB_URL)
-        }
-        binding.piped.setOnLongClickListener {
-            onLongClick(PIPED_GITHUB_URL)
-            true
-        }
-
-        binding.translate.setOnClickListener {
-            openLinkFromHref(WEBLATE_URL)
-        }
-        binding.translate.setOnLongClickListener {
-            onLongClick(WEBLATE_URL)
-            true
-        }
-
-        binding.github.setOnClickListener {
-            openLinkFromHref(GITHUB_URL)
-        }
-        binding.github.setOnLongClickListener {
-            onLongClick(GITHUB_URL)
-            true
-        }
 
         binding.license.setOnClickListener {
             showLicense()
@@ -89,10 +63,14 @@ class AboutActivity : BaseActivity() {
         }
     }
 
-    private fun openLinkFromHref(link: String) {
+    private fun setupCard(card: MaterialCardView, link: String) {
-        val uri = Uri.parse(link)
+        card.setOnClickListener {
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
+            IntentHelper.openLinkFromHref(this, link)
-        startActivity(intent)
+        }
+        card.setOnLongClickListener {
+            onLongClick(link)
+            true
+        }
     }
 
     private fun onLongClick(href: String) {
@@ -108,7 +86,7 @@ class AboutActivity : BaseActivity() {
             Snackbar.LENGTH_LONG
         )
             .setAction(R.string.open_copied) {
-                openLinkFromHref(href)
+                IntentHelper.openLinkFromHref(this, href)
             }
             .setAnimationMode(Snackbar.ANIMATION_MODE_FADE)
             .show()

app/src/main/java/com/github/libretube/ui/activities/HelpActivity.kt

@@ -1,16 +1,16 @@
 package com.github.libretube.ui.activities
 
-import android.content.Intent
-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.helpers.IntentHelper
 import com.github.libretube.ui.base.BaseActivity
+import com.google.android.material.card.MaterialCardView
 
 class HelpActivity : BaseActivity() {
     private lateinit var binding: ActivityHelpBinding
@@ -25,34 +25,17 @@ class HelpActivity : BaseActivity() {
             onBackPressedDispatcher.onBackPressed()
         }
 
-        binding.faq.setOnClickListener {
+        setupCard(binding.faq, FAQ_URL)
-            openLinkFromHref(FAQ_URL)
+        setupCard(binding.matrix, MATRIX_URL)
+        setupCard(binding.mastodon, MASTODON_URL)
+        setupCard(binding.telegram, TELEGRAM_URL)
+        setupCard(binding.discord, DISCORD_URL)
+        setupCard(binding.reddit, REDDIT_URL)
     }
 
-        binding.matrix.setOnClickListener {
+    private fun setupCard(card: MaterialCardView, link: String) {
-            openLinkFromHref(MATRIX_URL)
+        card.setOnClickListener {
+            IntentHelper.openLinkFromHref(this, link)
         }
-
-        binding.telegram.setOnClickListener {
-            openLinkFromHref(TELEGRAM_URL)
-        }
-
-        binding.discord.setOnClickListener {
-            openLinkFromHref(DISCORD_URL)
-        }
-
-        binding.reddit.setOnClickListener {
-            openLinkFromHref(REDDIT_URL)
-        }
-
-        binding.twitter.setOnClickListener {
-            openLinkFromHref(TWITTER_URL)
-        }
-    }
-
-    private fun openLinkFromHref(link: String) {
-        val uri = Uri.parse(link)
-        val intent = Intent(Intent.ACTION_VIEW).setData(uri)
-        startActivity(intent)
     }
 }

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>

app/src/main/res/drawable/ic_twitter.xml

@@ -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>

app/src/main/res/layout/activity_about.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">
 
@@ -16,14 +17,15 @@
             app:navigationIcon="?homeAsUpIndicator"
             app:title="@string/about" />
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <ImageView
-            android:id="@+id/appIcon"
+            android:id="@+id/app_icon"
-            android:layout_width="90dp"
+            android:layout_width="120dp"
-            android:layout_height="90dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
-            android:src="@mipmap/ic_launcher_round"
+            android:src="@drawable/ic_launcher_lockscreen"
-            app:shapeAppearance="@style/CircleImageView" />
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"

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">
 
@@ -14,16 +15,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:navigationIcon="?homeAsUpIndicator"
-            app:title="@string/community" />
+            app:title="@string/help" />
 
-        <com.google.android.material.imageview.ShapeableImageView
+        <ImageView
-            android:layout_width="90dp"
+            android:layout_width="120dp"
-            android:layout_height="90dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginTop="30dp"
             android:layout_marginBottom="40dp"
-            android:src="@mipmap/ic_launcher_round"
+            android:src="@drawable/ic_launcher_lockscreen"
-            app:shapeAppearance="@style/CircleImageView" />
+            app:tint="?attr/colorSecondary"
+            tools:ignore="ContentDescription" />
 
         <com.google.android.material.card.MaterialCardView
             android:id="@+id/faq"
@@ -42,8 +44,22 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/matrix"
+                android:text="Matrix"
-                app:drawableStartCompat="@drawable/ic_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 +69,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/telegram"
+                android:text="Telegram"
-                app:drawableStartCompat="@drawable/ic_telegram" />
+                app:drawableStartCompat="@drawable/ic_telegram"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -64,8 +81,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/discord"
+                android:text="Discord"
-                app:drawableStartCompat="@drawable/ic_discord" />
+                app:drawableStartCompat="@drawable/ic_discord"
+                tools:ignore="HardcodedText" />
 
         </com.google.android.material.card.MaterialCardView>
 
@@ -75,19 +93,9 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AboutItem"
-                android:text="@string/reddit"
+                android:text="Reddit"
-                app:drawableStartCompat="@drawable/ic_reddit" />
+                app:drawableStartCompat="@drawable/ic_reddit"
-
+                tools:ignore="HardcodedText" />
-        </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" />
 
         </com.google.android.material.card.MaterialCardView>
 

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

app/src/main/res/values-iw/strings.xml

@@ -213,14 +213,9 @@
     <string name="fullscreen_orientation">כיוון מסך מלא</string>
     <string name="landscape">לרוחב</string>
     <string name="community">קהילה</string>
-    <string name="discord">דיסקורד</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">טלגרם</string>
-    <string name="reddit">Reddit</string>
     <string name="auto_rotation">הטיה אוטומטית</string>
     <string name="portrait">לאורך</string>
     <string name="aspect_ratio">יחס רוחב-גובה של סרטון</string>
-    <string name="twitter">טוויטר</string>
     <string name="turnInternetOn">נא להפעיל את הרשת האלחוטית או החיבור הסלולרי כדי להתחבר לאינטרנט.</string>
     <string name="open">פתיחה…</string>
     <string name="chapters">פרקים</string>

app/src/main/res/values-ja/strings.xml

@@ -198,11 +198,6 @@
     <string name="landscape">横</string>
     <string name="portrait">縦</string>
     <string name="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="downloads">ダウンロード</string>
     <string name="video_format">動画の形式</string>
     <string name="video_format_summary">音声と動画の両方をダウンロードした場合のファイル形式の変換。</string>

app/src/main/res/values-ko/strings.xml

@@ -273,7 +273,6 @@
     <string name="general_summary">언어 및 지역</string>
     <string name="audio_video_summary">품질 및 형식</string>
     <string name="queue">대기열</string>
-    <string name="twitter">트위터</string>
     <string name="none">없음</string>
     <string name="open_copied">열다</string>
     <string name="device_info">기기 정보</string>
@@ -318,8 +317,6 @@
     <string name="swipe_controls">컨트롤 변경</string>
     <string name="swipe_controls_summary">스와이프 제스처를 사용하여 밝기와 음량을 조정하십시오.</string>
     <string name="skip_segment">세그먼트 건너뛰기</string>
-    <string name="telegram">텔레그램</string>
-    <string name="reddit">레딧</string>
     <string name="selected">선택된</string>
     <string name="copied_to_clipboard">클립보드에 복사됨</string>
     <string name="volume">음량</string>
@@ -385,7 +382,6 @@
     <string name="resize_mode_fill">채우기</string>
     <string name="always">항상</string>
     <string name="network_metered">미터링됨</string>
-    <string name="matrix">매트릭스</string>
     <string name="never">전혀 아닌</string>
     <string name="repeat_mode_none">없음</string>
     <string name="resize_mode_zoom">확대</string>
@@ -422,7 +418,6 @@
     <string name="hide_watched_from_feed">시청한 영상 피드에서 숨기기</string>
     <string name="hide_watched_from_feed_summary">구독 탭에 90% 이상 시청한 비디오를 보여주지 않습니다.</string>
     <string name="sb_markers">마커</string>
-    <string name="discord">디스코드</string>
     <string name="pinch_control">핀치 컨트롤</string>
     <string name="misc">기타</string>
     <string name="playlistUrl">재생목록 URL</string>

app/src/main/res/values-lt/strings.xml

@@ -114,11 +114,6 @@
     <string name="audio_video">Garsas ir vaizdas</string>
     <string name="portrait">Portretas</string>
     <string name="community">Bendruomenė</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="turnInternetOn">Norėdami prisijungti prie interneto, įjunkite Wi-Fi arba mobiliuosius duomenis.</string>
     <string name="chapters">Skirsniai</string>
     <string name="require_restart">Būtina iš naujo paleisti programėlę</string>

app/src/main/res/values-lv/strings.xml

@@ -222,11 +222,6 @@
     <string name="landscape">Horizontāla</string>
     <string name="portrait">Vertikāla</string>
     <string name="community">Kopiena</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="navLabelVisibility">Rādīt tekstu navigācijas panelī</string>
     <string name="always">Vienmēr</string>
     <string name="never">Nekad</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -222,11 +222,6 @@
     <string name="landscape">Liggende</string>
     <string name="portrait">Stående</string>
     <string name="community">Gemenskap</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="none">Ingen</string>
     <string name="always">Alltid</string>
     <string name="pure_theme_summary">Ren svarthvitt-drakt</string>

app/src/main/res/values-or/strings.xml

@@ -199,10 +199,6 @@
     <string name="audio_video">ଅଡିଓ ଏବଂ ଭିଡିଓ</string>
     <string name="aspect_ratio">ଭିଡିଓ ଦିଗ ଅନୁପାତ</string>
     <string name="portrait">ଆନୁଲମ୍ବିକ</string>
-    <string name="discord">ଦିସ୍କର୍ଡ</string>
-    <string name="matrix">ମେଟ୍ରିକ୍</string>
-    <string name="telegram">ଟେଲିଗ୍ରାମ</string>
-    <string name="reddit">ରେଡିଟ</string>
     <string name="always">ସର୍ବଦା</string>
     <string name="selected">ମନୋନୀତ</string>
     <string name="never">କେବେ ନୁହ</string>
@@ -300,7 +296,6 @@
     <string name="community">ସମ୍ପ୍ରଦାୟ</string>
     <string name="change_playback_speed">ପ୍ଲେବେକ୍ ବେଗ</string>
     <string name="require_restart">ଆପ୍ ପୁନଆରମ୍ଭ ଆବଶ୍ୟକ</string>
-    <string name="twitter">ଟୁଇଟର</string>
     <string name="open">ଖୋଲନ୍ତୁ…</string>
     <string name="legacy_subscriptions">ପୁରୁଣା ସଦସ୍ୟତା ଦୃଶ୍ୟ</string>
     <string name="chapters">ଅଧ୍ୟାୟ ଗୁଡ଼ିକ</string>

app/src/main/res/values-pa/strings.xml

@@ -220,11 +220,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="twitter">ਟਵਿੱਟਰ</string>
-    <string name="reddit">ਰੈਡਿੱਟ</string>
     <string name="turnInternetOn">ਕਿਰਪਾ ਕਰਕੇ ਇੰਟਰਨੈੱਟ ਨਾਲ ਕਨੈਕਟ ਕਰਨ ਲਈ ਵਾਈ-ਫਾਈ ਜਾਂ ਮੋਬਾਈਲ ਡਾਟਾ ਚਾਲੂ ਕਰੋ।</string>
     <string name="open">ਖੋਲ੍ਹੋ…</string>
     <string name="chapters">ਚੈਪਟਰ</string>

app/src/main/res/values-pl/strings.xml

@@ -238,8 +238,6 @@
     <string name="fullscreen_orientation">Wyświetlanie pełnoekranowe</string>
     <string name="portrait">Wymuś tryb pionowy</string>
     <string name="community">Społeczność</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="chapters">Rozdziały</string>
     <string name="change_playback_speed">Prędkość odtwarzania</string>
     <string name="pure_theme_summary">Czysty biały/czarny motyw</string>
@@ -303,12 +301,9 @@
     <string name="worst_quality">Najgorsza</string>
     <string name="torchIcon">Modna lampka</string>
     <string name="aspect_ratio">Użyj proporcji obrazu wideo</string>
-    <string name="reddit">Reddit</string>
     <string name="pauseOnScreenOff_summary">Zatrzymaj odtwarzanie, gdy ekran jest wyłączony.</string>
     <string name="unlimited">Bez limitu</string>
     <string name="auto_rotation">Automatyczne obracanie</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="none">Brak</string>
     <string name="history_size">Maksymalny rozmiar historii</string>
     <string name="update_now">Zainstalować teraz nową wersję LibreTube\?</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -233,11 +233,6 @@
     <string name="landscape">Paisagem</string>
     <string name="portrait">Retrato</string>
     <string name="community">Comunidade</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="live">Ao vivo</string>
     <string name="no_video">Sem vídeo</string>
     <string name="audio">Áudio</string>

app/src/main/res/values-pt/strings.xml

@@ -195,11 +195,6 @@
     <string name="landscape">Horizontal</string>
     <string name="portrait">Vertical</string>
     <string name="community">Comunidade</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="no_audio">Sem áudio</string>
     <string name="no_video">Sem vídeo</string>
     <string name="audio">Áudio</string>

app/src/main/res/values-ru/strings.xml

@@ -214,13 +214,8 @@
     <string name="auth_instances">Выбрать сервер</string>
     <string name="auto_rotation">Автоповорот</string>
     <string name="landscape">Альбомная</string>
-    <string name="reddit">Reddit</string>
     <string name="portrait">Портретная</string>
     <string name="community">Сообщество</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Пожалуйста, включите Wi-Fi или мобильный интернет для подключения.</string>
     <string name="open">Открыть…</string>
     <string name="chapters">Эпизоды</string>

app/src/main/res/values-si/strings.xml

@@ -163,11 +163,6 @@
     <string name="fullscreen_orientation">සම්පූර්ණ තිර නැඹුරුව</string>
     <string name="landscape">භූ දර්ශනය</string>
     <string name="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="turnInternetOn">කරුණාකර අන්තර්ජාලයට සම්බන්ධ වීමට Wi-Fi හෝ ජංගම දත්ත ක්‍රියාත්මක කරන්න.</string>
     <string name="open">විවෘත කරන්න…</string>
     <string name="chapters">පරිච්ඡේද</string>

app/src/main/res/values-sk/strings.xml

@@ -236,7 +236,6 @@
     <string name="audio_video">Audio a video</string>
     <string name="fullscreen_orientation">Orientácia na celú obrazovku</string>
     <string name="landscape">Nastavenie zobrazenia</string>
-    <string name="telegram">Telegram</string>
     <string name="add_to_queue">Pridať do radu</string>
     <string name="misc">Rôzne</string>
     <string name="break_reminder">Pripomienka prestávky</string>
@@ -250,8 +249,6 @@
     <string name="repeat_mode_current">Aktuálne</string>
     <string name="auth_instance_summary">Použi inú inštanciu pre overené hovory.</string>
     <string name="community">Komunita</string>
-    <string name="matrix">Matrix</string>
-    <string name="twitter">Twitter</string>
     <string name="playerVideoFormat">Video formát pre prehrávač</string>
     <string name="no_audio">Bez zvuku</string>
     <string name="no_video">bez videa</string>

app/src/main/res/values-sr/strings.xml

@@ -164,9 +164,6 @@
     <string name="landscape">Хоризонтално</string>
     <string name="portrait">Вертикално</string>
     <string name="community">Заједница</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="turnInternetOn">Укључите WiFi или мобилне податке да би сте се повезали на интернет.</string>
     <string name="open">Отвори…</string>
     <string name="chapters">Поглавља</string>
@@ -242,8 +239,6 @@
     <string name="player_autoplay">Аутоплеј</string>
     <string name="reset_message">Ресетовати сва подешавања и одјавити се\?</string>
     <string name="audio_video">Аудио и видео</string>
-    <string name="discord">Дискорд</string>
-    <string name="matrix">Matrix</string>
     <string name="change_playback_speed">Брзина репродукције</string>
     <string name="data_saver_mode_summary">Прескочи сличице и друге слике.</string>
     <string name="history_summary">Историја прегледа и претрага</string>

app/src/main/res/values-sv/strings.xml

@@ -180,10 +180,5 @@
     <string name="buffering_goal_summary">Maks. antal sekunder videor att buffra.</string>
     <string name="playerVideoFormat">Videoformat for spelaren</string>
     <string name="github">GitHub</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="picture_in_picture">Bild i bild</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
 </resources>

app/src/main/res/values-tk/strings.xml

@@ -167,7 +167,6 @@
     <string name="landscape">Landşaft</string>
     <string name="portrait">Portret</string>
     <string name="community">Jemgyýet</string>
-    <string name="discord">Discord</string>
     <string name="turnInternetOn">Wi-Fi ýa-da ykjam maglumatlary açyp, internete birikmegiňizi haýyş edýäris.</string>
     <string name="open">Aç …</string>
     <string name="chapters">Baplar</string>

app/src/main/res/values-tr/strings.xml

@@ -215,12 +215,7 @@
     <string name="portrait">Dikey</string>
     <string name="landscape">Yatay</string>
     <string name="audio_video">Ses ve video</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Topluluk</string>
-    <string name="discord">Discord</string>
     <string name="open">Açın…</string>
     <string name="turnInternetOn">İnternete bağlanmak için lütfen Wi-Fi veya mobil verileri açın.</string>
     <string name="chapters">Bölümler</string>

app/src/main/res/values-uk/strings.xml

@@ -207,11 +207,6 @@
     <string name="landscape">Альбомна</string>
     <string name="portrait">Портретна</string>
     <string name="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="instance_name">Ім\'я екземпляра</string>
     <string name="playerVideoFormat">Формат відео для програвача</string>
     <string name="auth_instance">Сервер аутентифікації</string>

app/src/main/res/values-vi/strings.xml

@@ -227,12 +227,7 @@
     <string name="required_network">Yêu cầu kết nối mạng</string>
     <string name="network_all">Tất cả</string>
     <string name="landscape">Ngang</string>
-    <string name="telegram">Telegram</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="community">Cộng đồng</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
     <string name="watch_history">Lịch sử xem</string>
     <string name="watch_positions">Nhớ vị trí</string>
     <string name="auth_instance">Instance được xác minh</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -215,12 +215,7 @@
     <string name="auto_rotation">自动旋转</string>
     <string name="landscape">横屏</string>
     <string name="portrait">竖屏</string>
-    <string name="reddit">Reddit</string>
     <string name="community">社区</string>
-    <string name="twitter">Twitter</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="turnInternetOn">请打开 Wi-Fi 或移动数据连接到互联网。</string>
     <string name="open">打开…</string>
     <string name="chapters">章节</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -266,9 +266,6 @@
     <string name="resume">繼續</string>
     <string name="pauseOnScreenOff">自動暫停</string>
     <string name="portrait">肖像</string>
-    <string name="discord">Discord</string>
-    <string name="matrix">Matrix</string>
-    <string name="telegram">Telegram</string>
     <string name="turnInternetOn">請開啟Wifi或行動數據連上網路。</string>
     <string name="never">永不</string>
     <string name="change_playback_speed">播放速度</string>
@@ -388,8 +385,6 @@
     <string name="aspect_ratio">影片比例</string>
     <string name="auto_rotation">自動旋轉</string>
     <string name="landscape">風景</string>
-    <string name="reddit">Reddit</string>
-    <string name="twitter">Twitter</string>
     <string name="pinch_control">調整音高</string>
     <string name="play_latest_videos">播放最新影片</string>
     <string name="audio_track">音訊曲目</string>

app/src/main/res/values/strings.xml

@@ -226,11 +226,6 @@
     <string name="landscape">Landscape</string>
     <string name="portrait">Portrait</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="turnInternetOn">Please turn on Wi-Fi or mobile data to connect to the Internet.</string>
     <string name="open">Open…</string>
     <string name="chapters">Chapters</string>

app/src/main/res/values/style.xml

@@ -39,8 +39,8 @@
         <item name="android:drawablePadding">20dp</item>
         <item name="android:paddingStart">15dp</item>
         <item name="android:paddingEnd">15dp</item>
-        <item name="android:paddingTop">10dp</item>
+        <item name="android:paddingTop">15dp</item>
-        <item name="android:paddingBottom">10dp</item>
+        <item name="android:paddingBottom">15dp</item>
     </style>
 
     <style name="CustomDialogButton" parent="@style/Widget.Material3.Button.TextButton">

build.gradle

@@ -11,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
+        classpath 'com.android.tools.build:gradle:7.4.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
 

gradle/libs.versions.toml

@@ -11,7 +11,7 @@ espresso = "3.5.1"
 workRuntime = "2.7.1"
 exoplayer = "2.18.2"
 retrofit = "2.9.0"
-desugaring = "2.0.0"
+desugaring = "2.0.1"
 cronetEmbedded = "108.5359.79"
 cronetOkHttp = "0.1.0"
 coil = "2.2.2"