Update image branding in the plugin

This commit is contained in:
Lucien Greathouse
2019-07-02 16:22:01 -07:00
parent dd0327ba85
commit 09a0a803a1
11 changed files with 7 additions and 23 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 559 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 986 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1001 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 382 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 B

View File

@@ -15,7 +15,8 @@ local Assets = {
}, },
}, },
Images = { Images = {
Logo = "rbxassetid://2773210620", Logo = "rbxassetid://3405346157",
Icon = "rbxassetid://3405341609",
}, },
StartSession = "", StartSession = "",
SessionActive = "", SessionActive = "",

View File

@@ -1,15 +1,14 @@
local Studio = settings().Studio
local Rojo = script:FindFirstAncestor("Rojo") local Rojo = script:FindFirstAncestor("Rojo")
local Plugin = Rojo.Plugin local Plugin = Rojo.Plugin
local Roact = require(Rojo.Roact) local Roact = require(Rojo.Roact)
local Session = require(Plugin.Session) local Assets = require(Plugin.Assets)
local Config = require(Plugin.Config) local Config = require(Plugin.Config)
local Version = require(Plugin.Version)
local Logging = require(Plugin.Logging)
local DevSettings = require(Plugin.DevSettings) local DevSettings = require(Plugin.DevSettings)
local Logging = require(Plugin.Logging)
local Session = require(Plugin.Session)
local Version = require(Plugin.Version)
local preloadAssets = require(Plugin.preloadAssets) local preloadAssets = require(Plugin.preloadAssets)
local ConnectPanel = require(Plugin.Components.ConnectPanel) local ConnectPanel = require(Plugin.Components.ConnectPanel)
@@ -53,13 +52,6 @@ local function checkUpgrade(plugin)
plugin:SetSetting("LastRojoVersion", Config.version) plugin:SetSetting("LastRojoVersion", Config.version)
end end
-- Since we need to switch our plugin icon based on the theme, we use the
-- insta-deprecated theme API. There isn't really an alternative here!
local pluginButtonIcons = {
[Enum.UITheme.Dark] = "rbxassetid://3294408143",
[Enum.UITheme.Light] = "rbxassetid://3294218933",
}
local SessionStatus = { local SessionStatus = {
Disconnected = "Disconnected", Disconnected = "Disconnected",
Connected = "Connected", Connected = "Connected",
@@ -90,17 +82,12 @@ function App:init()
self.toggleButton = toolbar:CreateButton( self.toggleButton = toolbar:CreateButton(
"Rojo", "Rojo",
"Show or hide the Rojo panel", "Show or hide the Rojo panel",
"") Assets.Images.Icon)
self.toggleButton.ClickableWhenViewportHidden = true self.toggleButton.ClickableWhenViewportHidden = true
self.toggleButton.Click:Connect(function() self.toggleButton.Click:Connect(function()
self.dockWidget.Enabled = not self.dockWidget.Enabled self.dockWidget.Enabled = not self.dockWidget.Enabled
end) end)
self:setToolbarButtonIcon()
self.signals.theme = Studio.ThemeChanged:Connect(function()
self:setToolbarButtonIcon()
end)
local widgetInfo = DockWidgetPluginGuiInfo.new( local widgetInfo = DockWidgetPluginGuiInfo.new(
Enum.InitialDockState.Right, Enum.InitialDockState.Right,
false, -- Initially enabled state false, -- Initially enabled state
@@ -120,10 +107,6 @@ function App:init()
end) end)
end end
function App:setToolbarButtonIcon()
self.toggleButton.Icon = pluginButtonIcons[Studio["UI Theme"]]
end
function App:render() function App:render()
local children local children