[FIX] fixed merge conflicts

Client/Client.cs

@@ -72,14 +72,15 @@ namespace Client
             }
 
             stream.BeginRead(buffer, 0, buffer.Length, new AsyncCallback(OnReadComplete), null);
-
         }
 
         private void handleData(byte[] message)
         {
             byte id = message[4];
+
             byte[] payload = new byte[message.Length - 5];
             Array.Copy(message, 5, payload, 0, message.Length - 5);
+
             switch (id)
             {
                 case JSONConvert.LOGIN:
@@ -90,8 +91,10 @@ namespace Client
                     (string, string) combo = JSONConvert.GetUsernameAndMessage(payload);
                     string textUsername = combo.Item1;
                     string textMsg = combo.Item2;
-                    //TODO display username and message in chat window
 
+                    //TODO display username and message in chat window
+                    Debug.WriteLine("[CLIENT] INCOMING MESSAGE!");
+                    Debug.WriteLine("[CLIENT] User name: {0}\t User message: {1}", textUsername, textMsg);
                     break;
 
                 case JSONConvert.LOBBY:
@@ -118,9 +121,11 @@ namespace Client
                     }
                     //TODO fill lobby with the data received
                     break;
+
                 case JSONConvert.CANVAS:
                     // canvas data
                     break;
+
                 default:
                     Debug.WriteLine("[CLIENT] Received weird identifier: " + id);
                     break;

Client/ClientData.cs

@@ -30,6 +30,7 @@ namespace Client
         private User _user;
         private Client _client;
         private Lobby _lobby;
+        private string _message;
 
         private ClientData()
         {
@@ -55,5 +56,17 @@ namespace Client
             set { _lobby = value; }
         }
 
+        public String Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                _message = value;
+            }
+        }
+
     }
 }

Client/ViewModels/ViewModelGame.cs

@@ -1,4 +1,6 @@
+
 using Client.Views;
+using GalaSoft.MvvmLight.Command;
 using SharedClientServer;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -18,6 +20,26 @@ namespace Client.ViewModels
         private Point currentPoint = new Point();
         private Color color;
 
+        public ObservableCollection<string> Messages { get; } = new ObservableCollection<string>();
+
+        private dynamic _payload;
+
+        private string _username;
+
+        private string _message;
+        public string Message
+        {
+            get
+            {
+                return _message;
+            }
+            set
+            {
+                _message = value;
+            }
+        }
+        public ICommand OnKeyDown { get; set; }
+
         public void Canvas_MouseDown(MouseButtonEventArgs e, GameWindow window)
         {
             if (e.ButtonState == MouseButtonState.Pressed)
@@ -59,9 +81,46 @@ namespace Client.ViewModels
             colorSelected.B = window.ClrPcker_Background.SelectedColor.Value.B;
             color = colorSelected;
         }
+        
 
+        public ViewModelGame()
+        {
+            if (_payload == null)
+            {
+                _message = "";
 
+            }
+            else
+            {
+                //_message = data.Message;
+                //_username = data.User.Username;
+                //Messages.Add($"{data.User.Username}: {Message}");
+            }
+            OnKeyDown = new RelayCommand(ChatBox_KeyDown);
+        }
+
+        private void ChatBox_KeyDown()
+        {
+            //if enter then clear textbox and send message.
+            if (Message != string.Empty) AddMessage(Message);
+            Message = string.Empty;
+        }
+
+        internal void AddMessage(string message)
+        {
+            Messages.Add($"{data.User.Username}: {message}");
+
+            _payload = new
+            {
+                username = data.User.Username,
+                message = message
+            };
+
+            //Broadcast the message after adding it to the list!
+            data.Client.SendMessage(JSONConvert.GetMessageToSend(JSONConvert.MESSAGE, _payload));
+        }
 
 
     }
 }
+       

Client/Views/GameWindow.xaml

@@ -48,8 +48,13 @@
         </Border>
 
         <Grid Grid.Column="2" Grid.Row="1">
-            <TextBox Name="SentMessage" IsReadOnly="True" Margin="0,0,0,50"/>
-            <TextBox x:Name="ChatBox" Keyboard.KeyDown="ChatBox_KeyDown" Width="200" Height="50" ToolTip="Message goes here" ToolTipService.IsEnabled="True" VerticalAlignment="Bottom" HorizontalAlignment="Left"/>
+            <ListBox Name ="TextBox" ItemsSource="{Binding Path=Messages}" Margin="0,0,0,69"/>
+
+            <TextBox Name="ChatBox" Text="{Binding Message, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="0,465,0,0">
+                <TextBox.InputBindings>
+                    <KeyBinding Key="Return" Command="{Binding OnKeyDown}"/>
+                </TextBox.InputBindings>
+            </TextBox>
         </Grid>
 
     </Grid>

Client/Views/GameWindow.xaml.cs

@@ -52,36 +52,11 @@ namespace Client.Views
             //    var deepCopy = System.Windows.Markup.XamlReader.Parse(xaml) as UIElement;
             //    TEST.Children.Add(deepCopy);
             //}
-
         }
 
         private void ClrPcker_Background_SelectedColorChanged_1(object sender, RoutedPropertyChangedEventArgs<Color?> e)
         {
             viewModel.Color_Picker(e, this);
         }
-
-        private void ChatBox_KeyDown(object sender, KeyEventArgs e)
-        {
-            //if enter then clear textbox and send message.
-            if (e.Key.Equals(Key.Enter))
-            {
-                WriteToChat(ChatBox.Text);
-                ChatBox.Clear();
-            }
-        }
-
-        /*
-         * Writes the current client's message to the chatbox.
-         */
-        private void WriteToChat(string message)
-        {
-            string user = data.User.Username; 
-            SentMessage.AppendText($"{user}: {message}\n");
-        }
-
-        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
-        {
-
-        }
     }
 }

Client/Views/MainWindow.xaml.cs

@@ -32,8 +32,6 @@ namespace Client
 
         private void Button_Click(object sender, RoutedEventArgs e)
         {
-
-            
         }
     }
 }