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

remove actionbar in PlayerActivity and add exit button to menu #88

Closed
wants to merge 0 commits into from

Conversation

yakagami
Copy link
Contributor

...now in Kotlin ;) (previously #66)

@yakagami yakagami changed the title Add "toggle ActionBar" to menu in PlayerActivity remove actionbar in PlayerActivity and add exit button to menu Mar 20, 2024
true
if (item.itemId == resourceIdExit) {
finish()
true
Copy link
Member

Choose a reason for hiding this comment

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

I guess the true can be kept out of the branch, as it's the same in both arms.

@@ -123,9 +123,16 @@ class PlayerActivity : GameActivity() {
item.setChecked(true)
}
}
val resourceIdExit: Int = items.size + 1
Copy link
Member

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm not sure what to call it

Copy link
Member

Choose a reason for hiding this comment

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

Perhaps item?

@torokati44
Copy link
Member

I can fix up these minor nits, and rebase/squash your commits before merging, if you don't mind.
It's your main branch, but you did leave the "Allow edits by maintainers" box checked after all...

@yakagami
Copy link
Contributor Author

@torokati44 Yes, please make any changes you think are good!

@torokati44
Copy link
Member

Turns out, your main branch is protected, just like in the main repo, so I wasn't able to force-push to it.
And I accidentally closed this by fumbling around with the git CLI, sorry about that! ._.

@torokati44
Copy link
Member

BTW in the future, it would be better to make a dedicated branch for PRs, so this is avoided. :)

@torokati44
Copy link
Member

Turns out, your main branch is protected, just like in the main repo, so I wasn't able to force-push to it.

Okay, just to be precise, I was able to force-push to it, once. I intended to push my local yakagami-main branch onto your main branch. But the command I used for this doesn't work that way. So instead I pushed my own main branch onto it, thereby making this PR empty, and closing it. And after this, the branch protection was no longer being overridden by the PR being open, so I was no longer able to force-push to it. 😅

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.

3 participants