diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 8c89a97..56a3127 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -13,7 +13,7 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest] rustup: [stable] runs-on: ${{ matrix.os }} diff --git a/Cargo.lock b/Cargo.lock index 7c8d9cc..a4d1561 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1179,7 +1179,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "proc-macro2", "quote", @@ -2517,7 +2517,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2619,7 +2619,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2630,7 +2630,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "gpui", @@ -2852,7 +2852,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "async-compression", @@ -2877,7 +2877,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3638,7 +3638,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "bindgen", @@ -4498,7 +4498,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "collections", "serde", @@ -5133,7 +5133,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "derive_refineable", ] @@ -5232,7 +5232,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "bytes", @@ -5286,7 +5286,7 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "arrayvec", "log", @@ -5565,7 +5565,7 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "async-task", "backtrace", @@ -6155,7 +6155,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "arrayvec", "log", @@ -7113,7 +7113,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "async-fs", @@ -7149,7 +7149,7 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "perf", "quote", @@ -8625,7 +8625,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "anyhow", "chrono", @@ -8642,7 +8642,7 @@ checksum = "bd8f3f50b848df28f887acb68e41201b5aea6bc8a8dacc00fb40635ff9a72fea" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" dependencies = [ "tracing", "tracing-subscriber", @@ -8653,7 +8653,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ceecf82287b4f9323b4ecbfb388a147361db7aaf" +source = "git+https://github.com/zed-industries/zed#83ca31055cf3e56aa8a704ac49e1686434f4e640" [[package]] name = "zune-core" diff --git a/assets/icons/arrow-left.svg b/assets/icons/arrow-left.svg index d0b5d88..ac3e659 100644 --- a/assets/icons/arrow-left.svg +++ b/assets/icons/arrow-left.svg @@ -1,3 +1,16 @@ - - + + + diff --git a/assets/icons/arrow-right.svg b/assets/icons/arrow-right.svg index 05ef2da..8aa7e0d 100644 --- a/assets/icons/arrow-right.svg +++ b/assets/icons/arrow-right.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/arrows-in.svg b/assets/icons/arrows-in.svg deleted file mode 100644 index 46904e4..0000000 --- a/assets/icons/arrows-in.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/boom.svg b/assets/icons/boom.svg new file mode 100644 index 0000000..3f18d96 --- /dev/null +++ b/assets/icons/boom.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/caret-down-fill.svg b/assets/icons/caret-down-fill.svg deleted file mode 100644 index 48d34e0..0000000 --- a/assets/icons/caret-down-fill.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/caret-down.svg b/assets/icons/caret-down.svg index ca53e93..a5717ec 100644 --- a/assets/icons/caret-down.svg +++ b/assets/icons/caret-down.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/caret-right.svg b/assets/icons/caret-right.svg index f86630d..1d0cc50 100644 --- a/assets/icons/caret-right.svg +++ b/assets/icons/caret-right.svg @@ -1 +1,3 @@ - + + + diff --git a/assets/icons/caret-up.svg b/assets/icons/caret-up.svg index 09e8ccd..6ffbd8b 100644 --- a/assets/icons/caret-up.svg +++ b/assets/icons/caret-up.svg @@ -1 +1,3 @@ - + + + diff --git a/assets/icons/check-circle-fill.svg b/assets/icons/check-circle-fill.svg deleted file mode 100644 index e776f4f..0000000 --- a/assets/icons/check-circle-fill.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/check-circle.svg b/assets/icons/check-circle.svg index 4889d9c..74e45c3 100644 --- a/assets/icons/check-circle.svg +++ b/assets/icons/check-circle.svg @@ -1 +1,3 @@ - + + + diff --git a/assets/icons/check.svg b/assets/icons/check.svg index 5b34ba7..5105a0d 100644 --- a/assets/icons/check.svg +++ b/assets/icons/check.svg @@ -1 +1,3 @@ - + + + diff --git a/assets/icons/close-circle-fill.svg b/assets/icons/close-circle-fill.svg index 9e7b90f..27c42e3 100644 --- a/assets/icons/close-circle-fill.svg +++ b/assets/icons/close-circle-fill.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/close-circle.svg b/assets/icons/close-circle.svg index 9e7b90f..b622fb0 100644 --- a/assets/icons/close-circle.svg +++ b/assets/icons/close-circle.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/close.svg b/assets/icons/close.svg index 55af35f..debd9cb 100644 --- a/assets/icons/close.svg +++ b/assets/icons/close.svg @@ -1 +1,3 @@ - + + + diff --git a/assets/icons/copy.svg b/assets/icons/copy.svg index 5af5438..2daf6a6 100644 --- a/assets/icons/copy.svg +++ b/assets/icons/copy.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/door.svg b/assets/icons/door.svg new file mode 100644 index 0000000..df03a31 --- /dev/null +++ b/assets/icons/door.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/edit.svg b/assets/icons/edit.svg deleted file mode 100644 index 0bcd4e0..0000000 --- a/assets/icons/edit.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/icons/ellipsis.svg b/assets/icons/ellipsis.svg index f3113af..2ab4cc7 100644 --- a/assets/icons/ellipsis.svg +++ b/assets/icons/ellipsis.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/assets/icons/emoji-fill.svg b/assets/icons/emoji-fill.svg deleted file mode 100644 index 974ccf4..0000000 --- a/assets/icons/emoji-fill.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/emoji.svg b/assets/icons/emoji.svg new file mode 100644 index 0000000..fd52a5f --- /dev/null +++ b/assets/icons/emoji.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/encryption.svg b/assets/icons/encryption.svg deleted file mode 100644 index 4f23a2d..0000000 --- a/assets/icons/encryption.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/eye.svg b/assets/icons/eye.svg new file mode 100644 index 0000000..907673c --- /dev/null +++ b/assets/icons/eye.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/group.svg b/assets/icons/group.svg deleted file mode 100644 index 7f94e3c..0000000 --- a/assets/icons/group.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/info.svg b/assets/icons/info.svg index 1b3641a..48994c5 100644 --- a/assets/icons/info.svg +++ b/assets/icons/info.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/link.svg b/assets/icons/link.svg new file mode 100644 index 0000000..88ae017 --- /dev/null +++ b/assets/icons/link.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/logout.svg b/assets/icons/logout.svg deleted file mode 100644 index e7beade..0000000 --- a/assets/icons/logout.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/minimize.svg b/assets/icons/minimize.svg deleted file mode 100644 index 67009bf..0000000 --- a/assets/icons/minimize.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/moon.svg b/assets/icons/moon.svg index c161221..1684e5f 100644 --- a/assets/icons/moon.svg +++ b/assets/icons/moon.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/open-url.svg b/assets/icons/open-url.svg deleted file mode 100644 index 837e1e6..0000000 --- a/assets/icons/open-url.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/panel-left-open.svg b/assets/icons/panel-left-open.svg deleted file mode 100644 index bd9af3e..0000000 --- a/assets/icons/panel-left-open.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/panel-left.svg b/assets/icons/panel-left.svg deleted file mode 100644 index def688f..0000000 --- a/assets/icons/panel-left.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/panel-right-open.svg b/assets/icons/panel-right-open.svg deleted file mode 100644 index 0cf3c3c..0000000 --- a/assets/icons/panel-right-open.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/panel-right.svg b/assets/icons/panel-right.svg deleted file mode 100644 index f7278a5..0000000 --- a/assets/icons/panel-right.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/plus-circle-fill.svg b/assets/icons/plus-circle-fill.svg deleted file mode 100644 index 848c240..0000000 --- a/assets/icons/plus-circle-fill.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/assets/icons/plus-circle.svg b/assets/icons/plus-circle.svg new file mode 100644 index 0000000..a615ad7 --- /dev/null +++ b/assets/icons/plus-circle.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/plus-fill.svg b/assets/icons/plus-fill.svg deleted file mode 100644 index 1ba3086..0000000 --- a/assets/icons/plus-fill.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/plus.svg b/assets/icons/plus.svg index 8cf89a0..f9e4c8f 100644 --- a/assets/icons/plus.svg +++ b/assets/icons/plus.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/refresh.svg b/assets/icons/refresh.svg deleted file mode 100644 index ed200e0..0000000 --- a/assets/icons/refresh.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/icons/relay.svg b/assets/icons/relay.svg new file mode 100644 index 0000000..cd47109 --- /dev/null +++ b/assets/icons/relay.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/icons/reply.svg b/assets/icons/reply.svg index 53da0cb..8a36e4c 100644 --- a/assets/icons/reply.svg +++ b/assets/icons/reply.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/report.svg b/assets/icons/report.svg deleted file mode 100644 index 07c1403..0000000 --- a/assets/icons/report.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/resize-corner.svg b/assets/icons/resize-corner.svg deleted file mode 100644 index 31065be..0000000 --- a/assets/icons/resize-corner.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/assets/icons/search.svg b/assets/icons/search.svg index 5207a79..c519f15 100644 --- a/assets/icons/search.svg +++ b/assets/icons/search.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/server.svg b/assets/icons/server.svg deleted file mode 100644 index 841911c..0000000 --- a/assets/icons/server.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/icons/settings.svg b/assets/icons/settings.svg index 059f4a8..01426e5 100644 --- a/assets/icons/settings.svg +++ b/assets/icons/settings.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/assets/icons/signal.svg b/assets/icons/signal.svg deleted file mode 100644 index 5c46c01..0000000 --- a/assets/icons/signal.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/icons/sun.svg b/assets/icons/sun.svg index de6bb8b..07e5909 100644 --- a/assets/icons/sun.svg +++ b/assets/icons/sun.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/upload.svg b/assets/icons/upload.svg index 448cd21..ffa5b34 100644 --- a/assets/icons/upload.svg +++ b/assets/icons/upload.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/warning.svg b/assets/icons/warning.svg index 8ac94eb..0854261 100644 --- a/assets/icons/warning.svg +++ b/assets/icons/warning.svg @@ -1,3 +1,3 @@ - - + + diff --git a/assets/icons/zoom.svg b/assets/icons/zoom.svg new file mode 100644 index 0000000..663232e --- /dev/null +++ b/assets/icons/zoom.svg @@ -0,0 +1,58 @@ + + + + + + + + + + diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs index 109182f..7b5b90c 100644 --- a/crates/chat_ui/src/lib.rs +++ b/crates/chat_ui/src/lib.rs @@ -1199,7 +1199,7 @@ impl Render for ChatPanel { .child( EmojiPicker::new() .target(self.input.downgrade()) - .icon(IconName::EmojiFill) + .icon(IconName::Emoji) .large(), ), ) diff --git a/crates/coop/src/chatspace.rs b/crates/coop/src/chatspace.rs index 4616486..e290321 100644 --- a/crates/coop/src/chatspace.rs +++ b/crates/coop/src/chatspace.rs @@ -545,15 +545,6 @@ impl ChatSpace { let persons = PersonRegistry::global(cx); let profile = persons.read(cx).get(&public_key, cx); - let keystore = KeyStore::global(cx); - let is_using_file_keystore = keystore.read(cx).is_using_file_keystore(); - - let keyring_label = if is_using_file_keystore { - SharedString::from("Disabled") - } else { - SharedString::from("Enabled") - }; - this.child( Button::new("user") .small() @@ -563,29 +554,17 @@ impl ChatSpace { .child(Avatar::new(profile.avatar()).size(rems(1.45))) .popup_menu(move |this, _window, _cx| { this.label(profile.name()) - .menu_with_icon( - "Profile", - IconName::EmojiFill, - Box::new(ViewProfile), - ) + .menu_with_icon("Profile", IconName::Emoji, Box::new(ViewProfile)) .menu_with_icon( "Messaging Relays", - IconName::Server, + IconName::Relay, Box::new(ViewRelays), ) .separator() - .label(SharedString::from("Keyring Service")) - .menu_with_icon_and_disabled( - keyring_label.clone(), - IconName::Encryption, - Box::new(KeyringPopup), - !is_using_file_keystore, - ) - .separator() .menu_with_icon("Dark Mode", IconName::Sun, Box::new(DarkMode)) .menu_with_icon("Themes", IconName::Moon, Box::new(Themes)) .menu_with_icon("Settings", IconName::Settings, Box::new(Settings)) - .menu_with_icon("Sign Out", IconName::Logout, Box::new(Logout)) + .menu_with_icon("Sign Out", IconName::Door, Box::new(Logout)) }), ) }) diff --git a/crates/coop/src/new_identity/backup.rs b/crates/coop/src/new_identity/backup.rs index 36858db..f5a52b8 100644 --- a/crates/coop/src/new_identity/backup.rs +++ b/crates/coop/src/new_identity/backup.rs @@ -151,7 +151,7 @@ impl Render for Backup { Button::new("copy-pubkey") .icon({ if self.copied { - IconName::CheckCircleFill + IconName::CheckCircle } else { IconName::Copy } @@ -187,7 +187,7 @@ impl Render for Backup { Button::new("copy-secret") .icon({ if self.copied { - IconName::CheckCircleFill + IconName::CheckCircle } else { IconName::Copy } diff --git a/crates/coop/src/new_identity/mod.rs b/crates/coop/src/new_identity/mod.rs index ab7daa8..8a1c3aa 100644 --- a/crates/coop/src/new_identity/mod.rs +++ b/crates/coop/src/new_identity/mod.rs @@ -311,7 +311,7 @@ impl Render for NewAccount { .child(Avatar::new(avatar).size(rems(4.25))) .child( Button::new("upload") - .icon(IconName::PlusCircleFill) + .icon(IconName::PlusCircle) .label("Add an avatar") .xsmall() .ghost() diff --git a/crates/coop/src/sidebar/mod.rs b/crates/coop/src/sidebar/mod.rs index bfb823b..d8f4ef4 100644 --- a/crates/coop/src/sidebar/mod.rs +++ b/crates/coop/src/sidebar/mod.rs @@ -511,7 +511,7 @@ impl Sidebar { .gap_1() .font_semibold() .child( - Icon::new(IconName::Signal) + Icon::new(IconName::Relay) .small() .text_color(cx.theme().danger_active) .when(connected, |this| { diff --git a/crates/coop/src/user/mod.rs b/crates/coop/src/user/mod.rs index cfee59a..8bdabc2 100644 --- a/crates/coop/src/user/mod.rs +++ b/crates/coop/src/user/mod.rs @@ -366,7 +366,7 @@ impl Render for UserProfile { Button::new("copy") .icon({ if self.copied { - IconName::CheckCircleFill + IconName::CheckCircle } else { IconName::Copy } diff --git a/crates/coop/src/user/viewer.rs b/crates/coop/src/user/viewer.rs index e710dba..57f3c04 100644 --- a/crates/coop/src/user/viewer.rs +++ b/crates/coop/src/user/viewer.rs @@ -168,7 +168,7 @@ impl Render for ProfileViewer { .relative() .text_color(cx.theme().text_accent) .child( - Icon::new(IconName::CheckCircleFill) + Icon::new(IconName::CheckCircle) .small() .block(), ), @@ -240,7 +240,7 @@ impl Render for ProfileViewer { Button::new("copy") .icon({ if self.copied { - IconName::CheckCircleFill + IconName::CheckCircle } else { IconName::Copy } diff --git a/crates/coop/src/views/compose.rs b/crates/coop/src/views/compose.rs index cca222c..f38b00d 100644 --- a/crates/coop/src/views/compose.rs +++ b/crates/coop/src/views/compose.rs @@ -386,7 +386,7 @@ impl Compose { ) .when(contact.selected, |this| { this.child( - Icon::new(IconName::CheckCircleFill) + Icon::new(IconName::CheckCircle) .small() .text_color(cx.theme().text_accent), ) @@ -459,7 +459,7 @@ impl Render for Compose { .disabled(loading) .suffix( Button::new("add") - .icon(IconName::PlusCircleFill) + .icon(IconName::PlusCircle) .transparent() .small() .disabled(loading) diff --git a/crates/coop/src/views/screening.rs b/crates/coop/src/views/screening.rs index bc0705f..8ab5443 100644 --- a/crates/coop/src/views/screening.rs +++ b/crates/coop/src/views/screening.rs @@ -278,7 +278,7 @@ impl Render for Screening { .child( Button::new("report") .tooltip("Report as a scam or impostor") - .icon(IconName::Report) + .icon(IconName::Boom) .danger() .rounded() .on_click(cx.listener(move |this, _e, window, cx| { @@ -440,7 +440,7 @@ fn status_badge(status: Option, cx: &App) -> Div { .flex_shrink_0() .map(|this| { if let Some(status) = status { - this.child(Icon::new(IconName::CheckCircleFill).small().text_color({ + this.child(Icon::new(IconName::CheckCircle).small().text_color({ if status { cx.theme().icon_accent } else { diff --git a/crates/coop/src/views/setup_relay.rs b/crates/coop/src/views/setup_relay.rs index cbc2809..a79b969 100644 --- a/crates/coop/src/views/setup_relay.rs +++ b/crates/coop/src/views/setup_relay.rs @@ -296,7 +296,7 @@ impl Render for SetupRelay { .child(TextInput::new(&self.input).small()) .child( Button::new("add") - .icon(IconName::PlusFill) + .icon(IconName::Plus) .label("Add") .ghost() .on_click(cx.listener(move |this, _, window, cx| { diff --git a/crates/ui/src/dock_area/tab_panel.rs b/crates/ui/src/dock_area/tab_panel.rs index f92b7d3..b91e635 100644 --- a/crates/ui/src/dock_area/tab_panel.rs +++ b/crates/ui/src/dock_area/tab_panel.rs @@ -423,7 +423,7 @@ impl TabPanel { .when(self.is_zoomed, |this| { this.child( Button::new("zoom") - .icon(IconName::ArrowIn) + .icon(IconName::Zoom) .small() .ghost() .tooltip("Zoom Out") diff --git a/crates/ui/src/icon.rs b/crates/ui/src/icon.rs index d3dd4de..4dcbd3d 100644 --- a/crates/ui/src/icon.rs +++ b/crates/ui/src/icon.rs @@ -9,127 +9,79 @@ use crate::{Sizable, Size}; #[derive(IntoElement, Clone)] pub enum IconName { - ArrowIn, - ArrowDown, ArrowLeft, ArrowRight, - ArrowUp, - CaretUp, + Boom, CaretDown, - CaretDownFill, CaretRight, + CaretUp, Check, CheckCircle, - CheckCircleFill, Close, CloseCircle, CloseCircleFill, Copy, - Edit, + Door, Ellipsis, - Encryption, + Emoji, Eye, - EyeOff, - EmojiFill, Info, + Link, Loader, - Logout, Moon, - PanelBottom, - PanelBottomOpen, - PanelLeft, - PanelLeftClose, - PanelLeftOpen, - PanelRight, - PanelRightClose, - PanelRightOpen, Plus, - PlusFill, - PlusCircleFill, - Group, - ResizeCorner, + PlusCircle, + Relay, Reply, - Report, - Refresh, - Signal, Search, Settings, - Server, - SortAscending, - SortDescending, Sun, - ThumbsDown, - ThumbsUp, Upload, - OpenUrl, Warning, WindowClose, WindowMaximize, WindowMinimize, WindowRestore, + Zoom, } impl IconName { pub fn path(self) -> SharedString { match self { - Self::ArrowIn => "icons/arrows-in.svg", - Self::ArrowDown => "icons/arrow-down.svg", Self::ArrowLeft => "icons/arrow-left.svg", Self::ArrowRight => "icons/arrow-right.svg", - Self::ArrowUp => "icons/arrow-up.svg", + Self::Boom => "icons/boom.svg", + Self::CaretDown => "icons/caret-down.svg", Self::CaretRight => "icons/caret-right.svg", Self::CaretUp => "icons/caret-up.svg", - Self::CaretDown => "icons/caret-down.svg", - Self::CaretDownFill => "icons/caret-down-fill.svg", Self::Check => "icons/check.svg", Self::CheckCircle => "icons/check-circle.svg", - Self::CheckCircleFill => "icons/check-circle-fill.svg", Self::Close => "icons/close.svg", Self::CloseCircle => "icons/close-circle.svg", Self::CloseCircleFill => "icons/close-circle-fill.svg", Self::Copy => "icons/copy.svg", - Self::Edit => "icons/edit.svg", + Self::Door => "icons/door.svg", Self::Ellipsis => "icons/ellipsis.svg", + Self::Emoji => "icons/emoji.svg", Self::Eye => "icons/eye.svg", - Self::Encryption => "icons/encryption.svg", - Self::EmojiFill => "icons/emoji-fill.svg", - Self::EyeOff => "icons/eye-off.svg", Self::Info => "icons/info.svg", + Self::Link => "icons/link.svg", Self::Loader => "icons/loader.svg", - Self::Logout => "icons/logout.svg", Self::Moon => "icons/moon.svg", - Self::PanelBottom => "icons/panel-bottom.svg", - Self::PanelBottomOpen => "icons/panel-bottom-open.svg", - Self::PanelLeft => "icons/panel-left.svg", - Self::PanelLeftClose => "icons/panel-left-close.svg", - Self::PanelLeftOpen => "icons/panel-left-open.svg", - Self::PanelRight => "icons/panel-right.svg", - Self::PanelRightClose => "icons/panel-right-close.svg", - Self::PanelRightOpen => "icons/panel-right-open.svg", Self::Plus => "icons/plus.svg", - Self::PlusFill => "icons/plus-fill.svg", - Self::PlusCircleFill => "icons/plus-circle-fill.svg", - Self::Group => "icons/group.svg", - Self::ResizeCorner => "icons/resize-corner.svg", + Self::PlusCircle => "icons/plus-circle.svg", + Self::Relay => "icons/relay.svg", Self::Reply => "icons/reply.svg", - Self::Report => "icons/report.svg", - Self::Refresh => "icons/refresh.svg", - Self::Signal => "icons/signal.svg", Self::Search => "icons/search.svg", Self::Settings => "icons/settings.svg", - Self::Server => "icons/server.svg", - Self::SortAscending => "icons/sort-ascending.svg", - Self::SortDescending => "icons/sort-descending.svg", Self::Sun => "icons/sun.svg", - Self::ThumbsDown => "icons/thumbs-down.svg", - Self::ThumbsUp => "icons/thumbs-up.svg", Self::Upload => "icons/upload.svg", - Self::OpenUrl => "icons/open-url.svg", Self::Warning => "icons/warning.svg", Self::WindowClose => "icons/window-close.svg", Self::WindowMaximize => "icons/window-maximize.svg", Self::WindowMinimize => "icons/window-minimize.svg", Self::WindowRestore => "icons/window-restore.svg", + Self::Zoom => "icons/zoom.svg", } .into() } diff --git a/crates/ui/src/menu/popup_menu.rs b/crates/ui/src/menu/popup_menu.rs index 7e08e52..cf3105e 100644 --- a/crates/ui/src/menu/popup_menu.rs +++ b/crates/ui/src/menu/popup_menu.rs @@ -1015,7 +1015,7 @@ impl PopupMenu { .gap_1p5() .child(label.clone()) .child( - Icon::new(IconName::OpenUrl) + Icon::new(IconName::Link) .xsmall() .text_color(cx.theme().text_muted), ),