Commit 85a320df authored by Margaux Clerc's avatar Margaux Clerc

Rework history view and fix typo

parent 07df8123
......@@ -38,7 +38,7 @@ namespace Linphone.Model
public event ChangedEventHandler CallStateChanged;
public event ChangedEventHandler RegistrationChanged;
public event ChangedEventHandler MessagReceived;
public event ChangedEventHandler MessageReceived;
private Core _core;
public bool isLinphoneRunning = false;
......@@ -622,9 +622,9 @@ namespace Linphone.Model
#pragma warning disable CS4014 // Dans la mesure où cet appel n'est pas attendu, l'exécution de la méthode actuelle continue avant la fin de l'appel
CoreDispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
{
if (MessagReceived != null)
if (MessageReceived != null)
{
MessagReceived(this, new MessageEventArgs(message));
MessageReceived(this, new MessageEventArgs(message));
}
Address fromAddress = message.FromAddress;
......
......@@ -67,7 +67,7 @@ namespace Linphone.Views
*/
LinphoneManager.Instance.MessagReceived += MessagReceived;
LinphoneManager.Instance.MessageReceived += MessageReceived;
GetMessagesAndDisplayConversationsList();
Conversations.ItemsSource = _conversations;
......@@ -85,7 +85,7 @@ namespace Linphone.Views
base.OnNavigatedFrom(e);
}
private void MessagReceived(object sender, EventArgs e)
private void MessageReceived(object sender, EventArgs e)
{
//GetMessagesAndDisplayConversationsList();
}
......
......@@ -125,7 +125,7 @@ namespace Linphone.Views
LinphoneManager.Instance.CoreDispatcher = Dispatcher;
LinphoneManager.Instance.RegistrationChanged += RegistrationChanged;
LinphoneManager.Instance.MessagReceived += MessageReceived;
LinphoneManager.Instance.MessageReceived += MessageReceived;
LinphoneManager.Instance.CallStateChanged += CallStateChanged;
status.RefreshStatus();
/* if (e.NavigationMode == NavigationMode.New)
......
......@@ -23,10 +23,17 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Column="1"
<Ellipse Width="32" Height="32" VerticalAlignment="Center" Grid.RowSpan="2" Margin="0,2,10,0">
<Ellipse.Fill>
<ImageBrush ImageSource="/Assets/avatar.png"/>
</Ellipse.Fill>
</Ellipse>
<TextBlock Grid.Column="1" Padding="0,5,0,0"
Text="{Binding DisplayedName}"
Style="{StaticResource ListItemHeaderStyle}"/>
<TextBlock Grid.Column="1" Margin="0,0,0,10"
<TextBlock Grid.Column="1" Padding="0,0,0,5"
Grid.Row="1" Style="{StaticResource ListItemStyle}" Foreground="{Binding IsMissed, Converter={StaticResource BoolToAccentBrushConverter}}">
<Run Text="{Binding StatusText}"></Run>
<Run Text=","></Run>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment