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

Conversation

surinder-tsys
Copy link
Collaborator

During the merging build process the app_name and other setup strings gets duplicated as the placement of splashScreenBold strings are right after the app_name.

Screenshot 2023-06-12 195223
setup.xml output

So to avoid this issue we have to place the text somewhere bottom.

  • Tests written, or not not needed

@AndyScherzinger AndyScherzinger merged commit 5a25b43 into master Jun 12, 2023
13 of 18 checks passed
@delete-merged-branch delete-merged-branch bot deleted the nmc/splashTextMergeFix branch June 12, 2023 14:37
@AndyScherzinger
Copy link
Member

Sounds good, merged @surinder-tsys 👍

@AndyScherzinger AndyScherzinger added this to the Nextcloud App 3.26.0 milestone Jun 12, 2023
@surinder-tsys
Copy link
Collaborator Author

Wow...That's fast. Thank you.

@AndyScherzinger
Copy link
Member

AndyScherzinger commented Jun 12, 2023

Well, you just moved to items within the file, so that doesn't change any behavior and I just saw it and took a look and merged 😊

@github-actions
Copy link

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/11731.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud app.

@github-actions
Copy link

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants