aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/settings
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-152-26/+31
|\
| * Clean up using variablesRiku Isokoski2021-08-151-10/+16
| * Ui updateRiku Isokoski2021-08-152-25/+24
| * ImprovementsRiku Isokoski2021-08-011-1/+1
| * Merge branch 'develop' into HEADRiku Isokoski2021-08-018-59/+56
| |\
| * | cleaned up the code and reduced the size of the diff by removing things like ...Florian Kraupa2021-05-161-1/+1
| * | implemented continuous vibration pattern for incoming callsFlorian Kraupa2021-05-161-1/+1
* | | 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
* | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-285-18/+6
|\ \ \ | | |/ | |/|
| * | Add new unique icons for some appsRiku Isokoski2021-07-253-5/+5
| * | Code cleanup (#466)Riku Isokoski2021-07-252-6/+1
| * | Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime in...Jean-François Milants2021-07-241-8/+1
| |\ \
| | * \ Merge branch 'develop' into fix_touchevent_tapRiku Isokoski2021-07-145-9/+17
| | |\ \
| | * | | Fix touchevent tapRiku Isokoski2021-06-111-8/+1
| | | |/ | | |/|
* | | | 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-203-33/+34
|\| | |
| * | | Multiple wakeup sources (#290)Kozova12021-07-142-32/+33
| | |/ | |/|
| * | LVGL use system tickRiku Isokoski2021-07-071-1/+1
* | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-121-3/+3
|\| |
| * | Fixed a bunch of format specifiersAvamander2021-07-021-3/+3
| * | Add PineTimeStyle watchface (#334)kieranc2021-06-291-0/+9
* | | Add reset button, reduce button opacityKieran Cawthray2021-06-272-12/+37
* | | 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-251-4/+4
* | | Move array to member variable, retrieve colors from settings for displayKieran Cawthray2021-06-252-13/+10
* | | 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-244-1/+377
* | | Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-163-5/+4
|\| |
| * | Minor improvements: use std::make_unique when creating unique_ptr, check the ...Jean-François Milants2021-06-102-3/+2
| * | Initialize SystemTask, DisplayApp and HeartRateTask as global static variable...Jean-François Milants2021-06-061-2/+2
| |/
* | Remove newline modificationsKieran Cawthray2021-05-191-1/+1
* | Fix it again..Kieran Cawthray2021-05-181-1/+10
* | Revert "Reset"Kieran Cawthray2021-05-185-18/+135
* | ResetKieran Cawthray2021-05-185-135/+18
|/
* Merge pull request #298 from joaquimorg/StepsAppJF0022021-05-153-7/+133
|\
| * Merge branch 'develop' ofJoaquim2021-04-2612-280/+251
| |\
| * | Fix button size and default step goalJoaquim2021-04-201-11/+7
| * | New Steps appJoaquim2021-04-193-1/+135
* | | short vibration when enabling itpetter2021-05-022-0/+6
| |/ |/|
* | Changed access modified indentationAvamander2021-04-246-12/+12
* | Reformatted all the files according to clang-format styleAvamander2021-04-2412-276/+251
|/
* array in SettingWakeUp wrong sizeJoaquim José Almeida Pereira2021-04-051-1/+1
* Big UI and navigation RewriteJoaquim2021-04-0412-0/+853