diff --git a/MareSynchronos.sln b/MareSynchronos.sln index ec5ad79..61b2bbc 100644 --- a/MareSynchronos.sln +++ b/MareSynchronos.sln @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SnowcloakSync", "SnowcloakSync\SnowcloakSync.csproj", "{E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -36,6 +38,14 @@ Global {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|Any CPU.Build.0 = Release|Any CPU {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|x64.ActiveCfg = Release|Any CPU {5A0B7434-8D89-4E90-B55C-B4A7AE1A6ADE}.Release|x64.Build.0 = Release|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Debug|x64.ActiveCfg = Debug|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Debug|x64.Build.0 = Debug|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Release|Any CPU.Build.0 = Release|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Release|x64.ActiveCfg = Release|Any CPU + {E633A968-2FB8-48FF-8136-5EBAEDF8E6F3}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MareSynchronos/MareSynchronos.csproj b/MareSynchronos/MareSynchronos.csproj index 3066d3a..6809c01 100644 --- a/MareSynchronos/MareSynchronos.csproj +++ b/MareSynchronos/MareSynchronos.csproj @@ -58,6 +58,7 @@ + diff --git a/MareSynchronos/UI/CompactUI.cs b/MareSynchronos/UI/CompactUI.cs index 71c9d3a..088827b 100644 --- a/MareSynchronos/UI/CompactUI.cs +++ b/MareSynchronos/UI/CompactUI.cs @@ -105,7 +105,7 @@ public class CompactUi : WindowMediatorSubscriberBase protected override void DrawInternal() { if (_serverManager.CurrentApiUrl.Equals(ApiController.SnowcloakServiceUri, StringComparison.Ordinal)) - UiSharedService.AccentColor = new(0.4275f, 0.6863f, 1f, 1f); + UiSharedService.AccentColor = SnowcloakSync.Utils.Colours._snowcloakOnline; else UiSharedService.AccentColor = ImGuiColors.ParsedGreen; ImGui.SetCursorPosY(ImGui.GetCursorPosY() - ImGui.GetStyle().WindowPadding.Y - 1f * ImGuiHelpers.GlobalScale + ImGui.GetStyle().ItemSpacing.Y); diff --git a/MareSynchronos/UI/Components/DrawUserPair.cs b/MareSynchronos/UI/Components/DrawUserPair.cs index ac1a46e..34477c6 100644 --- a/MareSynchronos/UI/Components/DrawUserPair.cs +++ b/MareSynchronos/UI/Components/DrawUserPair.cs @@ -58,7 +58,7 @@ public class DrawUserPair : DrawPairBase { connectionIcon = FontAwesomeIcon.Snowflake; connectionText = "You are paired with " + _pair.UserData.AliasOrUID; - connectionColor = _pair.IsOnline ? ImGuiColors.ParsedGreen : ImGuiColors.DalamudGrey; + connectionColor = _pair.IsOnline ? SnowcloakSync.Utils.Colours._snowcloakOnline : ImGuiColors.DalamudGrey; } if (!_pair.IsVisible) { @@ -72,7 +72,7 @@ public class DrawUserPair : DrawPairBase { ImGui.SetCursorPosY(textPosY); ImGui.PushFont(UiBuilder.IconFont); - UiSharedService.ColorText(FontAwesomeIcon.Eye.ToIconString(), ImGuiColors.ParsedGreen); + UiSharedService.ColorText(FontAwesomeIcon.Eye.ToIconString(), SnowcloakSync.Utils.Colours._snowcloakOnline); if (ImGui.IsItemClicked()) { _mediator.Publish(new TargetPairMessage(_pair)); diff --git a/MareSynchronos/packages.lock.json b/MareSynchronos/packages.lock.json index 654e9b1..7cf1b41 100644 --- a/MareSynchronos/packages.lock.json +++ b/MareSynchronos/packages.lock.json @@ -536,6 +536,9 @@ "dependencies": { "MessagePack.Annotations": "[2.5.129, )" } + }, + "snowcloaksync": { + "type": "Project" } } } diff --git a/SnowcloakSync/SnowcloakSync.csproj b/SnowcloakSync/SnowcloakSync.csproj new file mode 100644 index 0000000..125f4c9 --- /dev/null +++ b/SnowcloakSync/SnowcloakSync.csproj @@ -0,0 +1,9 @@ + + + + net9.0 + enable + enable + + + diff --git a/SnowcloakSync/Utils/Colours.cs b/SnowcloakSync/Utils/Colours.cs new file mode 100644 index 0000000..014d2d6 --- /dev/null +++ b/SnowcloakSync/Utils/Colours.cs @@ -0,0 +1,9 @@ +using System.Numerics; + +namespace SnowcloakSync.Utils +{ + public static class Colours + { + public static readonly Vector4 _snowcloakOnline = new(0.4275f, 0.6863f, 1f, 1f); + } +}