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

Android restructure to allow rotation and game running in background #532

Merged
merged 253 commits into from May 17, 2017

Conversation

@tom-pratt
Copy link
Member

tom-pratt commented Jan 9, 2017

Most of the UI has been replaced, a MainActivity shows pre game menus. GameActivity shows loading and gameplay. Game objects are held in an Android service called GameService to allow game to run in background. The jsettlers.graphics.androidui module still contains some unused files and there is general tidying up to be done when more detail is implemented.

tom-pratt added 30 commits May 27, 2016
…ities are alldestroyed but game service continues
@andreas-eberle
Copy link
Member

andreas-eberle commented Apr 30, 2017

@tom-pratt: Can you join the Discord, so I can ask you some questions to better understand the code? https://discord.gg/6gXQ6

…ties and use AndroidAnnotations in SettingsActivity.
@tom-pratt
Copy link
Member Author

tom-pratt commented May 2, 2017

Yeah sure, can you send a new link. This one expired before i saw it

@andreas-eberle
Copy link
Member

andreas-eberle commented May 2, 2017

@andreas-eberle
Copy link
Member

andreas-eberle commented May 17, 2017

I think this is good to go into master now. @tom-pratt: Can you test everything again to see if I broke something with the whole AndroidAnnotations refactoring?

@tom-pratt
Copy link
Member Author

tom-pratt commented May 17, 2017

Just ran it on my phone and everything seems to be working as far as I can tell 👍

@andreas-eberle
Copy link
Member

andreas-eberle commented May 17, 2017

Great, so I'll merge it as soon as Travis is done! Thanks @tom-pratt for all your work! I'm looking forward to your next PRs ;)

@andreas-eberle andreas-eberle merged commit 838730d into jsettlers:master May 17, 2017
1 check passed
1 check passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@tom-pratt tom-pratt deleted the tom-pratt:android_restructure_and_gameservice branch May 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.