From 8f16db1855785979e0419d40bcee090da7002e88 Mon Sep 17 00:00:00 2001 From: EnderPrism Date: Sun, 22 Jan 2023 15:34:54 +0000 Subject: [PATCH 1/5] Translated using Weblate (French) Currently translated at 100.0% (450 of 450 strings) Translation: LibreTube/LibreTube Translate-URL: https://hosted.weblate.org/projects/libretube/libretube/fr/ --- app/src/main/res/values-fr/strings.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0d1f2c116..e019d4557 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -437,4 +437,17 @@ Contrôles alternatifs de la PiP Afficher uniquement l\'audio et les commandes de saut dans PiP au lieu de l\'avance et du retour en arrière Lecteur audio + FAQ + Maximum de téléchargements simultanés + Saute les silences + Limite maximum de téléchargements simultanés atteinte. + Inconnu + Reprendre + Aide + Mode audio seulement + Transforme LibreTube en lecteur de musique. + Pas de sous-titre + Téléchargement en pause + Téléchargement terminé + Minuteur de sommeil \ No newline at end of file From 295bc39492b5cf349e5793432cc4a9a15f2076e6 Mon Sep 17 00:00:00 2001 From: Kazevic Date: Sun, 22 Jan 2023 15:31:07 +0000 Subject: [PATCH 2/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (450 of 450 strings) Translation: LibreTube/LibreTube Translate-URL: https://hosted.weblate.org/projects/libretube/libretube/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 4cd5863ff..e55e8bcf3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -177,7 +177,7 @@ Transferências e redefinição Padrões e comportamento Ocultar capítulos - Exibir transmissões semelhantes ao que você assiste. + Exibir conteúdo semelhante ao que você assiste. Abrir… Restaurar para os padrões Idioma de legendas @@ -207,7 +207,7 @@ Acompanhar os vídeos assistidos localmente Redefinir Tela cheia automática - Notificações de novas transmissões + Notificações de novos vídeos Mais visualizações Só no Wi-Fi Tradução @@ -435,18 +435,18 @@ Avançar Pausar Controles PiP alternativos - Mostrar controles de apenas áudio e pular no PiP em vez de avançar e retroceder - Player de Áudio - Sem legenda - Download pausado - Download concluído - Máximo de downloads simultâneos - Limite máximo de downloads simultâneos atingido. + Só exibir controles de áudio e pular no PiP em vez de avançar e retroceder + Reprodutor de áudio + Sem legendas + Transferência pausada + Transferência concluída + Número de transferências simultâneas + Limite máximo de transferências simultâneas atingido. Desconhecido Retomar - Transforme o LibreTube em um reprodutor de música. - Modo somente áudio - Temporizador + Transforme LibreTube num reprodutor de música. + Só áudio + Temporizador de sono Pular silêncio Ajuda FAQ From d4d746037f758163e30d976b3c508e222477989e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=20=C4=81vis?= Date: Sun, 22 Jan 2023 05:35:14 +0000 Subject: [PATCH 3/5] Translated using Weblate (Latvian) Currently translated at 77.5% (349 of 450 strings) Translation: LibreTube/LibreTube Translate-URL: https://hosted.weblate.org/projects/libretube/libretube/lv/ --- app/src/main/res/values-lv/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 1c804cc5f..edc33b93e 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -346,4 +346,7 @@ Ielādēt plūsmu fonā Ielādē abonementu plūsmu fonā un neļauj tai automātiski atjaunoties. Atskaņot nākamo + Bez subtitriem + Lejupielāde iepauzēta + Lejupielāde pabeigta \ No newline at end of file From bce743398a837e317f3b474bd759a1d52a7f836b Mon Sep 17 00:00:00 2001 From: Ricardo Date: Mon, 23 Jan 2023 06:20:23 +0000 Subject: [PATCH 4/5] Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (450 of 450 strings) Translation: LibreTube/LibreTube Translate-URL: https://hosted.weblate.org/projects/libretube/libretube/pt_BR/ --- app/src/main/res/values-pt-rBR/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e55e8bcf3..9507a3a94 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -435,7 +435,7 @@ Avançar Pausar Controles PiP alternativos - Só exibir controles de áudio e pular no PiP em vez de avançar e retroceder + Mostrar opções de apenas áudio e pular no PiP em vez de avançar e retroceder Reprodutor de áudio Sem legendas Transferência pausada @@ -444,8 +444,8 @@ Limite máximo de transferências simultâneas atingido. Desconhecido Retomar - Transforme LibreTube num reprodutor de música. - Só áudio + Transforme o LibreTube em um reprodutor de música. + Modo apenas áudio Temporizador de sono Pular silêncio Ajuda From 9a8a048c0409480b95e059e7f914c703a75632a6 Mon Sep 17 00:00:00 2001 From: Bnyro <82752168+Bnyro@users.noreply.github.com> Date: Mon, 23 Jan 2023 18:29:59 +0100 Subject: [PATCH 5/5] Reduce the player top bar margin (#2846) --- .../java/com/github/libretube/extensions/ToPixel.kt | 4 ++-- .../com/github/libretube/ui/adapters/VideosAdapter.kt | 6 +++--- .../github/libretube/ui/fragments/LibraryFragment.kt | 4 ++-- .../github/libretube/ui/fragments/PlaylistFragment.kt | 4 ++-- .../libretube/ui/fragments/WatchHistoryFragment.kt | 4 ++-- .../com/github/libretube/ui/sheets/CommentsSheet.kt | 4 ++-- .../github/libretube/ui/views/CustomExoPlayerView.kt | 10 +++++----- .../com/github/libretube/ui/views/MarkableTimeBar.kt | 4 ++-- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/github/libretube/extensions/ToPixel.kt b/app/src/main/java/com/github/libretube/extensions/ToPixel.kt index 1af59c65c..c37e29fe9 100644 --- a/app/src/main/java/com/github/libretube/extensions/ToPixel.kt +++ b/app/src/main/java/com/github/libretube/extensions/ToPixel.kt @@ -3,8 +3,8 @@ package com.github.libretube.extensions import android.content.res.Resources /** - * Convert DP to pixels + * Convert dp to pixels */ -fun Int.toPixel(): Float { +fun Int.dpToPx(): Float { return this * Resources.getSystem().displayMetrics.density + 0.5f } diff --git a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt index fccbcaa0a..89ba284da 100644 --- a/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt +++ b/app/src/main/java/com/github/libretube/ui/adapters/VideosAdapter.kt @@ -16,9 +16,9 @@ import com.github.libretube.constants.PreferenceKeys import com.github.libretube.databinding.AllCaughtUpRowBinding import com.github.libretube.databinding.TrendingRowBinding import com.github.libretube.databinding.VideoRowBinding +import com.github.libretube.extensions.dpToPx import com.github.libretube.extensions.formatShort import com.github.libretube.extensions.toID -import com.github.libretube.extensions.toPixel import com.github.libretube.ui.base.BaseActivity import com.github.libretube.ui.extensions.setFormattedDuration import com.github.libretube.ui.extensions.setWatchProgressLength @@ -119,8 +119,8 @@ class VideosAdapter( // set a fixed width for better visuals val params = root.layoutParams when (forceMode) { - ForceMode.RELATED -> params.width = (210).toPixel().toInt() - ForceMode.HOME -> params.width = (250).toPixel().toInt() + ForceMode.RELATED -> params.width = (210).dpToPx().toInt() + ForceMode.HOME -> params.width = (250).dpToPx().toInt() else -> {} } root.layoutParams = params diff --git a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt index 1c26b5f85..832253e9d 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/LibraryFragment.kt @@ -18,7 +18,7 @@ import com.github.libretube.databinding.FragmentLibraryBinding import com.github.libretube.db.DatabaseHolder import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.adapters.PlaylistBookmarkAdapter import com.github.libretube.ui.adapters.PlaylistsAdapter import com.github.libretube.ui.base.BaseFragment @@ -103,7 +103,7 @@ class LibraryFragment : BaseFragment() { // optimize CreatePlaylistFab bottom margin if miniPlayer active val bottomMargin = if (isMiniPlayerVisible) 64 else 16 val layoutParams = binding.createPlaylist.layoutParams as ViewGroup.MarginLayoutParams - layoutParams.bottomMargin = bottomMargin.toPixel().toInt() + layoutParams.bottomMargin = bottomMargin.dpToPx().toInt() binding.createPlaylist.layoutParams = layoutParams } diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt index a38ce7b70..63e4f9875 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlaylistFragment.kt @@ -22,9 +22,9 @@ import com.github.libretube.db.DatabaseHolder import com.github.libretube.enums.PlaylistType import com.github.libretube.extensions.TAG import com.github.libretube.extensions.awaitQuery +import com.github.libretube.extensions.dpToPx import com.github.libretube.extensions.query import com.github.libretube.extensions.toID -import com.github.libretube.extensions.toPixel import com.github.libretube.extensions.toPlaylistBookmark import com.github.libretube.ui.adapters.PlaylistAdapter import com.github.libretube.ui.base.BaseFragment @@ -86,7 +86,7 @@ class PlaylistFragment : BaseFragment() { playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { binding.playlistRecView.updatePadding( - bottom = if (it) (64).toPixel().toInt() else 0 + bottom = if (it) (64).dpToPx().toInt() else 0 ) } diff --git a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt index 1fc8395c0..667b27c3e 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/WatchHistoryFragment.kt @@ -16,8 +16,8 @@ import com.github.libretube.api.obj.StreamItem import com.github.libretube.databinding.FragmentWatchHistoryBinding import com.github.libretube.db.DatabaseHolder.Companion.Database import com.github.libretube.extensions.awaitQuery +import com.github.libretube.extensions.dpToPx import com.github.libretube.extensions.query -import com.github.libretube.extensions.toPixel import com.github.libretube.ui.adapters.WatchHistoryAdapter import com.github.libretube.ui.base.BaseFragment import com.github.libretube.ui.models.PlayerViewModel @@ -46,7 +46,7 @@ class WatchHistoryFragment : BaseFragment() { playerViewModel.isMiniPlayerVisible.observe(viewLifecycleOwner) { binding.watchHistoryRecView.updatePadding( - bottom = if (it) (64).toPixel().toInt() else 0 + bottom = if (it) (64).dpToPx().toInt() else 0 ) } diff --git a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt index 62acc6541..000a4d407 100644 --- a/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt +++ b/app/src/main/java/com/github/libretube/ui/sheets/CommentsSheet.kt @@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels import androidx.recyclerview.widget.LinearLayoutManager import com.github.libretube.R import com.github.libretube.databinding.CommentsSheetBinding -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.ui.adapters.CommentsAdapter import com.github.libretube.ui.models.CommentsViewModel @@ -37,7 +37,7 @@ class CommentsSheet : ExpandedBottomSheet() { binding.dragHandle.viewTreeObserver.removeOnGlobalLayoutListener(this) // limit the recyclerview height to not cover the video binding.commentsRV.layoutParams = binding.commentsRV.layoutParams.apply { - height = viewModel.maxHeight - (binding.dragHandle.height + (20).toPixel().toInt()) + height = viewModel.maxHeight - (binding.dragHandle.height + (20).dpToPx().toInt()) } } }) diff --git a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt index 33a4f2502..004179c00 100644 --- a/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt +++ b/app/src/main/java/com/github/libretube/ui/views/CustomExoPlayerView.kt @@ -19,8 +19,8 @@ import com.github.libretube.R import com.github.libretube.databinding.DoubleTapOverlayBinding import com.github.libretube.databinding.ExoStyledPlayerControlViewBinding import com.github.libretube.databinding.PlayerGestureControlsViewBinding +import com.github.libretube.extensions.dpToPx import com.github.libretube.extensions.normalize -import com.github.libretube.extensions.toPixel import com.github.libretube.obj.BottomSheetItem import com.github.libretube.ui.activities.MainActivity import com.github.libretube.ui.base.BaseActivity @@ -573,8 +573,8 @@ internal class CustomExoPlayerView( // add a larger bottom margin to the time bar in landscape mode val offset = when (newConfig?.orientation) { - Configuration.ORIENTATION_LANDSCAPE -> 20.toPixel() - else -> 10.toPixel() + Configuration.ORIENTATION_LANDSCAPE -> 20.dpToPx() + else -> 10.dpToPx() } binding.progressBar.let { @@ -624,7 +624,7 @@ internal class CustomExoPlayerView( playerViewModel?.isFullscreen?.value == true binding.topBar.let { it.layoutParams = (it.layoutParams as MarginLayoutParams).apply { - topMargin = (if (isFullscreen) 25 else 5).toPixel().toInt() + topMargin = (if (isFullscreen) 10 else 5).dpToPx().toInt() } } } @@ -719,6 +719,6 @@ internal class CustomExoPlayerView( private const val SUBTITLE_BOTTOM_PADDING_FRACTION = 0.158f private const val ANIMATION_DURATION = 100L private const val AUTO_HIDE_CONTROLLER_DELAY = 2000L - private val LANDSCAPE_MARGIN_HORIZONTAL = (20).toPixel().toInt() + private val LANDSCAPE_MARGIN_HORIZONTAL = (20).dpToPx().toInt() } } diff --git a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt index 061e04f85..ffd97eefb 100644 --- a/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt +++ b/app/src/main/java/com/github/libretube/ui/views/MarkableTimeBar.kt @@ -10,7 +10,7 @@ import androidx.core.view.marginLeft import com.github.libretube.R import com.github.libretube.api.obj.Segment import com.github.libretube.constants.PreferenceKeys -import com.github.libretube.extensions.toPixel +import com.github.libretube.extensions.dpToPx import com.github.libretube.util.PreferenceHelper import com.github.libretube.util.ThemeHelper import com.google.android.exoplayer2.Player @@ -28,7 +28,7 @@ class MarkableTimeBar( private var player: Player? = null private var length: Int = 0 - private val progressBarHeight = (2).toPixel().toInt() + private val progressBarHeight = (2).dpToPx().toInt() override fun onDraw(canvas: Canvas) { super.onDraw(canvas)