diff --git a/draft_pictures/cat.xcf b/draft_pictures/cat.xcf index 27de1c78..f1df51f8 100644 Binary files a/draft_pictures/cat.xcf and b/draft_pictures/cat.xcf differ diff --git a/src/displayapp/screens/WatchFaceMeow.cpp b/src/displayapp/screens/WatchFaceMeow.cpp index 1f8afe18..c7328b4d 100644 --- a/src/displayapp/screens/WatchFaceMeow.cpp +++ b/src/displayapp/screens/WatchFaceMeow.cpp @@ -191,6 +191,7 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController, lv_line_set_points(lines[i], linePoints[i], 2); } + //Battery indicator logoPine = lv_img_create(lv_scr_act(), nullptr); lv_img_set_src(logoPine, "F:/images/pine_small.bin"); lv_obj_set_pos(logoPine, 15, 106); @@ -198,6 +199,7 @@ WatchFaceMeow::WatchFaceMeow(Controllers::DateTime& dateTimeController, lineBattery = lv_line_create(lv_scr_act(), nullptr); lv_obj_set_style_local_line_width(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 24); lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]); + lv_obj_set_style_local_line_color(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, (*colors)[4]); lv_obj_set_style_local_line_opa(lineBattery, LV_LINE_PART_MAIN, LV_STATE_DEFAULT, 190); lineBatteryPoints[0] = {27, 105}; lineBatteryPoints[1] = {27, 106}; @@ -532,7 +534,6 @@ void WatchFaceMeow::Refresh() { } void WatchFaceMeow::SetBatteryLevel(uint8_t batteryPercent) { - // starting point (y) + Pine64 logo height * (100 - batteryPercent) / 100 lineBatteryPoints[1] = {27, static_cast(105 + 32 * (100 - batteryPercent) / 100)}; lv_line_set_points(lineBattery, lineBatteryPoints, 2); }