sem/Csharp-eindproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] randomword is not visible

Browse Source
This commit is contained in:
Lars
2020-10-23 11:54:43 +02:00
parent 0d44b2d840
commit f5d55ef405
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Client/Client.cs
View File

@@ -12,6 +12,7 @@ namespace Client
{ {
public delegate void LobbyCallback(int id); public delegate void LobbyCallback(int id);
public delegate void LobbyJoinCallback(bool isHost); public delegate void LobbyJoinCallback(bool isHost);
public delegate void RandomWord(string word);
class Client : ObservableObject class Client : ObservableObject
{ {
private TcpClient tcpClient; private TcpClient tcpClient;
@@ -30,6 +31,7 @@ namespace Client
public Callback OnClientJoinLobby; public Callback OnClientJoinLobby;
public LobbyCallback OnLobbyCreated; public LobbyCallback OnLobbyCreated;
public LobbyCallback OnLobbyLeave; public LobbyCallback OnLobbyLeave;
public RandomWord RandomWord;
private ClientData data = ClientData.Instance; private ClientData data = ClientData.Instance;
public Lobby[] Lobbies { get; set; } public Lobby[] Lobbies { get; set; }
@@ -182,7 +184,8 @@ namespace Client
string randomWord = JSONConvert.GetRandomWord(payload); string randomWord = JSONConvert.GetRandomWord(payload);
if (data.Lobby?.ID == lobbyId) if (data.Lobby?.ID == lobbyId)
ViewModels.ViewModelGame.HandleRandomWord(randomWord); RandomWord?.Invoke(randomWord);
break; break;
default: default:
Debug.WriteLine("[CLIENT] Received weird identifier: " + id); Debug.WriteLine("[CLIENT] Received weird identifier: " + id);

8
Client/ViewModels/ViewModelGame.cs
View File

@@ -29,7 +29,8 @@ namespace Client.ViewModels
private dynamic _payload; private dynamic _payload;
private static string _randomWord; private string _randomWord;
public string RandomWord public string RandomWord
{ {
get { return _randomWord; } get { return _randomWord; }
@@ -97,6 +98,7 @@ namespace Client.ViewModels
public ViewModelGame() public ViewModelGame()
{ {
OnKeyDown = new RelayCommand(ChatBox_KeyDown); OnKeyDown = new RelayCommand(ChatBox_KeyDown);
data.Client.RandomWord = HandleRandomWord;
} }
private void ChatBox_KeyDown() private void ChatBox_KeyDown()
@@ -144,9 +146,9 @@ namespace Client.ViewModels
* MISC make this a callback * MISC make this a callback
* Handles the random word that has been received from the server. * Handles the random word that has been received from the server.
*/ */
public static void HandleRandomWord(string randomWord) public void HandleRandomWord(string randomWord)
{ {
_randomWord = randomWord; RandomWord = randomWord;
Debug.WriteLine($"[CLIENT] The random word is: {_randomWord}"); Debug.WriteLine($"[CLIENT] The random word is: {_randomWord}");
} }

2
Client/Views/GameWindow.xaml
View File

@@ -29,7 +29,7 @@
<Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="2" Margin="84,10,10,10" Content="RESET"/> <Button Name="CanvasReset" Click="CanvasReset_Click" Grid.Row="0" Grid.Column="2" Margin="84,10,10,10" Content="RESET"/>
<Label Name="GuessWord" Grid.Row="0" Grid.Column="1" Content="{Binding Path=Word, Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Margin="140,0,109,0"/> <Label Name="GuessWord" Grid.Row="0" Grid.Column="1" Content="{Binding Path=RandomWord, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" HorizontalAlignment="Center"/>
<xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/> <xctk:ColorPicker Name="ClrPcker_Background" SelectedColorChanged="ClrPcker_Background_SelectedColorChanged_1" Grid.Column="1" HorizontalAlignment="Left" VerticalAlignment="Center" Height="22" Width="100"/>