SteveAmor
cc259b6a4a
resolves conflicts
2022-01-02 22:27:43 +00:00
SteveAmor
94561b2331
resolves conflicts
2022-01-02 21:49:18 +00:00
Kieran Cawthray
c00ad4af35
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-12-05 20:32:29 +01:00
Reinhold Gschweicher
ac7b2da611
Update includes to to be relative to src directory
...
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.
2021-11-15 22:02:49 +01:00
SteveAmor
5932391c8b
Chimes option
2021-11-07 10:50:33 +00:00
Kieran Cawthray
32978b6a06
Restore settings order
2021-10-20 15:36:28 +02:00
Kieran Cawthray
1c3372b319
Fix settings merge error
2021-10-18 23:29:41 +02:00
Kieran Cawthray
ff1fce18d6
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-10-18 23:14:39 +02:00
Jean-François Milants
cf9e149b33
Merge with develop and fix conflicts from timaios:set-datetime-manually.
2021-10-10 16:01:43 +02:00
Kieran Cawthray
7d1da9f1f9
Remove old PineTimeStyle settings app
2021-10-03 21:49:57 +02:00
Itai Nelken
bd1a571399
Update Settings.cpp
2021-09-02 23:20:25 +03:00
JF002
ef9f809e14
Merge pull request #458 from kieranc/pinetimestyle-colorpicker
...
Add color picker for PineTimeStyle watchface
2021-08-28 20:56:34 +02:00
Tim
3e9c30a18f
Merge branch 'JF002:develop' into set-datetime-manually
2021-08-08 14:37:48 +02:00
Riku Isokoski
10b5d30ec3
Merge branch 'develop' into refresh_rework
2021-08-03 12:16:40 +03:00
Kieran Cawthray
12aeb46889
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-28 16:07:43 +02:00
Riku Isokoski
f2f22184b0
Add new unique icons for some apps
2021-07-25 17:55:08 +02:00
Kieran Cawthray
b3e3d75d0f
Add extra screen in settings to show scrollbar correctly
2021-07-24 14:25:27 +02:00
Riku Isokoski
97c761a5c7
Refresh rework
2021-07-19 16:26:12 +03:00
Tim Taenny
0842a13339
Modified Settings menu as per suggestion
...
Moved "Set date" and "Set time" to the second page of the
Settings menu.
2021-07-09 17:49:35 +02:00
timaios
5ae4192d8d
Added new menu entries to Settings page
2021-07-09 14:22:45 +02:00
Kieran Cawthray
38ab0add48
PineTimeStyle color picker initial commit
2021-06-24 19:15:23 +02:00
Jean-François Milants
b1925ff286
Minor improvements: use std::make_unique when creating unique_ptr, check the code is running from an IRQ before calling xQueueSendFromISR or xQueueSend)
2021-06-10 21:20:27 +02:00
Joaquim
cd0d85dff9
Merge branch 'develop' of
...
https://github.com/JF002/InfiniTime into StepsApp
2021-04-26 21:29:48 +01:00
Avamander
40d45d923b
Reformatted all the files according to clang-format style
2021-04-24 11:39:53 +03:00
Joaquim
cd4a3e1dfe
New Steps app
...
Settings to set the steps goal
More detail in Motion app
New 42px Font
2021-04-19 15:28:38 +01:00
Joaquim
1d3742e14f
Big UI and navigation Rewrite
...
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...
2021-04-04 03:08:51 +01:00
