aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski2021-08-3077-304/+635
|\
| * Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2021-08-286-96/+116
| * Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-288-17/+432
| |\
| | * Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-191-1/+1
| | |\
| | * \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-1515-268/+230
| | |\ \
| | * | | Fix potential edge case of sidebar being set blackKieran Cawthray2021-08-151-1/+1
| | * | | More tidying following reviewKieran Cawthray2021-08-151-85/+88
| | * | | Avoid setting the sidebar blackKieran Cawthray2021-08-151-0/+4
| | * | | Remove duplicate code, minor fixesKieran Cawthray2021-08-151-33/+19
| | * | | Add check for randomise button in case colors clashKieran Cawthray2021-08-151-0/+5
| | * | | Add randomise button to color pickerKieran Cawthray2021-08-152-0/+22
| | * | | TidyingKieran Cawthray2021-08-121-1/+0
| | * | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-129-143/+54
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2825-182/+221
| | |\ \ \ \
| | * | | | | Increment settings value, remove old hacky fixKieran Cawthray2021-07-251-20/+8
| | * | | | | Add extra screen in settings to show scrollbar correctlyKieran Cawthray2021-07-241-3/+3
| | * | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-233-9/+40
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-2015-105/+73
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-1220-390/+264
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix bad mergeKieran Cawthray2021-06-291-27/+0
| | * | | | | | | | Replace font fileKieran Cawthray2021-06-291-0/+0
| | * | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-06-293-4/+52
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add reset button, reduce button opacityKieran Cawthray2021-06-272-12/+37
| | * | | | | | | | | Fix the fix, whoopsKieran Cawthray2021-06-251-7/+7
| | * | | | | | | | | Add a check to set default colors if all colors are whiteKieran Cawthray2021-06-251-0/+7
| | * | | | | | | | | Make it loop around when you get to the end of the list of colorsKieran Cawthray2021-06-251-0/+28
| | * | | | | | | | | Fix off-by-one error, reduce step gauge needle widthKieran Cawthray2021-06-252-5/+5
| | * | | | | | | | | Use colors from settings for PineTimeStyle watchfaceKieran Cawthray2021-06-252-5/+10
| | * | | | | | | | | Move array to member variable, retrieve colors from settings for displayKieran Cawthray2021-06-252-13/+10
| | * | | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-06-256-198/+211
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | PineTimeStyle color picker tidyingKieran Cawthray2021-06-242-56/+5
| | * | | | | | | | | | PineTimeStyle color picker add settings integrationKieran Cawthray2021-06-241-45/+53
| | * | | | | | | | | | PineTimeStyle color picker initial commitKieran Cawthray2021-06-246-2/+384
| | * | | | | | | | | | Move static needle_colors array to member variableKieran Cawthray2021-06-232-1/+1
| | * | | | | | | | | | Add font source fileKieran Cawthray2021-06-221-0/+0
| | * | | | | | | | | | Set step gauge outer to be white when step goal is reachedKieran Cawthray2021-06-211-2/+6
| | * | | | | | | | | | Enable 12/24h functionalityKieran Cawthray2021-06-202-1/+30
| | * | | | | | | | | | Add step count gauge - replaces heartrate in sidebarKieran Cawthray2021-06-203-29/+36
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-203-8/+25
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-1623-93/+365
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-044-122/+122
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-05-2113-24/+269
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Move GPL license headerKieran Cawthray2021-05-191-16/+15
| | * | | | | | | | | | | | | | Remove newline modificationsKieran Cawthray2021-05-193-3/+3
| | * | | | | | | | | | | | | | Tidying/formatting fixesKieran Cawthray2021-05-191-13/+23
| | * | | | | | | | | | | | | | Fix it again..Kieran Cawthray2021-05-183-3/+27
| | * | | | | | | | | | | | | | Revert "Reset"Kieran Cawthray2021-05-1822-76/+591
| | * | | | | | | | | | | | | | PineTimeStyleKieran Cawthray2021-05-183-0/+1638
| | * | | | | | | | | | | | | | ResetKieran Cawthray2021-05-1822-591/+76
| * | | | | | | | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-2819-98/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \