aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/settings
Commit message (Expand)AuthorAgeFilesLines
* resolves conflictsSteveAmor2022-01-0215-490/+75
|\
| * Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-097-105/+65
| |\
| | * Organize includesRiku Isokoski2021-12-093-6/+9
| | * Move radio button styling to a single placeRiku Isokoski2021-12-093-18/+6
| | * Optimize arraysRiku Isokoski2021-12-096-9/+15
| | * Fix too small arrayRiku Isokoski2021-12-091-1/+1
| | * Style checkboxes as radio buttonsRiku Isokoski2021-12-096-99/+63
| | * Added autodetection for clang-format versionAvamander2021-12-041-8/+7
| * | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-0510-11/+9
| |\|
| | * QuickSettings: remove unused importsReinhold Gschweicher2021-12-021-2/+0
| | * Update includes to to be relative to src directoryReinhold Gschweicher2021-11-1510-10/+10
| * | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-231-1/+1
| |\|
| * | Restore settings orderKieran Cawthray2021-10-201-2/+2
| * | Fix settings merge errorKieran Cawthray2021-10-181-2/+5
| * | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-185-0/+438
| |\ \
| * | | Remove old PineTimeStyle settings appKieran Cawthray2021-10-033-392/+3
* | | | resolves conflictsSteveAmor2022-01-022-2/+2
* | | | Chimes optionSteveAmor2021-11-073-1/+116
| |_|/ |/| |
* | | Flashlight brightness controlRiku Isokoski2021-10-131-1/+1
| |/ |/|
* | Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nu...Jean-François Milants2021-10-104-85/+61
* | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-105-5/+455
|\ \ | |/ |/|
| * Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-086-51/+40
| |\
| * | Code optimizations in SettingSetDate and SettingSetTimeTim Taenny2021-07-092-13/+7
| * | Code optimizations in SettingSetTimeTim Taenny2021-07-091-9/+17
| * | Modified Settings menu as per suggestionTim Taenny2021-07-091-4/+4
| * | Code optimizations in SettingSetDateTim Taenny2021-07-091-41/+2
| * | Code optimizations in SettingSetTimeTim Taenny2021-07-091-24/+10
| * | Code optimizations in SettingSetDateTim Taenny2021-07-091-28/+12
| * | Added new menu entries to Settings pagetimaios2021-07-092-3/+17
| * | Added new screen: SettingSetDatetimaios2021-07-092-0/+317
| * | Added new screen: SettingSetTimetimaios2021-07-092-0/+212
* | | Toggle notifications only, keep vibrations.Riku Isokoski2021-09-121-3/+3
* | | Update Settings.cppItai Nelken2021-09-021-2/+2
* | | Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2021-08-282-86/+73
* | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-284-3/+406
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-152-26/+31
| |\ \ \
| * | | | 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 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
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-121-3/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | 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