Put the "Bobby" label above widgets, not below.

Signed-off-by: Katharine Berry <[email protected]>

Author: Katharine

app/src/c/alarms/manager.c

@@ -99,6 +99,7 @@ int alarm_manager_add_alarm(time_t when, bool is_timer, char* name, bool convers
       // For timers, instead of the standard action item, we add a countdown widget.
       ConversationWidget widget = {
         .type = ConversationWidgetTypeTimer,
+        .locally_created = true,
         .widget = {
           .timer = {
             .target_time = alarm->scheduled_time,

app/src/c/converse/conversation.c

@@ -359,3 +359,33 @@ bool conversation_is_idle(Conversation* conversation) {
   }
   return false;
 }
+
+static bool prv_entry_type_is_assistant(ConversationEntry* entry) {
+  switch (entry->type) {
+    case EntryTypePrompt:
+    case EntryTypeError:
+    case EntryTypeThought:
+    case EntryTypeAction:
+      return false;
+    case EntryTypeResponse:
+      return true;
+    case EntryTypeWidget:
+      return !entry->content.widget->locally_created;
+  }
+  return false;
+}
+
+bool conversation_assistant_just_started(Conversation* conversation) {
+  ConversationEntry *entry = conversation_peek(conversation);
+  if (entry == NULL) {
+    return false;
+  }
+  if (!prv_entry_type_is_assistant(entry)) {
+    return false;
+  }
+  if (conversation->entry_count == 1) {
+    return true;
+  }
+  ConversationEntry *previous = &conversation->entries[conversation->entry_count - 2];
+  return !prv_entry_type_is_assistant(previous);
+}

app/src/c/converse/conversation.h

@@ -132,6 +132,7 @@ typedef struct {
 
 typedef struct {
   ConversationWidgetType type;
+  bool locally_created;
   union {
     ConversationWidgetWeatherSingleDay weather_single_day;
     ConversationWidgetWeatherCurrent weather_current;
@@ -165,6 +166,7 @@ void conversation_set_thread_id(Conversation* conversation, const char* thread_i
 const char* conversation_get_thread_id(Conversation* conversation);
 int conversation_length(Conversation* conversation);
 bool conversation_is_idle(Conversation* conversation);
+bool conversation_assistant_just_started(Conversation* conversation);
 ConversationEntry* conversation_entry_at_index(Conversation* conversation, int index);
 ConversationEntry* conversation_peek(Conversation* conversation);
 EntryType conversation_entry_get_type(ConversationEntry* entry);

app/src/c/converse/segments/message_layer.c

@@ -38,17 +38,17 @@ MessageLayer* message_layer_create(GRect rect, ConversationEntry* entry) {
     MessageLayerData* data = layer_get_data(layer);
     data->entry = entry;
     data->speaker_layer = text_layer_create(GRect(5, 0, rect.size.w, NAME_HEIGHT));
+    size_t content_origin_y = -5;
     EntryType type = conversation_entry_get_type(entry);
     if (type == EntryTypePrompt) {
       text_layer_set_text(data->speaker_layer, "You");
-    } else if (type == EntryTypeResponse) {
-      text_layer_set_text(data->speaker_layer, "Bobby");
+      content_origin_y = NAME_HEIGHT;
     }
     layer_add_child(layer, (Layer *)data->speaker_layer);
     data->last_newline_offset = 0;
     data->content_height = 24;
     data->content_height = prv_get_content_height(layer);
-    data->content_layer = text_layer_create(GRect(5, NAME_HEIGHT, rect.size.w - 10, data->content_height));
+    data->content_layer = text_layer_create(GRect(5, content_origin_y, rect.size.w - 10, data->content_height));
     text_layer_set_text(data->content_layer, prv_get_content_text(layer));
     text_layer_set_font(data->content_layer, fonts_get_system_font(CONTENT_FONT));
     data->content_height = text_layer_get_content_size(data->content_layer).h;
@@ -73,7 +73,10 @@ void message_layer_update(MessageLayer* layer) {
   data->content_height = prv_get_content_height(layer);
   int width = layer_get_bounds(layer).size.w;
   GRect frame = layer_get_frame(layer);
-  frame.size.h = data->content_height + NAME_HEIGHT + 5;
+  frame.size.h = data->content_height + 5;
+  if (conversation_entry_get_type(data->entry) == EntryTypePrompt) {
+    frame.size.h += NAME_HEIGHT;
+  }
   text_layer_set_size(data->content_layer, GSize(width - 10, data->content_height + 5));
   layer_set_frame(layer, frame);
 }

app/src/c/converse/segments/segment_layer.c

@@ -28,7 +28,7 @@
 
 
 #define CONTENT_FONT FONT_KEY_GOTHIC_24_BOLD
-#define NAME_HEIGHT 15
+#define NAME_HEIGHT 20
 
 typedef enum {
   SegmentTypeMessage,
@@ -42,6 +42,7 @@ typedef enum {
 
 typedef struct {
   ConversationEntry* entry;
+  TextLayer* assistant_label_layer;
   SegmentType type;
   union {
     // fun fact: every member of this union is actually a Layer*.
@@ -60,44 +61,50 @@ typedef struct {
 
 static SegmentType prv_get_segment_type(ConversationEntry* entry);
 
-SegmentLayer* segment_layer_create(GRect rect, ConversationEntry* entry) {
+SegmentLayer* segment_layer_create(GRect rect, ConversationEntry* entry, bool assistant_label) {
   Layer* layer = layer_create_with_data(rect, sizeof(SegmentLayerData));
   SegmentLayerData* data = layer_get_data(layer);
   data->entry = entry;
   data->type = prv_get_segment_type(entry);
   GRect child_frame = GRect(0, 0, rect.size.w, rect.size.h);
+  if (assistant_label) {
+    data->assistant_label_layer = text_layer_create(GRect(5, 0, rect.size.w, NAME_HEIGHT));
+    layer_add_child(layer, text_layer_get_layer(data->assistant_label_layer));
+    text_layer_set_text(data->assistant_label_layer, "Bobby");
+    child_frame = GRect(0, NAME_HEIGHT, rect.size.w, rect.size.h - NAME_HEIGHT);
+  } else {
+    data->assistant_label_layer = NULL;
+  }
   switch (data->type) {
     case SegmentTypeMessage:
       data->message_layer = message_layer_create(child_frame, entry);
-      layer_add_child(layer, data->message_layer);
       break;
     case SegmentTypeInfo:
       data->info_layer = info_layer_create(child_frame, entry);
-      layer_add_child(layer, data->info_layer);
       break;
     case SegmentTypeWeatherSingleDayWidget:
       data->weather_single_day_widget = weather_single_day_widget_create(child_frame, entry);
-      layer_add_child(layer, data->weather_single_day_widget);
       break;
     case SegmentTypeWeatherCurrentWidget:
       data->weather_current_widget = weather_current_widget_create(child_frame, entry);
-      layer_add_child(layer, data->weather_current_widget);
       break;
     case SegmentTypeWeatherMultiDayWidget:
       data->weather_multi_day_widget = weather_multi_day_widget_create(child_frame, entry);
-      layer_add_child(layer, data->weather_multi_day_widget);
       break;
     case SegmentTypeTimerWidget:
       data->timer_widget = timer_widget_create(child_frame, entry);
-      layer_add_child(layer, data->timer_widget);
       break;
     case SegmentTypeNumberWidget:
       data->number_widget = number_widget_create(child_frame, entry);
-      layer_add_child(layer, data->number_widget);
       break;
   }
+  layer_add_child(layer, data->layer);
   GSize child_size = layer_get_frame(data->layer).size;
-  layer_set_frame(layer, GRect(rect.origin.x, rect.origin.y, child_size.w, child_size.h));
+  GRect final_size = GRect(rect.origin.x, rect.origin.y, child_size.w, child_size.h);
+  if (data->assistant_label_layer) {
+    final_size.size.h += NAME_HEIGHT;
+  }
+  layer_set_frame(layer, final_size);
   return layer;
 }
 
@@ -127,6 +134,9 @@ void segment_layer_destroy(SegmentLayer* layer) {
       number_widget_destroy(data->number_widget);
       break;
   }
+  if (data->assistant_label_layer) {
+    text_layer_destroy(data->assistant_label_layer);
+  }
   layer_destroy(layer);
 }
 
@@ -162,7 +172,11 @@ void segment_layer_update(SegmentLayer* layer) {
   }
   GSize child_size = layer_get_frame(data->layer).size;
   GPoint origin = layer_get_frame(layer).origin;
-  layer_set_frame(layer, GRect(origin.x, origin.y, child_size.w, child_size.h));
+  GRect final_frame = GRect(origin.x, origin.y, child_size.w, child_size.h);
+  if (data->assistant_label_layer) {
+    final_frame.size.h += NAME_HEIGHT;
+  }
+  layer_set_frame(layer, final_frame);
 }
 
 static SegmentType prv_get_segment_type(ConversationEntry* entry) {

app/src/c/converse/segments/segment_layer.h

@@ -23,7 +23,7 @@
 
 typedef Layer SegmentLayer;
 
-SegmentLayer* segment_layer_create(GRect rect, ConversationEntry* entry);
+SegmentLayer* segment_layer_create(GRect rect, ConversationEntry* entry, bool assistant_label);
 ConversationEntry* segment_layer_get_entry(SegmentLayer* layer);
 void segment_layer_destroy(SegmentLayer* layer);
 void segment_layer_update(SegmentLayer* layer);

app/src/c/converse/segments/widgets/number.c

@@ -29,7 +29,6 @@ static void prv_choose_font(Layer *layer);
 bool prv_is_sufficiently_numeric(const char* text);
 
 NumberWidget* number_widget_create(GRect rect, ConversationEntry* entry) {
-  char *number = conversation_entry_get_widget(entry)->widget.number.number;
   Layer *number_layer = layer_create_with_data(GRect(rect.origin.x, rect.origin.y, rect.size.w, 60), sizeof(NumberWidgetData));
   NumberWidgetData *data = layer_get_data(number_layer);
   data->entry = entry;

app/src/c/converse/session_window.c

@@ -269,7 +269,8 @@ static void prv_conversation_manager_handler(bool entry_added, void* context) {
       sw->segment_layers[--sw->segment_count] = NULL;
     }
   }
-  ConversationEntry* entry = conversation_peek(conversation_manager_get_conversation(sw->manager));
+  Conversation *conversation = conversation_manager_get_conversation(sw->manager);
+  ConversationEntry* entry = conversation_peek(conversation);
   if (entry == NULL) {
     // ??????
     APP_LOG(APP_LOG_LEVEL_ERROR, "We were told a new entry was added, but no entries actually exist????");
@@ -282,7 +283,7 @@ static void prv_conversation_manager_handler(bool entry_added, void* context) {
     free(sw->segment_layers);
     sw->segment_layers = new_block;
   }
-  SegmentLayer* layer = segment_layer_create(GRect(0, prv_content_height(sw), holder_size.w, 10), entry);
+  SegmentLayer* layer = segment_layer_create(GRect(0, prv_content_height(sw), holder_size.w, 10), entry, conversation_assistant_just_started(conversation));
   sw->segment_layers[sw->segment_count++] = layer;
   scroll_layer_add_child(sw->scroll_layer, layer);
   int layer_height = layer_get_frame(layer).size.h;