properly set text on unread markers

Author: Trolldemorted

Signal-Windows/Controls/UnreadMarker.xaml.cs

@@ -24,7 +24,6 @@ public UnreadMarker()
         {
             this.InitializeComponent();
             DataContextChanged += UnreadMarker_DataContextChanged;
-            UnreadText.Text = "keks";
         }
 
         public SignalUnreadMarker Model
@@ -37,6 +36,10 @@ public SignalUnreadMarker Model
 
         private void UnreadMarker_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
         {
+            if (Model != null)
+            {
+                UnreadText.Text = Model.Text;
+            }
         }
 
         public void SetText(string text)

Signal-Windows/Controls/VirtualizedMessagesCollection.cs

@@ -25,6 +25,7 @@ public SignalMessageContainer(SignalMessage message, int index)
 
     public class SignalUnreadMarker
     {
+        public string Text = "";
     }
 
     public class VirtualizedCollection : IList, INotifyCollectionChanged
@@ -42,6 +43,7 @@ public VirtualizedCollection(SignalConversation c)
             if (Conversation.LastSeenMessageIndex > 0 && Conversation.LastSeenMessageIndex < Conversation.MessagesCount )
             {
                 UnreadMarkerIndex = (int) Conversation.LastSeenMessageIndex;
+                UnreadMarker.Text = Conversation.UnreadCount > 1 ? $"{Conversation.UnreadCount} new messages" : "1 new message";
             }
             else
             {