Skip to content

Ajout du bouton #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
andre726 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Ajout du bouton #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4bb8269
Ajout du bouton
Mar 30, 2017
353ff85
modifications 1
Apr 3, 2017
1d0d245
modif2
Apr 3, 2017
8b6b530
Modifications4
Apr 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions LIvecoding-uwp/Livecoding/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@
</Storyboard>
</VisualState>
</VisualStateGroup>

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression de la ligne en trop


<!-- VolumeMute states -->
<VisualStateGroup x:Name="VolumeMuteStates">
Expand Down Expand Up @@ -733,6 +734,18 @@
<FontIcon Glyph="&#xEC57;"/>
</AppBarButton.Icon>
</AppBarButton>
<AppBarButton x:Name="ChatButton"

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression de la ligne en trop

MediaTransportControlsHelper.DropoutOrder ="5"
Visibility="Collapsed"
Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Le bouton est censé être toujours visible, non ? Ligne à supprimer.

Command="ChatVisibilityChange">
Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Voilà comment on écrit une commande généralement :

Command="{Binding ShowChatCommand}"

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dans notre cas, je pense plutôt qu'il faut l'appeler ToggleChatCommand.

<AppBarButton.Icon>
<FontIcon Glyph="comment"/>
Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Il me semble qu'il y a une majuscule pour le nom d'une glyph. Donc ce serait Comment plutôt.

</AppBarButton.Icon>
</AppBarButton>

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression des lignes en trop



</CommandBar.PrimaryCommands>
</CommandBar>
</Border>
Expand Down
11 changes: 11 additions & 0 deletions LIvecoding-uwp/Livecoding/ViewModels/StreamViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
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;
using Windows.UI.Xaml.Controls;

namespace Livecoding.UWP.ViewModels
{
Expand All @@ -21,6 +24,14 @@ public class StreamViewModel : ViewModelBase
#endregion

#region Properties
public ObservableCollection<ChatMessage> Messages { get; } = new ObservableCollection<ChatMessage>();
Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, en fait la classe ChatMessage est déjà utilisé par l'OS. Il faudra créer une classe dans le dossier Models. Tu peux l'appeler LivecodingChatMessage par exemple. Et il doit y avoir les propriétés spécifiques d'un message, comme par exemple le username, le contenu du message et la date.


private bool _showChat;
public bool ShowChat
{
get { return _showChat; }
set { _showChat = value; RaisePropertyChanged(); }
}

private string _title;
public string Title
Expand Down
12 changes: 12 additions & 0 deletions LIvecoding-uwp/Livecoding/Views/StreamPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression de la ligne en trop

mc:Ignorable="d"
DataContext="{Binding Stream, Source={StaticResource Locator}}"
NavigationCacheMode="Required">
Expand All @@ -23,11 +24,22 @@
<lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
<DataTemplate>
<usercontrols:StreamHeaderControl DataContext="{Binding Stream, Source={StaticResource Locator}}" />

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression des lignes en trop


</DataTemplate>
</lvcontrols:LivecodingMediaTransportControls.HeaderTemplate>
</lvcontrols:LivecodingMediaTransportControls>

Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression des lignes en trop

</MediaPlayerElement.TransportControls>


Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression des lignes en trop


</MediaPlayerElement>



Copy link
Contributor

@Odonno Odonno Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suppression des lignes en trop



</Grid>
</Grid>
</Page>
13 changes: 7 additions & 6 deletions LIvecoding-uwp/Livecoding/project.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.2",
"Microsoft.Services.Store.SDK": "10.1703.19001",
"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"
"MvvmLightLibs": "5.3.0",
"XMPP": "0.7.0.21"
},
"frameworks": {
"uap10.0": {}
Expand Down