haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

c'est mieux aligné

Browse source
This commit is contained in:
ecarlett 2024-05-23 16:36:07 +02:00
parent d7de641b8d
commit 1ec43e27de
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
compile.sh
View file

@ -1,7 +1,8 @@
#!/bin/bash #!/bin/bash
rm -r build rm -r build
cp make_pine.sh build/
cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/home/eve/Work/gcc-arm-none-eabi-10.3-2021.10 -DNRF5_SDK_PATH=/home/eve/Work/nRF5_SDK_17.1.0_ddde560 -DTARGET_DEVICE=PINETIME -DBUILD_DFU=1 -DBUILD_RESOURCES=1 -B build -DCMAKE_BUILD_TYPE=Release cmake -DARM_NONE_EABI_TOOLCHAIN_PATH=/home/eve/Work/gcc-arm-none-eabi-10.3-2021.10 -DNRF5_SDK_PATH=/home/eve/Work/nRF5_SDK_17.1.0_ddde560 -DTARGET_DEVICE=PINETIME -DBUILD_DFU=1 -DBUILD_RESOURCES=1 -B build -DCMAKE_BUILD_TYPE=Release
cp make_pine_mcu.sh build/

10
src/displayapp/screens/WatchFaceMeow.cpp
View file

@ -240,19 +240,19 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController,
bleIcon = lv_label_create(lv_scr_act(), nullptr); bleIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_color(bleIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor);
lv_label_set_text_static(bleIcon, Symbols::bluetooth); lv_label_set_text_static(bleIcon, Symbols::bluetooth);
lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0); lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_TOP_MID, 0, -10);
//version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ? //version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ?
alarmIcon = lv_label_create(lv_scr_act(), nullptr); alarmIcon = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_color(alarmIcon, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor);
lv_label_set_text_static(alarmIcon, Symbols::paw); lv_label_set_text_static(alarmIcon, Symbols::paw);
lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, -10); lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
//version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ? //version par defaut de l'icône avant qu'il aie regardé le statut de l'alarme ?
labelAlarm = lv_label_create(lv_scr_act(), nullptr); labelAlarm = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_color(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor); lv_obj_set_style_local_text_color(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, pinkColor);
lv_obj_set_style_local_text_font(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko); lv_obj_set_style_local_text_font(labelAlarm, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, font_teko);
lv_obj_align(labelAlarm, alarmIcon, LV_ALIGN_OUT_BOTTOM_MID, -15, 10); lv_obj_align(labelAlarm, alarmIcon, LV_ALIGN_OUT_BOTTOM_MID, -10, 0);
lv_label_set_text_static(labelAlarm, "00:00"); lv_label_set_text_static(labelAlarm, "00:00");
@ -478,14 +478,14 @@ void WatchFaceMeow::Refresh() {
//bleState.Get : in displayapp/widgets/StatusIcons.cpp: bleState = bleController.IsConnected(); //bleState.Get : in displayapp/widgets/StatusIcons.cpp: bleState = bleController.IsConnected();
//dynamic icons have their definitions in displayApp/screens/BleIcon.h / cpp //dynamic icons have their definitions in displayApp/screens/BleIcon.h / cpp
lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get())); lv_label_set_text_static(bleIcon, BleIcon::GetIcon(bleState.Get()));
lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 3); lv_obj_align(bleIcon, dateContainer, LV_ALIGN_OUT_TOP_MID, 0, -10);
} }
//Add alarm state and time //Add alarm state and time
// AlarmState is an enum type in class AlarmController that is in namespace controllers // AlarmState is an enum type in class AlarmController that is in namespace controllers
alarmState = alarmController.State()==Pinetime::Controllers::AlarmController::AlarmState::Set; alarmState = alarmController.State()==Pinetime::Controllers::AlarmController::AlarmState::Set;
lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(alarmState)); lv_label_set_text_static(alarmIcon, AlarmIcon::GetIcon(alarmState));
lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, -3); lv_obj_align(alarmIcon, dateContainer, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
if (alarmState) { if (alarmState) {
uint8_t alarmHours = alarmController.Hours(); uint8_t alarmHours = alarmController.Hours();
uint8_t alarmMinutes = alarmController.Minutes(); uint8_t alarmMinutes = alarmController.Minutes();