aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/Clock.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Watch face selection at build timeJean-François Milants2023-12-211-133/+0
| | | | Watch faces can now be selected at buid time. It's implemented in a similar way than the selection of user apps, using a list of watch face description that is generated at build time (consteval, constexpr)
* PineTimeStyle weather display (#1459)kieranc2023-06-041-1/+4
| | | | | Weather display for PineTimeStyle Documentation : https://wiki.pine64.org/wiki/PineTimeStyle and https://wiki.pine64.org/wiki/Infinitime-Weather
* Refactor watch face to enum (#1339)Max Friedrich2023-04-301-7/+8
| | | | | | | change watch face from int to enum --------- Co-authored-by: minacode <minamoto9@web.de>
* date: Remove date libRiku Isokoski2023-02-251-1/+0
| | | | DateTimeController can provide everything we need.
* screens: Remove unused DisplayApp parametersRiku Isokoski2023-02-251-16/+8
|
* screens: Remove displayapp parameter from screenRiku Isokoski2023-02-251-1/+1
| | | | | | | | The DisplayApp class isn't used in the Screen base class and most screens, so requiring it is pointless. In this commit, DisplayApp pointers were added to screens which use it and the explicit Screen constructor was removed in those screens.
* displayapp: Make Ble references constRiku Isokoski2023-02-241-1/+1
|
* displayapp: Make Battery class references constRiku Isokoski2023-02-241-1/+1
|
* Fix typo in Clock.cpp.Jean-François Milants2022-10-011-1/+1
|
* Merge branch 'ITCactus-watchface-casio-digital-G7710' into developJean-François Milants2022-10-011-0/+16
|\
| * Merge branch 'watchface-casio-digital-G7710' of ↵Jean-François Milants2022-09-271-0/+16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:ITCactus/InfiniTime into ITCactus-watchface-casio-digital-G7710 # Conflicts: # src/components/settings/Settings.h # src/displayapp/screens/CheckboxList.cpp # src/displayapp/screens/CheckboxList.h # src/displayapp/screens/Clock.cpp # src/displayapp/screens/Clock.h # src/displayapp/screens/settings/SettingWatchFace.cpp
| | * Apply clang-format to Clock.cppAutoformatter2022-06-301-7/+7
| | |
| | * [new watchface] watchface inspired by G7710, with day of year and week ↵ITCactus2022-06-301-0/+15
| | | | | | | | | | | | number info
* | | Fix typo in Clock.cpp.Jean-François Milants2022-10-011-1/+1
| | |
* | | fix typominacode2022-09-281-6/+6
|/ /
* | A few minors changes following the code review : rename fs -> filesystem, ↵Jean-François Milants2022-09-271-3/+3
| | | | | | | | use std::array instead of raw array,...
* | Fix formattingJean-François Milants2022-09-111-1/+1
| |
* | Infineat : Add support for external resources, and read the images and fonts ↵Jean-François Milants2022-09-111-2/+5
| | | | | | | | from the ilesystem
* | Implement battery indicatorDiego Miguel2022-06-111-0/+1
| |
* | Implement SettingWatchFace listDiego Miguel2022-06-111-3/+3
| |
* | Add Infineat watchface to settingsDiego Miguel2022-06-111-1/+14
|/
* Apply clang-format to all C++ filesFinlay Davidson2022-06-051-4/+13
|
* Rename PineTimeStyle to WatchFacePineTimeStylemabuch2022-03-121-4/+4
|
* Manual squash merge of PR #932 ↵Jean-François Milants2022-02-201-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (https://github.com/InfiniTimeOrg/InfiniTime/pull/932) from 13werwolf13 (https://github.com/13werwolf13). This PR adds a new Terminal watchface to InfiniTime! Squashed commit of the following: commit 23ea840b059c69667c8711265cecaf992791acb6 Author: Jean-François Milants <jf@codingfield.com> Date: Sun Feb 20 13:14:27 2022 +0100 Terminal watch face : fix includes and a few code cleaning. commit 3c244def25e3ad8e1f56d708fb0864c122059948 Merge: 40790868 138a6552 Author: Jean-François Milants <jf@codingfield.com> Date: Sun Feb 20 12:45:54 2022 +0100 Merge branch 'develop' of https://github.com/13werwolf13/InfiniTime into 13werwolf13-develop commit 138a65528a86799fd5c37f065023a92f222fe044 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:13:00 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.h Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 35156166b2f7589bf005ec7c7192a4226578f6d9 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:12:43 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 757ca2dd438f1f314267a8b81a6034c576f1d6be Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:12:30 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 60b6b4e5824d04faa3efa45173358d04fa68a368 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:12:20 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 6959d8c043013550a7a3e4e6588b234d3bb942b5 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:11:46 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 4d850281bedf342d0856da5eafc22e46d0767c56 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:11:17 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit af483bee33c225fcb03432db1eb14c0453df0ae7 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:10:57 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 6bc6c1a637be4e514ecd0097d1dc9e4aacdba1db Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:10:40 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.h Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 25fdafc6aba0d9e0173103501de3802af261e2ae Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:06:10 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 12e1b0f8c0202a7f62e3e1c297af850ce3526d13 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:05:44 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit e6c0f32056e9fea878d270d761607ac5ddc263b0 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:05:22 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.h Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 342ce8cd114f4af265078bc0cfa6b2d8831706d7 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:05:06 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 265fec5eeca27fcc1152a18e4af0273bcf119c46 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:04:06 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit b4669be38be0df2b6a3505d5f7a770c71636be60 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:03:29 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 471a84390957ded2ac23ebfe1cb99408e3783b0f Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:03:10 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit 6853166cf546a4ce561195eba01f1b1fd6d56420 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Wed Feb 2 09:02:51 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit bba34f69bfdd6b44f142c93644f71c9eda007290 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Sat Jan 22 12:32:41 2022 +0500 some fixes commit 74eea9f5800f273249846e6e1c887d15ba6eb10b Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Sat Jan 22 12:32:17 2022 +0500 some fixes commit 1e4a6763d73c3ba39c680ad25f90813e6a6a36d1 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Fri Jan 21 08:59:44 2022 +0500 no errors, no warnings, no work.. commit eb8bd4dc4ecbbf61f1e0f725fd2116ee25319fd6 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 20 23:50:04 2022 +0500 add ble state text output commit fda1c088becb4a7f9ced451a0291694abe2249dc Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 20 22:25:35 2022 +0500 add ble state text output commit 68d3d9b343c0f37830bb640fab10b186faf73067 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 20 22:22:20 2022 +0500 add ble state text output commit 0ed45a9916787f68c0aa6bab9c97b090f2eebdd5 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Tue Jan 18 15:48:15 2022 +0500 typo fix commit 477a3a7f27c7486be2c8f985afab1f1739608fed Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Tue Jan 18 10:36:19 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit d6849888ea5cc152f04c5bf6fe2631e66296c357 Author: Марков Дмитрий <13werwolf13@mail.ru> Date: Tue Jan 18 10:36:09 2022 +0500 Update src/displayapp/screens/WatchFaceTerminal.cpp Co-authored-by: NeroBurner <pyro4hell@gmail.com> commit e2f7e318298b8a6f4d436cbbb1b92a738dacab7f Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Mon Jan 17 13:34:05 2022 +0500 typo fix commit fc246beb01d3feac4fd0b2fc9c45b38847e1d950 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Sat Jan 15 15:26:25 2022 +0500 typo fix commit ebbb31abf10ad9f61a8a7ecfdf29c2aaeaf33c19 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Fri Jan 14 10:08:29 2022 +0500 typo fix commit 3afedcaa28009f59e6960730e9349097ef455ea8 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 13 12:34:39 2022 +0500 time format commit 471a4c942f7e3cfd5c52bd61152ede770da5e026 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 13 12:27:10 2022 +0500 time format commit d3fd348de4b4a89c216a717de84fcc923cc099fe Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 13 12:26:49 2022 +0500 time format commit e540d103e3204649ff585742f8834d16136372d5 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Thu Jan 13 11:28:31 2022 +0500 add patch commit 728830178f31f71785c49cdc6b83daea4e0a7df6 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Wed Jan 12 22:08:07 2022 +0500 add menue item commit 4c5847669fa083f15ee3fdb404dadfdaef0f82aa Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Wed Jan 12 21:42:22 2022 +0500 typo fix commit 79273fe24f9162aca5508f07b17896149ad19839 Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Wed Jan 12 20:48:06 2022 +0500 typo fix commit 1808a78ad94d0dfe97b6410a93ba30560de22f4b Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Wed Jan 12 20:17:15 2022 +0500 typo fix commit 6dfa141dca176789da4e978f008eb842d9ec515a Author: Дмитрий Марков <markov@promobit.ru> Date: Wed Jan 12 20:12:09 2022 +0500 typo fix commit 88f01902325505a9206ced4504aae0762042535d Author: Дмитрий Марков <13werwolf13@mail.ru> Date: Wed Jan 12 14:50:54 2022 +0500 add terminal watchface
* Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-051-5/+6
|\
| * Clock: add missing Settings includeReinhold Gschweicher2021-12-021-0/+1
| | | | | | | | | | | | Add missing include in `Clock.cpp` for `Settings.h`. The Settings class is forward declared in the header file, but it needs to be included in the cpp file.
| * Update includes to to be relative to src directoryReinhold Gschweicher2021-11-151-5/+5
| | | | | | | | | | | | | | 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.
* | Close menu with buttonRiku Isokoski2021-11-131-0/+4
|/
* Merge branch 'develop' into refresh_reworkRiku Isokoski2021-08-101-18/+0
|\
| * Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, ↵Jean-François Milants2021-08-101-19/+1
| | | | | | | | inspired by PR #232 by nscooling.
* | Refresh reworkRiku Isokoski2021-07-191-6/+1
|/
* Add PineTimeStyle watchface (#334)kieranc2021-06-291-0/+14
| | | | | | | | | | | | | * PineTimeStyle * Move GPL license header * Add step count gauge - replaces heartrate in sidebar * Enable 12/24h functionality * Set step gauge outer to be white when step goal is reached * Add font source file * Move static needle_colors array to member variable * Add documentation on generating a font * Replace .ttf with Google version, add link to font page Co-authored-by: JF002 <JF002@users.noreply.github.com>
* Clock : initialize the actual clockface in initialization list instead of in ↵Jean-François Milants2021-06-121-19/+12
| | | | the core of the ctro().
* replace ScreenList with a single screen in Clock. This removes the tap to ↵Florian2021-06-111-18/+21
| | | | switch feature
* Reformatted all the files according to clang-format styleAvamander2021-04-241-38/+51
|
* Merge branch 'develop' into motion-sensorJean-François Milants2021-04-091-5/+0
|\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/DisplayApp.h # src/displayapp/lv_pinetime_theme.c # src/displayapp/screens/ApplicationList.cpp # src/drivers/TwiMaster.cpp # src/systemtask/SystemTask.h
| * Big UI and navigation RewriteJoaquim2021-04-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more...
* | First integration of the motion sensor (bma 421) : step counting + wake on ↵Jean-François Milants2021-04-041-3/+6
|/ | | | wrist rotation + app to see the value of the 3 axis in "real time".
* replaced all unique_ptr.reset calls with std::make_uniqueNiall Cooling2021-03-221-4/+4
|
* Merge from upstreamJoaquim2021-03-061-1/+2
|
* Multi face support, analog clock, 12/24 configJoaquim2021-02-241-211/+41
|
* LVGL v7.10.0Joaquim2021-01-281-4/+3
|
* HR Sensor : Add start/stop button to the HeartRate app (the HR sensors stays ↵Jean-François Milants2021-01-171-5/+13
| | | | ON when the app is closed), display the HR value on the Clock app.
* Include cleanup: displayapp + screensokaestne2020-11-161-7/+8
|
* Fix conflictsJF2020-10-271-11/+12
|\
| * Switched from NULL to nullptrAvamander2020-10-041-11/+11
| |
* | Integrate new notification UI with notifications coming from BLEJF2020-10-201-3/+18
|/
* Fixed all the includes that were broken due to the renamesAvamander2020-10-021-1/+2
|
* Renamed displayapp/Screens to displayapp/screensAvamander2020-10-021-0/+227
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2026-01-12 15:30:41 +0000