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

Merge branch 'ConnectionController' of https://sourcecode.socialcoding.bosch.com/scm/~hpl2fe/polychat into ConnectionController

Browse Source
This commit is contained in:
Patrick Hellebrand
2021-09-23 08:59:33 +02:00
parent 44ef2f4cd2 52422072a6
commit 43b78014ca
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PolyChat/MainPage.xaml
View File

@@ -53,7 +53,7 @@
<ListView x:Name="listViewPartners" ItemsSource="{x:Bind Partners}" HorizontalAlignment="Stretch" Margin="0 8 0 0"> <ListView x:Name="listViewPartners" ItemsSource="{x:Bind Partners}" HorizontalAlignment="Stretch" Margin="0 8 0 0">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:DataType="models:ChatPartner"> <DataTemplate x:DataType="models:ChatPartner">
<RadioButton GroupName="chatSelect" Tag="{x:Bind Code}" HorizontalAlignment="Stretch" Height="64" Checked="OnChatPartnerSelected"> <RadioButton GroupName="chatSelect" Tag="{x:Bind Code}" HorizontalAlignment="Stretch" Height="64" Click="OnChatPartnerSelected">
<StackPanel x:Name="ChatPartner" VerticalAlignment="Center" HorizontalAlignment="Stretch"> <StackPanel x:Name="ChatPartner" VerticalAlignment="Center" HorizontalAlignment="Stretch">
<StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
<TextBlock HorizontalAlignment="Stretch" Text="{x:Bind Name}"/> <TextBlock HorizontalAlignment="Stretch" Text="{x:Bind Name}"/>

6
PolyChat/MainPage.xaml.cs
View File

@@ -124,7 +124,7 @@ namespace PolyChat
/// <param name="message">ChatMessage</param> /// <param name="message">ChatMessage</param>
public void OnIncomingMessage(string origin, string json) public void OnIncomingMessage(string origin, string json)
{ {
ChatPartner sendingPartner = Partners.First(p => p.Code == origin); ChatPartner sendingPartner = Partners.FirstOrDefault(p => p.Code == origin);
sendingPartner.AddMessage(new ChatMessage(origin, json)); sendingPartner.AddMessage(new ChatMessage(origin, json));
} }
@@ -140,7 +140,7 @@ namespace PolyChat
{ {
await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{ {
Partners.Remove(Partners.First(p => p.Code == code)); Partners.Remove(Partners.FirstOrDefault(p => p.Code.Equals(code)));
selectedPartner = null; selectedPartner = null;
updateNoChatsPlaceholder(); updateNoChatsPlaceholder();
updateNoChatSelected(); updateNoChatSelected();
@@ -149,7 +149,7 @@ namespace PolyChat
public void OnChatPartnerSelected(object sender, RoutedEventArgs e) public void OnChatPartnerSelected(object sender, RoutedEventArgs e)
{ {
string code = ((RadioButton)sender).Tag.ToString(); string code = ((RadioButton)sender).Tag.ToString();
selectedPartner = Partners.First(p => p.Code == code); selectedPartner = Partners.FirstOrDefault(p => p.Code == code);
listViewMessages.ItemsSource = selectedPartner.Messages; listViewMessages.ItemsSource = selectedPartner.Messages;
selectedPartnerName.Text = selectedPartner.Name; selectedPartnerName.Text = selectedPartner.Name;
updateNoChatSelected(); updateNoChatSelected();