summaryrefslogtreecommitdiff
path: root/src/displayapp/screens/settings
AgeCommit message (Expand)AuthorFilesLines
2021-09-16Merge upstreamMark Russell1-2/+2
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2-86/+73
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0024-3/+406
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski2-4/+4
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski2-26/+31
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2-26/+31
2021-08-15Fix potential edge case of sidebar being set blackKieran Cawthray1-1/+1
2021-08-15More tidying following reviewKieran Cawthray1-85/+88
2021-08-15Avoid setting the sidebar blackKieran Cawthray1-0/+4
2021-08-15Remove duplicate code, minor fixesKieran Cawthray1-33/+19
2021-08-15Merge branch 'develop' into refresh_reworkRiku Isokoski2-26/+31
2021-08-15Add check for randomise button in case colors clashKieran Cawthray1-0/+5
2021-08-15Clean up using variablesRiku Isokoski1-10/+16
2021-08-15Ui updateRiku Isokoski2-25/+24
2021-08-15Add randomise button to color pickerKieran Cawthray2-0/+22
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski5-17/+5
2021-08-01ImprovementsRiku Isokoski1-1/+1
2021-08-01Merge branch 'develop' into HEADRiku Isokoski8-59/+56
2021-07-28Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray5-18/+6
2021-07-25Merge branch 'develop' into new_touch_handlerRiku Isokoski4-6/+6
2021-07-25Add new unique icons for some appsRiku Isokoski3-5/+5
2021-07-25Code cleanup (#466)Riku Isokoski2-6/+1
2021-07-24Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime in...Jean-François Milants1-8/+1
2021-07-24Add extra screen in settings to show scrollbar correctlyKieran Cawthray1-3/+3
2021-07-20Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray3-33/+34
2021-07-19Refresh reworkRiku Isokoski14-57/+14
2021-07-16Fix gesturesRiku Isokoski2-12/+0
2021-07-15New touch handler, with issuesRiku Isokoski2-5/+5
2021-07-14Multiple wakeup sources (#290)Kozova12-32/+33
2021-07-14Merge branch 'develop' into fix_touchevent_tapRiku Isokoski5-9/+17
2021-07-12Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-3/+3
2021-07-07LVGL use system tickRiku Isokoski1-1/+1
2021-07-02Fixed a bunch of format specifiersAvamander1-3/+3
2021-06-29Add PineTimeStyle watchface (#334)kieranc1-0/+9
2021-06-27Add reset button, reduce button opacityKieran Cawthray2-12/+37
2021-06-25Make it loop around when you get to the end of the list of colorsKieran Cawthray1-0/+28
2021-06-25Fix off-by-one error, reduce step gauge needle widthKieran Cawthray1-4/+4
2021-06-25Move array to member variable, retrieve colors from settings for displayKieran Cawthray2-13/+10
2021-06-24PineTimeStyle color picker tidyingKieran Cawthray2-56/+5
2021-06-24PineTimeStyle color picker add settings integrationKieran Cawthray1-45/+53
2021-06-24PineTimeStyle color picker initial commitKieran Cawthray4-1/+377
2021-06-16Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray3-5/+4
2021-06-11Fix touchevent tapRiku Isokoski1-8/+1
2021-06-10Minor improvements: use std::make_unique when creating unique_ptr, check the ...Jean-François Milants2-3/+2
2021-06-06Initialize SystemTask, DisplayApp and HeartRateTask as global static variable...Jean-François Milants1-2/+2
2021-05-19Remove newline modificationsKieran Cawthray1-1/+1
2021-05-18Fix it again..Kieran Cawthray1-1/+10
2021-05-18Revert "Reset"Kieran Cawthray5-18/+135
2021-05-18ResetKieran Cawthray5-135/+18
2021-05-16cleaned up the code and reduced the size of the diff by removing things like ...Florian Kraupa1-1/+1