Merge branch 'master' into redesign

Author: golf1052

Signal-Windows/Controls/Conversation.xaml

@@ -12,16 +12,37 @@
     d:DesignWidth="400">
 
     <Control.Resources>
-        <DataTemplate x:Key="NormalMessageTemplate" x:DataType="models:SignalMessage">
-            <local:Message></local:Message>
-        </DataTemplate>
-        <DataTemplate x:Key="UnreadMarkerTemplate">
-            <local:UnreadMarker />
-        </DataTemplate>
+        <Style TargetType="ListBoxItem" x:Key="NormalMessageStyle">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <local:Message x:Name="ListBoxItemContent" />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style TargetType="ListBoxItem" x:Key="UnreadMarkerStyle">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <local:UnreadMarker />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style TargetType="ListBoxItem" x:Key="IdentityKeyChangeStyle">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="ListBoxItem">
+                        <local:IdentityKeyChangeMessage />
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
         <DataTemplate x:Key="IdentityKeyChangeTemplate">
             <local:IdentityKeyChangeMessage />
         </DataTemplate>
-        <local:MessageTemplateSelector x:Key="MessageDataTemplateSelector" NormalMessage="{StaticResource NormalMessageTemplate}" UnreadMarker="{StaticResource UnreadMarkerTemplate}" IdentityKeyChangeMessage="{StaticResource IdentityKeyChangeTemplate}" />
+        <local:MessageStyleSelector x:Key="MessageDataStyleSelector" NormalMessage="{StaticResource NormalMessageStyle}" UnreadMarker="{StaticResource UnreadMarkerStyle}" IdentityKeyChangeMessage="{StaticResource IdentityKeyChangeStyle}" />
     </Control.Resources>
     <Grid Background="White">
         <Grid.RowDefinitions>
@@ -36,19 +57,7 @@
                 <TextBlock Name="Username" IsTextSelectionEnabled="True" HorizontalAlignment="Center" Text="{x:Bind ThreadUsername, Mode=OneWay}" Visibility="{x:Bind ThreadUsernameVisibility, Mode=OneWay}" />
             </StackPanel>
         </Border>
-        <ListBox Grid.Row="1" Name="ConversationItemsControl" VirtualizingStackPanel.VirtualizationMode="Recycling" Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" Padding="0 0 15 0"> <!--ItemTemplateSelector="{StaticResource MessageDataTemplateSelector}"-->
-            <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="ListBoxItem">
-                                <local:Message x:Name="ListBoxItemContent" />
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </ListBox.ItemContainerStyle>
-        </ListBox>
+        <ListBox Grid.Row="1" Name="ConversationItemsControl" VirtualizingStackPanel.VirtualizationMode="Recycling" Background="White" ScrollViewer.VerticalScrollBarVisibility="Visible" Padding="0 0 15 0" ItemContainerStyleSelector="{StaticResource MessageDataStyleSelector}" />
         <Grid Grid.Row="2" BorderBrush="{ThemeResource TextBoxBorderThemeBrush}" BorderThickness="0,1,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>

Signal-Windows/Controls/Conversation.xaml.cs

@@ -244,13 +244,13 @@ public class SignalUnreadMarker
     {
         public UnreadMarker View { get; set; }
     }
-    public class MessageTemplateSelector : DataTemplateSelector
+    public class MessageStyleSelector : StyleSelector
     {
-        public DataTemplate NormalMessage { get; set; }
-        public DataTemplate UnreadMarker { get; set; }
-        public DataTemplate IdentityKeyChangeMessage { get; set; }
+        public Style NormalMessage { get; set; }
+        public Style UnreadMarker { get; set; }
+        public Style IdentityKeyChangeMessage { get; set; }
 
-        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+        protected override Style SelectStyleCore(object item, DependencyObject container)
         {
             FrameworkElement element = container as FrameworkElement;
             if (item is SignalMessageContainer)

Signal-Windows/Storage/DB.cs

@@ -743,6 +743,10 @@ public static void SaveMessageLocked(SignalMessage message)
 
                         message.Receipts = (uint)receipts.Count;
                         ctx.EarlyReceipts.RemoveRange(receipts);
+                        if (message.Receipts > 0)
+                        {
+                            message.Status = SignalMessageStatus.Received;
+                        }
                     }
                     if (message.Author != null)
                     {