Merge ecfd50f991 into 4051c5bb97

src/fw/apps/system_apps/app_fetch_ui.c

@@ -89,7 +89,7 @@ static void prv_app_fetch_launch_app(AppFetchUIData *data) {
     vibes_short_pulse();
   }
 
-  // Allocate and inialize the data that would have been sent to the app originally before the
+  // Allocate and initialize the data that would have been sent to the app originally before the
   // fetch request.
   PebbleLaunchAppEventExtended *ext = kernel_malloc_check(sizeof(PebbleLaunchAppEventExtended));
   *ext = (PebbleLaunchAppEventExtended) {

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

@@ -87,7 +87,7 @@ static void prv_health_service_event_handler(HealthEventType event, void *contex
 //
 
 //! Initialize application
-static void prv_finish_initilization_cb(bool in_focus) {
+static void prv_finish_initialization_cb(bool in_focus) {
   if (in_focus) {
     HealthAppData *health_app_data = app_state_get_user_data();
 
@@ -128,7 +128,7 @@ static void prv_initialize(void) {
 
   // Finish up initializing the app a bit later. This helps reduce lag when opening the app
   app_focus_service_subscribe_handlers((AppFocusHandlers){
-    .did_focus = prv_finish_initilization_cb,
+    .did_focus = prv_finish_initialization_cb,
   });
 }
 

src/fw/apps/system_apps/health/health_activity_summary_card_segments.h

@@ -19,7 +19,7 @@
 #include "health_progress.h"
 
 //! 5 main segments + 2 real corners + 2 endcaps implemented as corners (for bw)
-//! Each of the 5 non-corener segments get 20% of the total
+//! Each of the 5 non-corner segments get 20% of the total
 #define AMOUNT_PER_SEGMENT (HEALTH_PROGRESS_BAR_MAX_VALUE * 20 / 100)
 
 // Found through trial and error

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

@@ -103,7 +103,7 @@ static int prv_get_next_card_idx(Card current, bool up) {
   if (next == Card_HrSummary && !activity_is_hrm_present()) {
     next = next + direction;
   }
-  // if heart rate is diabled, change the order of cards to Activiy <-> Sleep <-> HR
+  // if heart rate is disabled, change the order of cards to Activity <-> Sleep <-> HR
   else if (activity_is_hrm_present() && !activity_prefs_heart_rate_is_enabled()) {
     if (current == Card_ActivitySummary) {
       next = up ? Card_SleepSummary : BACK_TO_WATCHFACE;

src/fw/apps/system_apps/health/health_data.h

@@ -60,7 +60,7 @@ void health_data_update_step_derived_metrics(HealthData *health_data);
 
 //! Update the number of steps the user has taken today
 //! @param health_data A pointer to the health data to use
-//! @param new_steps the new value of the steps for toaday
+//! @param new_steps the new value of the steps for today
 void health_data_update_steps(HealthData *health_data, uint32_t new_steps);
 
 //! Update the number of seconds the user has slept today

src/fw/apps/system_apps/health/health_data_private.h

@@ -20,7 +20,7 @@
 
 typedef struct HealthData {
   //!< Current step / activity info
-  int32_t step_data[DAYS_PER_WEEK]; //!< Step histroy for today and the previous 6 days
+  int32_t step_data[DAYS_PER_WEEK]; //!< Step history for today and the previous 6 days
   int32_t current_distance_meters;
   int32_t current_calories;
 

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

@@ -175,7 +175,7 @@ static void prv_draw_progress_bar_in_zone(GContext *ctx, const GRect *zone_rect,
 
   HealthProgressSegment segments[] = {
     {
-      // Left side vertical line (needed for the draw outline function to draw the verticle lines)
+      // Left side vertical line (needed for the draw outline function to draw the vertical lines)
       .type = HealthProgressSegmentType_Corner,
       .points = {
         {progress_bar_x, progress_bar_y},
@@ -185,7 +185,7 @@ static void prv_draw_progress_bar_in_zone(GContext *ctx, const GRect *zone_rect,
       },
     },
     {
-      // Right side vertical line (needed for the draw outline function to draw the verticle lines)
+      // Right side vertical line (needed for the draw outline function to draw the vertical lines)
       .type = HealthProgressSegmentType_Corner,
       .points = {
         {progress_bar_x + progress_bar_width, progress_bar_y},

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

@@ -134,7 +134,7 @@ static void prv_render_bpm(GContext *ctx, Layer *base_layer) {
   graphics_text_node_destroy(&container->node);
 }
 
-static void prv_render_timstamp(GContext *ctx, Layer *base_layer) {
+static void prv_render_timestamp(GContext *ctx, Layer *base_layer) {
   HealthHrSummaryCardData *data = layer_get_data(base_layer);
 
   if (data->last_updated <= 0 || data->now_bpm == 0) {
@@ -189,7 +189,7 @@ static void prv_base_layer_update_proc(Layer *base_layer, GContext *ctx) {
 
   prv_render_bpm(ctx, base_layer);
 
-  prv_render_timstamp(ctx, base_layer);
+  prv_render_timestamp(ctx, base_layer);
 }
 
 static void prv_hr_detail_card_unload_callback(Window *window) {

src/fw/apps/system_apps/health/health_hr_summary_card_segments.h

@@ -19,7 +19,7 @@
 #include "health_progress.h"
 
 //! 4 main segments + 4 real corners
-//! Each of the 4 non-corener segments get 25% of the total
+//! Each of the 4 non-corner segments get 25% of the total
 #define AMOUNT_PER_SEGMENT (HEALTH_PROGRESS_BAR_MAX_VALUE * 25 / 100)
 
 // The shape is the same, but the offsets are different

src/fw/apps/system_apps/health/health_sleep_summary_card_segments.h

@@ -29,7 +29,7 @@
 #define X_SHIFT (PBL_IF_ROUND_ELSE(23, PBL_IF_BW_ELSE(1, 0)))
 #define Y_SHIFT (PBL_IF_ROUND_ELSE(8, PBL_IF_BW_ELSE(3, 0)))
 
-// Used to shrink the thinkness of the bars
+// Used to shrink the thickness of the bars
 #define X_SHRINK (PBL_IF_BW_ELSE(2, 0))
 
 // These are used to shrink the shape for round

src/fw/apps/system_apps/launcher/default/launcher_app_glance_structured.c

@@ -72,7 +72,7 @@ typedef struct GenericGlanceIconBitmapProcessor {
   GColor desired_tint_color;
 } GenericGlanceIconBitmapProcessor;
 
-static void prv_strucutred_glance_icon_bitmap_processor_pre_func(
+static void prv_structured_glance_icon_bitmap_processor_pre_func(
     GBitmapProcessor *processor, GContext *ctx, UNUSED const GBitmap **bitmap_to_use,
     UNUSED GRect *global_grect_to_use) {
   GenericGlanceIconBitmapProcessor *processor_with_data =
@@ -108,7 +108,7 @@ void launcher_app_glance_structured_draw_icon(LauncherAppGlanceStructured *struc
 
   GenericGlanceIconBitmapProcessor structured_glance_icon_bitmap_processor = {
     .bitmap_processor = {
-      .pre = prv_strucutred_glance_icon_bitmap_processor_pre_func,
+      .pre = prv_structured_glance_icon_bitmap_processor_pre_func,
       .post = prv_structured_glance_icon_bitmap_processor_post_func,
     },
     .desired_tint_color = desired_tint_color,
@@ -117,7 +117,7 @@ void launcher_app_glance_structured_draw_icon(LauncherAppGlanceStructured *struc
   GColor8 luminance_tint_lookup_table[GCOLOR8_COMPONENT_NUM_VALUES] = {};
   gcolor_tint_luminance_lookup_table_init(desired_tint_color, luminance_tint_lookup_table);
 
-  GenericGlanceIconDrawCommandProcessor strucutred_glance_icon_draw_command_processor = {
+  GenericGlanceIconDrawCommandProcessor structured_glance_icon_draw_command_processor = {
     .draw_command_processor.command =
         prv_structured_glance_icon_draw_command_processor_process_command,
     .luminance_tint_lookup_table = luminance_tint_lookup_table,
@@ -126,7 +126,7 @@ void launcher_app_glance_structured_draw_icon(LauncherAppGlanceStructured *struc
   KinoReelProcessor structured_glance_icon_processor = {
     .bitmap_processor = &structured_glance_icon_bitmap_processor.bitmap_processor,
     .draw_command_processor =
-        &strucutred_glance_icon_draw_command_processor.draw_command_processor,
+        &structured_glance_icon_draw_command_processor.draw_command_processor,
   };
 
   // Draw the glance's icon, luminance tinting its colors according to the glance's highlight

src/fw/apps/system_apps/music_app.c

@@ -376,7 +376,7 @@ static void prv_flip_animated_text(Animation *animation, bool finished, void *co
   data->length_text_layer.layer.bounds.origin.y = -TIME_BOUNDS_OFFSET;
 }
 
-static inline bool prv_should_animate_casssette(void) {
+static inline bool prv_should_animate_cassette(void) {
   return music_get_playback_state() != MusicPlayStatePaused;
 }
 
@@ -401,7 +401,7 @@ static Animation *prv_create_cassette_animation(MusicAppData *data) {
   animation_set_curve(cassette_bounceback, AnimationCurveEaseOut);
   Animation *sequence = animation_sequence_create(cassette_left, cassette_right,
                                                   cassette_bounceback, NULL);
-  if (!prv_should_animate_casssette()) {
+  if (!prv_should_animate_cassette()) {
     animation_set_play_count(sequence, 0);
   }
   return sequence;

src/fw/apps/system_apps/reminders/reminder_app.c

@@ -166,7 +166,7 @@ static void prv_build_transcription_dialog_text(ReminderAppData *data) {
 
   int buf_space_remaining = required_buf_size - 1 /*for the final \0 */;
   strncpy(data->dialog_text, data->reminder_str, sentence_len);
-  // Having to call MAX everytime is a bit silly, but the strn function expect a size_t (unsigned).
+  // Having to call MAX every time is a bit silly, but the strn function expect a size_t (unsigned).
   // Calling MAX ensures that a negative value isn't passed in which gets cast to something positive
   buf_space_remaining = MAX(buf_space_remaining - sentence_len, 0);
 

src/fw/apps/system_apps/settings/settings_activity_tracker.c

@@ -144,7 +144,7 @@ static void prv_draw_no_activities_cell_rect(GContext *ctx, const Layer *cell_la
   const GSize text_size = graphics_text_layout_get_max_used_size(ctx, no_activities_string, font,
                                                                  box, overflow, alignment, NULL);
 
-  // We want to position the text in the center of the cell veritically,
+  // We want to position the text in the center of the cell vertically,
   // we divide the height of the cell by two and subtract half of the text size.
   // However, that just puts the TOP of a line vertically aligned.
   // So we also have to subtract half of a single line's width.

src/fw/apps/system_apps/settings/settings_certifications.h

@@ -62,7 +62,7 @@ typedef struct CertificationIds {
 static const RegulatoryFlags s_regulatory_flags_fallback = {
 };
 
-// Certifiation ID strings used for bigboards and such.
+// Certification ID strings used for bigboards and such.
 static const CertificationIds s_certification_ids_fallback = {
   .canada_ic_id = "XXXXXX-YYY",
   .china_cmiit_id = "ABCDEFGHIJ",

src/fw/apps/system_apps/settings/settings_notifications_private.h

@@ -20,7 +20,7 @@
 
 #include "applib/preferred_content_size.h"
 
-//! TODO PBL-41920: This mapping should be an opt in set in a platform specific location
+//! TODO PBL-41920: This mapping should be an opt-in set in a platform specific location
 typedef enum SettingsContentSize {
   SettingsContentSize_Small,
   SettingsContentSize_Default,

src/fw/apps/system_apps/settings/settings_quick_launch.c

@@ -17,7 +17,7 @@
 //! This file displays the main Quick Launch menu that is found in our settings menu
 //! It allows the feature to be enabled or for an app to be set
 //! The list of apps that the user can choose from is found in settings_quick_launch_app_menu.c
-//! This file is also responsible for saving / storing the uuid of each quichlaunch app as well as
+//! This file is also responsible for saving / storing the uuid of each quicklaunch app as well as
 //! whether or not the quicklaunch app is enabled.
 
 #include "settings_menu.h"

src/fw/apps/system_apps/settings/settings_system.c

@@ -92,7 +92,7 @@ typedef struct SystemCertificationData {
 
   GBitmap **regulatory_marks;
   uint8_t regulatory_marks_count;
-  // For buiding up regulatory marks cells when constructing the menu
+  // For building up regulatory marks cells when constructing the menu
   uint8_t current_regulatory_marks_cell_start_idx;
   uint8_t num_regulatory_marks_in_current_cell;
   uint16_t current_regulatory_marks_cell_width;

src/fw/apps/system_apps/timeline/timeline.c

@@ -338,7 +338,7 @@ static void prv_exit(TimelineAppData *data) {
 #endif
 }
 
-static void prv_inactive_timer_callack(void *data) {
+static void prv_inactive_timer_callback(void *data) {
   prv_set_state(data, TimelineAppStateInactive);
   prv_exit(data);
 }
@@ -346,7 +346,7 @@ static void prv_inactive_timer_callack(void *data) {
 static void prv_inactive_timer_refresh(TimelineAppData *data) {
   static const uint32_t INACTIVITY_TIMEOUT_MS = 30 * 1000;
   s_app_data->inactive_timer_id = evented_timer_register_or_reschedule(
-      s_app_data->inactive_timer_id, INACTIVITY_TIMEOUT_MS, prv_inactive_timer_callack, data);
+      s_app_data->inactive_timer_id, INACTIVITY_TIMEOUT_MS, prv_inactive_timer_callback, data);
 }
 
 /////////////////////////////////////

src/fw/apps/system_apps/weather/weather_app_layout.c

@@ -87,7 +87,7 @@ static void prv_fill_high_low_temp_buffer(const int high, const int low, char *b
     /// Shown when only the day's low temperature is known (e.g. "--° / 52°")
     snprintf(buffer, buffer_size, i18n_get("--° / %i°", i18n_owner), low);
   } else {
-    /// A day's high and low temperature, separated by a foward slash (e.g. "68° / 52°")
+    /// A day's high and low temperature, separated by a forward slash (e.g. "68° / 52°")
     snprintf(buffer, buffer_size, i18n_get("%i° / %i°", i18n_owner), high, low);
   }
 }