aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'restructure_includes' of ↵Jean-François Milants2021-11-2886-174/+177
|\ | | | | | | | | | | | | | | https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes # Conflicts: # doc/contribute.md # src/displayapp/screens/BatteryInfo.h
| * Move up file header include to topReinhold Gschweicher2021-11-154-4/+4
| |
| * remove unused libs/ prefix from lvgl includes as not neededReinhold Gschweicher2021-11-155-9/+9
| |
| * Add missing standard includesReinhold Gschweicher2021-11-153-0/+3
| |
| * Update includes to to be relative to src directoryReinhold Gschweicher2021-11-1583-165/+165
| | | | | | | | | | | | | | Don't use relative imports like `../foo.h` as those depend on the relative position of both files. Rather than that use imports relative to the `src` directory, which explicitly is part of the include directories.
* | Merge pull request #820 from Riksu9000/fix-anim-dirJF2021-11-281-1/+7
|\ \ | | | | | | Fix animation when long pressing on screens adjacent to watch face
| * | Fix animation when long pressing on screens adjacent to watch faceRiku Isokoski2021-11-101-1/+7
| | |
* | | BatteryInfo: remove unused FreeRTOS.h and timer.h includesReinhold Gschweicher2021-11-151-2/+0
| |/ |/|
* | Fix Alarm app crashing on buttonpressRiku Isokoski2021-11-091-1/+3
|/
* Merge pull request #782 from Riksu9000/newer_buttonhandlerJF2021-11-062-0/+17
|\ | | | | Newer ButtonHandler
| * Newer buttonhandlerRiku Isokoski2021-10-252-0/+17
| |
* | Merge pull request #792 from Riksu9000/memory_savingJF2021-11-062-17/+21
|\ \ | | | | | | Memory savings by replacing strings
| * | Memory savings by replacing stringsRiku Isokoski2021-10-292-17/+21
| |/
* | Merge pull request #791 from evergreen22/recovery-bootJF2021-10-311-1/+1
|\ \ | |/ |/| Fix recovery firmware build
| * Fix recovery firmware buildJames A. Jerkins2021-10-281-1/+1
| |
* | Merge pull request #740 from Riksu9000/flashlight_brightnessJF2021-10-234-32/+102
|\ \ | |/ |/| Flashlight brightness control
| * Flashlight brightness controlRiku Isokoski2021-10-134-32/+102
| |
* | Merge pull request #746 from Quantum-cross/recovery-fixJF2021-10-161-0/+2
|\ \ | | | | | | fix building of Recovery image
| * | fix building of Recovery image.Quantum-cross2021-10-141-0/+2
| | |
* | | Merge pull request #507 from Riksu9000/fit_more_tasksJF2021-10-161-5/+8
|\ \ \ | | | | | | | | Fit more tasks in SystemInfo
| * \ \ Merge branch 'develop' into fit_more_tasksRiku Isokoski2021-08-2835-524/+360
| |\ \ \
| * \ \ \ Merge branch 'develop' into fit_more_tasksRiku Isokoski2021-07-2525-181/+249
| |\ \ \ \
| * | | | | FixRiku Isokoski2021-07-211-2/+1
| | | | | |
| * | | | | Fit more tasks in SystemInfoRiku Isokoski2021-07-211-4/+8
| | | | | |
* | | | | | Merge pull request #655 from NeroBurner/paddle_hor_fixJF2021-10-161-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Paddle: compare ballX coordinate with horizontal resolution
| * | | | | | Paddle: compare ballX coordinate with horizontal resolutionReinhold Gschweicher2021-10-111-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the comment as the comparison checks if the ball is at the right side of the screen. Compare the x coordinate of the ball with the horizontal resolution of the screen, instead of the vertical resolution. On the PinePhone this does make no difference as we have square 240x240 screen. Change it anyways to be completely correct.
* / | | | | Replaced "JF002" in github URLs with "InfiniTimeOrg"mabuch2021-10-152-2/+3
|/ / / / /
* | | | | Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime ↵Jean-François Milants2021-10-107-10/+103
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | into Riksu9000-update_touch_driver # Conflicts: # src/displayapp/Apps.h
| * | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-10-0512-54/+67
| |\ \ \ \
| * \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-189-2/+332
| |\ \ \ \ \
| * | | | | | Fix Error screen and optimize GetTouchInfoRiku Isokoski2021-09-152-5/+0
| | | | | | |
| * | | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-09-1480-334/+653
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-2820-100/+68
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Automatic error detectionRiku Isokoski2021-08-185-5/+96
| | | | | | | |
| * | | | | | | Fix after mergeRiku Isokoski2021-08-171-1/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' into update_touch_driverRiku Isokoski2021-08-1742-606/+542
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'develop' into update_touch_driverRiku Isokoski2021-07-153-35/+38
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Update touchpad driverRiku Isokoski2021-07-143-7/+15
| | | | | | | | |
* | | | | | | | | Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by ↵Jean-François Milants2021-10-104-85/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nullptr and other small cleanings.
* | | | | | | | | Merge with develop and fix conflicts from timaios:set-datetime-manually.Jean-François Milants2021-10-107-6/+468
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'JF002:develop' into set-datetime-manuallyTim2021-08-0836-331/+381
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Code optimizations in SettingSetDate and SettingSetTimeTim Taenny2021-07-092-13/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling lv_obj_align after each button click, the labels have their auto_realign property set.
| * | | | | | | | | | Code optimizations in SettingSetTimeTim Taenny2021-07-091-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The positions of the labels are controlled by #define's, just like in SettingSetDate.
| * | | | | | | | | | Modified Settings menu as per suggestionTim Taenny2021-07-091-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved "Set date" and "Set time" to the second page of the Settings menu.
| * | | | | | | | | | Code optimizations in SettingSetDateTim Taenny2021-07-091-41/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using static method of DateTimeController for retrieving month texts instead of implementing it in SettingSetDate again.
| * | | | | | | | | | 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 screens to DisplayApp.cpptimaios2021-07-091-0/+10
| | | | | | | | | | |
| * | | | | | | | | | Added new screens to the list of applicationstimaios2021-07-091-1/+3
| | | | | | | | | | |