Allow multiline input, disable send button focus

fixes #155, closes #160

Author: Trolldemorted

Signal-Windows/Controls/Conversation.xaml

@@ -126,7 +126,7 @@
             <Button x:Name="SendMessageButton" Grid.Column="1" Click="SendMessageButton_Click" IsEnabled="{x:Bind SendButtonEnabled, Mode=OneWay}" Background="{x:Bind SendButtonBackground}" VerticalAlignment="Bottom" Width="50" VerticalContentAlignment="Stretch" MinHeight="50" Visibility="{x:Bind SendMessageVisible, Mode=OneWay}">
                 <SymbolIcon Symbol="Send"/>
             </Button>
-            <Button x:Name="UnblockButton" Content="Unblock" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.ColumnSpan="2" Height="50" Visibility="{x:Bind Blocked, Mode=OneWay}" Click="UnblockButton_Click"/>
+            <Button x:Name="UnblockButton" Content="Unblock" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Grid.ColumnSpan="2" Height="50" Visibility="{x:Bind Blocked, Mode=OneWay}" Click="UnblockButton_Click" AllowFocusOnInteraction="False"/>
         </Grid>
     </Grid>
 </UserControl>

Signal-Windows/Controls/Conversation.xaml.cs

@@ -14,6 +14,7 @@
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Storage;
+using Windows.System;
 using Windows.UI.Core;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
@@ -36,7 +37,6 @@ public sealed partial class Conversation : UserControl, INotifyPropertyChanged
     {
         private readonly ILogger Logger = LibsignalLogging.CreateLogger<Conversation>();
         public event PropertyChangedEventHandler PropertyChanged;
-        private bool SendingMessage = false;
         private SignalConversation SignalConversation;
         public VirtualizedCollection Collection;
         private CoreWindowActivationState ActivationState = CoreWindowActivationState.Deactivated;
@@ -283,18 +283,23 @@ public AppendResult Append(Message sm)
 
         private async void TextBox_KeyDown(object sender, KeyRoutedEventArgs e)
         {
-            if (e.Key == Windows.System.VirtualKey.Enter)
+            if (e.Key == VirtualKey.Enter)
             {
-                // this fixes double send by enter repeat
-                if (!SendingMessage)
+                e.Handled = true; // Prevent KeyDown from firing twice on W10 CU
+                bool shift = CoreWindow.GetForCurrentThread().GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+                if (shift)
                 {
-                    SendingMessage = true;
-                    bool sendMessageResult = await GetMainPageVm().SendMessageButton_Click(InputTextBox.Text);
+                    InputTextBox.Text += "\r";
+                    InputTextBox.SelectionStart = InputTextBox.Text.Length;
+                    InputTextBox.SelectionLength = 0;
+                }
+                else
+                {
+                    bool sendMessageResult = await GetMainPageVm().SendMessage(InputTextBox.Text);
                     if (sendMessageResult)
                     {
                         InputTextBox.Text = string.Empty;
                     }
-                    SendingMessage = false;
                 }
             }
         }
@@ -310,8 +315,7 @@ private void ScrollToBottom()
 
         private async void SendMessageButton_Click(object sender, RoutedEventArgs e)
         {
-            InputTextBox.Focus(FocusState.Programmatic);
-            bool sendMessageResult = await GetMainPageVm().SendMessageButton_Click(InputTextBox.Text);
+            bool sendMessageResult = await GetMainPageVm().SendMessage(InputTextBox.Text);
             if (sendMessageResult)
             {
                 InputTextBox.Text = string.Empty;

Signal-Windows/ViewModels/MainPageViewModel.cs

@@ -88,13 +88,14 @@ public bool ThreadListAlignRight
             set { _ThreadListAlignRight = value; RaisePropertyChanged(nameof(ThreadListAlignRight)); }
         }
 
-        private async Task<bool> SendMessage(string messageText)
+        internal async Task<bool> SendMessage(string messageText)
         {
             try
             {
                 if (!string.IsNullOrEmpty(messageText))
                 {
                     var now = Util.CurrentTimeMillis();
+                    messageText = messageText.Replace("\r", "\r\n");
                     SignalMessage message = new SignalMessage()
                     {
                         Author = null,
@@ -144,11 +145,6 @@ internal void RepositionConversation(SignalConversation uiConversation)
             }
         }
 
-        internal async Task<bool> SendMessageButton_Click(string text)
-        {
-            return await SendMessage(text.Replace("\r", "\r\n"));
-        }
-
         internal void Deselect()
         {
             if (SelectedConversation != null)