Update last message timestamp in conversation list element

Author: golf1052

Signal-Windows/Controls/ConversationListElement.xaml

@@ -24,7 +24,7 @@
                     <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Name="ConversationDisplayName" FontSize="15" FontWeight="SemiLight" Text="Sanders Lauture" TextTrimming="CharacterEllipsis"/>
-                <TextBlock x:Name="LastActiveTextBlock" Grid.Column="1" Text="11:11p" FontSize="11" Foreground="#999999" TextTrimming="CharacterEllipsis"/>
+                <TextBlock x:Name="LastActiveTextBlock" Grid.Column="1" Text="{x:Bind LastMessageTimestamp, Mode=OneWay}" FontSize="11" Foreground="#999999" TextTrimming="CharacterEllipsis"/>
             </Grid>
             <TextBlock Text="{x:Bind LastMessage, Mode=OneWay}" FontSize="12"/>
         </StackPanel>

Signal-Windows/Controls/ConversationListElement.xaml.cs

@@ -106,6 +106,13 @@ public string Initials
             }
         }
 
+        private string _LastMessageTimestamp = string.Empty;
+        public string LastMessageTimestamp
+        {
+            get { return _LastMessageTimestamp; }
+            set { _LastMessageTimestamp = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(LastMessageTimestamp))); }
+        }
+
         private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
         {
             if (Model != null)
@@ -116,6 +123,7 @@ private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataCont
                 LastMessage = Model.LastMessage?.Content.Content;
                 Initials = Model.ThreadDisplayName.Length == 0 ? "#" : Model.ThreadDisplayName.Substring(0, 1);
                 FillBrush = Model is SignalContact ? Utils.GetBrushFromColor(((SignalContact)Model).Color) : Utils.Blue;
+                LastMessageTimestamp = Utils.GetTimestamp(Model.LastActiveTimestamp);
             }
         }
 
@@ -126,6 +134,7 @@ public void UpdateConversationDisplay(SignalConversation thread)
             ConversationDisplayName.Text = thread.ThreadDisplayName;
             UnreadCount = thread.UnreadCount;
             LastMessage = Model.LastMessage?.Content.Content;
+            LastMessageTimestamp = Utils.GetTimestamp(Model.LastActiveTimestamp);
         }
     }
 }

Signal-Windows/Controls/Message.xaml.cs

@@ -91,44 +91,10 @@ private void UpdateUI()
                     HorizontalAlignment = HorizontalAlignment.Left;
                     FooterPanel.HorizontalAlignment = HorizontalAlignment.Left;
                 }
-                DateTimeOffset dateTimeOffset = DateTimeOffset.FromUnixTimeSeconds(Model.Message.ComposedTimestamp / 1000);
-                DateTime dt = dateTimeOffset.UtcDateTime.ToLocalTime();
-                DateTime now = DateTimeOffset.Now.LocalDateTime;
-                if (GetMidnightDateTime(now) - GetMidnightDateTime(dt) < TimeSpan.FromDays(7))
-                {
-                    if (now.Day == dt.Day)
-                    {
-                        // on the same day
-                        FancyTimestampBlock.Text = dt.ToString("t");
-                    }
-                    else
-                    {
-                        // within the last week
-                        FancyTimestampBlock.Text = $"{dt.ToString("ddd")}, {dt.ToString("t")}";
-                    }
-                    
-                }
-                else
-                {
-                    if (now.Year == dt.Year)
-                    {
-                        // greater than one week and in the same year
-                        FancyTimestampBlock.Text = $"{dt.ToString("M")}, {dt.ToString("t")}";
-                    }
-                    else
-                    {
-                        // not in the same year
-                        FancyTimestampBlock.Text = dt.ToString("g");
-                    }
-                }
+                FancyTimestampBlock.Text = Utils.GetTimestamp(Model.Message.ComposedTimestamp);
             }
         }
 
-        private DateTime GetMidnightDateTime(DateTime dateTime)
-        {
-            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, 0, 0, 0, dateTime.Kind);
-        }
-
         private void MessageBox_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
         {
             UpdateUI();

Signal-Windows/Utils.cs

@@ -151,6 +151,51 @@ public static PageStyle GetViewStyle(Size s)
             }
         }
 
+        public static string GetTimestamp(long timestamp)
+        {
+            DateTimeOffset dateTimeOffset = DateTimeOffset.FromUnixTimeSeconds(timestamp / 1000);
+            DateTime dt = dateTimeOffset.UtcDateTime.ToLocalTime();
+            return GetTimestamp(dt);
+        }
+
+        public static string GetTimestamp(DateTime dateTime)
+        {
+            string formattedTimestamp = string.Empty;
+            DateTime now = DateTimeOffset.Now.LocalDateTime;
+            if (GetMidnightDateTime(now) - GetMidnightDateTime(dateTime) < TimeSpan.FromDays(7))
+            {
+                if (now.Day == dateTime.Day)
+                {
+                    // on the same day
+                    formattedTimestamp = dateTime.ToString("t");
+                }
+                else
+                {
+                    // within the last week
+                    formattedTimestamp = $"{dateTime.ToString("ddd")}, {dateTime.ToString("t")}";
+                }
+            }
+            else
+            {
+                if (now.Year == dateTime.Year)
+                {
+                    // greater than one week and in the same year
+                    formattedTimestamp = $"{dateTime.ToString("M")}, {dateTime.ToString("t")}";
+                }
+                else
+                {
+                    // not in the same year
+                    formattedTimestamp = dateTime.ToString("g");
+                }
+            }
+            return formattedTimestamp;
+        }
+
+        public static DateTime GetMidnightDateTime(DateTime dateTime)
+        {
+            return new DateTime(dateTime.Year, dateTime.Month, dateTime.Day, 0, 0, 0, dateTime.Kind);
+        }
+
         public static string GetCountryISO()
         {
             var c = CultureInfo.CurrentCulture.Name;