From 10e6c5b651d05923240e6f64c169d96b8e710506 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@zed.dev>
Date: Mon, 20 Mar 2023 09:04:30 -0600
Subject: [PATCH] Use an envelope as the feedback icon

This makes room to use the speech bubble for discussion threads.
---
 assets/icons/feedback_16.svg                  |  3 +++
 crates/collab_ui/src/collab_titlebar_item.rs  |  4 ++--
 crates/feedback/src/deploy_feedback_button.rs |  4 ++--
 crates/feedback/src/feedback_editor.rs        | 14 ++++++++++++--
 4 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 assets/icons/feedback_16.svg

diff --git a/assets/icons/feedback_16.svg b/assets/icons/feedback_16.svg
new file mode 100644
index 0000000000..b85a40b353
--- /dev/null
+++ b/assets/icons/feedback_16.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M15.9083 3.19699L7.99999 10.3949L0.0916311 3.1969C0.346537 2.49164 1.10447 1.98018 2 1.98018H14C14.8943 1.98018 15.653 2.49168 15.9083 3.19699ZM16 4.7153L12.1526 8.21715L16 11.688V4.7153ZM8.52024 11.5232L11.4199 8.88404L15.9081 12.933C15.6528 13.6378 14.8941 14.1501 14 14.1501H2C1.10461 14.1501 0.346779 13.6378 0.0917535 12.9331L4.58012 8.88404L7.47975 11.5232L7.99999 11.9967L8.52024 11.5232ZM3.84742 8.21715L0 4.71532V11.688L3.84742 8.21715Z" fill="white"/>
+</svg>
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index 59a4f36e27..7b4b819b03 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -305,7 +305,7 @@ impl CollabTitlebarItem {
                         action: Box::new(SignOut),
                     },
                     ContextMenuItem::Item {
-                        label: "Give Feedback".into(),
+                        label: "Send Feedback".into(),
                         action: Box::new(feedback::feedback_editor::GiveFeedback),
                     },
                 ]
@@ -316,7 +316,7 @@ impl CollabTitlebarItem {
                         action: Box::new(SignIn),
                     },
                     ContextMenuItem::Item {
-                        label: "Give Feedback".into(),
+                        label: "Send Feedback".into(),
                         action: Box::new(feedback::feedback_editor::GiveFeedback),
                     },
                 ]
diff --git a/crates/feedback/src/deploy_feedback_button.rs b/crates/feedback/src/deploy_feedback_button.rs
index 52d1ab9d92..49b6de5a4a 100644
--- a/crates/feedback/src/deploy_feedback_button.rs
+++ b/crates/feedback/src/deploy_feedback_button.rs
@@ -36,7 +36,7 @@ impl View for DeployFeedbackButton {
                         .item
                         .style_for(state, active);
 
-                    Svg::new("icons/speech_bubble_12.svg")
+                    Svg::new("icons/feedback_16.svg")
                         .with_color(style.icon_color)
                         .constrained()
                         .with_width(style.icon_size)
@@ -56,7 +56,7 @@ impl View for DeployFeedbackButton {
                 })
                 .with_tooltip::<Self, _>(
                     0,
-                    "Give Feedback".into(),
+                    "Send Feedback".into(),
                     Some(Box::new(GiveFeedback)),
                     theme.tooltip.clone(),
                     cx,
diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs
index 8b12e859e6..9e759b4d15 100644
--- a/crates/feedback/src/feedback_editor.rs
+++ b/crates/feedback/src/feedback_editor.rs
@@ -10,7 +10,7 @@ use editor::{Anchor, Editor};
 use futures::AsyncReadExt;
 use gpui::{
     actions,
-    elements::{ChildView, Flex, Label, ParentElement},
+    elements::{ChildView, Flex, Label, ParentElement, Svg},
     serde_json, AnyViewHandle, AppContext, Element, ElementBox, Entity, ModelHandle,
     MutableAppContext, PromptLevel, RenderContext, Task, View, ViewContext, ViewHandle,
 };
@@ -250,7 +250,17 @@ impl Item for FeedbackEditor {
     fn tab_content(&self, _: Option<usize>, style: &theme::Tab, _: &AppContext) -> ElementBox {
         Flex::row()
             .with_child(
-                Label::new("Feedback", style.label.clone())
+                Svg::new("icons/feedback_16.svg")
+                    .with_color(style.label.text.color)
+                    .constrained()
+                    .with_width(style.type_icon_width)
+                    .aligned()
+                    .contained()
+                    .with_margin_right(style.spacing)
+                    .boxed(),
+            )
+            .with_child(
+                Label::new("Send Feedback", style.label.clone())
                     .aligned()
                     .contained()
                     .boxed(),