Merge remote-tracking branch 'refs/remotes/signal-csharp/master'

Author: SERVCUBED

Signal-Windows/Controls/ConversationListElement.xaml

@@ -13,11 +13,10 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
         </Grid.ColumnDefinitions>
-        <Ellipse Grid.Column="0" Width="64" Height="64" Margin="8">
-            <Ellipse.Fill>
-                <ImageBrush ImageSource="ms-appx:///Assets/gambino.png"/>
-            </Ellipse.Fill>
-        </Ellipse>
+        <Grid>
+            <Ellipse Grid.Column="0" Width="64" Height="64" Margin="8" Fill="{x:Bind FillBrush, Mode=OneWay}"/>
+            <TextBlock Foreground="White" FontWeight="Light" FontSize="26" Text="{x:Bind Initials, Mode=OneWay}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+        </Grid>
         <StackPanel Grid.Column="1" VerticalAlignment="Center" Margin="0,0,8,0">
             <Grid>
                 <Grid.ColumnDefinitions>

Signal-Windows/Controls/ConversationListElement.xaml.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media;
 
 // The User Control item template is documented at https://go.microsoft.com/fwlink/?LinkId=234236
 
@@ -75,6 +76,36 @@ public string LastMessage
             }
         }
 
+        private Brush _FillBrush = Utils.Blue;
+
+        public Brush FillBrush
+        {
+            get
+            {
+                return _FillBrush;
+            }
+            set
+            {
+                _FillBrush = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(FillBrush)));
+            }
+        }
+
+        private string _Initials = string.Empty;
+
+        public string Initials
+        {
+            get
+            {
+                return _Initials;
+            }
+            set
+            {
+                _Initials = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Initials)));
+            }
+        }
+
         private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
         {
             if (Model != null)
@@ -83,6 +114,8 @@ private void ThreadListItem_DataContextChanged(FrameworkElement sender, DataCont
                 ConversationDisplayName.Text = Model.ThreadDisplayName;
                 UnreadCount = Model.UnreadCount;
                 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;
             }
         }