Implemented Two-Way chat

Author: arkangel-dev

SyncPlayWPF/.vs/SyncPlayWPF/v16/.suo

@@ -8,6 +8,7 @@ namespace SyncPlayWPF.Common {
     public class Shared {
         public static WpfPageTransitions.PageTransition WindowPageTransition;
         public static WpfPageTransitions.PageTransition LandingPageTransition;
+        public static Pages.SessionPages.ChatSession ChatPageSingleton;
         public static SyncPlay.SyncPlayWrapper Wrapper;
 
     }

SyncPlayWPF/SyncPlayWPF/Common/Shared.cs

@@ -21,7 +21,12 @@ public partial class SessionLandingPage : UserControl {
         public SessionLandingPage() {
             InitializeComponent();
 
-            SessionPageWindow.ShowPage(new Pages.SessionPages.ChatSession());
+            Common.Shared.ChatPageSingleton = new Pages.SessionPages.ChatSession();
+            ShowChatWindow();
+        }
+
+        private void ShowChatWindow() {
+            SessionPageWindow.ShowPage(Common.Shared.ChatPageSingleton);
         }
     }
 }

SyncPlayWPF/SyncPlayWPF/Pages/SessionLandingPage.xaml.cs

@@ -39,6 +39,8 @@
                     <ColumnDefinition Width="50"/>
                 </Grid.ColumnDefinitions>
                 <custom:PromptingLabel 
+                    x:Name="MessageBlockField"
+                    KeyUp="SendMessageEnterClick"
                     Grid.Column="0"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Left"
@@ -56,7 +58,8 @@
                     Grid.Column="2"
                     ImageBackgroundHoverBrush="{StaticResource DarkMode_ContrastedGradient}"
                     Image="{StaticResource SendButton}"
-                    Style="{StaticResource ImageSilhouette}"/>
+                    Style="{StaticResource ImageSilhouette}"
+                    Click="SendMessageButtonClick"/>
             </Grid>
         </Border>
 

SyncPlayWPF/SyncPlayWPF/Pages/SessionPages/ChatSession.xaml

@@ -29,10 +29,9 @@ private void OnPageLoad(object sender, RoutedEventArgs e) {
         }
 
         private void NewChatMessage(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.ChatMessageEventArgs e) {
-            Console.WriteLine("NEW MESSAGE!");
             Dispatcher.Invoke(() => {
                 var msgballoon = new CustomControls.ChatMessage();
-                msgballoon.Style = (Style)this.FindResource("IncomingMessage");
+                msgballoon.Style = e.LocallySentMessage ? (Style)this.FindResource("OutgoingMessage") : (Style)this.FindResource("IncomingMessage");
                 msgballoon.MessageSender = e.Sender.Username;
                 msgballoon.MessageContent = e.Message;
                 msgballoon.MessageTime = DateTime.Now.ToString("hh:mm tt");
@@ -42,7 +41,25 @@ private void NewChatMessage(SyncPlay.SyncPlayClient sender, SyncPlay.EventArgs.C
 
                 MessageStack.Children.Add(msgballoon);
             });
-            
+        }
+
+        private void SendMessageButtonClick(object sender, RoutedEventArgs e) {
+            SendMessage();
+        }
+
+        private void SendMessage() {
+            if (!String.IsNullOrWhiteSpace(MessageBlockField.Text)) {
+                Common.Shared.Wrapper.SyncPlayClient.SendChatMessage(MessageBlockField.Text);
+            } else {
+                Console.WriteLine("Ignored Blank Message");
+            }
+            MessageBlockField.Text = "";
+        }
+
+        private void SendMessageEnterClick(object sender, KeyEventArgs e) {
+            if (e.Key == Key.Enter) {
+                SendMessage();
+            }
         }
     }
 }

SyncPlayWPF/SyncPlayWPF/Pages/SessionPages/ChatSession.xaml.cs

@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2021.201.65.0")]
-[assembly: AssemblyFileVersion("2021.201.65.0")]
+[assembly: AssemblyVersion("2021.201.75.0")]
+[assembly: AssemblyFileVersion("2021.201.75.0")]

SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs

@@ -8,6 +8,7 @@ namespace SyncPlay.EventArgs {
     public  class ChatMessageEventArgs {
         public User Sender;
         public String Message;
+        public bool LocallySentMessage;
 
         public ChatMessageEventArgs(User _sender, String _message) {
             Sender = _sender;

SyncPlayWPF/SyncPlayWPF/SyncPlay/EventArgs/ChatMessageEventArgs.cs

@@ -133,6 +133,17 @@ public static string CraftSetClientReadiness(bool isReady, bool manuallyInitiate
             var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
             return sresult;
         }
+
+        public static string CraftOutgoingChatMessage(string message) {
+            var result = new JObject(
+                    new JProperty("Chat", message)
+                );
+            var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
+            return sresult;
+        }
+
+
+
         public static string CraftSendList() {
             var result = new JObject(
                 new JProperty("List", null)

SyncPlayWPF/SyncPlayWPF/SyncPlay/Misc/Packets.cs

@@ -26,8 +26,7 @@ public class SyncPlayClient {
         private bool Seeked = false;
         private bool clientIgnoreOnFly = false;
 
-        //TODO: Fix the issue where the client has no idea what users were in the session before joining. This crashing every time one of them sends a message.
-
+        
         #region Front Facing Accessors
         /// <summary>
         /// This function will get the pause state of the client
@@ -102,6 +101,10 @@ public void AddFileToPlayList(string path) {
             nclient.SendMessage(Packets.CraftSetFileMessage(mfile.FilePath, mfile.Duration, mfile.Size));
         }
 
+        public void SendChatMessage(string message) {
+            nclient.SendMessage(Packets.CraftOutgoingChatMessage(message));
+        }
+
         /// <summary>
         /// This is the constructor to the client class
         /// </summary>
@@ -286,6 +289,7 @@ private void NewIncomingMessage(NetworkClient sender, string message) {
                     User s;
                     if (!UserDictionary.TryGetValue(username, out s)) throw new Exception($"Cannot find user {username}");
                     var args = new EventArgs.ChatMessageEventArgs(s, chatmessage);
+                    args.LocallySentMessage = username.Equals(this.Username);
                     OnNewChatMessage(this, args);
                 }
             }

SyncPlayWPF/SyncPlayWPF/SyncPlay/SyncPlayClient.cs

@@ -564,7 +564,7 @@
                                 TextWrapping="WrapWithOverflow"
                                 Background="Transparent"
                                 Foreground="{StaticResource DarkMode_TextColorF}"
-                                Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text}"
+                                Text="{Binding RelativeSource={RelativeSource Mode=TemplatedParent}, Path=Text,Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                                 Width="{Binding Path=ActualWidth, ElementName=ContainerGrid}"
                                 MaxWidth="{Binding Path=ActualWidth, ElementName=ContainerGrid}">