felixh/polychat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merged with UI Changes and NetworkController

Browse Source
This commit is contained in:
Patrick Hellebrand
2021-09-21 11:04:56 +02:00
parent d1a7963670 8097b9f2cf
commit 125aa1b243
11 changed files with 223 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PolyChat/MainPage.xaml.cs
View File

@@ -17,14 +17,15 @@ namespace PolyChat
/// </summary>
public sealed partial class MainPage : Page
{
private Controller Controller;
private NetworkingController networkingController;
private ObservableCollection<ChatPartner> Partners;
private ChatPartner selectedPartner;
private string username;
public MainPage()
{
this.InitializeComponent();
Controller = new Controller(this);
networkingController = new NetworkingController(this);
Partners = new ObservableCollection<ChatPartner>();
//ipAddress.Text = IP.GetCodeFromIP(Controller.GetIP());
}
@@ -41,10 +42,9 @@ namespace PolyChat
{
selectedPartner.AddMessage(new ChatMessage(
inputSend.Text,
DateTime.Now.ToString(),
false
));
Controller.sendMessage(selectedPartner.Code, username, inputSend.Text);
networkingController.sendMessage(selectedPartner.Code, inputSend.Text);
// clear input
inputSend.Text = "";
}
@@ -79,13 +79,13 @@ namespace PolyChat
}
}
public void OnIncomingMessage(MSG message)
public void OnIncomingMessage(ChatMessage message)
{
ChatPartner sendingPartner = Partners.First(p => p.Code == message.ip.ToString());
ChatPartner sendingPartner = Partners.First(p => p.Code == message.Ip);
sendingPartner.AddMessage(new ChatMessage(
message.msg,
message.timestamp.ToString(),
true
message.Msg,
true,
message.Sender
));
}