aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 378fa6b4016b65e2d7b128fdc3ce89c4ca779a4d.
| * | | | | | | | | | | | | | | | | | | PineTimeStyleKieran Cawthray2021-05-183-0/+1638
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | ResetKieran Cawthray2021-05-1822-591/+76
| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-2819-98/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix recovery firmware since last changes in DisplayApp.Jean-François Milants2021-08-283-2/+11
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-08-1815-269/+230
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix music app buttonsRiku Isokoski2021-08-181-1/+1
| | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make diff smaller and revert some changes in DisplayAppRiku Isokoski2021-08-102-57/+61
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-08-1011-159/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-2520-127/+176
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-07-233-8/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Restore Tile.cpp changesRiku Isokoski2021-07-192-4/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix remaining known issuesRiku Isokoski2021-07-162-2/+5
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix gesturesRiku Isokoski2021-07-162-12/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix touch wakeup and code cleanupRiku Isokoski2021-07-161-21/+0
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fix most issuesRiku Isokoski2021-07-168-23/+6
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | New touch handler, with issuesRiku Isokoski2021-07-1515-98/+91
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-1514-167/+164
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Adjust inner padding in applistRiku Isokoski2021-08-151-1/+1
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Clean up using variablesRiku Isokoski2021-08-151-10/+16
| | | | | | | | | | | | | | | | | | |