diff --git a/src/activities/settings/FontDownloadActivity.cpp b/src/activities/settings/FontDownloadActivity.cpp index ce18ce67..a9dd9cef 100644 --- a/src/activities/settings/FontDownloadActivity.cpp +++ b/src/activities/settings/FontDownloadActivity.cpp @@ -466,10 +466,6 @@ void FontDownloadActivity::render(RenderLock&&) { renderer, Rect{metrics.contentSidePadding, barY, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight}, static_cast(progress * 100), 100); - - int percentY = barY + metrics.progressBarHeight + metrics.verticalSpacing; - renderer.drawCenteredText(UI_10_FONT_ID, percentY, - (std::to_string(static_cast(progress * 100)) + "%").c_str()); } else if (state_ == COMPLETE) { renderer.drawCenteredText(UI_10_FONT_ID, centerY, tr(STR_FONT_INSTALLED), true, EpdFontFamily::BOLD); const auto labels = mappedInput.mapLabels(tr(STR_BACK), "", "", ""); diff --git a/src/activities/settings/OtaUpdateActivity.cpp b/src/activities/settings/OtaUpdateActivity.cpp index 7bf1a444..db39830e 100644 --- a/src/activities/settings/OtaUpdateActivity.cpp +++ b/src/activities/settings/OtaUpdateActivity.cpp @@ -116,8 +116,8 @@ void OtaUpdateActivity::render(RenderLock&&) { static_cast(updaterProgress * 100), 100); y += metrics.progressBarHeight + metrics.verticalSpacing; - renderer.drawCenteredText(UI_10_FONT_ID, y, - (std::to_string(static_cast(updaterProgress * 100)) + "%").c_str()); + // Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty + // so the bytes line below stays at the same Y it was at when the activity drew its own percent. y += height + metrics.verticalSpacing; renderer.drawCenteredText( UI_10_FONT_ID, y, diff --git a/src/activities/settings/SdFirmwareUpdateActivity.cpp b/src/activities/settings/SdFirmwareUpdateActivity.cpp index 7e73a7f9..b0ca1f63 100644 --- a/src/activities/settings/SdFirmwareUpdateActivity.cpp +++ b/src/activities/settings/SdFirmwareUpdateActivity.cpp @@ -230,7 +230,8 @@ void SdFirmwareUpdateActivity::render(RenderLock&&) { Rect{metrics.contentSidePadding, y, pageWidth - metrics.contentSidePadding * 2, metrics.progressBarHeight}, static_cast(pct), 100); y += metrics.progressBarHeight + metrics.verticalSpacing; - renderer.drawCenteredText(UI_10_FONT_ID, y, (std::to_string(pct) + "%").c_str()); + // Percent label is drawn by BaseTheme::drawProgressBar; this slot is left intentionally empty + // so the do-not-power-off line below stays at the same Y as before. y += lineHeight + metrics.verticalSpacing; renderer.drawCenteredText(UI_10_FONT_ID, y, tr(STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF)); } else if (state == State::SUCCESS) {