Merge pull request #11354 from nextcloud/chore/differentiate-dev-version

Fix F-Droid metadata to differentiate dev version more

app/src/versionDev/res/values/setup.xml

@@ -5,7 +5,7 @@
     <bool name="dev_version_direct_download_enabled">false</bool>
 
     <!-- App name  and other strings-->
-    <string name="app_name">Nextcloud dev</string>
+    <string name="app_name">Nextcloud Dev</string>
     <string name="account_type">nextcloud.beta</string>     <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.nextcloud.beta.provider</string>    <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="users_and_groups_search_authority">org.nextcloud.beta.android.providers.UsersAndGroupsSearchProvider</string>
@@ -13,7 +13,7 @@
     <string name="document_provider_authority">org.nextcloud.beta.documents</string>
     <string name="file_provider_authority">org.nextcloud.beta.files</string>
     <string name="image_cache_provider_authority">org.nextcloud.beta.android.providers.imageCache</string>
-    <string name="default_display_name_for_root_folder">Nextcloud dev</string>
+    <string name="default_display_name_for_root_folder">Nextcloud Dev</string>
     
     <bool name="logger_enabled">true</bool>
     <string name="dev_changelog">https://github.com/nextcloud/android/commits/master</string>

scripts/buildDev

@@ -74,7 +74,7 @@ if git log --pretty='format:%an' HEAD "^$lastBuildTag" | grep -q dependabot; the
 fi
 
 # changelog
-echo "$changelog" > app/src/versionDev/fastlane/metadata/android/en-US/changelogs/$date.txt
+echo "$changelog" > src/versionDev/fastlane/metadata/android/en-US/changelogs/$date.txt
 
 git add .
 git commit -m "daily dev $date" -m "$changelog"

scripts/metadata/generate_metadata.py

@@ -11,8 +11,8 @@ import shutil
 from xml.etree import ElementTree
 
 XML_PATH = '../../app/src/main/res'
-METADATA_PATH = '../../app/src/generic/fastlane/metadata/android/'
-METADATA_DEV_PATH = '../../app/src/versionDev/fastlane/metadata/android/'
+METADATA_PATH = '../../src/generic/fastlane/metadata/android/'
+METADATA_DEV_PATH = '../../src/versionDev/fastlane/metadata/android/'
 DEFAULT_LANG = 'en-US'
 LANG_MAP = {
     'values': 'en-US',

src/README.md

@@ -0,0 +1,2 @@
+This `src/` directory is only here for F-Droid, as it doesn't pick up per-flavor metadata in the app/ subdir.
+Tracking issue: https://gitlab.com/fdroid/fdroidserver/-/issues/829