Added popup to notify we're going to sleep (loading image takes time).
Skip files starting with '.'
This commit is contained in:
parent
4fe467ca3c
commit
95cf1dcfc3
@ -10,6 +10,7 @@
|
|||||||
#include "images/CrossLarge.h"
|
#include "images/CrossLarge.h"
|
||||||
|
|
||||||
void SleepActivity::onEnter() {
|
void SleepActivity::onEnter() {
|
||||||
|
renderPopup("Entering Sleep...");
|
||||||
// Check if we have a /sleep directory
|
// Check if we have a /sleep directory
|
||||||
auto dir = SD.open("/sleep");
|
auto dir = SD.open("/sleep");
|
||||||
if (dir && dir.isDirectory()) {
|
if (dir && dir.isDirectory()) {
|
||||||
@ -21,6 +22,11 @@ void SleepActivity::onEnter() {
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
auto filename = std::string(file.name());
|
auto filename = std::string(file.name());
|
||||||
|
if (filename[0] == '.') {
|
||||||
|
file.close();
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
if (filename.substr(filename.length() - 4) != ".bmp") {
|
if (filename.substr(filename.length() - 4) != ".bmp") {
|
||||||
Serial.printf("[%lu] [Slp] Skipping non-.bmp file name: %s\n", millis(), file.name());
|
Serial.printf("[%lu] [Slp] Skipping non-.bmp file name: %s\n", millis(), file.name());
|
||||||
file.close();
|
file.close();
|
||||||
@ -70,6 +76,21 @@ void SleepActivity::onEnter() {
|
|||||||
renderDefaultSleepScreen();
|
renderDefaultSleepScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SleepActivity::renderPopup(const char* message) const {
|
||||||
|
const int textWidth = renderer.getTextWidth(READER_FONT_ID, message);
|
||||||
|
constexpr int margin = 20;
|
||||||
|
// Round all coordinates to 8 pixel boundaries
|
||||||
|
const int x = ((GfxRenderer::getScreenWidth() - textWidth - margin * 2) / 2 + 7) / 8 * 8;
|
||||||
|
constexpr int y = 56;
|
||||||
|
const int w = (textWidth + margin * 2 + 7) / 8 * 8;
|
||||||
|
const int h = (renderer.getLineHeight(READER_FONT_ID) + margin * 2 + 7) / 8 * 8;
|
||||||
|
// renderer.clearScreen();
|
||||||
|
renderer.fillRect(x + 5, y + 5, w - 10, h - 10, false);
|
||||||
|
renderer.drawText(READER_FONT_ID, x + margin, y + margin, message);
|
||||||
|
renderer.drawRect(x + 5, y + 5, w - 10, h - 10);
|
||||||
|
renderer.displayBuffer();
|
||||||
|
}
|
||||||
|
|
||||||
void SleepActivity::renderDefaultSleepScreen() const {
|
void SleepActivity::renderDefaultSleepScreen() const {
|
||||||
const auto pageWidth = GfxRenderer::getScreenWidth();
|
const auto pageWidth = GfxRenderer::getScreenWidth();
|
||||||
const auto pageHeight = GfxRenderer::getScreenHeight();
|
const auto pageHeight = GfxRenderer::getScreenHeight();
|
||||||
|
|||||||
@ -11,4 +11,5 @@ class SleepActivity final : public Activity {
|
|||||||
private:
|
private:
|
||||||
void renderDefaultSleepScreen() const;
|
void renderDefaultSleepScreen() const;
|
||||||
void renderCustomSleepScreen(const Bitmap& bitmap) const;
|
void renderCustomSleepScreen(const Bitmap& bitmap) const;
|
||||||
|
void renderPopup(const char* message) const;
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user