Merge main branch changes (#1183)

anilbeesetti · Dec 23, 2024 · 2b46138 · 2b46138
2 parents b5eea01 + 0f510dd
commit 2b46138
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/core/ui/src/main/res/values-pt-rBR/strings.xml b/core/ui/src/main/res/values-pt-rBR/strings.xml
@@ -18,7 +18,7 @@
     <string name="open_settings">Abrir configurações</string>
     <string name="permission_not_granted">Permissão não concedida</string>
     <string name="fast_seek">Navegação rápida</string>
-    <string name="fast_seek_description">Procure o quadro-chave mais próximo em vez do exato.</string>
+    <string name="fast_seek_description">Procure o quadro-chave mais próximo em vez do exato</string>
     <string name="error_playing_video">Erro: não foi possível reproduzir o vídeo</string>
     <string name="permission_request">Solicitação de permissão</string>
     <string name="player_controls_exit">Navegar para cima</string>
@@ -206,4 +206,7 @@
     <string name="control_buttons_alignment_left">A esquerda</string>
     <string name="control_buttons_alignment_right">A direita</string>
     <string name="control_buttons_alignment">Alinhamento dos botões de controle</string>
+    <string name="enable_pip_from_settings">Picture-in-Picture está desabilitado. Ative-o em Configurações para usar este recurso.</string>
+    <string name="background_play">Reproduzir em segundo plano</string>
+    <string name="background_play_description">Reproduzir em segundo plano quando tocado na tela inicial ou de bloqueio</string>
 </resources>
diff --git a/core/ui/src/main/res/values-ru/strings.xml b/core/ui/src/main/res/values-ru/strings.xml
@@ -206,4 +206,8 @@
     <string name="control_buttons_alignment">Расположение кнопок управления</string>
     <string name="control_buttons_alignment_right">Справа</string>
     <string name="control_buttons_alignment_left">Слева</string>
+    <string name="enable_pip_from_settings">Картинка в картинке отключена. Включите её в настройках, чтобы использовать эту функцию.</string>
+    <string name="background_play_description">Воспроизведение в фоновом режиме при нажатии на «Домой» или при заблокированном экране.</string>
+    <string name="stop_player_session">Остановить сеанс</string>
+    <string name="background_play">Фоновое воспроизведение</string>
 </resources>
diff --git a/core/ui/src/main/res/values-zh-rCN/strings.xml b/core/ui/src/main/res/values-zh-rCN/strings.xml
@@ -183,7 +183,7 @@
     <string name="volume_boost_desc">将音量增强至 200%</string>
     <string name="volume_boost">音量增强</string>
     <string name="pip_settings">画中画模式</string>
-    <string name="pip_settings_description">点击 主页 按钮时自动切换到小窗播放</string>
+    <string name="pip_settings_description">当切换到其它应用时自动开启小窗播放</string>
     <string name="open_subtitle">打开本地字幕</string>
     <string name="no_subtitle_tracks_found">此视频的字幕轨道不可用或不被支持。</string>
     <string name="no_audio_tracks_found">此视频的音轨不可用或不被支持。</string>
@@ -206,8 +206,8 @@
     <string name="control_buttons_alignment_left">左</string>
     <string name="control_buttons_alignment_right">右</string>
     <string name="control_buttons_alignment">控制按钮对齐</string>
-    <string name="background_play_description">当返回主屏幕或锁屏时，继续在后台播放</string>
+    <string name="background_play_description">当返回主屏幕或锁屏时继续在后台播放</string>
     <string name="stop_player_session">停止播放器会话</string>
     <string name="background_play">后台播放</string>
-    <string name="enable_pip_from_settings">画中画被停用，在设置中启用它来使用此功能</string>
+    <string name="enable_pip_from_settings">画中画模式被停用，请在设置中启用它来使用此功能</string>
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -17,20 +17,20 @@ androidxDataStore = "1.1.1"
 androidxEspresso = "3.6.1"
 androidxHiltNavigationCompose = "1.2.0"
 androidxLifecycle = "2.8.7"
-androidxMedia3 = "1.5.0"
+androidxMedia3 = "1.5.1"
 androidxNavigation = "2.8.5"
 androidxTestCore = "1.5.0"
 androidxTestExt = "1.2.1"
 coil = "2.7.0"
-hilt = "2.53.1"
+hilt = "2.54"
 junit4 = "4.13.2"
 kotlin = "2.1.0"
-kotlinxCoroutines = "1.9.0"
-kotlinxCoroutinesGuava = "1.9.0"
+kotlinxCoroutines = "1.10.1"
+kotlinxCoroutinesGuava = "1.10.1"
 kotlinxSerializationJson = "1.7.3"
 ksp = "2.1.0-1.0.29"
 ktlint = "12.1.2"
-nextlib = "0.8.3"
+nextlib = "0.8.4"
 room = "2.6.1"
 timber = "5.0.1"
 universalChardet = "2.5.0"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=f397b287023acdba1e9f6fc5ea72d22dd63669d59ed4a289a29b1a76eee151c6
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum