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

Message Alignment First Try

Browse Source
This commit is contained in:
Patrick Hellebrand
2021-09-23 16:05:20 +02:00
committed by Felix Hartmann (PEA3-Fe-FI)
parent 5c4b4373d6
commit ac67ff38c6
3 changed files with 16 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PolyChat/MainPage.xaml.cs
View File

@@ -28,7 +28,6 @@ namespace PolyChat
private string username;
private static ElementTheme Theme = ElementTheme.Light;
public MainPage()
{
this.InitializeComponent();
@@ -78,7 +77,7 @@ namespace PolyChat
public void OnSendMessage(object sender = null, RoutedEventArgs e = null)
{
selectedPartner.AddMessage(new ChatMessage(username, "message", inputSend.Text));
selectedPartner.AddMessage(new ChatMessage(username, "message", inputSend.Text, DateTime.Now, false));
Controller.SendMessage(selectedPartner.Code, "message", inputSend.Text);
// clear input
inputSend.Text = "";
@@ -161,7 +160,7 @@ namespace PolyChat
Partners.Insert(index, sendingPartner);
break;
default:
sendingPartner.AddMessage(new ChatMessage(origin, type, content, timeStamp));
sendingPartner.AddMessage(new ChatMessage(origin, type, content, timeStamp, true));
break;
}
});
@@ -178,12 +177,9 @@ namespace PolyChat
new ChatMessage(
origin,
item["type"].ToString(),
item["content"].ToString()//,
<<<<<<< HEAD
//DateTime.Parse(item["timestamp"].ToString())
=======
//DateTime.Parse(item["timestamp"].ToString())
>>>>>>> be4eada (stuff)
item["content"].ToString(),
DateTime.Parse(item["timestamp"].ToString()),
false // TODO: FIX !!!!
)
);
}