added send message on enter option

Author: clemensott

Signal-Windows.Lib/GlobalSettingsManager.cs

@@ -26,6 +26,7 @@ public enum ShowNotificationTextSettings
         private const string BlockScreenshots = "BlockScreenshots";
         private const string EnableReadReceipts = "EnableReadReceipts";
         private const string SpellCheck = "SpellCheck";
+        private const string SendMessageWithEnter = "SendMessageWithEnter";
 
         private static ApplicationDataContainer localSettings;
         private static IReadOnlyDictionary<string, ApplicationDataContainer> Containers
@@ -108,6 +109,18 @@ public static bool SpellCheckSetting
             }
         }
 
+        public static bool SendMessageWithEnterSetting
+        {
+            get
+            {
+                return GetSetting(Containers[ChatsAndMediaContainer], SendMessageWithEnter, true);
+            }
+            set
+            {
+                Containers[ChatsAndMediaContainer].Values[SendMessageWithEnter] = value;
+            }
+        }
+
         private static T GetSetting<T>(ApplicationDataContainer container, string key, T defaultValue)
         {
             if (container.Values.ContainsKey(key))

Signal-Windows/Controls/Conversation.xaml.cs

@@ -128,6 +128,13 @@ public bool SpellCheckEnabled
             set { spellCheckEnabled = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SpellCheckEnabled))); }
         }
 
+        private bool sendMessageWithEnterEnabled;
+        public bool SendMessageWithEnterEnabled
+        {
+            get { return sendMessageWithEnterEnabled; }
+            set { sendMessageWithEnterEnabled = value; PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(SendMessageWithEnterEnabled))); }
+        }
+
         public Conversation()
         {
             this.InitializeComponent();
@@ -210,6 +217,7 @@ public void Load(SignalConversation conversation)
             DisposeCurrentThread();
             UpdateHeader(conversation);
             SpellCheckEnabled = GlobalSettingsManager.SpellCheckSetting;
+            SendMessageWithEnterEnabled = GlobalSettingsManager.SendMessageWithEnterSetting;
 
             /*
              * When selecting a small (~650 messages) conversation after a bigger (~1800 messages) one,
@@ -219,7 +227,7 @@ public void Load(SignalConversation conversation)
              */
             ConversationItemsControl.ItemsSource = new List<object>();
             UpdateLayout();
-            Collection =  new VirtualizedCollection(conversation);
+            Collection = new VirtualizedCollection(conversation);
             ConversationItemsControl.ItemsSource = Collection;
             UpdateLayout();
             SendButtonEnabled = conversation.CanReceive;
@@ -304,8 +312,12 @@ public void HandleDeleteMesage(SignalMessage message)
 
         private async void UserInputBar_OnEnterKeyPressed()
         {
-            bool shift = CoreWindow.GetForCurrentThread().GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
-            if (shift)
+            CoreWindow corWindow = CoreWindow.GetForCurrentThread();
+            bool shift = corWindow.GetKeyState(VirtualKey.Shift).HasFlag(CoreVirtualKeyStates.Down);
+            bool control = corWindow.GetKeyState(VirtualKey.Control).HasFlag(CoreVirtualKeyStates.Down);
+            // If SendMessageWithEnterEnabled is true then add new if shift key is pressed.
+            // If SendMessageWithEnterEnabled is false then send message if control key is pressed.
+            if (SendMessageWithEnterEnabled ? shift : !control)
             {
                 UserInputBar.AddLinefeed();
             }

Signal-Windows/ViewModels/ChatsAndMediaSettingsPageViewModel.cs

@@ -17,14 +17,27 @@ public bool SpellCheck
             set { spellCheck = value; RaisePropertyChanged(nameof(SpellCheck)); }
         }
 
+        private bool sendMessageWithEnter;
+        public bool SendMessageWithEnter
+        {
+            get { return sendMessageWithEnter; }
+            set { sendMessageWithEnter = value; RaisePropertyChanged(nameof(SendMessageWithEnter)); }
+        }
+
         public void OnNavigatedTo()
         {
             SpellCheck = GlobalSettingsManager.SpellCheckSetting;
+            SendMessageWithEnter = GlobalSettingsManager.SendMessageWithEnterSetting;
         }
 
         public void SpellCheckToggleSwitch_Toggled(bool value)
         {
             GlobalSettingsManager.SpellCheckSetting = value;
         }
+
+        public void SendMessageWithEnterToggleSwitch_Toggled(bool value)
+        {
+            GlobalSettingsManager.SendMessageWithEnterSetting = value;
+        }
     }
 }

Signal-Windows/Views/ChatsAndMediaSettingsPage.xaml

@@ -21,6 +21,7 @@
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
                     <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
                 <Grid>
                     <Grid.RowDefinitions>
@@ -79,6 +80,14 @@
                     <TextBlock Text="Spell Check" Style="{StaticResource SubtitleTextBlockStyle}"/>
                     <ToggleSwitch x:Name="SpellCheckToggleSwitch" Grid.Row="1" Margin="0,8" IsOn="{x:Bind Vm.SpellCheck, Mode=TwoWay}" Toggled="SpellCheckToggleSwitch_Toggled"/>
                 </Grid>
+                <Grid Grid.Row="3" Margin="0,16,0,0">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition/>
+                    </Grid.RowDefinitions>
+                    <TextBlock Text="Send Message With Enter" Style="{StaticResource SubtitleTextBlockStyle}"/>
+                    <ToggleSwitch x:Name="SendMessageWithEnterToggleSwitch" Grid.Row="1" Margin="0,8" IsOn="{x:Bind Vm.SendMessageWithEnter, Mode=TwoWay}" Toggled="SendMessageWithEnterToggleSwitch_Toggled"/>
+                </Grid>
             </Grid>
         </ScrollViewer>
     </Grid>

Signal-Windows/Views/ChatsAndMediaSettingsPage.xaml.cs

@@ -57,5 +57,11 @@ private void SpellCheckToggleSwitch_Toggled(object sender, RoutedEventArgs e)
             var toggleSwitch = sender as ToggleSwitch;
             Vm.SpellCheckToggleSwitch_Toggled(toggleSwitch.IsOn);
         }
+
+        private void SendMessageWithEnterToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+        {
+            var toggleSwitch = sender as ToggleSwitch;
+            Vm.SendMessageWithEnterToggleSwitch_Toggled(toggleSwitch.IsOn);
+        }
     }
 }