Fix remaining VS messages in Signal-Windows

Author: Trolldemorted

Signal-Windows/Controls/ConversationListElement.xaml.cs

@@ -153,9 +153,8 @@ public void UpdateConversationDisplay()
         {
             if (Model != null)
             {
-                if (Model is SignalContact)
+                if (Model is SignalContact contact)
                 {
-                    var contact = (SignalContact)Model;
                     BlockedIconVisible = contact.Blocked;
                     FillBrush = contact.Color != null ? Utils.GetBrushFromColor((contact.Color)) :
                         Utils.GetBrushFromColor(Utils.CalculateDefaultColor(Model.ThreadDisplayName));

Signal-Windows/Controls/Message.xaml.cs

@@ -146,16 +146,20 @@ private void UpdateMessageTextBlock()
                     var length = currentIndex - previousIndex;
                     if (length > 0)
                     {
-                        Run run = new Run();
-                        run.Text = messageText.Substring(previousIndex, currentIndex - previousIndex);
+                        Run run = new Run
+                        {
+                            Text = messageText.Substring(previousIndex, currentIndex - previousIndex)
+                        };
                         MessageContentTextBlock.Inlines.Add(run);
                     }
 
                     // Now add the hyperlink
                     string link = match.Value;
                     Hyperlink hyperlink = new Hyperlink();
-                    Run hyperlinkRun = new Run();
-                    hyperlinkRun.Text = link;
+                    Run hyperlinkRun = new Run
+                    {
+                        Text = link
+                    };
                     try
                     {
                         hyperlink.NavigateUri = new Uri(link);
@@ -175,8 +179,10 @@ private void UpdateMessageTextBlock()
                 var restLength = messageText.Length - currentIndex;
                 if (restLength > 0)
                 {
-                    Run restRun = new Run();
-                    restRun.Text = messageText.Substring(currentIndex, restLength);
+                    Run restRun = new Run
+                    {
+                        Text = messageText.Substring(currentIndex, restLength)
+                    };
                     MessageContentTextBlock.Inlines.Add(restRun);
                 }
             }

Signal-Windows/Controls/VirtualizedMessagesCollection.cs

@@ -196,9 +196,8 @@ public IEnumerator GetEnumerator()
 
         public int IndexOf(object value)
         {
-            if (value is SignalMessageContainer)
+            if (value is SignalMessageContainer smc)
             {
-                SignalMessageContainer smc = (SignalMessageContainer) value;
                 return GetVirtualIndex(smc.Index);
             }
             else if (value is SignalUnreadMarker)

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -327,8 +327,7 @@ public void HandleBlockedContacts(List<SignalContact> blockedContacts)
             {
                 // "as" is more efficient than "is" and a cast because "as" only needs to
                 // type check once
-                var conversationContact = conversation.Value as SignalContact;
-                if (conversationContact != null)
+                if (conversation.Value is SignalContact conversationContact)
                 {
                     if (blockedContacts.FirstOrDefault(c => c.ThreadId == conversationContact.ThreadId) != null)
                     {

Signal-Windows/Views/AddContactPage.xaml

@@ -37,7 +37,7 @@
             <TextBlock Text="Number" Margin="0,16,0,0" />
             <TextBox x:Name="ContactNumberTextBox" Text="{x:Bind Vm.ContactNumber, Mode=TwoWay}" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}" Margin="0,4,0,0" TextChanged="ContactNumberTextBox_TextChanged" InputScope="TelephoneNumber" />
             <Button x:Name="AddButton" Content="Add" IsEnabled="{x:Bind Vm.AddEnabled, Mode=OneWay}" HorizontalAlignment="Stretch" Margin="0,16" Click="AddButton_Click" />
-            <AutoSuggestBox x:Name="searchBox" VerticalAlignment="Stretch" QueryIcon="Find" TextChanged="searchBox_TextChanged" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}"/>
+            <AutoSuggestBox x:Name="searchBox" VerticalAlignment="Stretch" QueryIcon="Find" TextChanged="SearchBox_TextChanged" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}"/>
         </StackPanel>
         <Grid Grid.Row="1" Visibility="{x:Bind Vm.ContactsVisible, Mode=OneWay}">
             <toolbox:PullToRefreshListView x:Name="ContactsList" ItemClick="ContactsList_ItemClick" ItemsSource="{x:Bind Vm.Contacts, Mode=OneWay}" IsItemClickEnabled="True" HorizontalAlignment="Center" IsEnabled="{x:Bind Vm.UIEnabled, Mode=OneWay}"

Signal-Windows/Views/AddContactPage.xaml.cs

@@ -51,7 +51,7 @@ private async void ContactsList_ItemClick(object sender, ItemClickEventArgs e)
             Frame.Navigate(typeof(MainPage));
         }
 
-        private void searchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+        private void SearchBox_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
         {
             Vm.SearchBox_TextChanged(sender, args);
         }