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.

Sign up for GitHub

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

Jump to bottom

Fix Android disabling splash screen Show Image #84491

Merged
merged 1 commit into from Nov 7, 2023
Merged

Fix Android disabling splash screen Show Image #84491

merged 1 commit into from Nov 7, 2023

Conversation

scgm0
Copy link
Contributor

@scgm0 scgm0 commented Nov 5, 2023 •
edited by AThousandShips

@scgm0 scgm0 requested a review from a team as a code owner November 5, 2023 19:39
@AThousandShips
Copy link
Member

Is there an open issue for this? If not please open one

@scgm0
Copy link
Contributor Author

scgm0 commented Nov 5, 2023

Is there an open issue for this? If not please open one这有一个开放的问题吗？如果没有请打开一个

#69316
Sorry, I'm not familiar with github

@AThousandShips AThousandShips added this to the 4.3 milestone Nov 5, 2023
@fire fire changed the title Fix Andorid disabling splash screen Show Image Fix Android disabling splash screen Show Image Nov 5, 2023
m4gr3d
m4gr3d approved these changes Nov 6, 2023
View reviewed changes
Copy link
Contributor

@m4gr3d m4gr3d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks for the fix!

@m4gr3d m4gr3d added the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Nov 6, 2023
@m4gr3d m4gr3d modified the milestones: 4.3, 4.2 Nov 6, 2023
YuriSizov
YuriSizov reviewed Nov 6, 2023
View reviewed changes
platform/android/export/export_plugin.cpp Outdated
if (OS::get_singleton()->is_stdout_verbose()) {
print_error("- unable to load splash image from " + project_splash_path + " (" + itos(err) + ")");
// Setup the splash bg color
bool bg_color_valid;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Needs to be initialized.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though maybe it can even be done without a boolean, using get_setting("application/boot_splash/bg_color", boot_splash_bg_color).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though maybe it can even be done without a boolean, using get_setting("application/boot_splash/bg_color", boot_splash_bg_color).

It was already there, I wasn't sure what it did, I just changed its position

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's okay for now 👍 But we should probably fix it at some point.

@scgm0 scgm0 force-pushed the andorid-no-show-splash-image branch from 45acd69 to 7488b4e Compare November 6, 2023 15:49
@scgm0 scgm0 requested review from a team as code owners November 6, 2023 15:49
@AThousandShips
Copy link
Member

Your rebase went wrong and you have included commits from others you need to restore this

@AThousandShips
Copy link
Member

Please do:

git reset --hard e325567

And then add your fix to the default value with

git commit --amend

And finally

git push --force

@AThousandShips AThousandShips removed request for a team November 6, 2023 15:52
@AThousandShips AThousandShips removed request for a team November 6, 2023 15:52
@scgm0 scgm0 force-pushed the andorid-no-show-splash-image branch from a04dfef to 66ab205 Compare November 6, 2023 15:54
@scgm0
Copy link
Contributor Author

scgm0 commented Nov 6, 2023

Please do:

git reset --hard e325567

And then add your fix to the default value with

git commit --amend

And finally

git push --force

Thanks! I'm so stupid.（

@scgm0 scgm0 force-pushed the andorid-no-show-splash-image branch 2 times, most recently from ecea1fc to 8fda1aa Compare November 6, 2023 15:59
@AThousandShips
Copy link
Member

Can you please squash your commits into one, see here

AThousandShips
AThousandShips approved these changes Nov 6, 2023
View reviewed changes
Copy link
Member

@AThousandShips AThousandShips left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good otherwise, just the comment and squashing :)

@scgm0 scgm0 force-pushed the andorid-no-show-splash-image branch from 8fda1aa to 2899d6e Compare November 6, 2023 16:02
@scgm0
Copy link
Contributor Author

scgm0 commented Nov 6, 2023

Can you please squash your commits into one, see here

Trying, forgive my stupidity (

@AThousandShips
Copy link
Member

Not at all! Git can be a mess to figure out and there are plenty of pitfalls

@scgm0 scgm0 force-pushed the andorid-no-show-splash-image branch from b22a7bc to 7771936 Compare November 6, 2023 16:23
@scgm0
Copy link
Contributor Author

scgm0 commented Nov 6, 2023

Not at all! Git can be a mess to figure out and there are plenty of pitfalls

Should be fine, thanks!

@YuriSizov YuriSizov merged commit 4c5c041 into godotengine:master Nov 7, 2023
15 checks passed
@YuriSizov
Copy link
Contributor

Thanks!

@scgm0 scgm0 deleted the andorid-no-show-splash-image branch November 7, 2023 12:24
@YuriSizov YuriSizov removed the cherrypick:4.1 Considered for cherry-picking into a future 4.1.x release label Jan 23, 2024
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.1.4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuriSizov YuriSizov YuriSizov left review comments

@m4gr3d m4gr3d m4gr3d approved these changes

@AThousandShips AThousandShips AThousandShips approved these changes

Assignees
No one assigned
Labels
bug platform:android topic:porting
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.

Disabling splash screen Show Image project setting has no effect on Android
4 participants
@scgm0 @AThousandShips @YuriSizov @m4gr3d