Merge pull request #6609 from Bnyro/master

refactor: unify views string formatting logic to avoid bugs
2024-12-13 05:40:31 +05:30 · 2024-10-11 12:27:00 +02:00 · 2024-10-11 12:27:00 +02:00 · 69185bbf80
commit 69185bbf80
parent 2a61acc360 7e12df799b
56 changed files with 19 additions and 106 deletions
--- a/app/src/main/java/com/github/libretube/ui/adapters/SearchChannelAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchChannelAdapter.kt
@ -73,16 +73,7 @@ class SearchChannelAdapter : ListAdapter<ContentItem, SearchViewHolder>(SearchCa
            ImageHelper.loadImage(item.thumbnail, thumbnail)
            thumbnailDuration.setFormattedDuration(item.duration, item.isShort)
            videoTitle.text = item.title
-
-            val viewsString = item.views.takeIf { it != -1L }?.formatShort().orEmpty()
-            val uploadDate = item.uploaded.takeIf { it > 0 }?.let {
-                " ${TextUtils.SEPARATOR} ${TextUtils.formatRelativeDate(root.context, it)}"
-            }.orEmpty()
-            videoInfo.text = root.context.getString(
-                R.string.normal_views,
-                viewsString,
-                uploadDate
-            )
+            videoInfo.text = TextUtils.formatViewsString(root.context, item.views, item.uploaded)

            channelContainer.isGone = true

--- a/app/src/main/java/com/github/libretube/ui/adapters/SearchResultsAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/SearchResultsAdapter.kt
@ -82,16 +82,7 @@ class SearchResultsAdapter(
            ImageHelper.loadImage(item.thumbnail, thumbnail)
            thumbnailDuration.setFormattedDuration(item.duration, item.isShort)
            videoTitle.text = item.title
-
-            val viewsString = item.views.takeIf { it != -1L }?.formatShort().orEmpty()
-            val uploadDate = item.uploaded.takeIf { it > 0 }?.let {
-                " ${TextUtils.SEPARATOR} ${TextUtils.formatRelativeDate(root.context, it)}"
-            }.orEmpty()
-            videoInfo.text = root.context.getString(
-                R.string.normal_views,
-                viewsString,
-                uploadDate
-            )
+            videoInfo.text = TextUtils.formatViewsString(root.context, item.views, item.uploaded)

            channelName.text = item.uploaderName
            ImageHelper.loadImage(item.uploaderAvatar, channelImage, true)
--- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt
@ -11,7 +11,6 @@ import androidx.core.view.updateLayoutParams
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerView.LayoutManager
-import com.github.libretube.R
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.constants.IntentData
 import com.github.libretube.constants.PreferenceKeys
@ -20,7 +19,6 @@ import com.github.libretube.databinding.TrendingRowBinding
 import com.github.libretube.databinding.VideoRowBinding
 import com.github.libretube.extensions.ceilHalf
 import com.github.libretube.extensions.dpToPx
-import com.github.libretube.extensions.formatShort
 import com.github.libretube.extensions.toID
 import com.github.libretube.helpers.ImageHelper
 import com.github.libretube.helpers.NavigationHelper
@ -102,10 +100,6 @@ class VideosAdapter(
        val activity = (context as BaseActivity)
        val fragmentManager = activity.supportFragmentManager

-        val uploadDateStr = video.uploaded.takeIf { it > 0 }
-            ?.let { TextUtils.formatRelativeDate(context, it) }
-            ?.toString()
-
        // Trending layout
        holder.trendingRowBinding?.apply {
            // set a fixed width for better visuals
@ -116,16 +110,8 @@ class VideosAdapter(
            }

            textViewTitle.text = video.title
-            textViewChannel.text = if ((video.views ?: 0L) > 0L) {
-                root.context.getString(
-                    R.string.trending_views,
-                    video.uploaderName,
-                    video.views.formatShort(),
-                    uploadDateStr
-                )
-            } else {
-                "${video.uploaderName} ${TextUtils.SEPARATOR} $uploadDateStr"
-            }
+            textViewChannel.text = TextUtils.formatViewsString(root.context, video.views ?: -1, video.uploaded, video.uploaderName)
+
            video.duration?.let { thumbnailDuration.setFormattedDuration(it, video.isShort) }
            channelImage.setOnClickListener {
                NavigationHelper.navigateChannel(root.context, video.uploaderUrl)
@ -153,15 +139,9 @@ class VideosAdapter(
        // Normal videos row layout
        holder.videoRowBinding?.apply {
            videoTitle.text = video.title
-
-            videoInfo.text = root.context.getString(
-                R.string.normal_views,
-                video.views.formatShort(),
-                uploadDateStr?.let { " ${TextUtils.SEPARATOR} $it" }
-            )
+            videoInfo.text = TextUtils.formatViewsString(root.context, video.views ?: -1, video.uploaded)

            thumbnailDuration.text = video.duration?.let { DateUtils.formatElapsedTime(it) }
-
            ImageHelper.loadImage(video.thumbnail, thumbnail)

            if (forceMode != LayoutMode.CHANNEL_ROW) {
--- a/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
+++ b/app/src/main/java/com/github/libretube/ui/views/DescriptionLayout.kt
@ -20,8 +20,6 @@ import com.github.libretube.ui.activities.VideoTagsAdapter
 import com.github.libretube.util.HtmlParser
 import com.github.libretube.util.LinkHandler
 import com.github.libretube.util.TextUtils
-import kotlinx.datetime.TimeZone
-import kotlinx.datetime.toLocalDateTime
 import java.util.Locale

 class DescriptionLayout(
@ -48,7 +46,7 @@ class DescriptionLayout(

        val views = streams.views.formatShort()
        binding.run {
-            playerViewsInfo.text = context.getString(R.string.normal_views, views, localizeDate(streams))
+            playerViewsInfo.text = context.getString(R.string.normal_views, views, TextUtils.formatRelativeDate(context, streams.uploaded ?: -1L))

            textLike.text = streams.likes.formatShort()
            textDislike.isVisible = streams.dislikes >= 0
@ -119,7 +117,7 @@ class DescriptionLayout(
            // show exact view count
            "%,d".format(streams.views)
        }
-        val viewInfo = context.getString(R.string.normal_views, views, localizeDate(streams))
+        val viewInfo = context.getString(R.string.normal_views, views, TextUtils.formatRelativeDate(context, streams.uploaded ?: -1L))
        if (binding.descLinLayout.isVisible) {
            // hide the description and chapters
            binding.playerDescriptionArrow.animate().rotation(
@ -147,14 +145,6 @@ class DescriptionLayout(
        binding.playerViewsInfo.text = viewInfo
    }

-    private fun localizeDate(streams: Streams): String {
-        if (streams.livestream || streams.uploadTimestamp == null) return ""
-
-        val date = streams.uploadTimestamp.toLocalDateTime(TimeZone.currentSystemDefault()).date
-
-        return TextUtils.SEPARATOR + TextUtils.localizeDate(date)
-    }
-
    companion object {
        private const val ANIMATION_DURATION = 250L
    }
--- a/app/src/main/java/com/github/libretube/util/TextUtils.kt
+++ b/app/src/main/java/com/github/libretube/util/TextUtils.kt
@ -7,6 +7,7 @@ import android.os.Build
 import android.text.format.DateUtils
 import com.github.libretube.BuildConfig
 import com.github.libretube.R
+import com.github.libretube.extensions.formatShort
 import com.google.common.math.IntMath.pow
 import kotlinx.datetime.toJavaLocalDate
 import java.time.Instant
@ -146,4 +147,14 @@ object TextUtils {
    fun getUserAgent(context: Context): String {
        return "${context.packageName}/${BuildConfig.VERSION_NAME}"
    }
+
+    fun formatViewsString(context: Context, views: Long, uploaded: Long, uploader: String? = null): String {
+        val viewsString = views.takeIf { it != -1L }?.formatShort()?.let {
+            context.getString(R.string.view_count, it)
+        }
+        val uploadDate = uploaded.takeIf { it > 0 }?.let {
+            formatRelativeDate(context, it)
+        }
+        return listOfNotNull(uploader, viewsString, uploadDate).joinToString(SEPARATOR)
+    }
 }
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">سرعة مخصصة</string>
    <string name="custom_playback_speed_summary">استخدم سرعة تشغيل مختلفة عن سرعة المشغل العادي</string>
    <string name="category">الفئة</string>
-    <string name="trending_views">%1$s • %2$s مشاهدات • %3$s</string>
    <string name="normal_views">%1$s مشاهدات %2$s</string>
    <string name="stats_for_nerds">احصائيات لتقنيين</string>
    <string name="video_id">معرف الفيديو</string>
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed_summary">Adi oynadıcıdan fərqli oynatma sürəti istifadə et</string>
    <string name="custom_playback_speed">Fərdi sürət</string>
    <string name="category">Kateqoriya</string>
-    <string name="trending_views">%1$s • %2$s baxış • %3$s</string>
    <string name="normal_views">%1$s baxış %2$s</string>
    <string name="playing_next">%1$s saniyə sonra növbəti oynadılır</string>
    <string name="stats_for_nerds">Mütəxəssislər üçün statistika</string>
--- a/app/src/main/res/values-b+es+419/strings.xml
+++ b/app/src/main/res/values-b+es+419/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Utilice una velocidad de reproducción diferente a la del reproductor normal</string>
    <string name="category">Categoría</string>
    <string name="normal_views">%1$s reproducciones%2$s</string>
-    <string name="trending_views">%1$s • %2$s reproducciones • %3$s</string>
    <string name="stats_for_nerds">Estadísticas para frikis</string>
    <string name="video_id">ID del video</string>
    <string name="autoplay_countdown">Cuenta regresiva</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -60,7 +60,6 @@
    <string name="appearance_summary">Наладзьце праграму на свой густ</string>
    <string name="advanced_summary">Загрузкі і скід</string>
    <string name="shareTo">Абагуліць URL для</string>
-    <string name="trending_views">%1$s • %2$s праглядаў • %3$s</string>
    <string name="normal_views">%1$s праглядаў%2$s</string>
    <string name="defaultIcon">Па змаўчанні</string>
    <string name="legacyIcon">Страчаная спадчына</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -326,7 +326,6 @@
    <string name="defaultIconLight">Светлина по подразбиране</string>
    <string name="visibility_public">Обществен</string>
    <string name="areYouSure">Изтриване на плейлиста\?</string>
-    <string name="trending_views">%1$s • %2$s показвания • %3$s</string>
    <string name="download_paused">Изтеглянето е на пауза</string>
    <string name="sleep_timer">Таймер за заспиване</string>
    <string name="skip_buttons">Бутони за пропускане</string>
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@ -351,7 +351,6 @@
    <string name="normal_views">%1$s বার দেখা হয়েছে %2$s</string>
    <string name="show_stream_thumbnails">থাম্বনেইলগুলো দেখান</string>
    <string name="show_stream_thumbnails_summary">নতুন স্ট্রিমগুলোর জন্য থাম্বনেইল প্রদর্শন করুন। এই অপশনটা চালু করা হলে অতিরিক্ত ডাটা খরচ হবে</string>
-    <string name="trending_views">%1$s • %2$s বার দেখা হয়েছে • %3$s</string>
    <string name="best_quality">সেরা</string>
    <string name="donate">দান করুন</string>
    <string name="pip">PiP</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -212,7 +212,6 @@
    <string name="export_subscriptions">Exporta subscripcions</string>
    <string name="show_stream_thumbnails_summary">Mostra les miniatures de les noves retransmissions. Activar-ho consumirà dades addicionals</string>
    <string name="network_all">Totes</string>
-    <string name="trending_views">%1$s • %2$s reproduccions • %3$s</string>
    <string name="download_paused">Descàrrega en pausa</string>
    <string name="skip_buttons">Botons de saltar</string>
    <string name="reset_watch_positions">Restableix</string>
--- a/app/src/main/res/values-ckb/strings.xml
+++ b/app/src/main/res/values-ckb/strings.xml
@ -55,7 +55,6 @@
    <string name="lightTheme">ڕووناک</string>
    <string name="darkTheme">تاریک</string>
    <string name="subscribers">%1$sهاوبەشەکان</string>
-    <string name="trending_views">%1$s • %2$s بینین • %3$s</string>
    <string name="pure_theme_summary">ڕووکاری سادەی سپی/ڕەش</string>
    <string name="channels">کەناڵەکان</string>
    <string name="all">هەمووی</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">Vlastní rychlost</string>
    <string name="custom_playback_speed_summary">Použít jinou rychlost přehrávání než u běžného přehrávače</string>
    <string name="category">Kategorie</string>
-    <string name="trending_views">%1$s • %2$s zhlédnutí • %3$s</string>
    <string name="normal_views">%1$s zhlédnutí%2$s</string>
    <string name="autoplay_countdown">Odpočítávání automatického přehrávání</string>
    <string name="autoplay_countdown_summary">Před automatickým přehráním dalšího videa zobrazit 5s odpočítávání</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -404,7 +404,6 @@
    <string name="donate">Donér</string>
    <string name="subscriberAndVideoCounts">%1$s abonnenter • %2$d videoer</string>
    <string name="music_artists">YT Musik Kunstnere</string>
-    <string name="trending_views">%1$s • %2$s visninger • %3$s</string>
    <string name="normal_views">%1$s visninger%2$s</string>
    <string name="download_paused">Download sat på pause</string>
    <string name="download_completed">Download fuldført</string>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -360,7 +360,6 @@
    <string name="unsupported_file_format">Nicht unterstütztes Dateiformat: %1$s</string>
    <string name="codecs">Videocodecs</string>
    <string name="custom_playback_speed">Benutzerdefinierte Geschwindigkeit</string>
-    <string name="trending_views">%1$s • %2$s Aufrufe • %3$s</string>
    <string name="normal_views">%1$s Aufrufe%2$s</string>
    <string name="custom_playback_speed_summary">Verwende eine andere Wiedergabegeschwindigkeit als für den normalen Player</string>
    <string name="category">Kategorie</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@ -364,7 +364,6 @@
    <string name="choose_instance">Παρακαλώ επιλέξτε πρώτα μια περίπτωση!</string>
    <string name="mark_as_unwatched">Σημειώστε ως μη παρακολουθούμενη</string>
    <string name="home_tab_content">Περιεχόμενο καρτέλας Home</string>
-    <string name="trending_views">%1$s• %2$sπροβολές• %3$s</string>
    <string name="unlimited_search_history">Απεριόριστο ιστορικό αναζήτησης</string>
    <string name="channel_groups">Ομάδες καναλιών</string>
    <string name="fullscreen_gestures">Χειρονομίες εισόδου/εξόδου πλήρους οθόνη</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Utilice una velocidad de reproducción diferente a la del reproductor normal</string>
    <string name="category">Categoría</string>
    <string name="normal_views">%1$s reproducciones%2$s</string>
-    <string name="trending_views">%1$s • %2$s reproducciones • %3$s</string>
    <string name="stats_for_nerds">Estadísticas para frikis</string>
    <string name="video_id">ID del vídeo</string>
    <string name="autoplay_countdown">Cuenta regresiva</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -117,7 +117,6 @@
    <string name="normal_views">%1$s vaatamist%2$s</string>
    <string name="live">Otseeeter</string>
    <string name="shareTo">Jaga URL\'i</string>
-    <string name="trending_views">%1$s • %2$s vaatamist • %3$s</string>
    <string name="defaultIcon">Vaikimisi</string>
    <string name="category_intro_summary">Vahelõik ilma tegeliku sisuta. Võib olla paus, staatiline vahekaader või korduv vaheklipp. Seda ei peaks kasutama vaheklippideks, kus on tegelikku sisu</string>
    <string name="category_interaction">Suhtluse meeldetuletus</string>
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@ -315,7 +315,6 @@
    <string name="stop">Gelditu</string>
    <string name="replies">Erantzun</string>
    <string name="category_highlight_summary">Izenburua, aurrebista edo bideoaren unerik interesgarriena izan daiteke. Aurrera egin dezakezu nabarmendutako atalean ukituz</string>
-    <string name="trending_views">%1$s • %2$s ikustaldi • %3$s</string>
    <string name="category_highlight">Erakutsi une nabarmenduak</string>
    <string name="uploaderAndVideoCount">%1$s • %2$d bideo</string>
    <string name="subscriberAndVideoCounts">%1$s harpidedun • %2$d bideo</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -198,7 +198,6 @@
    <string name="repeat_mode">حالت تکرار</string>
    <string name="backup_restore">پشتیبان و بازگردانی</string>
    <string name="legacyIcon">میراث گم‌گشته</string>
-    <string name="trending_views">%1$s • %2$s مشاهده • %3$s</string>
    <string name="normal_views">%1$s مشاهده%2$s</string>
    <string name="fireIcon">آتش مد</string>
    <string name="torchIcon">مشعل داغ</string>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@ -252,7 +252,6 @@
    <string name="custom_playback_speed">Mukauttu nopeus</string>
    <string name="uploaderAndVideoCount">%1$s • %2$d videota</string>
    <string name="subscriberAndVideoCounts">%1$s tilaajaa • %2$d videota</string>
-    <string name="trending_views">%1$s • %2$s katselukertaa • %3$s</string>
    <string name="normal_views">%1$s katselukertaa%2$s</string>
    <string name="no_subtitle">Ei tekstitystä</string>
    <string name="download_paused">Lataus keskeytetty</string>
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@ -87,7 +87,6 @@
    <string name="playback_speed">Bilis ng playback</string>
    <string name="update_available_text">May available na bagong update. I-click para buksan ang GitHub releases page.</string>
    <string name="areYouSure">Burahin ang playlist\?</string>
-    <string name="trending_views">%1$s • %2$s views • %3$s</string>
    <string name="library">Library</string>
    <string name="license">Lisensya</string>
    <string name="instance_name">Pangalan ng instance</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -357,7 +357,6 @@
    <string name="sleep_timer">Minuterie de mise en veille</string>
    <string name="replies">Réponses</string>
    <string name="lbry_hls_summary">Utilisez LBRY HLS pour la diffusion en continu si disponible</string>
-    <string name="trending_views">%1$s • %2$s vues • %3$s</string>
    <string name="normal_views">%1$s vues%2$s</string>
    <string name="autoplay_countdown">Compte à rebours de lecture automatique</string>
    <string name="autoplay_countdown_summary">Afficher un compte à rebours de 5 secondes avant de lire automatiquement la vidéo suivante</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">कस्टम गति</string>
    <string name="custom_playback_speed_summary">सामान्य प्लेयर की तुलना में एक अलग प्लेबैक गति का उपयोग करें</string>
    <string name="normal_views">%1$s ने देखा %2$s</string>
-    <string name="trending_views">%1$s • %2$s दृश्य • %3$s</string>
    <string name="autoplay_countdown">ऑटोप्ले की उलटी गिनती</string>
    <string name="autoplay_countdown_summary">अगले वीडियो को स्वतः चलाने से पहले 5 सेकंड उलटी गिनती दिखाएं</string>
    <string name="playing_next">अगला %1$s में चलाया जा रहा है</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -374,7 +374,6 @@
    <string name="disable_proxy">Piped proxy letiltása</string>
    <string name="disable_proxy_summary">Videók és képek betöltése közvetlenül a YouTube szervereiről. Csak akkor engedélyezze ezt az opciót, ha mindig VPN-t használ</string>
    <string name="auto_fullscreen_shorts">Automatikus teljes képernyőre váltás rövid videóknál</string>
-    <string name="trending_views">%1$s • %2$s megtekintés • %3$s</string>
    <string name="normal_views">%1$s megtekintés %2$s</string>
    <plurals name="years_ago">
        <item quantity="one">%d éve</item>
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@ -128,7 +128,6 @@
    <string name="show_stream_thumbnails_summary">Monstra le miniaturas de nove fluxos. Activar iste option consumera datos additional</string>
    <string name="areYouSure">Deler le lista de reproduction\?</string>
    <string name="network_all">Tote</string>
-    <string name="trending_views">%1$s • %2$s reproductiones • %3$s</string>
    <string name="download_paused">Discargamento in pausa</string>
    <string name="location">Localisation</string>
    <string name="reset_watch_positions">Reinitialisar</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">Kecepatan kustom</string>
    <string name="custom_playback_speed_summary">Gunakan kecepatan pemutaran yang berbeda daripada pemutar yang normal</string>
    <string name="normal_views">%1$s tampilan%2$s</string>
-    <string name="trending_views">%1$s • %2$s tampilan • %3$s</string>
    <string name="category">Kategori</string>
    <string name="autoplay_countdown">Hitung mundur otomatis</string>
    <string name="autoplay_countdown_summary">Tampilkan hitungan mundur 5 detik sebelum memutar video berikutnya secara otomatis</string>
--- a/app/src/main/res/values-is/strings.xml
+++ b/app/src/main/res/values-is/strings.xml
@ -39,7 +39,6 @@
    <string name="appearance_summary">Aðlagaðu forritið að smekk þínum</string>
    <string name="shapedIcon">Fáránlega formað</string>
    <string name="live">Í beinni</string>
-    <string name="trending_views">%1$s • %2$s áhorf • %3$s</string>
    <string name="instance_summary">Piped, innskráning og aðgangur</string>
    <string name="flameIcon">Fljúgandi eldur</string>
    <string name="birdIcon">Endurbirt tíst</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -359,7 +359,6 @@
    <string name="codecs">Codec video</string>
    <string name="mark_as_watched">Segna come visto</string>
    <string name="unsupported_file_format">Formato di file non supportato: %1$s</string>
-    <string name="trending_views">%1$s • %2$s visualizzazioni • %3$s</string>
    <string name="normal_views">%1$s visualizzazioni%2$s</string>
    <string name="custom_playback_speed">Velocità personalizzata</string>
    <string name="custom_playback_speed_summary">Usa una velocità di riproduzione diversa da quella del lettore normale</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">מהירות מותאמת אישית</string>
    <string name="custom_playback_speed_summary">להשתמש במהירות נגינה שונה מהנגן הרגיל</string>
    <string name="category">קטגוריה</string>
-    <string name="trending_views">%1$s • %2$s צפיות • %3$s</string>
    <string name="normal_views">%1$s צפיות%2$s</string>
    <string name="video_id">מזהה סרטון</string>
    <string name="stats_for_nerds">סטטיסטיקה לחנונים</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -337,7 +337,6 @@
    <string name="shuffle">シャッフル再生</string>
    <string name="add_to_bookmarks">ブックマークに追加</string>
    <string name="remove_bookmark">ブックマークを削除</string>
-    <string name="trending_views">%1$s • %2$s 回視聴 • %3$s</string>
    <string name="normal_views">%1$s 回視聴%2$s</string>
    <string name="pause">一時停止</string>
    <string name="autoplay_countdown">自動再生の秒読み</string>
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@ -179,7 +179,6 @@
    <string name="notifications">ការជូនដំណឹង</string>
    <string name="export_subscriptions">នាំចេញការជាវ</string>
    <string name="network_all">ទាំងអស់</string>
-    <string name="trending_views">%1$s • %2$s ទស្សនា • %3$s</string>
    <string name="download_paused">ការទាញយកបានផ្អាក</string>
    <string name="skip_buttons">ប៊ូតុងរំលង</string>
    <string name="reset_watch_positions">កំណត់ជាថ្មី</string>
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@ -350,7 +350,6 @@
    <string name="mark_as_watched">시청한 것으로 표시</string>
    <string name="lbry_hls">LBRY HLS</string>
    <string name="normal_views">%1$s 조회수%2$s</string>
-    <string name="trending_views">%1$s • %2$s 조회수 • %3$s</string>
    <string name="unsupported_file_format">지원되지 않는 파일 형식: %1$s</string>
    <string name="help">돕다</string>
    <string name="uploaderAndVideoCount">%1$s • 동영상 %2$d개</string>
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@ -273,7 +273,6 @@
    <string name="download_paused">Lejupielāde iepauzēta</string>
    <string name="download_completed">Lejupielāde pabeigta</string>
    <string name="local_playlists">Lokālie atksņošanas saraksti</string>
-    <string name="trending_views">%1$s • %2$s skatījumi • %3$s</string>
    <string name="normal_views">%1$s skatījumi%2$s</string>
    <string name="brightness">Spilgtums</string>
    <string name="auto">Automātiski</string>
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@ -140,7 +140,6 @@
    <string name="worst_quality">ഏറ്റവും മോശം</string>
    <string name="general">പൊതുവായ</string>
    <string name="category_music_offtopic">സംഗീതം: സംഗീതേതര വിഭാഗം</string>
-    <string name="trending_views">%1$s • %2$s കാഴ്‌ചകൾ • %3$s</string>
    <string name="addInstance">ഉദാഹരണം ചേർക്കുക</string>
    <string name="related_streams">ബന്ധപ്പെട്ട ഉള്ളടക്കം</string>
    <string name="customInstance_summary">ചേർക്കുക…</string>
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@ -155,7 +155,6 @@
    <string name="downloads">डाउनलोड</string>
    <string name="update_summary">अपडेट साठी तपासा</string>
    <string name="live">लाइव्ह</string>
-    <string name="trending_views">%1$s • %2$s व्ह्यूज • %3$s</string>
    <string name="instance_api_url">Instance API साठी URL</string>
    <string name="addInstance">Instance ॲड करा</string>
    <string name="empty_instance">नाव आणि API URL भरा.</string>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@ -356,7 +356,6 @@
    <string name="add_to_bookmarks">Bokmerk</string>
    <string name="remove_bookmark">Fjern bokmerke</string>
    <string name="mark_as_watched">Marker som sett</string>
-    <string name="trending_views">%1$s • %2$s visninger • %3$s</string>
    <string name="normal_views">%1$s visninger%2$s</string>
    <string name="unsupported_file_format">Ustøttet filformat: %1$s</string>
    <string name="autoplay_countdown">Autospillingsnedtelling</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -164,7 +164,6 @@
    <string name="replies">Reacties</string>
    <string name="normal_views">%1$s weergaven%2$s</string>
    <string name="concurrent_downloads">Maximaal aantal gelijktijdige downloads</string>
-    <string name="trending_views">%1$s • %2$s weergaven • %3$s</string>
    <string name="category_highlight">Videohoogtepunt laten zien</string>
    <string name="category_highlight_summary">Kan de geadverteerde titel zijn, de thumbnail of het meest interessante deel van de video. Je kan het overslaan door er op te tikken in het hoofdstuk deel</string>
    <string name="download_completed">Download voltooid</string>
--- a/app/src/main/res/values-or/strings.xml
+++ b/app/src/main/res/values-or/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">କଷ୍ଟମ୍ ବେଗ</string>
    <string name="custom_playback_speed_summary">ସାଧାରଣ ପ୍ଲେୟାର ଅପେକ୍ଷା ଏକ ଭିନ୍ନ ପ୍ଲେକ୍ ବେଗ ବ୍ୟବହାର କରନ୍ତୁ</string>
    <string name="category">ବର୍ଗ</string>
-    <string name="trending_views">%1$s •%2$s ଦର୍ଶନ •%3$s</string>
    <string name="normal_views">%1$s ଦର୍ଶନ%2$s</string>
    <string name="playing_next">%1$s ରେ ପରବର୍ତ୍ତୀ ଚାଲିବ</string>
    <string name="stats_for_nerds">ନର୍ଡସ୍ ପାଇଁ ପରିସଂଖ୍ୟାନ</string>
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@ -361,7 +361,6 @@
    <string name="codecs">ਵੀਡੀਓ ਕੋਡੈਕਸ</string>
    <string name="custom_playback_speed">ਕਸਟਮ ਗਤੀ</string>
    <string name="custom_playback_speed_summary">ਆਮ ਪਲੇਅਰ ਨਾਲੋਂ ਵੱਖਰੀ ਪਲੇਬੈਕ ਸਪੀਡ ਦੀ ਵਰਤੋਂ ਕਰੋ</string>
-    <string name="trending_views">%1$s • %2$s ਵਿਊਜ਼ • %3$s</string>
    <string name="normal_views">%1$s ਵਿਊਜ਼%2$s</string>
    <string name="autoplay_countdown">ਸਵੈਚਲਿਤ ਕਾਊਂਟਡਾਊਨ</string>
    <string name="autoplay_countdown_summary">ਅਗਲੀ ਵੀਡੀਓ ਨੂੰ ਆਟੋ-ਪਲੇਅ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ 5 ਸਕਿੰਟ ਕਾਊਂਟਡਾਊਨ ਦਿਖਾਓ</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -360,7 +360,6 @@
    <string name="codecs">Kodeki</string>
    <string name="custom_playback_speed">Niestandardowa prędkość</string>
    <string name="custom_playback_speed_summary">Użyj innej prędkości odtwarzania</string>
-    <string name="trending_views">%1$s • %2$s wyświetleń • %3$s</string>
    <string name="normal_views">%1$s wyświetleń%2$s</string>
    <string name="autoplay_countdown">Timer autoodtwarzania</string>
    <string name="autoplay_countdown_summary">Pokaż 5 sekundowe odliczanie przed automatycznym odtwarzaniem następnego filmu</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Usar velocidade de reprodução personalizada</string>
    <string name="category">Categoria</string>
    <string name="normal_views">%1$s visualizações %2$s</string>
-    <string name="trending_views">%1$s • %2$s visualizações • %3$s</string>
    <string name="playing_next">Próximo vídeo em %1$s</string>
    <string name="stats_for_nerds">Estatísticas para nerds</string>
    <string name="video_id">ID do vídeo</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">Personalizada</string>
    <string name="custom_playback_speed_summary">Utilizar velocidade de reprodução personalizada</string>
    <string name="normal_views">%1$s visualizações %2$s</string>
-    <string name="trending_views">%1$s • %2$s visualizações • %3$s</string>
    <string name="category">Categoria</string>
    <string name="playing_next">A reproduzir seguinte dentro de %1$s</string>
    <string name="stats_for_nerds">Estatísticas para totós</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -134,7 +134,6 @@
    <string name="invalid_url">Introduceți o adresă URL care funcționează</string>
    <string name="version">Versiune %1$s</string>
    <string name="related_streams">Conținut asociat</string>
-    <string name="trending_views">%1$s • %2$s vizualizări • %3$s</string>
    <string name="normal_views">%1$s vizualizări%2$s</string>
    <string name="chapters">Capitole</string>
    <string name="no_player_found">Nu a fost găsit niciun player extern. Vă rugăm să vă asigurați că aveți unul instalat.</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Использовать скорость воспроизведения, отличную от скорости обычного проигрывателя</string>
    <string name="category">Категория</string>
    <string name="normal_views">%1$s просмотров%2$s</string>
-    <string name="trending_views">%1$s • %2$s просмотров • %3$s</string>
    <string name="autoplay_countdown_summary">Показывать 5-секундный обратный отсчёт перед автовоспроизведением следующего видео</string>
    <string name="autoplay_countdown">Таймер автовоспроизведения</string>
    <string name="playing_next">Следующее воспроизведение за %1$s</string>
--- a/app/src/main/res/values-si/strings.xml
+++ b/app/src/main/res/values-si/strings.xml
@ -361,7 +361,6 @@
    <string name="codecs">කෝඩෙක්ස්</string>
    <string name="custom_playback_speed">අභිරුචි වේගය</string>
    <string name="custom_playback_speed_summary">සාමාන්‍ය වාදකයට වෙනස් වාදන වේගයක් භාවිතා කරන්න</string>
-    <string name="trending_views">%1$s • %2$s බැලීම් • %3$s</string>
    <string name="normal_views">%1$s බැලීම්%2$s</string>
    <string name="autoplay_countdown_summary">මීළඟ වීඩියෝව ස්වයංක්‍රීයව වාදනය කිරීමට පෙර තත්පර 5 කවුන්ට් ඩවුන් එකක් පෙන්වන්න</string>
    <string name="video_id">වීඩියෝ ID</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -239,7 +239,6 @@
    <string name="subscriberAndVideoCounts">%1$s odberateľov • %2$d videí</string>
    <string name="normal_views">%1$s zobrazení%2$s</string>
    <string name="category_highlight">Zobraziť výber videa</string>
-    <string name="trending_views">%1$s • %2$s zobrazení • %3$s</string>
    <string name="download_paused">Sťahovanie je pozastavené</string>
    <string name="no_subtitle">Bez titulkov</string>
    <string name="donate">Prispieť</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -355,7 +355,6 @@
    <string name="skip_silence">Прескочи тишину</string>
    <string name="help">Помоћ</string>
    <string name="faq">ЧПП</string>
-    <string name="trending_views">%1$s • %2$s прегледа • %3$s</string>
    <string name="normal_views">%1$s прегледа%2$s</string>
    <string name="replies">Одговори</string>
    <string name="unsupported_file_format">Неподржан формат фајла: %1$s</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -209,7 +209,6 @@
    <string name="export_subscriptions">Exportera prenumerationer</string>
    <string name="show_stream_thumbnails_summary">Visa förhandsbilder för nya sändningar. Aktivering av detta kommer att förbruka ytterligare data</string>
    <string name="network_all">Alla</string>
-    <string name="trending_views">%1$s • %2$s visningar • %3$s</string>
    <string name="download_paused">Nerladdning pausad</string>
    <string name="skip_buttons">Nästa/föregående knappar</string>
    <string name="reset_watch_positions">Återställ</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Normal oynatıcıdan farklı oynatma hızı kullan</string>
    <string name="category">Kategori</string>
    <string name="normal_views">%1$s görüntüleme%2$s</string>
-    <string name="trending_views">%1$s • %2$s görüntüleme • %3$s</string>
    <string name="autoplay_countdown">Otomatik oynatma geri sayımı</string>
    <string name="autoplay_countdown_summary">Sonraki videoyu otomatik oynatmadan önce 5 saniyelik bir geri sayım gösterin</string>
    <string name="playing_next">Sıradaki %1$s içinde oynanıyor</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -363,7 +363,6 @@
    <string name="custom_playback_speed_summary">Використовувати іншу швидкість відтворення, ніж для звичайного програвача</string>
    <string name="category">Категорія</string>
    <string name="normal_views">%1$s переглядів%2$s</string>
-    <string name="trending_views">%1$s • %2$s переглядів • %3$s</string>
    <string name="playing_next">Наступне відтворення за %1$s</string>
    <string name="autoplay_countdown">Таймер автовідтворення</string>
    <string name="autoplay_countdown_summary">Показувати зворотний відлік 5 с до автовідтворення наступного відео</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -320,7 +320,6 @@
    <string name="replies">Phản hồi</string>
    <string name="uploaderAndVideoCount">%1$s • %2$d video</string>
    <string name="subscriberAndVideoCounts">%1$s người đăng ký • %2$d video</string>
-    <string name="trending_views">%1$s • %2$s lượt xem • %3$s</string>
    <string name="normal_views">%1$s lượt xem%2$s</string>
    <string name="unknown">Không xác định</string>
    <string name="resume">Tiếp tục</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -362,7 +362,6 @@
    <string name="custom_playback_speed">自定义速度</string>
    <string name="custom_playback_speed_summary">使用不同于常规播放器的播放速度</string>
    <string name="category">类别</string>
-    <string name="trending_views">%1$s • %2$s 次观看 • %3$s</string>
    <string name="autoplay_countdown">自动播放倒计时</string>
    <string name="autoplay_countdown_summary">在自动播放下一个视频之前显示 5 秒倒计时</string>
    <string name="stats_for_nerds">详细统计信息</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -356,7 +356,6 @@
    <string name="alternative_pip_controls_summary">只顯示音訊，跳過畫中畫的前進後退控制</string>
    <string name="all_caught_up_summary">您已經看完了所有影片</string>
    <string name="mark_as_watched">標記為已觀看</string>
-    <string name="trending_views">%1$s • %2$s 觀看次數 • %3$s</string>
    <string name="normal_views">%1$s 次觀看%2$s</string>
    <string name="autoplay_countdown">自動播放倒計時</string>
    <string name="autoplay_countdown_summary">在自動播放下一個影片之前顯示 5 秒倒計時</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -135,7 +135,6 @@
    <string name="advanced_summary">Downloads, and reset</string>
    <string name="live">Live</string>
    <string name="shareTo">Share URL to</string>
-    <string name="trending_views">%1$s • %2$s views • %3$s</string>
    <string name="normal_views">%1$s views%2$s</string>
    <string name="defaultIcon">Default</string>
    <string name="legacyIcon">Lost legacy</string>
@ -518,6 +517,7 @@
    <string name="local_stream_extraction_summary">Directly fetch video playback information from YouTube without using Piped.</string>
    <string name="local_ryd">Local Return Youtube Dislikes</string>
    <string name="local_ryd_summary">Directly fetch dislike information from https://returnyoutubedislikeapi.com</string>
+    <string name="view_count">%1$s views</string>

    <!-- Notification channel strings -->
    <string name="download_channel_name">Download Service</string>