Make message timestamps better

Author: golf1052

Signal-Windows/Controls/Message.xaml

@@ -18,15 +18,15 @@
         <ItemsControl>
             <TextBlock Name="MessageAuthor" FontWeight="Bold" />
             <TextBlock Name="MessageContentTextBlock" TextWrapping="Wrap" MaxWidth="300" IsTextSelectionEnabled="True" FontSize="14" Foreground="Black" />
-            <Grid Name="FooterPanel">
+            <Grid Name="FooterPanel" MaxWidth="300">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto"/>
-                    <ColumnDefinition />
-                    <ColumnDefinition />
-                    <ColumnDefinition />
+                    <ColumnDefinition Width="*"/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
                 </Grid.ColumnDefinitions>
                 <TextBlock Grid.Column="0" Name="ResendTextBlock"  Margin="0 0 5 0" Foreground="Red" FontWeight="SemiBold" Tapped="ResendTextBlock_Tapped" Visibility="Collapsed">Send again</TextBlock>
-                <TextBlock Name="FancyTimestampBlock" Grid.Column="1" Margin="0 0 5 0" />
+                <TextBlock Name="FancyTimestampBlock" Grid.Column="1" Margin="0 0 5 0" FontSize="12" />
                 <Image Grid.Column="2" Name="CheckImage" Source="{StaticResource Check}" Width="16" Height="16" Visibility="Collapsed"/>
                 <Image Grid.Column="3" Name="DoubleCheckImage" Source="{StaticResource DoubleCheck}" Width="16" Height="16" Visibility="Collapsed"/>
             </Grid>

Signal-Windows/Controls/Message.xaml.cs

@@ -93,10 +93,42 @@ private void UpdateUI()
                 }
                 DateTimeOffset dateTimeOffset = DateTimeOffset.FromUnixTimeSeconds(Model.Message.ComposedTimestamp / 1000);
                 DateTime dt = dateTimeOffset.UtcDateTime.ToLocalTime();
-                FancyTimestampBlock.Text = dt.ToString();
+                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");
+                    }
+                }
             }
         }
 
+        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();