aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens
Commit message (Collapse)AuthorAgeFilesLines
* Updated to include WatchFaceAnalog and fixed clashesNiall Cooling2021-03-2216-307/+1124
|\
| * Merged upstreampanky-codes2021-03-2013-303/+819
| |\
| | * Merge pull request #237 from muesli/systeminfo-urlJF0022021-03-201-1/+1
| | |\ | | | | | | | | Update project URL in SystemInfo
| | | * Update project URL in SystemInfoChristian Muehlhaeuser2021-03-161-1/+1
| |_|/ |/| | | | | | | | Pinetime -> InfiniTime
| | * fix AM/PMJoaquim José Almeida Pereira2021-03-081-5/+15
| | |
| | * Update from JF comments to PRJoaquim2021-03-064-31/+6
| | |
| | * Merge from upstreamJoaquim2021-03-061-1/+2
| | |
| | * Multi face support, analog clock, 12/24 configJoaquim2021-02-2413-300/+830
| | |
| * | Reworked based on PR comments.panky-codes2021-03-203-38/+37
| | |
| * | Removed unused variables. Tested.panky-codes2021-03-152-8/+7
| | |
| * | Increased the size of the button and realigned the layout a bit. Tested.panky-codes2021-03-131-5/+7
| | |
| * | Added some comments for clarity. Ready for review. Tested.panky-codes2021-03-132-3/+15
| | |
| * | Stopwatch completed. Ready for PRpanky-codes2021-03-133-15/+8
| | |
| * | Adding laps completed.panky-codes2021-03-132-6/+17
| | |
| * | Laps introduced. Tested. Need to change the icon.panky-codes2021-03-122-6/+70
| | |
| * | Added a button for stop lap. Logic works. Need to implement symbol and ↵panky-codes2021-03-122-9/+58
| | | | | | | | | | | | buffer for lap
| * | Added play/pause button.panky-codes2021-03-112-9/+55
| | |
| * | Changed the clock source. Stopwatch works. Need to add butttons.panky-codes2021-03-112-12/+29
| | |
| * | Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watchpanky-codes2021-03-112-39/+39
| |\ \ | |/ / |/| |
| * | Basic logic done. Need to change the timer source to get ms. Also need to ↵panky-codes2021-03-113-1/+108
| |/ | | | | | | replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
* / Moved private statics into unnamed namespace in cpp file to reduce coupling ↵Niall Cooling2021-03-032-39/+39
|/ | | | and uncessar in header
* Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵Jean-François Milants2021-02-2322-438/+171
|\ | | | | | | | | | | | | | | | | | | | | | | joaquimorg-LVGL7 # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.cpp # src/displayapp/screens/Modal.cpp # src/displayapp/screens/Modal.h # src/displayapp/screens/Notifications.cpp # src/displayapp/screens/Tile.h
| * CleanupJoaquim2021-02-017-224/+10
| |
| * LVGL v7.10.0Joaquim2021-01-2819-225/+206
| |
* | Merge pull request #205 from nscooling/dirtyRefactorJF0022021-02-141-13/+13
|\ \ | | | | | | refactored class DirtyValue
| * | refactored class DirtyValueNiall Cooling2021-02-121-13/+13
| |/
* | Merge pull request #186 from petterhs/musicUIJF0022021-02-141-7/+8
|\ \ | | | | | | music: Symbols for the buttons
| * | improve music UI with icons for play/pause/next/prev/ and volumepetter2021-01-271-7/+8
| | |
| * | update font with icons for music, call and qrpetter2021-01-271-0/+10
| |/
* | Fix merge conflict.Jean-François Milants2021-02-141-3/+6
|\ \
| * | add vibration togglepetter2021-02-071-0/+4
| | |
| * | trigger vibration from systemtaskpetter2021-02-052-10/+3
| | |
| * | create motorcontroller in main and pass by referencepetter2021-01-252-5/+12
| | |
| * | Merge branch 'develop' into upstream-devThe King2021-01-2410-15/+543
| |\|
| * | add motor to notifs, fix tabs in motorcontroller.hjlukanc2021-01-152-0/+6
| | |
* | | add mute button and functionality for call notification + new button iconspetter2021-01-272-5/+31
| | |
* | | update font with icons for music, call and qrpetter2021-01-271-0/+10
| | |
* | | Revert invalid changes in Navigation.h and add missing changes in ↵Jean-François Milants2021-01-242-3/+8
| | | | | | | | | | | | Notifications.h.
* | | Handle call notification the same way than other notifications.Jean-François Milants2021-01-245-38/+144
| | | | | | | | | | | | Display the call notifications in the Notification app, with buttons to accept/reject the call.
* | | Add incoming call functionalityRasmus Schenstrom2021-01-212-12/+49
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Add categories to AlertNotification Add new alert notification screens bases Add Incoming Call Add Modal Add event to AlertNotification Co-authored-by: Robin Karlsson <robin.karlsson@protonmail.com>
* | Merge pull request #168 from Panky-codes/fix-erratic-batteryJF0022021-01-203-7/+7
|\ \ | | | | | | Fix erratic battery
| * | Converted all the other float usage to int.panky-codes2021-01-163-7/+7
| | |
| * | Converted percent remaining calc to int.panky-codes2021-01-161-2/+1
| | |
| * | Adjusted the firmware to display percent instead of gfx.panky-codes2021-01-161-1/+2
| |/
* | Merge branch piggz/nav into develop:Jean-François Milants2021-01-204-1/+360
| | | | | | | | | | - fix conflict - add a icon for the navigation app.
* | HR Sensor : Add start/stop button to the HeartRate app (the HR sensors stays ↵Jean-François Milants2021-01-174-17/+72
| | | | | | | | ON when the app is closed), display the HR value on the Clock app.
* | First implementation of the HR sensor using 100% foss code (ported from waspos)Jean-François Milants2021-01-103-1/+115
|/
* Merge pull request #154 from jedmijares/twos-gameJF0022021-01-033-1/+306
|\ | | | | Adds 2048 clone game
| * adds 2048 clone gameJed2021-01-023-1/+306
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | styles table reads touch events allows moving tiles allows merging tiles improves tile movement allows merging tiles adds score display implements color edit comments adjust game logic disallows double merges
* | Rename Pinetime in InfiniTime in sysinfo app.Jean-François Milants2021-01-021-1/+1
| |