Skip to content

BatteryInfo App Redesign: Fixup #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NeroBurner merged 9 commits into from
Jun 12, 2025
+9 −6
Merged

BatteryInfo App Redesign: Fixup #2310

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c73f016
Merge pull request #26 from InfiniTimeOrg/main
tituscmd Jan 21, 2025
ec4b3a7
Merge branch 'InfiniTimeOrg:main' into main
tituscmd Apr 10, 2025
d653c17
Merge branch 'InfiniTimeOrg:main' into main
tituscmd May 13, 2025
fede286
Merge branch 'InfiniTimeOrg:main' into main
tituscmd May 20, 2025
f48fb8a
remove leading zeros from battery percentage
tituscmd Jun 10, 2025
e1c45d5
add correct colors matching the battery icon color thresholds
tituscmd Jun 10, 2025
e722d40
Merge branch 'main' into battery_app_redesign_fixup
tituscmd Jun 10, 2025
d270ceb
formatting
tituscmd Jun 10, 2025
1986a5d
Merge branch 'battery_app_redesign_fixup' of github.com:tituscmd/Infi…
tituscmd Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/displayapp/screens/BatteryInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ BatteryInfo::BatteryInfo(const Pinetime::Controllers::Battery& batteryController

percent = lv_label_create(lv_scr_act(), nullptr);
lv_obj_set_style_local_text_font(percent, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &jetbrains_mono_42);
lv_label_set_text_fmt(percent, "%02i%%", batteryPercent);
lv_label_set_text_fmt(percent, "%i%%", batteryPercent);
lv_label_set_align(percent, LV_LABEL_ALIGN_LEFT);
lv_obj_align(percent, chargingArc, LV_ALIGN_CENTER, 0, 0);

Expand Down Expand Up @@ -60,15 +60,18 @@ void BatteryInfo::Refresh() {
} else if (batteryPercent == 100) {
lv_obj_set_style_local_line_color(chargingArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_BLUE);
lv_label_set_text_static(status, "Fully charged");
} else if (batteryPercent < 10) {
lv_obj_set_style_local_line_color(chargingArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_RED);
lv_label_set_text_static(status, "Battery low");
} else {
} else if (batteryPercent > 15) {
lv_obj_set_style_local_line_color(chargingArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_GREEN);
lv_label_set_text_static(status, "Discharging");
} else if (batteryPercent > 5) {
lv_obj_set_style_local_line_color(chargingArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, LV_COLOR_ORANGE);
lv_label_set_text_static(status, "Battery low");
} else {
lv_obj_set_style_local_line_color(chargingArc, LV_ARC_PART_INDIC, LV_STATE_DEFAULT, Colors::deepOrange);
Comment thread
tituscmd marked this conversation as resolved.
lv_label_set_text_static(status, "Battery critical");
}

lv_label_set_text_fmt(percent, "%02i%%", batteryPercent);
lv_label_set_text_fmt(percent, "%i%%", batteryPercent);
lv_obj_align(percent, chargingArc, LV_ALIGN_CENTER, 0, 0);

lv_obj_align(status, voltage, LV_ALIGN_IN_BOTTOM_MID, 0, -27);
Expand Down