From 10abc2254ac50ccbdb2024a8da68921f2b735dbb Mon Sep 17 00:00:00 2001
From: boatbomber <zack@boatbomber.com>
Date: Mon, 2 May 2022 14:28:18 -0700
Subject: [PATCH] Add changing toolbar icon to indicate state (#538)

* Add changing toolbar icon

* Return to default icon after closing error

* Update changelog

* Add assets

* Improved link icon

* Upload new icons

Co-authored-by: Lucien Greathouse <me@lpghatguy.com>
---
 CHANGELOG.md                                     |   6 ++++--
 assets/icon-link-32.png                          | Bin 0 -> 1378 bytes
 assets/icon-warn-32.png                          | Bin 0 -> 1264 bytes
 .../App/Components/Studio/StudioToggleButton.lua |   6 +++++-
 plugin/src/App/init.lua                          |  10 ++++++++--
 plugin/src/Assets.lua                            |   2 ++
 6 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 assets/icon-link-32.png
 create mode 100644 assets/icon-warn-32.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0013faeb..204cea8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,13 @@
 * Added support for optional paths in project files. ([#472])
 * Added support for the new Open Cloud API when uploading. ([#504])
 * Added `sourcemap` command for generating sourcemaps to feed into other tools. ([#530])
+* Added changing toolbar icon to indicate state ([#538])
 
 [#472]: https://github.com/rojo-rbx/rojo/pull/472
 [#504]: https://github.com/rojo-rbx/rojo/pull/504
 [#507]: https://github.com/rojo-rbx/rojo/pull/507
 [#530]: https://github.com/rojo-rbx/rojo/pull/530
+[#538]: https://github.com/rojo-rbx/rojo/pull/538
 
 ## [7.0.0] - December 10, 2021
 * Fixed Rojo's interactions with properties enabled by FFlags that are not yet enabled. ([#493])
@@ -96,7 +98,7 @@ The shorthand property format that most users use is not impacted. For reference
 ## [7.0.0-alpha.4][7.0.0-alpha.4] (May 5, 2021)
 * Added the `gameId` and `placeId` optional properties to project files.
     * When connecting from the Rojo Roblox Studio plugin, Rojo will set the game and place ID of the current place to these values, if set.
-    * This is equivalent to running `game:SetUniverseId(...)` and `game:SetPlaceId(...)` from the command bar in Studio. 
+    * This is equivalent to running `game:SetUniverseId(...)` and `game:SetPlaceId(...)` from the command bar in Studio.
 * Added "EXPERIMENTAL!" label to two-way sync toggle in Rojo's Roblox Studio plugin.
 * Fixed `Name` and `Parent` properties being allowed in Rojo projects. ([#413][pr-413])
 * Fixed "Open Scripts Externally" feature crashing Studio. ([#369][issue-369])
@@ -484,4 +486,4 @@ This is a general maintenance release for the Rojo 0.5.x release series.
 * More robust syncing with a new reconciler
 
 ## [0.1.0](https://github.com/rojo-rbx/rojo/releases/tag/v0.1.0) (November 29, 2017)
-* Initial release, functionally very similar to [rbxfs](https://github.com/LPGhatguy/rbxfs)
\ No newline at end of file
+* Initial release, functionally very similar to [rbxfs](https://github.com/LPGhatguy/rbxfs)
diff --git a/assets/icon-link-32.png b/assets/icon-link-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a69bbf997402843bb4ae8847b9015906723f4787
GIT binary patch
literal 1378
zcmV-o1)chdP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGjU;qFQU;%n~MU4Oe1oufqK~z{rwO4IS
zTU8i71EhQ?<5L8SWpfS&Srs#rEzwLgGBbaOiXq16HjF0zFfjG6=$MIrRN(IxH#g%4
znTu@3DHyX&7hR&;@ETw^5jx5?1Pbi}TPGEt=WtGUZ+qK<nNRYZd(PY2`@Z-6I_EAE
zOF*;hj#j55wbbcwxUy1`vr8O~6_k$zgF`0+myfr5FSKwjZ(bx48n7lK<L*tl*|l{A
z`CGKYc=+JrSX+zd{C2fWh?oXY*&D8s_c!I{)GE=U(K|DHX7g{o_o`)FB&(|hH96Uj
z?<-$@q%t$JN{Pbo&&^G}a&GXMFDHGU4PL!^wr}Q2k0U9`ack;LMd}veNLrQ#SsKHl
zM2kn0v-nNV`upa|j*9Z541uw(%BN)vg}OBg@7}p$ulc`992ZIIDxn{~WB7d2YlA~u
z>-)}DS7v71vpgjwhjJ#^=i?LmIJZM!E;OyCi-yGjZ!qZT@=bT{xir?U6+K;$zm->=
z>72(xAT&445OI$Chovw9ECxWqvHscFU)543;`*#x9@O)AZ%>%R!)K{!Tv!Z<M5D8~
zSxw~wV?C6L8GjndaM25ijMa#10INYwQQw!^)YJkdX|t=ORfmeo>-z?(<&S0<A_Lq2
zmMe)wOamHjD{M3;U-#7XA^C#|G_a$h?5MtvXz`3}H-}Ne5YJ*91%CwlvHk&+WgFXo
zqQXWs6?-m@wX3NF^MYlzyX>w`t(?t=)f44<Lo{IA5B?3l10DeH2R{MrJ0ahU4_8a!
zI{CA_kFln!bz*9C`KCHw`u&e5)bctEu^i(h_!n3$++u)Y$PZ$C5?pEPff`f$Jup7;
zA>+Jj^{Ou-l{4Ni4xFpCRZh5tALDc217YP0&>L2^tq0i2)HGcGS;@)SP`*)TIeSH$
z_reZ!n-zw53}Xve0S<yYVL%72{H+q>_uxOEGs**zt#&kc%|qpSQ)=~&zUBVqOl}<I
z&tp6ct^rShF7Q*x%Rn0R9mvqU45NZk9yqeL@-*6ScoSmn{}c!u>zkSFv8x0N4C(H@
z-~{+6SSF=HJOZ+Zbc6ZeHYooHS8Ecok({V<|EZP|%z@VjhqkF@Y#5>*<HsPCKLi$o
z--3MJX|M*o8KiPng@h#pPZi|ReHJkBn1E_&kA-aC1#%yF7z+Au<!<;k$TzM7Sq*h&
z<%GombNpG?YAP6ihK3$eqDX82v%vSDpjS%VB7|`_xEajDdL<b3B4GnqYGwsI(Qr%F
zyBqW3tF;xUB71;BP+jSX1u*H5Lg3d>?2|GZgbmQWoM7B}WmjWgXDM>c5@ZMDp@nM`
z*kVV(SD|<($TK06t`KYj6NAa8Pc!CCNP~I6-}LE-_glPSh;^VBoL8IyqjD+|vI^+_
zZ`_qVQUd7K8wqYu+#|Yu(}(H`^0v?;mQ%1H(lKrX)4&sOJu4zHc;44<pD^PA?G4Q+
zZ!7`wP5A(JJI)#NsO{7StQh73|EG7vn43}}(0UrdP$<!&z^Y+Vn!UjsVW`wC31J)S
zrGnnzsYrW*VCA5LHY7S5-Vg&cm`g7d6<W%U2G9^)%8{`BGWxGL?)P^c9G~2OyCc=L
zDm}eizkPElKWZJN{j*n$K*;*-a6=6sr~sdB9XvxYG?zmmzc+YoSSg<8*EK%r%!iZz
k7pxQ}rn!4wFIge}1@!7iL@dTy-v9sr07*qoM6N<$f=~s4MgRZ+

literal 0
HcmV?d00001

diff --git a/assets/icon-warn-32.png b/assets/icon-warn-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a8af730f7c6d4374b8ec456efa0d792c428e5e9
GIT binary patch
literal 1264
zcmV<M1P}X(P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000EHNkl<ZSi`+n
zO-vg{6#o2EFD$XK>AD27U_(&KkAiUol2fHBNEJxAKvYL*FEu4nPN~2uQhO;7a!eFJ
zIUrRE3B5F^R85sO61gNuRN~N<4G~b%7-N0{$Y5hTI2f(9J;Wo1jSV(MeW%$sv+sTL
z=9~B4D3FG9m<xM&Mq}X_#;jAT^aTu41OSWCsAoJB9_?Ft*}WKzdeX6}IA}o`%UT<9
z^i2*U=OhmIliMq6z1`jg*MA03z%WJMnhS0=<QSTerc7-`CeA&ZI-SZ|RU&1*LEku7
zdh%gKR+ddZ7Zk<7m;bmwd$8fZ=ic7_dwT1&z$lf>dzyFh$Qnke$Y7MpjPX!-G+pp$
z<4v7jdyV9^*GNO<rH{*4);d{j^AnxJ$T^e!d*ejW9s1u?{Hf^=V*Kj-LR%;n+Z^_-
z4?2vTGh3}T5V8&X)(4Xr3yHDKbT_;Qz*02oo!W{BGm*$sqPt+^nrWu*XDk#GH-n-W
z$X2Tji_z$O+5pBw;U{t;+I8AmGH&;ITJ|$WACKHtN&w{2%9}c9gUO6KjGWW1)7Fw}
z8WhFAen*uufO><zarb_&_9n{{9p-`_!jqsV1};v|)}_h;WwMEu<GHOg`5px}e@O&z
zsQmrMWE}u>dly|ahYlTqmb~0nG9Fl2>!auFI&H0s&+jDsAjxOgw>~Hjy(HjMMHTL)
z1)$!bZ=}=i!0H<S4kPEhVC0%<#{e+m58S`}{Ka{>9ZA5)0Dh1Jyi!!**VF+}>Gwz9
z`rR^?wYqpySGHQMr=15yG0^Vze39sQBmo%!`s1IsBmqwpRd|&W0CM-^;r?isaG6%(
zcwlv{uXpL?)qRfl8vrHou?4_20ImZ`C{MM^(H*Z&rP7n4)U&kQRr$w6&VJ4%0i^)G
zrksZXT#*D+9~gm_<GbV|G98Hs!@l*qi9(%3`T=ABhyhpza4cSV`y~Nq6jcxt0w`dZ
zqKYhbPX%0zM&}O*wS4!@0BWgfn@5%XY5-RN^d>xlPmJ$=o`?_Moh<n|MduuV>oWC%
z?E9J|fKLd3KL4q$$OIWT<QSSBo~rmOg^uVt0B%pmQw0Tp9ZGc!z^%6cl(DRpc5v?5
z)akF>p5~w^1^}QUi?#iBs{BuR4xn~_20(EFy#zobQ|l!Gb#FDCq?x#JqUa6{Y|K_U
zN9Mft8mWypb>fIbxtn};3(q5e;6548L?TbmPD~b$#C1VY47m9Gt}$EXoL#5=;79<-
z!=LE7U4H)JJn58fudMazR4V;YdFk&R=E9p~jd@<HI1~Un^Nmoum&?HFTHo1;$zq<-
zSV#rDl$Yy@N8>}UB`l>2Kmh<_w#qr3N~H&Yi_^1psgzTPk#n~3rcRwor6*vL6{Q2k
zuG7|z*(&GCSk{`(e+3LvG*n*tm?r3CwauR>n;!aQl!`cvoRjW~NE6fU_Ou+-8!B*w
z(qS&_xs;dNCU11x-JX_YZ${No0vHVjM}G2ce4o!~%q5wbrDXRVmckyMVJtI|*OQ^x
z-nYY%0(kQ_h;2UD@DGiL!lMo&=M2YU!KLWVeB80bGa8F~dwUlDm$dPw&dF+<pU$3i
aI{z1=4iQYht#xhy0000<MNUMnLSTaZzF^D%

literal 0
HcmV?d00001

diff --git a/plugin/src/App/Components/Studio/StudioToggleButton.lua b/plugin/src/App/Components/Studio/StudioToggleButton.lua
index 1970ff92..1adde586 100644
--- a/plugin/src/App/Components/Studio/StudioToggleButton.lua
+++ b/plugin/src/App/Components/Studio/StudioToggleButton.lua
@@ -44,6 +44,10 @@ function StudioToggleButton:didUpdate(lastProps)
 		self.button.Enabled = self.props.enabled
 	end
 
+	if self.props.icon ~= lastProps.icon then
+		self.button.Icon = self.props.icon
+	end
+
 	if self.props.active ~= lastProps.active then
 		self.button:SetActive(self.props.active)
 	end
@@ -63,4 +67,4 @@ local function StudioToggleButtonWrapper(props)
 	})
 end
 
-return StudioToggleButtonWrapper
\ No newline at end of file
+return StudioToggleButtonWrapper
diff --git a/plugin/src/App/init.lua b/plugin/src/App/init.lua
index b4d01f5b..78c94015 100644
--- a/plugin/src/App/init.lua
+++ b/plugin/src/App/init.lua
@@ -40,6 +40,7 @@ function App:init()
 	self:setState({
 		appStatus = AppStatus.NotConnected,
 		guiEnabled = false,
+		toolbarIcon = Assets.Images.PluginButton,
 	})
 end
 
@@ -57,6 +58,7 @@ function App:startSession(host, port, sessionOptions)
 		if status == ServeSession.Status.Connecting then
 			self:setState({
 				appStatus = AppStatus.Connecting,
+				toolbarIcon = Assets.Images.PluginButton,
 			})
 		elseif status == ServeSession.Status.Connected then
 			local address = ("%s:%s"):format(host, port)
@@ -64,6 +66,7 @@ function App:startSession(host, port, sessionOptions)
 				appStatus = AppStatus.Connected,
 				projectName = details,
 				address = address,
+				toolbarIcon = Assets.Images.PluginButtonConnected,
 			})
 		elseif status == ServeSession.Status.Disconnected then
 			self.serveSession = nil
@@ -76,10 +79,12 @@ function App:startSession(host, port, sessionOptions)
 				self:setState({
 					appStatus = AppStatus.Error,
 					errorMessage = tostring(details),
+					toolbarIcon = Assets.Images.PluginButtonWarning,
 				})
 			else
 				self:setState({
 					appStatus = AppStatus.NotConnected,
+					toolbarIcon = Assets.Images.PluginButton,
 				})
 			end
 		end
@@ -186,6 +191,7 @@ function App:render()
 						onClose = function()
 							self:setState({
 								appStatus = AppStatus.NotConnected,
+								toolbarIcon = Assets.Images.PluginButton,
 							})
 						end,
 					}),
@@ -206,7 +212,7 @@ function App:render()
 					button = e(StudioToggleButton, {
 						name = "Rojo",
 						tooltip = "Show or hide the Rojo panel",
-						icon = Assets.Images.PluginButton,
+						icon = self.state.toolbarIcon,
 						active = self.state.guiEnabled,
 						enabled = true,
 						onClick = function()
@@ -223,4 +229,4 @@ function App:render()
 	})
 end
 
-return App
\ No newline at end of file
+return App
diff --git a/plugin/src/Assets.lua b/plugin/src/Assets.lua
index beb4bad5..29e61d11 100644
--- a/plugin/src/Assets.lua
+++ b/plugin/src/Assets.lua
@@ -18,6 +18,8 @@ local Assets = {
 	Images = {
 		Logo = "rbxassetid://5990772764",
 		PluginButton = "rbxassetid://3405341609",
+		PluginButtonConnected = "rbxassetid://9529783993",
+		PluginButtonWarning = "rbxassetid://9529784530",
 		Icons = {
 			Close = "rbxassetid://6012985953",
 			Back = "rbxassetid://6017213752",