Riku Isokoski
21d37d1e23
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
2021-08-30 10:15:19 +03:00
Jean-François Milants
31bc47d1cb
Settings : use enums instead of ints to store colors. Group all PTS settings into a struct.
...
PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication.
Adapt SettingPineTimeStyle with the last Screen Interface
2021-08-28 21:02:11 +02: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
Riku Isokoski
c2fae47391
Merge branch 'develop' into refresh_rework
2021-08-28 17:25:50 +03:00
Riku Isokoski
085c9ab2e1
Merge branch 'develop' into timer_battery_reading
2021-08-28 16:54:40 +03:00
Kieran Cawthray
8ac1ae70cc
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-19 15:14:04 +02:00
Riku Isokoski
85c99797da
Merge branch 'develop' into new_touch_handler
2021-08-18 22:07:02 +03:00
Riku Isokoski
b91100573e
Fix music app buttons
2021-08-18 20:19:02 +02:00
Kieran Cawthray
30b32e4c8a
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-15 17:50:56 +02:00
Kieran Cawthray
9851ed33d8
Fix potential edge case of sidebar being set black
2021-08-15 15:28:40 +02:00
Kieran Cawthray
639fd3a9bd
More tidying following review
2021-08-15 15:00:54 +02:00
Kieran Cawthray
5789f1527c
Avoid setting the sidebar black
2021-08-15 14:42:30 +02:00
Kieran Cawthray
16ea069d55
Remove duplicate code, minor fixes
2021-08-15 14:05:21 +02:00
Riku Isokoski
3cef05b745
Merge branch 'develop' into refresh_rework
2021-08-15 13:35:15 +03:00
Kieran Cawthray
c0bb88799c
Add check for randomise button in case colors clash
2021-08-15 12:33:32 +02:00
Riku Isokoski
ee44b6ff49
Adjust inner padding in applist
2021-08-15 11:19:47 +02:00
Riku Isokoski
bc82905371
Clean up using variables
2021-08-15 11:19:47 +02:00
Riku Isokoski
637ed8033b
Adjust previously missed scrollbar and firmware validation buttons
2021-08-15 11:19:47 +02:00
Riku Isokoski
e0d01411d7
Ui update
2021-08-15 11:19:47 +02:00
Kieran Cawthray
477ff32edc
Add randomise button to color picker
2021-08-15 10:41:00 +02:00
Riku Isokoski
044036e884
Merge branch 'develop' into timer_battery_reading
2021-08-14 23:02:23 +03:00
Jean-François Milants
0eeed5ac33
Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime into Riksu9000-call-improvements
...
# Conflicts:
# src/displayapp/screens/Metronome.cpp
2021-08-14 21:54:00 +02:00
Riku Isokoski
c3d8ee14fe
Merge branch 'develop' into refresh_rework
2021-08-14 22:53:35 +03:00
Riku Isokoski
6192775161
Improve metronome
2021-08-14 21:08:42 +02:00
Riku Isokoski
23bde0d18e
Make battery reading periodic. Add events. Disable pullup
2021-08-14 21:18:11 +03:00
Kieran Cawthray
6bffc7d528
Tidying
2021-08-12 21:28:41 +02:00
Kieran Cawthray
52ee25e551
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-12 21:26:51 +02:00
Riku Isokoski
f1346f098e
Merge branch 'develop' into new_touch_handler
2021-08-10 20:58:42 +03:00
Riku Isokoski
d307c6bd9e
Merge branch 'develop' into refresh_rework
2021-08-10 14:13:58 +03:00
Jean-François Milants
81a143173f
Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://github.com/hassless/InfiniTime into hassless-improve-battery-percentage-to-battery-icon-mapping
...
# Conflicts:
# src/displayapp/screens/BatteryIcon.cpp
2021-08-10 12:30:42 +02:00
Jean-François Milants
c086520c97
Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, inspired by PR #232 by nscooling.
2021-08-10 11:39:25 +02:00
Riku Isokoski
10b5d30ec3
Merge branch 'develop' into refresh_rework
2021-08-03 12:16:40 +03:00
Riku Isokoski
a618f43b4d
Fixes
2021-08-01 14:13:32 +03:00
Riku Isokoski
e6dcb3009f
Improvements
2021-08-01 13:05:48 +03:00
Riku Isokoski
5bdef365f2
Merge branch 'develop' into HEAD
2021-08-01 11:47:26 +03:00
Kieran Cawthray
12aeb46889
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-28 16:07:43 +02:00
Kieran Cawthray
e6bc485679
Increment settings value, remove old hacky fix
2021-07-25 22:18:39 +02:00
Jean-François Milants
514481ef7f
Tile event handler : read the event data only if the event is a "value changed event". LVGL sends many other event and some of them do not set the event data (global static variable) to a valid address, which may cause an invalid read. I noticed that when porting this class on RISC-V platform (BL602).
2021-07-25 19:55:21 +02:00
Riku Isokoski
a1ba187c47
Merge branch 'develop' into new_touch_handler
2021-07-25 20:01:09 +03:00
Jonathan Vander Mey
7b75ca591d
Fix compile warnings
2021-07-25 18:01:13 +02:00
Riku Isokoski
574434550a
Fix slow scroll
2021-07-25 17:59:58 +02:00
Riku Isokoski
1ae22f45f9
Fix cases where Get() isn't used
2021-07-25 17:56:07 +02:00
Riku Isokoski
f2f22184b0
Add new unique icons for some apps
2021-07-25 17:55:08 +02:00
Riku Isokoski
a69be1520a
Add task state info to SystemInfo
2021-07-25 17:52:19 +02:00
Riku Isokoski
ec2469a6c1
Code cleanup ( #466 )
...
* Code cleanup
* Remove override again
2021-07-25 16:54:05 +02:00
Riku Isokoski
e4d9636e82
Merge branch 'develop' into new_touch_handler
2021-07-24 20:26:10 +03:00
Jean-François Milants
926553d043
Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap
...
# Conflicts:
# src/displayapp/DisplayApp.cpp
2021-07-24 18:46:52 +02:00
Kieran Cawthray
b3e3d75d0f
Add extra screen in settings to show scrollbar correctly
2021-07-24 14:25:27 +02:00
Riku Isokoski
fc93bdbbba
Merge branch 'develop' into refresh_rework
2021-07-23 22:56:00 +03:00
Riku Isokoski
d666c5004f
Merge branch 'develop' into new_touch_handler
2021-07-23 22:52:08 +03:00
