t0w0bi/ClubPenguinClient
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Partially revert Mare 0.9 UI/API changes

Browse Source
This commit is contained in:
Loporrit
2023-12-08 12:00:43 +00:00
parent d2ccafd505
commit 78b56aa952
37 changed files with 1795 additions and 1954 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
MareSynchronos/UI/Handlers/TagHandler.cs
View File

@@ -4,7 +4,6 @@ namespace MareSynchronos.UI.Handlers;
public class TagHandler
{
public const string CustomAllTag = "Mare_All";
public const string CustomOfflineTag = "Mare_Offline";
public const string CustomOnlineTag = "Mare_Online";
public const string CustomUnpairedTag = "Mare_Unpaired";

150
MareSynchronos/UI/Handlers/IdDisplayHandler.cs → MareSynchronos/UI/Handlers/UidDisplayHandler.cs
View File

@@ -1,96 +1,41 @@
using Dalamud.Interface;
using Dalamud.Interface.Utility.Raii;
using ImGuiNET;
using ImGuiScene;
using MareSynchronos.API.Dto.Group;
using MareSynchronos.MareConfiguration;
using MareSynchronos.PlayerData.Pairs;
using MareSynchronos.Services.Mediator;
using MareSynchronos.Services.ServerConfiguration;
using MareSynchronos.MareConfiguration;
using ImGuiScene;
using MareSynchronos.Services.Mediator;
namespace MareSynchronos.UI.Handlers;
public class IdDisplayHandler
public class UidDisplayHandler
{
private readonly MareConfigService _mareConfigService;
private readonly MareMediator _mediator;
private readonly PairManager _pairManager;
private readonly ServerConfigurationManager _serverManager;
private readonly Dictionary<string, bool> _showIdForEntry = new(StringComparer.Ordinal);
private string _editComment = string.Empty;
private string _editEntry = string.Empty;
private bool _editIsUid = false;
private readonly Dictionary<string, bool> _showUidForEntry = new(StringComparer.Ordinal);
private string _editNickEntry = string.Empty;
private string _editUserComment = string.Empty;
private string _lastMouseOverUid = string.Empty;
private bool _popupShown = false;
private DateTime? _popupTime;
private TextureWrap? _textureWrap;
public IdDisplayHandler(MareMediator mediator, ServerConfigurationManager serverManager, MareConfigService mareConfigService)
public UidDisplayHandler(MareMediator mediator, PairManager pairManager,
ServerConfigurationManager serverManager, MareConfigService mareConfigService)
{
_mediator = mediator;
_pairManager = pairManager;
_serverManager = serverManager;
_mareConfigService = mareConfigService;
}
public void DrawGroupText(string id, GroupFullInfoDto group, float textPosX, float originalY, Func<float> editBoxWidth)
{
ImGui.SameLine(textPosX);
(bool textIsUid, string playerText) = GetGroupText(group);
if (!string.Equals(_editEntry, group.GID, StringComparison.Ordinal))
{
ImGui.SetCursorPosY(originalY);
using (ImRaii.PushFont(UiBuilder.MonoFont, textIsUid))
ImGui.TextUnformatted(playerText);
if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{
var prevState = textIsUid;
if (_showIdForEntry.ContainsKey(group.GID))
{
prevState = _showIdForEntry[group.GID];
}
_showIdForEntry[group.GID] = !prevState;
}
if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
{
if (_editIsUid)
{
_serverManager.SetNoteForUid(_editEntry, _editComment, save: true);
}
else
{
_serverManager.SetNoteForGid(_editEntry, _editComment, save: true);
}
_editComment = _serverManager.GetNoteForGid(group.GID) ?? string.Empty;
_editEntry = group.GID;
_editIsUid = false;
}
}
else
{
ImGui.SetCursorPosY(originalY);
ImGui.SetNextItemWidth(editBoxWidth.Invoke());
if (ImGui.InputTextWithHint("", "Name/Notes", ref _editComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
{
_serverManager.SetNoteForGid(group.GID, _editComment, save: true);
_editEntry = string.Empty;
}
if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
{
_editEntry = string.Empty;
}
UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
}
}
public void DrawPairText(string id, Pair pair, float textPosX, float originalY, Func<float> editBoxWidth)
{
ImGui.SameLine(textPosX);
(bool textIsUid, string playerText) = GetPlayerText(pair);
if (!string.Equals(_editEntry, pair.UserData.UID, StringComparison.Ordinal))
if (!string.Equals(_editNickEntry, pair.UserData.UID, StringComparison.Ordinal))
{
ImGui.SetCursorPosY(originalY);
if (textIsUid) ImGui.PushFont(UiBuilder.MonoFont);
@@ -121,7 +66,7 @@ public class IdDisplayHandler
{
if (string.Equals(_lastMouseOverUid, id))
{
_mediator.Publish(new ProfilePopoutToggle(Pair: null));
_mediator.Publish(new ProfilePopoutToggle(null));
_lastMouseOverUid = string.Empty;
_popupShown = false;
_textureWrap?.Dispose();
@@ -132,27 +77,19 @@ public class IdDisplayHandler
if (ImGui.IsItemClicked(ImGuiMouseButton.Left))
{
var prevState = textIsUid;
if (_showIdForEntry.ContainsKey(pair.UserData.UID))
if (_showUidForEntry.ContainsKey(pair.UserData.UID))
{
prevState = _showIdForEntry[pair.UserData.UID];
prevState = _showUidForEntry[pair.UserData.UID];
}
_showIdForEntry[pair.UserData.UID] = !prevState;
_showUidForEntry[pair.UserData.UID] = !prevState;
}
if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
{
if (_editIsUid)
{
_serverManager.SetNoteForUid(_editEntry, _editComment, save: true);
}
else
{
_serverManager.SetNoteForGid(_editEntry, _editComment, save: true);
}
_editComment = pair.GetNote() ?? string.Empty;
_editEntry = pair.UserData.UID;
_editIsUid = true;
var nickEntryPair = _pairManager.DirectPairs.Find(p => string.Equals(p.UserData.UID, _editNickEntry, StringComparison.Ordinal));
nickEntryPair?.SetNote(_editUserComment);
_editUserComment = pair.GetNote() ?? string.Empty;
_editNickEntry = pair.UserData.UID;
}
if (ImGui.IsItemClicked(ImGuiMouseButton.Middle))
@@ -165,45 +102,21 @@ public class IdDisplayHandler
ImGui.SetCursorPosY(originalY);
ImGui.SetNextItemWidth(editBoxWidth.Invoke());
if (ImGui.InputTextWithHint("", "Nick/Notes", ref _editComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
if (ImGui.InputTextWithHint("", "Nick/Notes", ref _editUserComment, 255, ImGuiInputTextFlags.EnterReturnsTrue))
{
_serverManager.SetNoteForUid(pair.UserData.UID, _editComment);
_serverManager.SetNoteForUid(pair.UserData.UID, _editUserComment);
_serverManager.SaveNotes();
_editEntry = string.Empty;
_editNickEntry = string.Empty;
}
if (ImGui.IsItemClicked(ImGuiMouseButton.Right))
{
_editEntry = string.Empty;
_editNickEntry = string.Empty;
}
UiSharedService.AttachToolTip("Hit ENTER to save\nRight click to cancel");
}
}
public (bool isGid, string text) GetGroupText(GroupFullInfoDto group)
{
var textIsGid = true;
bool showUidInsteadOfName = ShowGidInsteadOfName(group);
string? groupText = _serverManager.GetNoteForGid(group.GID);
if (!showUidInsteadOfName && groupText != null)
{
if (string.IsNullOrEmpty(groupText))
{
groupText = group.GroupAliasOrGID;
}
else
{
textIsGid = false;
}
}
else
{
groupText = group.GroupAliasOrGID;
}
return (textIsGid, groupText!);
}
public (bool isUid, string text) GetPlayerText(Pair pair)
{
var textIsUid = true;
@@ -244,8 +157,8 @@ public class IdDisplayHandler
internal void Clear()
{
_editEntry = string.Empty;
_editComment = string.Empty;
_editNickEntry = string.Empty;
_editUserComment = string.Empty;
}
internal void OpenProfile(Pair entry)
@@ -253,17 +166,10 @@ public class IdDisplayHandler
_mediator.Publish(new ProfileOpenStandaloneMessage(entry));
}
private bool ShowGidInsteadOfName(GroupFullInfoDto group)
{
_showIdForEntry.TryGetValue(group.GID, out var showidInsteadOfName);
return showidInsteadOfName;
}
private bool ShowUidInsteadOfName(Pair pair)
{
_showIdForEntry.TryGetValue(pair.UserData.UID, out var showidInsteadOfName);
_showUidForEntry.TryGetValue(pair.UserData.UID, out var showUidInsteadOfName);
return showidInsteadOfName;
return showUidInsteadOfName;
}
}