Merge pull request #5927 from Bnyro/master

fix: missing spacing in comment info row
2024-12-13 22:00:30 +05:30 · 2024-04-20 12:40:25 +02:00 · 2024-04-20 12:40:25 +02:00 · 064b886546
commit 064b886546
parent 221a33c623 50ceb70076
37 changed files with 11 additions and 41 deletions
--- a/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt
+++ b/app/src/main/java/com/github/libretube/ui/adapters/CommentPagingAdapter.kt
@ -62,8 +62,7 @@ class CommentPagingAdapter(
            commentAuthor.setBackgroundResource(
                if (comment.channelOwner) R.drawable.comment_channel_owner_bg else 0
            )
-            commentInfos.text = root.context
-                .getString(R.string.commentedTimeWithSeparator, comment.commentedTime)
+            commentInfos.text = comment.commentedTime

            commentText.movementMethod = LinkMovementMethodCompat.getInstance()
            val linkHandler = LinkHandler {
--- a/app/src/main/res/layout/comments_row.xml
+++ b/app/src/main/res/layout/comments_row.xml
@ -47,6 +47,12 @@
                    android:textSize="14sp"
                    tools:text="Octacat" />

+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text=" • "
+                    tools:ignore="HardcodedText" />
+
                <TextView
                    android:id="@+id/comment_infos"
                    android:layout_width="wrap_content"
@ -56,7 +62,7 @@
                    android:textAlignment="viewStart"
                    android:textColor="?android:attr/textColorSecondary"
                    android:textSize="14sp"
-                    tools:text="• 10h" />
+                    tools:text="10h ago" />

                <ImageView
                    android:id="@+id/verified_imageView"
@ -83,10 +89,10 @@
                android:layout_height="wrap_content"
                android:layout_marginTop="5dp"
                android:layout_marginBottom="8dp"
+                android:focusable="false"
                android:textAlignment="viewStart"
                android:textIsSelectable="true"
                android:textSize="15sp"
-                android:focusable="false"
                tools:text="Comment Text" />

            <LinearLayout
@ -122,8 +128,8 @@
                    android:layout_height="14dp"
                    android:layout_marginEnd="8dp"
                    android:visibility="gone"
-                    tools:visibility="gone"
-                    app:shapeAppearance="@style/CircleImageView" />
+                    app:shapeAppearance="@style/CircleImageView"
+                    tools:visibility="gone" />

                <com.github.libretube.ui.views.DrawableTextView
                    android:id="@+id/replies_count"
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@ -546,7 +546,6 @@
    <string name="also_clear_watch_positions">أيضًا امسح مواضع المشاهدة</string>
    <string name="gestures">الإيماءات</string>
    <string name="behavior_when_minimized">السلوك عند التصغير</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">التعليقات (%1$s)</string>
    <string name="external_player">مشغل خارجي</string>
    <string name="show_updates">التحقق من التحديثات تلقائيا</string>
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@ -536,7 +536,6 @@
    <string name="gestures">Jestlər</string>
    <string name="external_player">Xarici oynadıcı</string>
    <string name="comments_count">Şərhlər (%1$s)</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="show_updates">Yeniləmələri avtomatik yoxla</string>
    <string name="albums">Albomlar</string>
    <string name="contribute_to_dearrow">DeArrow-a töhfə ver</string>
--- a/app/src/main/res/values-be/strings.xml
+++ b/app/src/main/res/values-be/strings.xml
@ -540,7 +540,6 @@
    <string name="enqueueing_playlist_download">Дадаць відэа з плэйліста %1$s ў чаргу на загрузку</string>
    <string name="audio_language">Мова аўдыё</string>
    <string name="default_language">Па змаўчанні</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="external_player">Знешні прайгравальнік</string>
    <string name="comments_count">Каментары (%1$s)</string>
    <string name="show_updates">Правяраць абнаўлення аўтаматычна</string>
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@ -534,7 +534,6 @@
    <string name="enqueueing_playlist_download">Подреждане на видеоклипове за изтегляне на плейлиста %1$s</string>
    <string name="default_language">По подразбиране</string>
    <string name="download_playlist_note">Моля, изберете максималното аудио/видео качество за изтегляне. Надписите ще бъдат изтеглени само ако са налични.</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Коментари (%1$s)</string>
    <string name="external_player">Външен плеър</string>
    <string name="show_updates">Автоматична проверка на актуализации</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -521,7 +521,6 @@
    <string name="creation_date">Data de creació</string>
    <string name="sb_custom_colors_summary">Activa/desactiva els segments dels colors personalitzats per als segments SponsorBlock</string>
    <string name="tooltip_repeat">Repeteix</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="play_next">Reprodueix a continuació</string>
    <string name="navigation_bar">Barra de navegació</string>
    <string name="change_region">Sembla que les tendències no estan disponibles per a la regió actual. Si us plau, seleccioneu-ne una altra a la configuració.</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -538,7 +538,6 @@
    <string name="gestures">Gesta</string>
    <string name="behavior_when_minimized">Chování při minimalizaci</string>
    <string name="external_player">Externí přehrávač</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Komentáře (%1$s)</string>
    <string name="show_updates">Automaticky kontrolovat aktualizace</string>
    <string name="albums">Alba</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -537,6 +537,5 @@
    <string name="albums">Album</string>
    <string name="show_updates">Tjek for opdateringer automatisk</string>
    <string name="external_player">Ekstern afspiller</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Kommentarer (%1$s)</string>
 </resources>
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@ -536,7 +536,6 @@
    <string name="behavior_when_minimized">Verhalten bei Minimierung</string>
    <string name="show_updates">Automatisch nach Updates prüfen</string>
    <string name="external_player">Externer Player</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Kommentare (%1$s)</string>
    <string name="albums">Alben</string>
 </resources>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -537,7 +537,6 @@
    <string name="behavior_when_minimized">Comportamiento al minimizar</string>
    <string name="gestures">Gestos</string>
    <string name="also_clear_watch_positions">Borre también las posiciones de visualización</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="external_player">Reproductor externo</string>
    <string name="comments_count">Comentarios (%1$s)</string>
    <string name="show_updates">Comprobar las actualizaciones automáticamente</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -73,7 +73,6 @@
    <string name="downloadfailed">Allalaadimine ei õnnestunud.</string>
    <string name="unknown_error">Võrguühenduse viga.</string>
    <string name="error">Midagi läks valesti.</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="lightTheme">Hele kujundus</string>
    <string name="noInternet">Palun loo esmalt internetiühendus.</string>
    <string name="channels">Kanalid</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@ -535,7 +535,6 @@
    <string name="enqueueing_playlist_download">در صف قرار دادن ویدیو‌ های فهرست پخش %1$s برای بارگیری</string>
    <string name="gestures">ژست های حرکتی</string>
    <string name="show_updates">بررسی خودکار به‌روزرسانی ها</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">نظرات (%1$s)</string>
    <string name="external_player">پخش کننده‌ٔ خارجی</string>
    <string name="albums">آلبوم‌ها</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -535,7 +535,6 @@
    <string name="enqueue_playlist_description">Affiche une notification lors de la mise en file d\'attente des vidéos d\'une liste de lecture à télécharger.</string>
    <string name="audio_language">Langue de l\'audio</string>
    <string name="also_clear_watch_positions">Effacez également les positions de lecture</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Commentaires (%1$s)</string>
    <string name="external_player">Lecteur externe</string>
    <string name="behavior_when_minimized">Comportement en cas de minimisation</string>
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@ -534,7 +534,6 @@
    <string name="also_clear_watch_positions">देखने की स्थिति भी साफ़ करें</string>
    <string name="behavior_when_minimized">व्यवहार जब मिनीमाईज किया जाए</string>
    <string name="comments_count">टिप्पणियाँ (%1$s)</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="external_player">बाहरी प्लेयर</string>
    <string name="gestures">इशारे</string>
    <string name="show_updates">अपडेट स्वचालित रूप से जांचें</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@ -534,7 +534,6 @@
    <string name="also_clear_watch_positions">A megtekintési pozíciókat is törölje</string>
    <string name="behavior_when_minimized">Viselkedés minimalizálva</string>
    <string name="gestures">Gesztusok</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Hozzászólások (%1$s)</string>
    <string name="external_player">Külső lejátszó</string>
    <string name="albums">Albumok</string>
--- a/app/src/main/res/values-ia/strings.xml
+++ b/app/src/main/res/values-ia/strings.xml
@ -534,7 +534,6 @@
    <string name="also_clear_watch_positions">Tamben rader le positiones de reguardar</string>
    <string name="behavior_when_minimized">Comportamento quando es minimisate</string>
    <string name="gestures">Gestos</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Commentos (%1$s)</string>
    <string name="external_player">Reproductor externe</string>
    <string name="show_updates">Verificar actualisationes automaticamente</string>
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@ -529,7 +529,6 @@
    <string name="rich_caption_rendering_summary">Render takarir web untuk pengalaman yang lebih kaya dan terkustomisasi</string>
    <string name="gestures">Gestur</string>
    <string name="grid_landscape">Kolom kisi (lanskap)</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Komentar (%1$s)</string>
    <string name="enqueue_playlist_description">Menampilkan notifikasi ketika mengantrekan video dari daftar putar untuk diunduh.</string>
    <string name="external_player">Pemutar eksternal</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -537,7 +537,6 @@
    <string name="also_clear_watch_positions">Cancella anche le posizioni di riproduzione</string>
    <string name="gestures">Gesti</string>
    <string name="behavior_when_minimized">Comportamento quando minimizzato</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Commenti (%1$s)</string>
    <string name="external_player">Riproduttore esterno</string>
    <string name="show_updates">Cerca aggiornamenti automaticamente</string>
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@ -516,7 +516,6 @@
    <string name="grid_landscape">עמודות רשת (לרוחב)</string>
    <string name="comments_count">תגובות (%1$s)</string>
    <string name="finished">הסתיים</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="show_updates">לבדוק אוטומטית אם יש עדכונים</string>
    <string name="rich_caption_rendering">עיבוד של כותרת עשירה</string>
    <string name="change">החלפה</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@ -532,7 +532,6 @@
    <string name="gestures">ジェスチャー</string>
    <string name="behavior_when_minimized">最小化時の動作</string>
    <string name="comments_count">コメント (%1$s)</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="external_player">別の再生プレイヤー</string>
    <string name="show_updates">最新版を自動で確認</string>
    <string name="albums">アルバム</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -534,7 +534,6 @@
    <string name="behavior_when_minimized">Gedrag wanneer geminimaliseerd</string>
    <string name="gestures">Gebaren</string>
    <string name="download_playlist_note">Selecteer de maximale audio/videokwaliteit om te downloaden. Bijschriften worden alleen gedownload als ze beschikbaar zijn.</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Opmerkingen (%1$s)</string>
    <string name="external_player">Externe speler</string>
    <string name="show_updates">Automatisch op updates controleren</string>
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@ -532,7 +532,6 @@
    <string name="enqueueing_playlist_download">ਪਲੇਲਿਸਟ %1$s ਨੂੰ ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਵੀਡੀਓਜ਼ ਦੀ ਕਤਾਰਬੰਦੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ</string>
    <string name="default_language">ਡਿਫ਼ਾਲਟ</string>
    <string name="also_clear_watch_positions">ਵੇਖਣ ਦੀਆਂ ਸਥਿਤੀਆਂ ਵੀ ਸਾਫ਼ ਕਰੋ</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">ਟਿੱਪਣੀਆਂ (%1$s)</string>
    <string name="behavior_when_minimized">ਮਿਨੀਮਾਈਜ਼ ਕਰਨ \'ਤੇ ਵਿਵਹਾਰ</string>
    <string name="external_player">ਬਾਹਰੀ ਪਲੇਅਰ</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -544,7 +544,6 @@
    <string name="gestures">Gesty</string>
    <string name="comments_count">Komentarze (%1$s)</string>
    <string name="albums">Albumy</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="import_temp_playlist">Zaimportować tymczasową playlistę?</string>
    <string name="import_temp_playlist_summary">Czy chcesz utworzyć nową playlistę o nazwie „%1$s”? Playlista będzie zawierać %2$d filmów.</string>
 </resources>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -537,7 +537,6 @@
    <string name="also_clear_watch_positions">Limpar também as posições de reprodução</string>
    <string name="behavior_when_minimized">Comportamento quando minimizado</string>
    <string name="gestures">Gestos</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Comentários (%1$s)</string>
    <string name="external_player">Player externo</string>
    <string name="show_updates">Buscar atualizações automaticamente</string>
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@ -537,7 +537,6 @@
    <string name="also_clear_watch_positions">Limpar também as posições de reprodução</string>
    <string name="behavior_when_minimized">Comportamento quando minimizado</string>
    <string name="gestures">Gestos</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Comentários (%1$s)</string>
    <string name="external_player">Reprodutor externo</string>
    <string name="show_updates">Procurar atualizações automaticamente</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -537,7 +537,6 @@
    <string name="default_language">Implicit</string>
    <string name="gestures">Gesturi</string>
    <string name="behavior_when_minimized">Comportament când este minimizat</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Comentarii (%1$s)</string>
    <string name="external_player">Player extern</string>
    <string name="show_updates">Verifică automat actualizările</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@ -540,7 +540,6 @@
    <string name="also_clear_watch_positions">Также удалить позиции просмотра</string>
    <string name="behavior_when_minimized">Поведение при сворачивании</string>
    <string name="gestures">Жесты</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Комментарии (%1$s)</string>
    <string name="external_player">Внешний проигрыватель</string>
    <string name="show_updates">Проверять обновления автоматически</string>
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -537,7 +537,6 @@
    <string name="also_clear_watch_positions">Vymazať aj pozície sledovania</string>
    <string name="gestures">Gestá</string>
    <string name="behavior_when_minimized">Správanie pri minimalizácii</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Komentáre (%1$s)</string>
    <string name="external_player">Externý prehrávač</string>
    <string name="show_updates">Kontrolovať aktualizácie automaticky</string>
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@ -537,7 +537,6 @@
    <string name="also_clear_watch_positions">Такође очисти позиције гледања</string>
    <string name="behavior_when_minimized">Понашање када је минимизирано</string>
    <string name="gestures">Покрети</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Коментари (%1$s)</string>
    <string name="external_player">Спољни плејер</string>
    <string name="show_updates">Аутоматски провери ажурирања</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -533,7 +533,6 @@
    <string name="enqueueing_playlist_download">Köar videor för nedladdning av spellistan %1$s</string>
    <string name="behavior_when_minimized">Beteende när det är minimerat</string>
    <string name="gestures">Gester</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Kommentarer (%1$s)</string>
    <string name="external_player">Extern spelare</string>
    <string name="show_updates">Kontrollera uppdateringar automatiskt</string>
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@ -535,7 +535,6 @@
    <string name="behavior_when_minimized">Küçültüldüğündeki davranış</string>
    <string name="gestures">Hareketler</string>
    <string name="comments_count">Yorumlar (%1$s)</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="external_player">Harici oynatıcı</string>
    <string name="show_updates">Güncellemeleri otomatik denetle</string>
    <string name="albums">Albümler</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@ -543,7 +543,6 @@
    <string name="gestures">Жести</string>
    <string name="comments_count">Коментарі (%1$s)</string>
    <string name="external_player">Зовнішній програвач</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="show_updates">Перевіряти оновлення автоматично</string>
    <string name="albums">Альбоми</string>
    <string name="import_temp_playlist">Імпортувати тимчасовий список відтворення?</string>
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@ -524,7 +524,6 @@
    <string name="delete_all">Tất cả các tải xuống sẽ bị xóa!</string>
    <string name="download_playlist_note">Vui lòng chọn chất lượng audio/video tối đa để tải xuống. Phụ đề sẽ chỉ được tải xuống nếu có.</string>
    <string name="enqueueing_playlist_download">Xếp hàng video để tải xuống danh sách phát %1$s</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">Bình luận (%1$s)</string>
    <string name="rich_caption_rendering_summary">Kết xuất phụ đề web để có trải nghiệm phong phú và tùy chỉnh hơn</string>
    <string name="copy_tooltip">Sao chép</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -531,7 +531,6 @@
    <string name="also_clear_watch_positions">同样清除观看位置</string>
    <string name="behavior_when_minimized">最小化时的行为</string>
    <string name="gestures">手势</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">评论（%1$s）</string>
    <string name="external_player">外部播放器</string>
    <string name="show_updates">自动检测更新</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -531,7 +531,6 @@
    <string name="also_clear_watch_positions">也清除觀看位置</string>
    <string name="behavior_when_minimized">最小化時的行為</string>
    <string name="gestures">手勢</string>
-    <string name="commentedTimeWithSeparator">• %1$s</string>
    <string name="comments_count">留言 (%1$s)</string>
    <string name="external_player">外部播放器</string>
    <string name="show_updates">自動檢查更新</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -65,7 +65,6 @@
    <string name="donate">Donate</string>
    <string name="uploaderAndVideoCount">%1$s • %2$d videos</string>
    <string name="subscriberAndVideoCounts">%1$s subscribers • %2$d videos</string>
-    <string name="commentedTimeWithSeparator"> • %1$s</string>
    <string name="videoCount">%1$d videos</string>
    <string name="noInternet">Connect to the Internet first.</string>
    <string name="retry">Retry</string>