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

More colours ✨ #11

Merged
merged 4 commits into from Sep 27, 2014
Merged

More colours ✨ #11

merged 4 commits into from Sep 27, 2014

Conversation

SimonMarquis
Copy link
Contributor

….html).

Split user defined colors and default colors.
Ordered color list (user defined colors first).
Colours are validated by Color.parseColor(String) and therefore more flexible
FloatLabelLayout from @chrisbanes (https://gist.github.com/chrisbanes/11247418)
<item>@string/green</item>
<item>@string/yellow</item>
<item>@string/red</item>
<item>@string/red</item>
Copy link
Owner

Choose a reason for hiding this comment

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

Is red meant to be here twice? When I run the app I only see it once

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was a mistake.

@emmaguy
Copy link
Owner

emmaguy commented Sep 27, 2014

Looks great - thanks very much :) 👍

emmaguy added a commit that referenced this pull request Sep 27, 2014
@emmaguy emmaguy merged commit 4c0ae91 into emmaguy:master Sep 27, 2014
emmaguy added a commit that referenced this pull request Sep 28, 2014
…ours are set in colourprefs if there's nothing saved, otherwise behave as any other user added colour as there were some issues - users could not delete default colours, app was crashing when trying to delete default colour, were also duplicates of black/white when upgrading from older version. Also slightly improved dialog to only enable the add button when both name and valid colour have been set
emmaguy added a commit that referenced this pull request Sep 28, 2014
…ours are set in colourprefs if there's nothing saved, otherwise behave as any other user added colour as there were some issues - users could not delete default colours, app was crashing when trying to delete default colour, were also duplicates of black/white when upgrading from older version. Also slightly improved dialog to only enable the add button when both name and valid colour have been set
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants