Merge branch 'master' into mentalinc/master

nextcloud · Oct 28, 2023 · 3ae35f1 · 3ae35f1
2 parents 67d4e47 + 6c8b2bc
commit 3ae35f1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle
@@ -120,7 +120,7 @@ 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.5.0'
+final MOCKITO_VERSION = '5.6.0'
 final RETROFIT_VERSION = '2.9.0'
 
 dependencies {
@@ -142,7 +142,7 @@ dependencies {
     // https://mvnrepository.com/artifact/com.google.android.material/material
     implementation "com.google.android.material:material:1.10.0"
     implementation "androidx.palette:palette:1.0.0"
-    implementation "androidx.recyclerview:recyclerview:1.3.1"
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
     implementation "androidx.browser:browser:1.6.0"
     implementation "androidx.cardview:cardview:1.0.0"
     implementation 'com.google.code.gson:gson:2.10.1'
@@ -165,7 +165,7 @@ dependencies {
     // implementation 'org.apache.commons:commons-lang3:3.4' // Required for DAO generation
 
     implementation 'com.github.gabrielemariotti.changeloglib:changelog:2.1.0'
-    implementation 'org.jsoup:jsoup:1.16.1'
+    implementation 'org.jsoup:jsoup:1.16.2'
     implementation ('net.rdrei.android.dirchooser:library:3.2@aar') {
         exclude group: 'com.google.auto.value', module: 'auto-value'
         transitive = true

diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:maxSdkVersion="22" />
     <!-- <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> -->
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+	<uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
 
     <application
         android:name=".NewsReaderApplication"
@@ -257,7 +258,8 @@
         -->
         <service
             android:name=".services.PodcastPlaybackService"
-            android:enabled="true"
+			android:foregroundServiceType="mediaPlayback"
+			android:enabled="true"
             android:exported="true">
             <intent-filter>
                <action android:name="android.media.browse.MediaBrowserService" />

diff --git a/News-Android-App/src/main/res/values-fr/strings.xml b/News-Android-App/src/main/res/values-fr/strings.xml
@@ -84,6 +84,7 @@
     <string name="action_feed_rename">Renommer le Flux</string>
     <string name="action_feed_move">Déplacer le Flux</string>
     <string name="action_feed_notification_settings">Paramètres de notification</string>
+    <string name="action_feed_open_in_detailed_view">Vue détaillée</string>
     <string name="feed_remove_button">Retirer</string>
     <string name="feed_rename_button">Renommer</string>
     <string name="confirm_feed_remove">Voulez-vous vraiment retirer ce flux ? Cela ne pourra pas être annulé !</string>

diff --git a/News-Android-App/src/main/res/values-hu-rHU/strings.xml b/News-Android-App/src/main/res/values-hu-rHU/strings.xml
@@ -81,6 +81,9 @@
     <string name="action_feed_rename">Hírfolyam átnevezése</string>
     <string name="action_feed_move">Hírcsatorna áthelyezése</string>
     <string name="action_feed_notification_settings">Értesítési beállítások</string>
+    <string name="action_feed_open_in">Megnyitási beállítások</string>
+    <string name="action_feed_open_in_general_setting">Általános beállítások használata</string>
+    <string name="action_feed_open_in_detailed_view">Részletes nézet</string>
     <string name="feed_remove_button">Eltávolítás</string>
     <string name="feed_rename_button">Átnevezés</string>
     <string name="confirm_feed_remove">Biztos, hogy eltávolítja ezt a hírcsatornát? Ez nem vonható vissza!</string>
@@ -151,6 +154,8 @@
 
     <string name="pref_general_search_in_title">Cím</string>
     <string name="pref_general_search_in_body">Törzs</string>
+    <string name="pref_general_search_in_both">Mindkettő</string>
+
     <string name="dialog_clearing_cache">Gyorsítótár ürítése</string>
     <string name="dialog_clearing_cache_please_wait">Gyorsítótár ürítése. Kis türelmet…</string>
     <string name="reset_cache_unsaved_changes">Nem szinkronizált változások vannak. Biztos, hogy mindenképp alaphelyzetbe állítja a gyorsítótárat?</string>

diff --git a/News-Android-App/src/main/res/values-zh-rCN/strings.xml b/News-Android-App/src/main/res/values-zh-rCN/strings.xml
@@ -78,6 +78,9 @@
     <string name="action_feed_rename">重命名订阅源</string>
     <string name="action_feed_move">移动订阅源</string>
     <string name="action_feed_notification_settings">通知设置</string>
+    <string name="action_feed_open_in">Open-in 设置</string>
+    <string name="action_feed_open_in_general_setting">使用一般设置</string>
+    <string name="action_feed_open_in_detailed_view">详细视图</string>
     <string name="feed_remove_button">移除</string>
     <string name="feed_rename_button">重命名</string>
     <string name="confirm_feed_remove">您真的要删除此订阅源吗？本操作不可恢复！</string>