Compare commits

...

12 Commits

Author SHA1 Message Date
Tobias Kaminsky d08b54b2ce daily dev 20240427
Update Nextcloud Android library
2024-04-27 03:43:02 +02:00
Tobias Kaminsky 34943090ab Merge remote-tracking branch 'origin/master' into dev 2024-04-27 03:36:17 +02:00
Andy Scherzinger 9925e49154
Merge pull request #12943 from nextcloud/feat/workflow-auto-update-reuse.yml
Updating reuse.yml workflow from template
2024-04-26 19:55:15 +02:00
Andy Scherzinger a91396a879
Merge pull request #12944 from nextcloud/feat/workflow-auto-update-pr-feedback.yml
Updating pr-feedback.yml workflow from template
2024-04-26 19:54:21 +02:00
Nextcloud bot 59370298d6 Updating pr-feedback.yml workflow from template
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-26 17:53:19 +00:00
Nextcloud bot bca6d37810 Updating reuse.yml workflow from template
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-26 17:28:56 +00:00
Alper Öztürk 20cabd4aab
Merge pull request #12877 from nextcloud/showSnackAboveFAB
Show snackbar above FAB
2024-04-26 16:04:29 +02:00
Unpublished e7badaec39
Improve screen tests?
Signed-off-by: Unpublished <unpublished@gmx.net>
2024-04-26 15:20:39 +02:00
Unpublished 724115de3e
Show snackbar above FAB
Signed-off-by: Unpublished <unpublished@gmx.net>
2024-04-26 15:20:39 +02:00
Andy Scherzinger f2cb841854
Merge pull request #12940 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-04-26 10:02:17 +02:00
Nextcloud bot 3644710cc6
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-04-26 02:45:46 +00:00
nextcloud-android-bot 8567928d16 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-04-26 02:22:05 +00:00
16 changed files with 55 additions and 19 deletions

View File

@ -44,7 +44,7 @@ jobs:
echo "repo=${{ github.event.pull_request.head.repo.full_name }}"
} >> "$GITHUB_OUTPUT"
fi
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
repository: ${{ steps.get-vars.outputs.repo }}
ref: ${{ steps.get-vars.outputs.branch }}

View File

@ -33,13 +33,13 @@ jobs:
language: [ 'java' ]
steps:
- name: Checkout repository
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: Set Swap Space
uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c # v1.0
with:
swap-size-gb: 10
- name: Initialize CodeQL
uses: github/codeql-action/init@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
uses: github/codeql-action/init@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
with:
languages: ${{ matrix.language }}
- name: Set up JDK 17
@ -53,4 +53,4 @@ jobs:
echo "org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
./gradlew assembleDebug
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
uses: github/codeql-action/analyze@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3

View File

@ -25,5 +25,5 @@ jobs:
name: "Validation"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
- uses: gradle/wrapper-validation-action@5188e9b5527a0a094cee21e2fe9a8ca44b4629af # v3.3.1
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- uses: gradle/wrapper-validation-action@216d1ad2b3710bf005dc39237337b9673fd8fcd5 # v3.3.2

View File

@ -3,7 +3,7 @@
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
# SPDX-FileCopyrightText: 2023 Nextcloud GmbH and Nextcloud contributors
# SPDX-FileCopyrightText: 2023-2024 Nextcloud GmbH and Nextcloud contributors
# SPDX-FileCopyrightText: 2023 Marcel Klehr <mklehr@gmx.net>
# SPDX-FileCopyrightText: 2023 Joas Schilling <213943+nickvergessen@users.noreply.github.com>
# SPDX-FileCopyrightText: 2023 Daniel Kesselberg <mail@danielkesselberg.de>

View File

@ -1,4 +1,7 @@
# synced from @nextcloud/android-config
# This workflow is provided via the organization template repository
#
# https://github.com/nextcloud/.github
# https://docs.github.com/en/actions/learn-github-actions/sharing-workflows-with-your-organization
# SPDX-FileCopyrightText: 2022 Free Software Foundation Europe e.V. <https://fsfe.org>
#
@ -6,12 +9,12 @@
name: REUSE Compliance Check
on: [push, pull_request]
on: [pull_request]
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
- name: REUSE Compliance Check
uses: fsfe/reuse-action@a46482ca367aef4454a87620aa37c2be4b2f8106 # v3.0.0

View File

@ -29,7 +29,7 @@ jobs:
steps:
- name: "Checkout code"
uses: actions/checkout@1d96c772d19495a3b5c517cd2bc0cb401ea0529f # v4.1.3
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
with:
persist-credentials: false
@ -42,6 +42,6 @@ jobs:
# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@8f596b4ae3cb3c588a5c46780b86dd53fef16c52 # v3.25.2
uses: github/codeql-action/upload-sarif@d39d31e687223d841ef683f52467bd88e9b21c14 # v3.25.3
with:
sarif_file: results.sarif

View File

@ -17,7 +17,7 @@ concurrency:
jobs:
screenshot:
runs-on: macOS-latest
runs-on: ubuntu-22.04
strategy:
fail-fast: false
matrix:
@ -48,6 +48,12 @@ jobs:
distribution: "temurin"
java-version: 17
- name: Enable KVM group perms
run: |
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
- name: create AVD and generate snapshot for caching
if: steps.avd-cache.outputs.cache-hit != 'true'
uses: reactivecircus/android-emulator-runner@6b0df4b0efb23bb0ec63d881db79aefbc976e4b2 # v2.30.1

View File

@ -171,8 +171,8 @@ android {
versionDev {
applicationId "com.nextcloud.android.beta"
dimension "default"
versionCode 20240426
versionName "20240426"
versionCode 20240427
versionName "20240427"
}
qa {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -650,10 +650,22 @@ public final class DisplayUtils {
*/
public static Snackbar showSnackMessage(Activity activity, String message) {
final Snackbar snackbar = Snackbar.make(activity.findViewById(android.R.id.content), message, Snackbar.LENGTH_LONG);
var fab = findFABView(activity);
if (fab != null && fab.getVisibility() == View.VISIBLE) {
snackbar.setAnchorView(fab);
}
snackbar.show();
return snackbar;
}
private static View findFABView(Activity activity) {
return activity.findViewById(R.id.fab_main);
}
private static View findFABView(View view) {
return view.findViewById(R.id.fab_main);
}
/**
* Show a temporary message in a {@link Snackbar} bound to the given view.
*
@ -663,6 +675,10 @@ public final class DisplayUtils {
*/
public static Snackbar showSnackMessage(View view, @StringRes int messageResource) {
final Snackbar snackbar = Snackbar.make(view, messageResource, Snackbar.LENGTH_LONG);
var fab = findFABView(view.getRootView());
if (fab != null && fab.getVisibility() == View.VISIBLE) {
snackbar.setAnchorView(fab);
}
snackbar.show();
return snackbar;
}

View File

@ -57,7 +57,7 @@
<string name="assistant_screen_top_bar_title">Yardımcı</string>
<string name="assistant_screen_unknown_task_status_text">Bilinmiyor</string>
<string name="assistant_task_detail_screen_input_button_title">Giriş</string>
<string name="assistant_task_detail_screen_output_button_title">Çıktı</string>
<string name="assistant_task_detail_screen_output_button_title">Çıkış</string>
<string name="associated_account_not_found">İlişkili hesap bulunamadı!</string>
<string name="auth_access_failed">Erişilemedi: %1$s</string>
<string name="auth_account_does_not_exist">Aygıt üzerinde henüz bu hesap açılmamış</string>
@ -172,6 +172,7 @@
<string name="confirmation_remove_folder_alert">%1$s klasörünü ve içindekileri silmek istediğinize emin misiniz?</string>
<string name="confirmation_remove_folders_alert">Seçilmiş ögeleri ve içindekileri silmek istediğinize emin misiniz?</string>
<string name="confirmation_remove_local">Yalnızca yerel</string>
<string name="conflict_dialog_error">Çakışma çözümleme penceresi oluşturulamadı</string>
<string name="conflict_file_headline">%1$s dosyası çakışıyor</string>
<string name="conflict_local_file">Yerel dosya</string>
<string name="conflict_message_description">İki sürümü de saklamayı seçerseniz, yerel dosyanın adına bir numara eklenecek.</string>

View File

@ -254,7 +254,7 @@
<string name="drawer_community">Спільнота</string>
<string name="drawer_header_background">Зображення тла верхньої панелі</string>
<string name="drawer_item_activities">Події</string>
<string name="drawer_item_all_files">Усі файли</string>
<string name="drawer_item_all_files">Усі документи</string>
<string name="drawer_item_assistant">Помічник</string>
<string name="drawer_item_favorites">Із зірочкою</string>
<string name="drawer_item_gallery">Зображення та відео</string>
@ -354,7 +354,7 @@
<string name="file_list_empty_favorite_headline">Поки що ви нічого не позначили зірочкою</string>
<string name="file_list_empty_favorites_filter_list">Тут можна буде знайти файли та каталоги, які ви позначити зірочкою.</string>
<string name="file_list_empty_gallery">Не знайдено ані зображень, ані відео</string>
<string name="file_list_empty_headline">Тут немає файлів</string>
<string name="file_list_empty_headline">Тут відсутні файли</string>
<string name="file_list_empty_headline_search">Жодного збігу у цьому каталозі</string>
<string name="file_list_empty_headline_server_search">Жодного збігу</string>
<string name="file_list_empty_moving">Тут нічого немає. Ви можете створити каталог.</string>

View File

@ -10,7 +10,7 @@
*/
buildscript {
ext {
androidLibraryVersion ="c4b285a988bd5dfa0d243983688a0d4768af1f0e"
androidLibraryVersion ="be87ba7948ba2067eaa6193b6c02f5e85b5bfdf1"
androidPluginVersion = '8.3.2'
androidxMediaVersion = '1.3.1'
androidxTestVersion = "1.5.0"

View File

@ -5332,6 +5332,14 @@
<sha256 value="dbf4aa8cb703b7282d6087795e69e8ebfe25ab8e6796f1f88d937208ad1d7641" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="be87ba7948ba2067eaa6193b6c02f5e85b5bfdf1">
<artifact name="android-library-be87ba7948ba2067eaa6193b6c02f5e85b5bfdf1.aar">
<sha256 value="55469f2cbaafc625115fe68a2ba1104af007b5a3bd828f388ce909ba76ba0f72" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
<artifact name="android-library-be87ba7948ba2067eaa6193b6c02f5e85b5bfdf1.module">
<sha256 value="66afb9f2eea39427f6f03c14c5b82ca240157e22b8b2a764f0a7c8ad87cb2d3e" origin="Generated by Gradle" reason="Artifact is not signed"/>
</artifact>
</component>
<component group="com.github.nextcloud" name="android-library" version="c4b285a988bd5dfa0d243983688a0d4768af1f0e">
<artifact name="android-library-c4b285a988bd5dfa0d243983688a0d4768af1f0e.aar">
<sha256 value="55469f2cbaafc625115fe68a2ba1104af007b5a3bd828f388ce909ba76ba0f72" origin="Generated by Gradle" reason="Artifact is not signed"/>

View File

@ -0,0 +1,2 @@
Update Nextcloud Android library