Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved splash screen setup strings to avoid merge issue during build process #11731

Merged
merged 1 commit into from
Jun 12, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/res/values/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

<!-- App name and other strings-->
<string name="app_name">Nextcloud</string>
<string name="splashScreenBold"></string>
<string name="splashScreenNormal"></string>
<string name="account_type">nextcloud</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</string> <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
<string name="users_and_groups_search_authority">com.nextcloud.android.providers.UsersAndGroupsSearchProvider</string>
Expand Down Expand Up @@ -118,6 +116,10 @@
<!-- Push server url -->
<string name="push_server_url" translatable="false"></string>

<!-- if contains values, will be used to show branding title below app icon in splash screen -->
<string name="splashScreenBold"></string>
<string name="splashScreenNormal"></string>

<!-- Dev settings -->
<string name="dev_link">https://download.nextcloud.com/android/dev/nextcloud-dev-</string>
<string name="dev_latest">https://download.nextcloud.com/android/dev/latest</string>
Expand Down
Loading