Merge branch 'master' of https://github.com/nextcloud/news-android

nextcloud · Nov 3, 2023 · b23cf2a · b23cf2a
2 parents de99536 + 1003e41
commit b23cf2a
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 5 deletions.
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
@@ -119,8 +119,8 @@ repositories {
 final DAGGER_VERSION = '2.48.1'
 final GLIDE_VERSION = '4.16.0'
 final ESPRESSO_VERSION = '3.5.1'
-final OKHTTP_VERSION = '4.11.0'
-final MOCKITO_VERSION = '5.6.0'
+final OKHTTP_VERSION = '4.12.0'
+final MOCKITO_VERSION = '5.7.0'
 final RETROFIT_VERSION = '2.9.0'
 
 dependencies {
@@ -185,7 +185,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:${OKHTTP_VERSION}"
     implementation "com.squareup.okhttp3:logging-interceptor:${OKHTTP_VERSION}"
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation("org.mockito:mockito-core:$MOCKITO_VERSION") {

diff --git a/News-Android-App/src/main/res/values-ar/strings.xml b/News-Android-App/src/main/res/values-ar/strings.xml
@@ -187,6 +187,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">حدِّد كمقروء أثناء التنقل</string>
     <string name="pref_title_ShowFastActions">مكًن وظائف الوصول السريع</string>
     <string name="pref_title_OpenInBrowserDirectly">تخطي العرض المفصل وفتح المقال في المتصفح</string>
+    <string name="pref_title_BackButtonOpensDrawer">زِر الرجوع يفتح الدُّرج</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">هل تقبل بشهادة غير معروفة؟</string>
     <string name="mtm_decision_always">دائماً</string>

diff --git a/News-Android-App/src/main/res/values-cs-rCZ/strings.xml b/News-Android-App/src/main/res/values-cs-rCZ/strings.xml
@@ -177,6 +177,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Posouváním po stránce ji označit jako přečtenou</string>
     <string name="pref_title_ShowFastActions">Aktivovat funkce pro rychlý přístup</string>
     <string name="pref_title_OpenInBrowserDirectly">Přeskočit podrobné zobrazení a otevřít článek v prohlížeči</string>
+    <string name="pref_title_BackButtonOpensDrawer">Tlačítko zpět otevře výsuvný panel</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Přijmout neznámý certifikát?</string>
     <string name="mtm_decision_always">Vždy</string>

diff --git a/News-Android-App/src/main/res/values-de/strings.xml b/News-Android-App/src/main/res/values-de/strings.xml
@@ -167,6 +167,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Beim Bildlauf als gelesen markieren</string>
     <string name="pref_title_ShowFastActions">Schnellzugriffsfunktionen aktivieren</string>
     <string name="pref_title_OpenInBrowserDirectly">Detailansicht überspringen und Artikel in Browser öffnen</string>
+    <string name="pref_title_BackButtonOpensDrawer">Die Zurück-Taste öffnet das Menü</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Unbekanntes Zertifikat akzeptieren?</string>
     <string name="mtm_decision_always">Immer</string>

diff --git a/News-Android-App/src/main/res/values-gl/strings.xml b/News-Android-App/src/main/res/values-gl/strings.xml
@@ -167,6 +167,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Marcar como lido mentres se despraza</string>
     <string name="pref_title_ShowFastActions">Activar as funcións de acceso rápido</string>
     <string name="pref_title_OpenInBrowserDirectly">Omitir a vista detallada e abrir o artigo no navegador</string>
+    <string name="pref_title_BackButtonOpensDrawer">O botón de retroceso abre o caixón</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Aceptar un certificado descoñecido?</string>
     <string name="mtm_decision_always">Sempre</string>

diff --git a/News-Android-App/src/main/res/values-sr/strings.xml b/News-Android-App/src/main/res/values-sr/strings.xml
@@ -172,6 +172,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">Означи као прочитано током клизања</string>
     <string name="pref_title_ShowFastActions">Активирај функције за брзи приступ</string>
     <string name="pref_title_OpenInBrowserDirectly">Прескочи детаљни преглед и одмах отвори чланак у прегледачу</string>
+    <string name="pref_title_BackButtonOpensDrawer">Дугме уназад отвара фиоку</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">Прихватити непознати сертификат?</string>
     <string name="mtm_decision_always">Увек</string>

diff --git a/News-Android-App/src/main/res/values-zh-rTW/strings.xml b/News-Android-App/src/main/res/values-zh-rTW/strings.xml
@@ -162,6 +162,8 @@
     <string name="pref_title_MarkAsReadWhileScrolling">當滾動時標為已讀</string>
     <string name="pref_title_ShowFastActions">啟用快速存取功能</string>
     <string name="pref_title_OpenInBrowserDirectly">略過詳細檢視，並在瀏覽器開啟文章</string>
+    <string name="pref_title_BackButtonOpensDrawer">返回按鈕開啟隱藏式側邊選單</string>
+
     <!-- MemorizingTrustManager -->
     <string name="mtm_accept_cert">允許未知憑證？</string>
     <string name="mtm_decision_always">總是</string>

diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.9.10'
+        kotlin_version = '1.9.20'
     }
     repositories {
         google()
@@ -16,5 +16,5 @@ buildscript {
 }
 
 plugins {
-    id 'com.google.devtools.ksp' version '1.9.20-1.0.13' apply false
+    id 'com.google.devtools.ksp' version '1.9.20-1.0.14' apply false
 }