Skip to content
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

Jump to bottom

Refactoring code chunk #400

Open
wants to merge 10 commits into
base: develop
Choose a base branch
from
Open

Refactoring code chunk #400

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b16160b
Remove unused param
RuffaloLavoisier Sep 14, 2024
112ab61
Remote unsed pram
RuffaloLavoisier Sep 14, 2024
fada5bc
Remote dead comment
RuffaloLavoisier Sep 14, 2024
8ac5bbb
Fix getDate function, for unused param
RuffaloLavoisier Sep 14, 2024
10811b8
Move declare value locate
RuffaloLavoisier Sep 14, 2024
126f6f7
Extend method usage
RuffaloLavoisier Sep 14, 2024
d965f56
Rename index, stepsCountOnDay
RuffaloLavoisier Sep 14, 2024
f1dd0c4
Replace 7 to WEEK
RuffaloLavoisier Sep 14, 2024
cb09eae
Remove unused code and rename param
RuffaloLavoisier Sep 15, 2024
a3c0dab
Rename value and name
RuffaloLavoisier Sep 15, 2024
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
Prev Previous commit
Next Next commit
Rename index, stepsCountOnDay
  • Loading branch information
@RuffaloLavoisier
RuffaloLavoisier committed Sep 15, 2024
commit d965f56859c3d5aea9b7b9350e8e81edd761e6a7
15 changes: 8 additions & 7 deletions src/apps/watchfaces/OswAppWatchface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,19 @@ void OswAppWatchface::drawStepHistory(OswUI* ui, uint8_t x, uint8_t y, uint8_t w
OswUI::getInstance()->resetTextColors();
uint32_t weekDay = 0;
uint32_t dayOfMonth = 0;
uint8_t index = 0;
RuffaloLavoisier marked this conversation as resolved.
Show resolved Hide resolved
hal->getLocalDate(&dayOfMonth, &weekDay);
for (uint8_t i = 0; i < 7; i++) {
uint32_t s = hal->environment()->getStepsOnDay(i);
uint16_t boxHeight = ((float)(s > max ? max : s) / max) * h;
for (index = 0; index < 7; index++) {
uint32_t stepsCountOnDay = hal->environment()->getStepsOnDay(index);
uint16_t boxHeight = ((float)(stepsCountOnDay > max ? max : stepsCountOnDay) / max) * h;
boxHeight = boxHeight < 2 ? 0 : boxHeight;

// step bars
uint16_t c = (unsigned int) OswConfigAllKeys::stepsPerDay.get() <= s ? ui->getSuccessColor() : ui->getPrimaryColor();
hal->gfx()->fillFrame(x + i * w, y + (h - boxHeight), w, boxHeight, c);
uint16_t c = (unsigned int) OswConfigAllKeys::stepsPerDay.get() <= stepsCountOnDay ? ui->getSuccessColor() : ui->getPrimaryColor();
hal->gfx()->fillFrame(x + index * w, y + (h - boxHeight), w, boxHeight, c);
// bar frames
uint16_t f = weekDay == i ? ui->getForegroundColor() : ui->getForegroundDimmedColor();
hal->gfx()->drawRFrame(x + i * w, y, w, h, 2, f);
uint16_t f = weekDay == index ? ui->getForegroundColor() : ui->getForegroundDimmedColor();
hal->gfx()->drawRFrame(x + index * w, y, w, h, 2, f);

// labels
hal->gfx()->setTextCenterAligned(); // horiz.
Expand Down