mirror of
https://github.com/ryzij/AMessanger-Avalonia-Client.git
synced 2026-09-18 20:13:20 +00:00
Добавил класс для представления сообщения
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
using System.Collections.ObjectModel;
|
||||
using AMessanger.Models;
|
||||
using AMessanger.Services;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using Avalonia.Threading;
|
||||
using System.Windows.Input;
|
||||
using CommunityToolkit.Mvvm.ComponentModel;
|
||||
using CommunityToolkit.Mvvm.Input;
|
||||
using System.Diagnostics;
|
||||
using System.Collections.ObjectModel;
|
||||
using System.Windows.Input;
|
||||
|
||||
namespace AMessanger.ViewModels;
|
||||
|
||||
public partial class MainViewModel : ViewModelBase
|
||||
{
|
||||
[ObservableProperty]
|
||||
public partial ObservableCollection<string> Messages { get; private set; } = new();
|
||||
public partial ObservableCollection<Message> Messages { get; private set; } = new();
|
||||
|
||||
[ObservableProperty]
|
||||
public partial string Message { get; set; } = string.Empty;
|
||||
@@ -31,10 +31,9 @@ public partial class MainViewModel : ViewModelBase
|
||||
SendButtonCommand = new RelayCommand(SendMessage);
|
||||
}
|
||||
|
||||
private void OnMessageRecived(string user, string message)
|
||||
private void OnMessageRecived(Message message)
|
||||
{
|
||||
Dispatcher.UIThread.Post(() => Messages.Add($"{user}: {message}"));
|
||||
Debug.WriteLine($"{user}: {message}");
|
||||
Dispatcher.UIThread.Post(() => Messages.Add(message));
|
||||
}
|
||||
|
||||
private void SendMessage()
|
||||
@@ -42,7 +41,7 @@ public partial class MainViewModel : ViewModelBase
|
||||
if (string.IsNullOrWhiteSpace(Message))
|
||||
return;
|
||||
|
||||
_chat.SendMessageAsync(UserName, Message.Trim());
|
||||
_chat.SendMessageAsync(new Message(UserName, Message.Trim()));
|
||||
Message = string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user