From f774dbfe2e5db9c6fd79b17e2879b397fbaa65c1 Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Thu, 22 Jun 2023 18:58:11 +0200
Subject: [PATCH] Use new icons, delete old ones

---
 assets/icons/microphone_active_12.svg        | 4 ----
 assets/icons/microphone_inactive_12.svg      | 5 -----
 assets/icons/speakers_active_12.svg          | 1 -
 assets/icons/speakers_inactive_12.svg        | 1 -
 crates/collab_ui/src/collab_titlebar_item.rs | 4 ++--
 5 files changed, 2 insertions(+), 13 deletions(-)
 delete mode 100644 assets/icons/microphone_active_12.svg
 delete mode 100644 assets/icons/microphone_inactive_12.svg
 delete mode 100644 assets/icons/speakers_active_12.svg
 delete mode 100644 assets/icons/speakers_inactive_12.svg

diff --git a/assets/icons/microphone_active_12.svg b/assets/icons/microphone_active_12.svg
deleted file mode 100644
index 797e64820b5b7b358e6951fe1d6178b7ca1a6908..0000000000000000000000000000000000000000
--- a/assets/icons/microphone_active_12.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.72742 9.33338C3.63539 9.07302 3.34973 8.93656 3.08937 9.02858C2.82901 9.1206 2.69255 9.40626 2.78458 9.66662C2.86101 9.88288 2.95188 10.0923 3.056 10.2936C3.81427 11.7601 5.27842 12.8044 7.00014 12.9753L7.00014 14.5L5.50014 14.5C5.22399 14.5 5.00014 14.7239 5.00014 15C5.00014 15.2761 5.22399 15.5 5.50014 15.5L7.50014 15.5L9.50014 15.5C9.77628 15.5 10.0001 15.2761 10.0001 15C10.0001 14.7239 9.77628 14.5 9.50014 14.5L8.00014 14.5L8.00014 12.9753C9.72168 12.8043 11.1857 11.76 11.9439 10.2936C12.048 10.0923 12.1389 9.88288 12.2153 9.66662C12.3073 9.40626 12.1709 9.1206 11.9105 9.02858C11.6501 8.93656 11.3645 9.07302 11.2725 9.33338C11.2114 9.50607 11.1388 9.67337 11.0556 9.83433C10.3899 11.1218 9.04706 12 7.49994 12C5.95282 12 4.60997 11.1218 3.94428 9.83433C3.86104 9.67337 3.78845 9.50607 3.72742 9.33338ZM5.5 4L5.5 8C5.5 9.10457 6.39543 10 7.5 10C8.60457 10 9.5 9.10457 9.5 8L9.5 4C9.5 2.89543 8.60457 2 7.5 2C6.39543 2 5.5 2.89543 5.5 4ZM4.5 8C4.5 9.65685 5.84315 11 7.5 11C9.15685 11 10.5 9.65685 10.5 8L10.5 4C10.5 2.34315 9.15685 1 7.5 1C5.84315 1 4.5 2.34315 4.5 4L4.5 8Z" fill="#CCCAC2"/>
-</svg>
-
diff --git a/assets/icons/microphone_inactive_12.svg b/assets/icons/microphone_inactive_12.svg
deleted file mode 100644
index 90ac393fc20fe9bb8877f82b416728887da72757..0000000000000000000000000000000000000000
--- a/assets/icons/microphone_inactive_12.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M3.72742 9.33338C3.63539 9.07302 3.34973 8.93656 3.08937 9.02858C2.82901 9.1206 2.69255 9.40626 2.78458 9.66662C2.86101 9.88288 2.95188 10.0923 3.056 10.2936C3.81427 11.7601 5.27842 12.8044 7.00014 12.9753L7.00014 14.5L5.50014 14.5C5.22399 14.5 5.00014 14.7239 5.00014 15C5.00014 15.2761 5.22399 15.5 5.50014 15.5L7.50014 15.5L9.50014 15.5C9.77628 15.5 10.0001 15.2761 10.0001 15C10.0001 14.7239 9.77628 14.5 9.50014 14.5L8.00014 14.5L8.00014 12.9753C9.72168 12.8043 11.1857 11.76 11.9439 10.2936C12.048 10.0923 12.1389 9.88288 12.2153 9.66662C12.3073 9.40626 12.1709 9.1206 11.9105 9.02858C11.6501 8.93656 11.3645 9.07302 11.2725 9.33338C11.2114 9.50607 11.1388 9.67337 11.0556 9.83433C10.3899 11.1218 9.04706 12 7.49994 12C5.95282 12 4.60997 11.1218 3.94428 9.83433C3.86104 9.67337 3.78845 9.50607 3.72742 9.33338ZM5.5 4L5.5 8C5.5 9.10457 6.39543 10 7.5 10C8.60457 10 9.5 9.10457 9.5 8L9.5 4C9.5 2.89543 8.60457 2 7.5 2C6.39543 2 5.5 2.89543 5.5 4ZM4.5 8C4.5 9.65685 5.84315 11 7.5 11C9.15685 11 10.5 9.65685 10.5 8L10.5 4C10.5 2.34315 9.15685 1 7.5 1C5.84315 1 4.5 2.34315 4.5 4L4.5 8Z" fill="#F18779"/>
-<path d="M12.5 2.00003L2.5 13" stroke="#F18779" stroke-linecap="round"/>
-</svg>
-
diff --git a/assets/icons/speakers_active_12.svg b/assets/icons/speakers_active_12.svg
deleted file mode 100644
index 10416a8f79248d09a28e47d9e117cebf524a5179..0000000000000000000000000000000000000000
--- a/assets/icons/speakers_active_12.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.46968 1.05085C7.64122 1.13475 7.75 1.30904 7.75 1.5V13.5C7.75 13.691 7.64122 13.8653 7.46968 13.9492C7.29813 14.0331 7.09377 14.0119 6.94303 13.8947L3.2213 11H1.5C0.671571 11 0 10.3284 0 9.5V5.5C0 4.67158 0.671573 4 1.5 4H3.2213L6.94303 1.10533C7.09377 0.988085 7.29813 0.966945 7.46968 1.05085ZM6.75 2.52232L3.69983 4.89468C3.61206 4.96294 3.50405 5 3.39286 5H1.5C1.22386 5 1 5.22386 1 5.5V9.5C1 9.77615 1.22386 10 1.5 10H3.39286C3.50405 10 3.61206 10.0371 3.69983 10.1053L6.75 12.4777V2.52232ZM10.2784 3.84804C10.4623 3.72567 10.7106 3.77557 10.833 3.95949C12.2558 6.09798 12.2558 8.90199 10.833 11.0405C10.7106 11.2244 10.4623 11.2743 10.2784 11.1519C10.0944 11.0296 10.0445 10.7813 10.1669 10.5973C11.4111 8.72728 11.4111 6.27269 10.1669 4.40264C10.0445 4.21871 10.0944 3.97041 10.2784 3.84804ZM12.6785 1.43044C12.5356 1.2619 12.2832 1.24104 12.1147 1.38386C11.9462 1.52667 11.9253 1.77908 12.0681 1.94762C14.7773 5.14488 14.7773 9.85513 12.0681 13.0524C11.9253 13.2209 11.9462 13.4733 12.1147 13.6161C12.2832 13.759 12.5356 13.7381 12.6785 13.5696C15.6406 10.0739 15.6406 4.92612 12.6785 1.43044Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
diff --git a/assets/icons/speakers_inactive_12.svg b/assets/icons/speakers_inactive_12.svg
deleted file mode 100644
index a74990d983e3cbae0822b3a6780074e7e227cd10..0000000000000000000000000000000000000000
--- a/assets/icons/speakers_inactive_12.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M7.72361 1.05279C7.893 1.13749 8 1.31062 8 1.5V13.5C8 13.6894 7.893 13.8625 7.72361 13.9472C7.55421 14.0319 7.35151 14.0136 7.2 13.9L3.33333 11H1.5C0.671573 11 0 10.3284 0 9.5V5.5C0 4.67158 0.671573 4 1.5 4H3.33333L7.2 1.1C7.35151 0.986371 7.55421 0.968093 7.72361 1.05279ZM7 2.5L3.8 4.9C3.71345 4.96491 3.60819 5 3.5 5H1.5C1.22386 5 1 5.22386 1 5.5V9.5C1 9.77614 1.22386 10 1.5 10H3.5C3.60819 10 3.71345 10.0351 3.8 10.1L7 12.5V2.5ZM14.8536 5.14645C15.0488 5.34171 15.0488 5.65829 14.8536 5.85355L13.2071 7.5L14.8536 9.14645C15.0488 9.34171 15.0488 9.65829 14.8536 9.85355C14.6583 10.0488 14.3417 10.0488 14.1464 9.85355L12.5 8.20711L10.8536 9.85355C10.6583 10.0488 10.3417 10.0488 10.1464 9.85355C9.95118 9.65829 9.95118 9.34171 10.1464 9.14645L11.7929 7.5L10.1464 5.85355C9.95118 5.65829 9.95118 5.34171 10.1464 5.14645C10.3417 4.95118 10.6583 4.95118 10.8536 5.14645L12.5 6.79289L14.1464 5.14645C14.3417 4.95118 14.6583 4.95118 14.8536 5.14645Z" fill="currentColor" fill-rule="evenodd" clip-rule="evenodd"></path></svg>
diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs
index ddc3f538018842586a71f7c19f480991688259f6..1cfa18f432367e1859a4948099032a7fa9a6526a 100644
--- a/crates/collab_ui/src/collab_titlebar_item.rs
+++ b/crates/collab_ui/src/collab_titlebar_item.rs
@@ -500,10 +500,10 @@ impl CollabTitlebarItem {
         let icon;
         let tooltip;
         if room.read(cx).is_deafened().unwrap_or(false) {
-            icon = "icons/speakers_inactive_12.svg";
+            icon = "icons/radix/speaker-off.svg";
             tooltip = "Unmute speakers\nRight click for options";
         } else {
-            icon = "icons/speakers_active_12.svg";
+            icon = "icons/radix/speaker-loud.svg";
             tooltip = "Mute speakers\nRight click for options";
         }