Dark theme contribution

[PauPau-Cor]

Change resolving #57 by adding new colors.xml file with dark theme qualifier.

line 157 in SenderRecieverService.kt is giving me an unresolvedReference error at compilation, I didn't make any changes to that part of the code or that icon so I left it as is assuming it's something wrong with my compiler.

[ortex]

hi @PauPau-Cor

Could you please resolve conflicts and rebase on main?

line 157 in SenderRecieverService.kt is giving me an unresolvedReference error at compilation, I didn't make any changes to that part of the code or that icon so I left it as is assuming it's something wrong with my compiler.

Did you try ./gradlew clean build ? 😄

[PauPau-Cor]

./gradlew clean build worked, thank you!
I am still new to github, took me a while to figure out resolving the conflicts and rebasing but I think I got it, sorry for the delay.

[ortex]

I am still new to github, took me a while to figure out resolving the conflicts and rebasing but I think I got it, sorry for the delay.

no worries :)

You merged. Not rebased

easy way to fix it:

1. sync your fork with upstream https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork (just click the button on github UI), I suppose you need discard commits before sync

2. exec git fetch in console

3. go to your local branch dark_theme_contribution

4. rebase your branch on origin/main
   I suppose the easiest way to do it is through android studio:

• open VCS operations -> 7. Branches

• select origin/main branch in Remote Branches, select Rebase 'dark_theme_contribution' onto 'origin/main'

• resolve conflicts

• check that you have only correct changes and force push to origin/dark_theme_contribution

[PauPau-Cor]

Thank you for the tutorial.
I did every step and it said the reabse was successful but there doesn't seem to be any changes on the remote
I think it's because there aren't any changes to the files so it didn't push anything 😕

[ortex]

I did every step and it said the reabse was successful but there doesn't seem to be any changes on the remote

looks like you didn't sync your for.

After proper sync you should see message: This branch is up to date with roc-streaming/roc-droid:main.

like this:

Another way is configure upstream https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/configuring-a-remote-repository-for-a-fork and rebase on upstream/main

[ortex]

And about PR itself :) Looks good, thanks

I guess text color in IP address input should be fixed in dark theme

[gavv]

And about PR itself :) Looks good, thanks

I guess text color in IP address input should be fixed in dark theme

And also tab names