Skip to content

Commit 8942c1c

Browse files
tildenhellcp
andcommitted
fw/apps/system_apps/health/: Restore light bg to hrm screens
Co-Authored-By: Stasia Michalska <hel@lcp.world> Signed-off-by: Dan Tilden <freakified@gmail.com>
1 parent 9ff5ff4 commit 8942c1c

9 files changed

+7
-7
lines changed

src/fw/apps/system_apps/health/health_detail_card.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ static void prv_draw_zones(HealthDetailCard *detail_card, GContext *ctx) {
228228
for (int i = 0; i < detail_card->num_zones; i++) {
229229
HealthDetailZone *zone = &detail_card->zones[i];
230230

231-
graphics_context_set_text_color(ctx, PBL_IF_COLOR_ELSE(GColorWhite, GColorBlack));
231+
graphics_context_set_text_color(ctx, gcolor_legible_over(detail_card->bg_color));
232232
graphics_draw_text(ctx, zone->label, detail_card->subtitle_font, zone_rect,
233233
GTextOverflowModeWordWrap, GTextAlignmentLeft, NULL);
234234

@@ -285,7 +285,7 @@ static void prv_draw_row_callback(GContext *ctx, const Layer *cell_layer,
285285
if (!menu_layer_is_index_selected(&detail_card->menu_layer, cell_index)) {
286286
label_rect.origin.y = (cell_index->row < selected_index.row) ? 3 : 22;
287287

288-
graphics_context_set_text_color(ctx, GColorWhite);
288+
graphics_context_set_text_color(ctx, gcolor_legible_over(detail_card->bg_color));
289289
graphics_draw_text(ctx, zone->label, detail_card->subtitle_font, label_rect,
290290
GTextOverflowModeWordWrap, GTextAlignmentCenter, NULL);
291291
} else {

src/fw/apps/system_apps/health/health_hr_detail_card.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ Window *health_hr_detail_card_create(HealthData *health_data) {
7878
/// Resting HR
7979
.primary_label = (char *)i18n_get("TIME IN ZONES", card_data),
8080
.primary_value = app_zalloc_check(buffer_size),
81-
.fill_color = GColorWhite,
81+
.fill_color = PBL_IF_COLOR_ELSE(GColorDarkCandyAppleRed, GColorWhite),
8282
.outline_color = PBL_IF_COLOR_ELSE(GColorClear, GColorBlack),
8383
};
8484

@@ -89,7 +89,7 @@ Window *health_hr_detail_card_create(HealthData *health_data) {
8989
.num_headings = card_data->num_headings,
9090
.headings = card_data->headings,
9191
.weekly_max = max_progress,
92-
.bg_color = PBL_IF_COLOR_ELSE(GColorBulgarianRose, GColorWhite),
92+
.bg_color = GColorWhite,
9393
.num_zones = card_data->num_zones,
9494
.zones = card_data->zones,
9595
.data = card_data,

src/fw/apps/system_apps/health/health_hr_summary_card.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ typedef struct HealthHrSummaryCardData {
4141

4242
#define PULSING_HEART_TIMEOUT (30 * MS_PER_SECOND)
4343

44-
#define PROGRESS_BACKGROUND_COLOR (PBL_IF_COLOR_ELSE(GColorRoseVale, GColorBlack))
44+
#define PROGRESS_BACKGROUND_COLOR (PBL_IF_COLOR_ELSE(GColorDarkCandyAppleRed, GColorBlack))
4545
#define PROGRESS_OUTLINE_COLOR (PBL_IF_COLOR_ELSE(GColorClear, GColorBlack))
4646

47-
#define TEXT_COLOR (PBL_IF_COLOR_ELSE(GColorSunsetOrange, GColorBlack))
48-
#define CARD_BACKGROUND_COLOR (PBL_IF_COLOR_ELSE(GColorBulgarianRose, GColorWhite))
47+
#define TEXT_COLOR (PBL_IF_COLOR_ELSE(GColorBulgarianRose, GColorBlack))
48+
#define CARD_BACKGROUND_COLOR (PBL_IF_COLOR_ELSE(GColorWhite, GColorWhite))
4949

5050

5151
static void prv_pulsing_heart_timer_cb(void *context) {
-21 Bytes
Loading
-26 Bytes
Loading
-40 Bytes
Loading
-21 Bytes
Loading
-36 Bytes
Loading
-15 Bytes
Loading

0 commit comments

Comments
 (0)