Rename and toggle screenshare

Mikayla Maki created 2 years ago

Change summary

crates/collab_ui/src/collab_titlebar_item.rs | 2 +-
crates/theme/src/theme.rs                    | 2 +-
styles/package.json                          | 2 +-
styles/src/styleTree/workspace.ts            | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)

Detailed changes

crates/collab_ui/src/collab_titlebar_item.rs

@@ -417,7 +417,7 @@ impl CollabTitlebarItem {
 
         let titlebar = &theme.workspace.titlebar;
         MouseEventHandler::<ToggleScreenSharing, Self>::new(0, cx, |state, _| {
-            let style = titlebar.call_control.style_for(state);
+            let style = titlebar.screen_share_button.style_for(state);
             Svg::new(icon)
                 .with_color(style.color)
                 .constrained()

crates/theme/src/theme.rs

@@ -133,7 +133,7 @@ pub struct Titlebar {
     pub sign_in_prompt: Toggleable<Interactive<ContainedText>>,
     pub outdated_warning: ContainedText,
     pub share_button: Toggleable<Interactive<ContainedText>>,
-    pub call_control: Interactive<IconButton>,
+    pub screen_share_button: Toggleable<Interactive<IconButton>>,
     pub toggle_contacts_button: Toggleable<Interactive<IconButton>>,
     pub toggle_microphone_button: Toggleable<Interactive<IconButton>>,
     pub toggle_speakers_button: Toggleable<Interactive<IconButton>>,

styles/package.json

@@ -7,7 +7,7 @@
         "build": "ts-node ./src/buildThemes.ts",
         "build-licenses": "ts-node ./src/buildLicenses.ts",
         "build-tokens": "ts-node ./src/buildTokens.ts",
-        "build-types": "cd ../crates/theme && cargo test && cd ../../styles && ts-node ./src/buildTypes.ts",
+        "build-types": "ts-node ./src/buildTypes.ts",
         "test": "vitest"
     },
     "author": "",

styles/src/styleTree/workspace.ts

@@ -300,7 +300,7 @@ export default function workspace(colorScheme: ColorScheme) {
                 cornerRadius: 6,
             },
 
-            call_control: icon_button(colorScheme, {
+            screen_share_button: icon_button(colorScheme, {
                 margin: { left: itemSpacing / 2 },
             }),