From 4bb82699e6e3917b4f8eb940924dc14bdb2f011d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andrevdbroro@gmail.com>
Date: Thu, 30 Mar 2017 16:52:22 +0200
Subject: [PATCH 1/4] Ajout du bouton

---
 .../Livecoding/ViewModels/ChatList.cs         | 19 +++++++++++++++++++
 .../Livecoding/Views/StreamPage.xaml          | 12 ++++++++++++
 LIvecoding-uwp/Livecoding/project.json        | 13 +++++++------
 3 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs

diff --git a/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs b/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs
new file mode 100644
index 0000000..d98fc6e
--- /dev/null
+++ b/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Windows.UI.Xaml.Controls;
+using XMPP;
+
+namespace Livecoding.UWP.ViewModels
+{
+    class ChatList : ListViewItem
+    {
+        //Methode
+        private void ChatActivate
+        {
+           
+        }
+    }
+}
diff --git a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
index 81cd77a..5c9551f 100644
--- a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
+++ b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
@@ -26,7 +26,19 @@
                             </DataTemplate>
                         </lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
                     </lvcontrols:LivecodingMediaTransportControls>
+                    <AppBarButton x:Name="ChatButton"
+                                          Icon="Contact"
+                                          Style="{StaticResource AppBarButtonStyle}"
+                                          MediaTransportControlsHelper.DropoutOrder="5"
+                                          VerticalAlignment="Center"
+
                 </MediaPlayerElement.TransportControls>
+
+            </MediaPlayerElement>
+            <ListViewItem x:Name="ChatList" IsEnabled="False" Visibility="Collapsed"/>
+
+            </MediaPlayerElement.TransportControls>
+                
             </MediaPlayerElement>
         </Grid>
     </Grid>
diff --git a/LIvecoding-uwp/Livecoding/project.json b/LIvecoding-uwp/Livecoding/project.json
index e4912a7..528a5b6 100644
--- a/LIvecoding-uwp/Livecoding/project.json
+++ b/LIvecoding-uwp/Livecoding/project.json
@@ -1,12 +1,13 @@
 {
   "dependencies": {
-    "livecoding-api-pcl": "1.1.10",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2",
-    "Microsoft.Services.Store.SDK": "10.1610.31001",
-    "Microsoft.Toolkit.Uwp": "1.3.0-dev00165",
-    "Microsoft.Toolkit.Uwp.UI.Controls": "1.3.0-dev00165",
+    "livecoding-api-pcl": "1.1.11",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1",
+    "Microsoft.Services.Store.SDK": "10.1703.19001",
+    "Microsoft.Toolkit.Uwp": "1.3.1",
+    "Microsoft.Toolkit.Uwp.UI.Controls": "1.3.1",
     "Microsoft.Xaml.Behaviors.Uwp.Managed": "2.0.0",
-    "MvvmLightLibs": "5.3.0"
+    "MvvmLightLibs": "5.3.0",
+    "XMPP": "0.7.0.21"
   },
   "frameworks": {
     "uap10.0": {}

From 353ff850b580960b4ee936a4e86da18f426ca036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andrevdbroro@gmail.com>
Date: Mon, 3 Apr 2017 12:39:41 +0200
Subject: [PATCH 2/4] modifications 1

---
 .../Livecoding/ViewModels/ChatList.cs         | 19 -------------------
 .../Livecoding/ViewModels/StreamViewModel.cs  | 14 ++++++++++++++
 2 files changed, 14 insertions(+), 19 deletions(-)
 delete mode 100644 LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs

diff --git a/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs b/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs
deleted file mode 100644
index d98fc6e..0000000
--- a/LIvecoding-uwp/Livecoding/ViewModels/ChatList.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.UI.Xaml.Controls;
-using XMPP;
-
-namespace Livecoding.UWP.ViewModels
-{
-    class ChatList : ListViewItem
-    {
-        //Methode
-        private void ChatActivate
-        {
-           
-        }
-    }
-}
diff --git a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
index 465c307..f753116 100644
--- a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
+++ b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
@@ -9,6 +9,7 @@
 using Windows.ApplicationModel.Core;
 using Windows.Media.Core;
 using Windows.UI.Core;
+using Windows.UI.Xaml.Controls;
 
 namespace Livecoding.UWP.ViewModels
 {
@@ -21,6 +22,19 @@ public class StreamViewModel : ViewModelBase
         #endregion
 
         #region Properties
+        private ListView _chatlist;
+        public ListView ChatList
+        {
+            get { return _chatlist; }
+            set { _chatlist = value; RaisePropertyChanged(); }
+        }
+
+        private bool _showChat;
+        public bool ShowChat
+        {
+            get { return _showChat; }
+            set { _showChat = value; RaisePropertyChanged(); }
+        }
 
         private string _title;
         public string Title

From 1d0d245039b14dfb8015d74b3f8bc3c64d4521cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andrevdbroro@gmail.com>
Date: Mon, 3 Apr 2017 12:39:50 +0200
Subject: [PATCH 3/4] modif2

---
 .../Livecoding/Views/StreamPage.xaml          | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
index 5c9551f..63ebdbe 100644
--- a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
+++ b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
@@ -7,6 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:lvcontrols="using:Livecoding.UWP.Controls"
     xmlns:usercontrols="using:Livecoding.UWP.UserControls"
+    xmlns:controls="using:Windows.UI.Xaml.Controls"
     mc:Ignorable="d"
     DataContext="{Binding Stream, Source={StaticResource Locator}}"
     NavigationCacheMode="Required">
@@ -23,23 +24,31 @@
                         <lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
                             <DataTemplate>
                                 <usercontrols:StreamHeaderControl DataContext="{Binding Stream, Source={StaticResource Locator}}" />
-                            </DataTemplate>
-                        </lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
-                    </lvcontrols:LivecodingMediaTransportControls>
-                    <AppBarButton x:Name="ChatButton"
+
+                                <controls:AppBarButton x:Name="ChatButton"
                                           Icon="Contact"
                                           Style="{StaticResource AppBarButtonStyle}"
+                                          DataContext="{Binding ShowChat, Source = {StaticRessource Locator}}"
                                           MediaTransportControlsHelper.DropoutOrder="5"
                                           VerticalAlignment="Center"
+                                          Onclick="ChatHide_Show">
+
+                                </controls:AppBarButton>
+                            </DataTemplate>
+                        </lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
+                    </lvcontrols:LivecodingMediaTransportControls>
 
                 </MediaPlayerElement.TransportControls>
 
+
+
             </MediaPlayerElement>
-            <ListViewItem x:Name="ChatList" IsEnabled="False" Visibility="Collapsed"/>
 
-            </MediaPlayerElement.TransportControls>
-                
+
+
             </MediaPlayerElement>
+
         </Grid>
+        <ListView x:Name="ChatList" Visibility="Collapsed"  />
     </Grid>
 </Page>

From 8b6b53019e4fdbb14048def181a1399ba6459d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andrevdbroro@gmail.com>
Date: Fri, 7 Apr 2017 17:16:47 +0200
Subject: [PATCH 4/4] Modifications4

dispositions des element dans appxaml, depuis bcp d'erreur
---
 LIvecoding-uwp/Livecoding/App.xaml                  | 13 +++++++++++++
 .../Livecoding/ViewModels/StreamViewModel.cs        |  9 +++------
 LIvecoding-uwp/Livecoding/Views/StreamPage.xaml     | 13 ++-----------
 LIvecoding-uwp/Livecoding/project.json              |  6 +++---
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/LIvecoding-uwp/Livecoding/App.xaml b/LIvecoding-uwp/Livecoding/App.xaml
index e1c5fef..77fce28 100644
--- a/LIvecoding-uwp/Livecoding/App.xaml
+++ b/LIvecoding-uwp/Livecoding/App.xaml
@@ -504,6 +504,7 @@
                                             </Storyboard>
                                         </VisualState>
                                     </VisualStateGroup>
+                                    
 
                                     <!-- VolumeMute states -->
                                     <VisualStateGroup x:Name="VolumeMuteStates">
@@ -733,6 +734,18 @@
                                                                 <FontIcon Glyph="&#xEC57;"/>
                                                             </AppBarButton.Icon>
                                                         </AppBarButton>
+                                                        <AppBarButton x:Name="ChatButton"
+                                                                      
+                                                                      MediaTransportControlsHelper.DropoutOrder ="5"
+                                                                      Visibility="Collapsed"
+                                                                      Command="ChatVisibilityChange">
+                                                            <AppBarButton.Icon>
+                                                                <FontIcon Glyph="comment"/>
+                                                            </AppBarButton.Icon>
+                                                        </AppBarButton>
+
+
+
                                                     </CommandBar.PrimaryCommands>
                                                 </CommandBar>
                                             </Border>
diff --git a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
index f753116..524e081 100644
--- a/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
+++ b/LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
@@ -3,9 +3,11 @@
 using LivecodingApi.Services;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.ApplicationModel.Chat;
 using Windows.ApplicationModel.Core;
 using Windows.Media.Core;
 using Windows.UI.Core;
@@ -22,12 +24,7 @@ public class StreamViewModel : ViewModelBase
         #endregion
 
         #region Properties
-        private ListView _chatlist;
-        public ListView ChatList
-        {
-            get { return _chatlist; }
-            set { _chatlist = value; RaisePropertyChanged(); }
-        }
+        public ObservableCollection<ChatMessage> Messages { get; } = new ObservableCollection<ChatMessage>();
 
         private bool _showChat;
         public bool ShowChat
diff --git a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
index 63ebdbe..d6af851 100644
--- a/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
+++ b/LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
@@ -25,15 +25,7 @@
                             <DataTemplate>
                                 <usercontrols:StreamHeaderControl DataContext="{Binding Stream, Source={StaticResource Locator}}" />
 
-                                <controls:AppBarButton x:Name="ChatButton"
-                                          Icon="Contact"
-                                          Style="{StaticResource AppBarButtonStyle}"
-                                          DataContext="{Binding ShowChat, Source = {StaticRessource Locator}}"
-                                          MediaTransportControlsHelper.DropoutOrder="5"
-                                          VerticalAlignment="Center"
-                                          Onclick="ChatHide_Show">
-
-                                </controls:AppBarButton>
+                                
                             </DataTemplate>
                         </lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
                     </lvcontrols:LivecodingMediaTransportControls>
@@ -46,9 +38,8 @@
 
 
 
-            </MediaPlayerElement>
+            
 
         </Grid>
-        <ListView x:Name="ChatList" Visibility="Collapsed"  />
     </Grid>
 </Page>
diff --git a/LIvecoding-uwp/Livecoding/project.json b/LIvecoding-uwp/Livecoding/project.json
index 528a5b6..b234d12 100644
--- a/LIvecoding-uwp/Livecoding/project.json
+++ b/LIvecoding-uwp/Livecoding/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
     "livecoding-api-pcl": "1.1.11",
-    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.1",
+    "Microsoft.NETCore.UniversalWindowsPlatform": "5.3.2",
     "Microsoft.Services.Store.SDK": "10.1703.19001",
-    "Microsoft.Toolkit.Uwp": "1.3.1",
-    "Microsoft.Toolkit.Uwp.UI.Controls": "1.3.1",
+    "Microsoft.Toolkit.Uwp": "1.4.1",
+    "Microsoft.Toolkit.Uwp.UI.Controls": "1.4.1",
     "Microsoft.Xaml.Behaviors.Uwp.Managed": "2.0.0",
     "MvvmLightLibs": "5.3.0",
     "XMPP": "0.7.0.21"