small ui changes
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:local="clr-namespace:ARAMUtility"
|
||||||
xmlns:vm="clr-namespace:ARAMUtility.ViewModel"
|
xmlns:vm="clr-namespace:ARAMUtility.ViewModel"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Title="{Binding Title}"
|
Title="{Binding Title}"
|
||||||
@@ -57,13 +58,33 @@
|
|||||||
<MenuItem Header="Actions">
|
<MenuItem Header="Actions">
|
||||||
<MenuItem Header="Open Mayhem Lobby" Command="{Binding OpenLobbyCommand}" />
|
<MenuItem Header="Open Mayhem Lobby" Command="{Binding OpenLobbyCommand}" />
|
||||||
<MenuItem Header="Start Queueing" Command="{Binding StartQueueingCommand}" />
|
<MenuItem Header="Start Queueing" Command="{Binding StartQueueingCommand}" />
|
||||||
<MenuItem Header="Reconnect" Command="{Binding ConnectCommand}" />
|
<Separator />
|
||||||
|
<MenuItem Header="Topmost" IsCheckable="True" IsChecked="{Binding Topmost, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:MainWindow}}}" />
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem Header="Reload ARAM Balance" Command="{Binding ReloadARAMBalanceCommand}" />
|
<MenuItem Header="Reload ARAM Balance" Command="{Binding ReloadARAMBalanceCommand}" />
|
||||||
<Separator />
|
<Separator />
|
||||||
<MenuItem Header="Quit" Command="{Binding QuitCommand}" />
|
<MenuItem Header="Quit" Command="{Binding QuitCommand}" />
|
||||||
</MenuItem>
|
</MenuItem>
|
||||||
<MenuItem Header="{Binding ConnectionStatus}" IsEnabled="False" />
|
<MenuItem Header="{Binding ConnectionStatus}" Command="{Binding ConnectCommand}" />
|
||||||
|
<MenuItem Header="Update ARAM">
|
||||||
|
<StackPanel Orientation="Vertical">
|
||||||
|
<ComboBox ItemsSource="{Binding .}"
|
||||||
|
SelectedIndex="0"
|
||||||
|
SelectedItem="{Binding .}"
|
||||||
|
/>
|
||||||
|
<ItemsControl ItemsSource="{Binding .}">
|
||||||
|
<ItemsControl.ItemTemplate>
|
||||||
|
<DataTemplate>
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<Label Content="{Binding .}" />
|
||||||
|
<TextBox Text="{Binding .}" />
|
||||||
|
</StackPanel>
|
||||||
|
</DataTemplate>
|
||||||
|
</ItemsControl.ItemTemplate>
|
||||||
|
</ItemsControl>
|
||||||
|
<Button Content="Save" />
|
||||||
|
</StackPanel>
|
||||||
|
</MenuItem>
|
||||||
</Menu>
|
</Menu>
|
||||||
<Viewbox Stretch="Uniform" StretchDirection="DownOnly">
|
<Viewbox Stretch="Uniform" StretchDirection="DownOnly">
|
||||||
<Grid Margin="10">
|
<Grid Margin="10">
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ public partial class MainViewModel : ObservableObject, IDisposable
|
|||||||
[ObservableProperty]
|
[ObservableProperty]
|
||||||
public partial string ConnectionStatus { get; private set; } = "Not connected.";
|
public partial string ConnectionStatus { get; private set; } = "Not connected.";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private Dictionary<int, ChampionData> _allChampions = [];
|
private Dictionary<int, ChampionData> _allChampions = [];
|
||||||
private List<int> _needChampionIds = [];
|
private List<int> _needChampionIds = [];
|
||||||
private readonly APIClient _client = new();
|
private readonly APIClient _client = new();
|
||||||
@@ -49,8 +51,8 @@ public partial class MainViewModel : ObservableObject, IDisposable
|
|||||||
public MainViewModel()
|
public MainViewModel()
|
||||||
{
|
{
|
||||||
_lcuWebsocket.Connecting += (_, _) => UpdateConnectionStatus(false, "Connecting ...");
|
_lcuWebsocket.Connecting += (_, _) => UpdateConnectionStatus(false, "Connecting ...");
|
||||||
_lcuWebsocket.Connected += (_, _) => UpdateConnectionStatus(false, "Connected.");
|
_lcuWebsocket.Connected += (_, _) => UpdateConnectionStatus(false, "Connected");
|
||||||
_lcuWebsocket.Disconnected += (_, _) => UpdateConnectionStatus(true, "Disconnected.");
|
_lcuWebsocket.Disconnected += (_, _) => UpdateConnectionStatus(true, "Reconnect?");
|
||||||
|
|
||||||
_lcuWebsocket.LcuApiEvent += OnLcuApiEvent;
|
_lcuWebsocket.LcuApiEvent += OnLcuApiEvent;
|
||||||
#if DEBUG
|
#if DEBUG
|
||||||
@@ -104,7 +106,6 @@ public partial class MainViewModel : ObservableObject, IDisposable
|
|||||||
File.AppendAllText("socket.log", $"{apiEvent.Uri}: {apiEvent.EventType} - {apiEvent.Data?.ToJsonString()}\n");
|
File.AppendAllText("socket.log", $"{apiEvent.Uri}: {apiEvent.EventType} - {apiEvent.Data?.ToJsonString()}\n");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task UpdateNeedChampionIdsAsync()
|
private async Task UpdateNeedChampionIdsAsync()
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ public class LcuWebsocket : IDisposable
|
|||||||
private static readonly IReadOnlyList<string> SUBSCRIBE_EVENTS =
|
private static readonly IReadOnlyList<string> SUBSCRIBE_EVENTS =
|
||||||
[
|
[
|
||||||
"OnJsonApiEvent_lol-champ-select_v1_session",
|
"OnJsonApiEvent_lol-champ-select_v1_session",
|
||||||
"OnJsonApiEvent_lol-matchmaking_v1_search",
|
|
||||||
"OnJsonApiEvent_lol-matchmaking_v1_ready-check",
|
"OnJsonApiEvent_lol-matchmaking_v1_ready-check",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user