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

Added background Color change functionality #14

Merged
merged 3 commits into from Nov 5, 2022

Conversation

Arsh-78
Copy link
Contributor

@Arsh-78 Arsh-78 commented Oct 24, 2022

Added the Change bacground functionality via following changes

  • Added the ColorPicker Dependency for Color wheel
  • Modified the main activity layout to contain both the canvas and a button to change the background color
  • demo :
    (Note due to some software glitch the wheel appears distorted in gif but is actually working finr attached a screenshot for correspondence)

gif:
ChangeBgColor

wheel actual view :
one

@anshul-kr1
Copy link
Collaborator

Hey, I'm getting merge conflicts in all 3 files, Can you check it once ? I'm unable to resolve on my own.

…gcolorfix

� Conflicts:
�	app/src/main/java/com/example/android/paintme/MainActivity.kt
�	app/src/main/java/com/example/android/paintme/MyCanvasView.kt
�	app/src/main/res/layout/activity_main.xml
@Arsh-78
Copy link
Contributor Author

Arsh-78 commented Oct 31, 2022

Hey, I'm getting merge conflicts in all 3 files, Can you check it once ? I'm unable to resolve on my own.

@anshul-kr1 can you please try now

@Arsh-78
Copy link
Contributor Author

Arsh-78 commented Oct 31, 2022 via email

@Arsh-78
Copy link
Contributor Author

Arsh-78 commented Nov 4, 2022

can you please confirm the status @anshul-kr1

@anshul-kr1
Copy link
Collaborator

@Arsh-78 Well done. Your PR is merged. Thanks for contributing!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants