diff --git a/.github/workflows/xenia-ci.yml b/.github/workflows/xenia-ci.yml new file mode 100644 index 000000000000..d38c4e5d74ba --- /dev/null +++ b/.github/workflows/xenia-ci.yml @@ -0,0 +1,38 @@ +# SPDX-FileCopyrightText: 2026 XeniaCloud +# SPDX-License-Identifier: GPL-3.0-or-later + +name: "XeniaCloud CI" + +on: + workflow_dispatch: + push: + branches: [ xenia-rebrand ] + +permissions: read-all + +concurrency: + group: xenia-ci-${{ github.ref }} + cancel-in-progress: true + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: "temurin" + java-version: 21 + - name: Build Generic debug (unsigned) + run: | + echo "org.gradle.jvmargs=-Xmx6g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:+UseParallelGC -XX:MaxMetaspaceSize=1g" >> gradle.properties + echo "org.gradle.caching=true" >> gradle.properties + echo "org.gradle.parallel=true" >> gradle.properties + ./gradlew assembleGenericDebug + - name: Upload unsigned APK + uses: actions/upload-artifact@v4 + with: + name: app-generic-debug + path: app/build/outputs/apk/generic/debug/*.apk + retention-days: 90 diff --git a/REUSE.toml b/REUSE.toml index 1fda7dfdbb65..2e07b9f220b2 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -36,7 +36,7 @@ SPDX-FileCopyrightText = "2026 Nextcloud GmbH and Nextcloud contributors" SPDX-License-Identifier = "AGPL-3.0-or-later" [[annotations]] -path = ["app/src/**/res/mipmap-**dpi/ic_launcher.png", "app/src/**/ic_launcher-web.png", "src/**/fastlane/metadata/en-US/images/*.png", "src/generic/fastlane/metadata/android/en-US/images/icon.png", "src/versionDev/fastlane/metadata/android/en-US/images/icon.png", "app/src/main/ic_launcher-web-round.png"] +path = ["app/src/qa/res/mipmap-**dpi/ic_launcher.png", "app/src/versionDev/res/mipmap-**dpi/ic_launcher.png", "app/src/qa/ic_launcher-web.png", "app/src/versionDev/ic_launcher-web.png", "src/**/fastlane/metadata/en-US/images/*.png", "src/generic/fastlane/metadata/android/en-US/images/icon.png", "src/versionDev/fastlane/metadata/android/en-US/images/icon.png"] precedence = "aggregate" SPDX-FileCopyrightText = "2017-2025 Nextcloud GmbH " SPDX-License-Identifier = "LicenseRef-NextcloudTrademarks" @@ -46,3 +46,9 @@ path = [".idea/**", "app/schemas/com.nextcloud.client.database.NextcloudDatabase precedence = "aggregate" SPDX-FileCopyrightText = "2016-2025 Nextcloud GmbH and Nextcloud contributors" SPDX-License-Identifier = "AGPL-3.0-or-later" + +[[annotations]] +path = ["app/src/main/res/mipmap-mdpi/ic_launcher.png", "app/src/main/res/mipmap-hdpi/ic_launcher.png", "app/src/main/res/mipmap-xhdpi/ic_launcher.png", "app/src/main/res/mipmap-xxhdpi/ic_launcher.png", "app/src/main/res/mipmap-xxxhdpi/ic_launcher.png", "app/src/main/ic_launcher-web.png", "app/src/main/ic_launcher-web-round.png"] +precedence = "aggregate" +SPDX-FileCopyrightText = "2026 XeniaCloud" +SPDX-License-Identifier = "AGPL-3.0-or-later" diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6235237224a3..33986f652062 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -112,7 +112,7 @@ android { "TEST_SERVER_PASSWORD" to ncTestServerPassword.toString(), "disableAnalytics" to "true" ) - applicationId = "com.nextcloud.client" + applicationId = "eu.xeniacloud.files" minSdk = 28 targetSdk = 36 compileSdk = 37 @@ -155,29 +155,29 @@ android { productFlavors { // used for f-droid register("generic") { - applicationId = "com.nextcloud.client" + applicationId = "eu.xeniacloud.files" dimension = "default" } register("gplay") { - applicationId = "com.nextcloud.client" + applicationId = "eu.xeniacloud.files" dimension = "default" } register("huawei") { - applicationId = "com.nextcloud.client" + applicationId = "eu.xeniacloud.files" dimension = "default" } register("versionDev") { - applicationId = "com.nextcloud.android.beta" + applicationId = "eu.xeniacloud.files.beta" dimension = "default" versionCode = 20220322 versionName = "20220322" } register("qa") { - applicationId = "com.nextcloud.android.qa" + applicationId = "eu.xeniacloud.files.qa" dimension = "default" versionCode = 1 versionName = "1" diff --git a/app/src/main/ic_launcher-web-round.png b/app/src/main/ic_launcher-web-round.png index dc58ff797add..233e0a6e1e67 100644 Binary files a/app/src/main/ic_launcher-web-round.png and b/app/src/main/ic_launcher-web-round.png differ diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png index 5ece49f5452a..da546b0df28f 100644 Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml index 9d33a9f53b6a..d5e5587ce0b9 100644 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -3,6 +3,7 @@ ~ ~ SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH ~ SPDX-FileCopyrightText: 2020-2024 Tobias Kaminsky + ~ SPDX-FileCopyrightText: 2026 XeniaCloud ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only --> + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 0235efa7e6fb..2c457933111d 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,20 +1,22 @@ + android:viewportWidth="480" + android:viewportHeight="480"> + android:scaleX="1.041667" + android:scaleY="1.041667" + android:translateX="-35.70501" + android:translateY="13.034049"> + android:pathData="m 188,296 c -36,0 -64,-28 -64,-62 0,-34 26,-61 60,-62 6,-40 38,-68 76,-68 38,0 70,28 76,68 34,1 60,28 60,62 0,34 -28,62 -64,62 z" /> diff --git a/app/src/main/res/drawable/nextcloud_splash_logo.xml b/app/src/main/res/drawable/nextcloud_splash_logo.xml index d34ef1204da9..3b0b02e910f0 100644 --- a/app/src/main/res/drawable/nextcloud_splash_logo.xml +++ b/app/src/main/res/drawable/nextcloud_splash_logo.xml @@ -1,8 +1,7 @@ - - + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png index 2e264cebd31d..32a4a1a348f1 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png index e34b6164db13..b36a63eab7ce 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png index ddee9370af8e..ee8e7b4b9d69 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 702614fa7221..92353da317b8 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index d4dbd35854da..1cdd88a845af 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/setup.xml b/app/src/main/res/values/setup.xml index 7df442ab878b..b03ae122d042 100644 --- a/app/src/main/res/values/setup.xml +++ b/app/src/main/res/values/setup.xml @@ -3,6 +3,7 @@ ~ Nextcloud - Android Client ~ ~ SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors + ~ SPDX-FileCopyrightText: 2026 XeniaCloud ~ SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only --> @@ -11,14 +12,14 @@ false - Nextcloud - nextcloud - org.nextcloud - com.nextcloud.android.providers.UsersAndGroupsSearchProvider - com.nextcloud.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH - org.nextcloud.documents - org.nextcloud.files - org.nextcloud.imageCache.provider + Xenia Files + xeniacloud + eu.xeniacloud.files.provider + eu.xeniacloud.files.providers.UsersAndGroupsSearchProvider + eu.xeniacloud.files.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH + eu.xeniacloud.files.documents + eu.xeniacloud.files.fileprovider + eu.xeniacloud.files.imageCache.provider nextcloud.db nextcloud nextcloud @@ -66,9 +67,9 @@ - #0082c9 - #006AA3 - #007cc2 + #002266 + #001233 + #003399 #ffffff #7fC0E3 diff --git a/app/src/qa/res/values/setup.xml b/app/src/qa/res/values/setup.xml index 6dd47627bcb4..b6fbd52c5a6e 100644 --- a/app/src/qa/res/values/setup.xml +++ b/app/src/qa/res/values/setup.xml @@ -12,13 +12,13 @@ Nextcloud QA - nextcloud.qa - org.nextcloud.qa.provider - org.nextcloud.qa.android.providers.UsersAndGroupsSearchProvider - org.nextcloud.qa.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH - org.nextcloud.qa.documents - org.nextcloud.qa.files - org.nextcloud.qa.android.providers.imageCache + xeniacloud.qa + eu.xeniacloud.files.qa.provider + eu.xeniacloud.files.qa.providers.UsersAndGroupsSearchProvider + eu.xeniacloud.files.qa.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH + eu.xeniacloud.files.qa.documents + eu.xeniacloud.files.qa.fileprovider + eu.xeniacloud.files.qa.imageCache.provider Nextcloud QA true diff --git a/app/src/versionDev/res/values/setup.xml b/app/src/versionDev/res/values/setup.xml index 4ae866e6728a..0072e42298ad 100644 --- a/app/src/versionDev/res/values/setup.xml +++ b/app/src/versionDev/res/values/setup.xml @@ -12,13 +12,13 @@ Nextcloud Dev - nextcloud.beta - org.nextcloud.beta.provider - org.nextcloud.beta.android.providers.UsersAndGroupsSearchProvider - org.nextcloud.beta.android.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH - org.nextcloud.beta.documents - org.nextcloud.beta.files - org.nextcloud.beta.android.providers.imageCache + xeniacloud.beta + eu.xeniacloud.files.beta.provider + eu.xeniacloud.files.beta.providers.UsersAndGroupsSearchProvider + eu.xeniacloud.files.beta.providers.UsersAndGroupsSearchProvider.action.SHARE_WITH + eu.xeniacloud.files.beta.documents + eu.xeniacloud.files.beta.fileprovider + eu.xeniacloud.files.beta.imageCache.provider Nextcloud Dev true diff --git a/fastlane/Appfile b/fastlane/Appfile index 64725e1fdeab..dd7ff6b807e8 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,2 +1,2 @@ json_key_file "~/.gradle/Google\ Play\ Android\ Developer-Fastlane.json" -package_name "com.nextcloud.client" +package_name "eu.xeniacloud.files" diff --git a/fastlane/Screengrabfile b/fastlane/Screengrabfile index 33be0a67f946..cc4d52b36a14 100644 --- a/fastlane/Screengrabfile +++ b/fastlane/Screengrabfile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors # SPDX-License-Identifier: AGPL-3.0-or-later OR GPL-2.0-only -app_package_name 'com.nextcloud.client' +app_package_name 'eu.xeniacloud.files' use_tests_in_packages ['com.owncloud.android.screenshots'] test_instrumentation_runner 'androidx.test.runner.AndroidJUnitRunner'