oblivion
oblivion copied to clipboard
Add androidTv support
This pull request makes this app compatible with android tv.
Changes:
- Background for actions and switch button
- Android Tv banner
This is great, thank you for contributing. I've had to take over maintenance and I'm not very strong with android app development, so give me some time to have someone review and test the changes. :heart:
Hi, when I tested the changes on mobile, I noticed that the switch in the middle looked different. Is it possible to make the Android TV changes without changing the colours and theme of the app? I'll happily merge this PR if you reduce the changes to just what is needed for Android TV. Thanks :heart:
Hi, you are right. fixed.
Hi, there's conflicts with the current main branch. This will happen if you run the wrong commands with git.
Here's my advice:
In your fork, do a hard reset so that your main
branch matches the main
branch of this repository.
Then, on your own fork, create a separate branch, and apply your changes there. Then commit, then push.
When updating your fork, github has a button for syncing, use that button so that the main
branch on your fork is updated.
Then, in your terminal, you can run git fetch
to fetch new commits, and then on your custom branch you can run git rebase origin/main
.
Hopefully this way you can fast-forward
rebase and then there's no merge commits.
Also, when you want to change your previous commit, you can use git commit --amend
which will apply current staged changes to the previous commit.
If possible, try to make your PR into one commit. Because right now I can't read all these commits and see which changes are correct. Also it's not possible to merge because github says there are conflicts.