mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-21 08:24:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into dev

Browse source
This commit is contained in:
Tobias Kaminsky 2024-04-12 03:37:37 +02:00
commit 9b4d39befe
4 changed files with 607 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -275,7 +275,7 @@ dependencies {
implementation("androidx.compose.ui:ui") implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics") implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.material3:material3") implementation("androidx.compose.material3:material3")
implementation("androidx.compose.ui:ui-tooling-preview:1.6.4") implementation("androidx.compose.ui:ui-tooling-preview:1.6.5")
debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5' debugImplementation 'androidx.compose.ui:ui-tooling:1.6.5'
compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' compileOnly 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'

2
app/src/main/res/values-da/strings.xml
View file

@ -858,7 +858,7 @@ Enheds legitimationsoplysninger er sat op
<string name="update_link_forbidden_permissions">for at opdatere denne deling</string> <string name="update_link_forbidden_permissions">for at opdatere denne deling</string>
<string name="updating_share_failed">Opdater deling fejlet</string> <string name="updating_share_failed">Opdater deling fejlet</string>
<string name="upload_action_failed_clear">Fjern fejlede uploads</string> <string name="upload_action_failed_clear">Fjern fejlede uploads</string>
<string name="upload_action_failed_retry">Prøv fejlede uploads igen</string> <string name="upload_action_failed_retry">Prøv mislykkede uploads igen</string>
<string name="upload_cannot_create_file">Kan ikke oprette filen lokalt</string> <string name="upload_cannot_create_file">Kan ikke oprette filen lokalt</string>
<string name="upload_chooser_title">Sender fra...</string> <string name="upload_chooser_title">Sender fra...</string>
<string name="upload_content_from_other_apps">Send indhold fra andre apps</string> <string name="upload_content_from_other_apps">Send indhold fra andre apps</string>

6
build.gradle
View file

@ -10,9 +10,9 @@
*/ */
buildscript { buildscript {
ext { ext {
androidLibraryVersion ="b74aee55088548deb9f596c5a34a9644db878785" androidLibraryVersion ="0c886d61f6"
androidPluginVersion = '8.3.1' androidPluginVersion = '8.3.2'
androidxMediaVersion = '1.3.0' androidxMediaVersion = '1.3.1'
androidxTestVersion = "1.5.0" androidxTestVersion = "1.5.0"
appCompatVersion = '1.6.1' appCompatVersion = '1.6.1'
checkerVersion = "3.21.2" checkerVersion = "3.21.2"

603
gradle/verification-metadata.xml
View file

File diff suppressed because it is too large Load diff