summaryrefslogtreecommitdiff
path: root/src/displayapp
AgeCommit message (Expand)AuthorFilesLines
2021-09-18Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metro...JF0021-1/+1
2021-09-18Fix DisplayAppRecovery : add AlarmController to ctor().Jean-François Milants2-0/+3
2021-09-16resolve conflict in src/systemtask/Messages.hMark Russell8-33/+23
2021-09-16Revert "Merge upstream"Mark Russell8-23/+33
2021-09-16Merge upstreamMark Russell8-33/+23
2021-09-16Fixes per Riksu9000's feedbackMark Russell2-15/+19
2021-09-16Fix unsigned/signed comparison warning in Metronome.cppReinhold Gschweicher1-1/+1
2021-09-13License header fix, add missing bracesMark Russell2-2/+10
2021-09-13Fixes based on code reviews (formatting, UI code)Mark Russell2-52/+92
2021-09-13Fix DisplayAppRecovery : fix include error by forward declaring Controllers i...Jean-François Milants2-13/+20
2021-09-12Merge pull request #602 from Riksu9000/del_unusedJF0023-12/+1
2021-09-12Merge pull request #580 from Riksu9000/timer_battery_readingJF0023-6/+0
2021-09-10Created basic alarm appMark Russell7-2/+277
2021-09-02Update Settings.cppItai Nelken1-2/+2
2021-08-31Fix notifications that wouldn't auto close when the timeout elapsed (in previ...Jean-François Milants1-1/+0
2021-08-30Merge remote-tracking branch 'upstream/develop' into timer_battery_readingRiku Isokoski77-304/+635
2021-08-28Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants6-96/+116
2021-08-28Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0028-17/+432
2021-08-28Merge branch 'develop' into refresh_reworkRiku Isokoski19-98/+66
2021-08-28Merge branch 'develop' into timer_battery_readingRiku Isokoski25-216/+182
2021-08-28Fix recovery firmware since last changes in DisplayApp.Jean-François Milants3-2/+11
2021-08-19Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray1-1/+1
2021-08-19Remove unused variablesRiku Isokoski3-12/+1
2021-08-18Merge branch 'develop' into new_touch_handlerRiku Isokoski15-271/+232
2021-08-18Fix music app buttonsRiku Isokoski1-1/+1
2021-08-15Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray15-270/+232
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 Isokoski14-169/+166
2021-08-15Add check for randomise button in case colors clashKieran Cawthray1-0/+5
2021-08-15Adjust inner padding in applistRiku Isokoski1-1/+1
2021-08-15Clean up using variablesRiku Isokoski1-10/+16
2021-08-15Adjust previously missed scrollbar and firmware validation buttonsRiku Isokoski2-11/+11
2021-08-15Ui updateRiku Isokoski9-107/+99
2021-08-15Add randomise button to color pickerKieran Cawthray2-0/+22
2021-08-14Merge branch 'develop' into timer_battery_readingRiku Isokoski6-154/+118
2021-08-14Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime i...Jean-François Milants5-57/+51
2021-08-14Merge branch 'develop' into refresh_reworkRiku Isokoski3-100/+70
2021-08-14Improve metronomeRiku Isokoski3-99/+69
2021-08-14Make battery reading periodic. Add events. Disable pullupRiku Isokoski3-7/+0
2021-08-12TidyingKieran Cawthray1-1/+0
2021-08-12Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray9-143/+54
2021-08-10Make diff smaller and revert some changes in DisplayAppRiku Isokoski2-57/+61
2021-08-10Merge branch 'develop' into new_touch_handlerRiku Isokoski11-159/+65
2021-08-10Merge branch 'develop' into refresh_reworkRiku Isokoski9-148/+53
2021-08-10Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://...Jean-François Milants1-4/+4
2021-08-10Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, ...Jean-François Milants8-146/+50
2021-08-03Merge branch 'develop' into refresh_reworkRiku Isokoski25-174/+213