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.

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

Add SGV minutes-ago indicator #47

Merged
merged 19 commits into from
Oct 9, 2016
Merged
Changes from 1 commit
Commits
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
Update Aplite screenshots, hard-code gray circle color
mddub committed Oct 8, 2016
commit 6e4192d8160b5531724d5ea48074373f63fe4907
4 changes: 2 additions & 2 deletions src/recency_component.c
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ static void draw_text(Layer *layer, GContext *ctx, int32_t seconds, bool has_cir
new_size = GSize(style.diameter, style.diameter);
}

graphics_context_set_text_color(ctx, get_prefs()->colors[COLOR_KEY_RECENCY_TEXT]);
graphics_context_set_text_color(ctx, COLOR_FALLBACK(get_prefs()->colors[COLOR_KEY_RECENCY_TEXT], props->parent_fg));
graphics_draw_text(ctx, string, fonts_get_system_font(font.key), text_bounds, GTextOverflowModeWordWrap, alignment, NULL);

if (props->size_changed_callback != NULL) {
@@ -106,7 +106,7 @@ static void draw_circle_and_text(Layer *layer, GContext *ctx) {
graphics_context_set_fill_color(ctx, props->parent_bg);
graphics_fill_radial(ctx, circle_bounds, GOvalScaleModeFitCircle, style.diameter, DEG_TO_TRIGANGLE(0), DEG_TO_TRIGANGLE(360));

graphics_context_set_fill_color(ctx, get_prefs()->colors[COLOR_KEY_RECENCY_CIRCLE]);
graphics_context_set_fill_color(ctx, COLOR_FALLBACK(get_prefs()->colors[COLOR_KEY_RECENCY_CIRCLE], GColorLightGray));
graphics_fill_radial(ctx, circle_bounds, GOvalScaleModeFitCircle, style.inset, DEG_TO_TRIGANGLE(start), DEG_TO_TRIGANGLE(end));
}

Binary file modified test/gold/TestBasalGraph-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestBasicIntegration-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestBatteryAsNumber-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestBlackBackground-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestDegenerateEntries-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestDynamicTimeFont10-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestDynamicTimeFont14-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestDynamicTimeFont18-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestDynamicTimeFont6-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestErrorCodes-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestGraphBoundsAndGridlines-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutA-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutB-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutC-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutCustom-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutD-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestLayoutE-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestMmol-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added test/gold/TestNiceLayout-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestNotRecentButNotYetStaleBGRow-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsBarelyOffScreen-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsBarelyOnScreen-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsBolusesCenteredEven-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsBolusesCenteredOdd-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsBolusesDefault-aplite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/gold/TestPointsCircleAlignment-aplite.png
Binary file modified test/gold/TestPointsColor-aplite.png
Binary file modified test/gold/TestPointsColorCustomLine-aplite.png
Binary file modified test/gold/TestPointsColorLineWithMissingPoints-aplite.png
Binary file modified test/gold/TestPointsMarginsWithTreatments-aplite.png
Binary file modified test/gold/TestPointsMissingWithLine-aplite.png
Binary file modified test/gold/TestPointsNegativeMargin-aplite.png
Binary file modified test/gold/TestPointsPresetA-aplite.png
Binary file modified test/gold/TestPointsPresetB-aplite.png
Binary file modified test/gold/TestPointsPresetC-aplite.png
Binary file modified test/gold/TestPointsPresetD-aplite.png
Binary file modified test/gold/TestPositiveDelta-aplite.png
Binary file added test/gold/TestRecencySuperOld-aplite.png
Binary file modified test/gold/TestSGVsAtBoundsAndGridlines-aplite.png
Binary file modified test/gold/TestStaleServerData-aplite.png
Binary file modified test/gold/TestStatusHiddenAfterMaxAge-aplite.png
Binary file modified test/gold/TestStatusRecencyFormatBracketRight-aplite.png
Binary file modified test/gold/TestStatusRecencyFormatColonLeft-aplite.png
Binary file modified test/gold/TestStatusRecencyHiddenBeforeMinAge-aplite.png
Binary file modified test/gold/TestStatusRecencyOverOneHour-aplite.png
Binary file modified test/gold/TestStatusRecencyShownAfterMinAge-aplite.png
Binary file modified test/gold/TestStatusTextTooLong-aplite.png
Binary file modified test/gold/TestTrimmingValues-aplite.png