From 49ed6ac38786260990e87dda41f03c8e078beacf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 20:18:13 +0200 Subject: [PATCH 1/6] =?UTF-8?q?=E2=9E=95=20Ajout=20d'icones=20pour=20l'app?= =?UTF-8?q?lication?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Trek-12/Resources/AppIcon/app_icon.png | Bin 0 -> 18105 bytes .../Trek-12/Resources/AppIcon/appicon.svg | 4 ---- .../Trek-12/Resources/AppIcon/appiconfg.svg | 8 -------- .../Trek-12/Resources/Images/back_arrow.png | Bin 0 -> 3282 bytes .../Trek-12/Trek-12/Resources/Images/user.png | Bin 0 -> 18573 bytes 5 files changed, 12 deletions(-) create mode 100644 source/Trek-12/Trek-12/Resources/AppIcon/app_icon.png delete mode 100644 source/Trek-12/Trek-12/Resources/AppIcon/appicon.svg delete mode 100644 source/Trek-12/Trek-12/Resources/AppIcon/appiconfg.svg create mode 100644 source/Trek-12/Trek-12/Resources/Images/back_arrow.png create mode 100644 source/Trek-12/Trek-12/Resources/Images/user.png diff --git a/source/Trek-12/Trek-12/Resources/AppIcon/app_icon.png b/source/Trek-12/Trek-12/Resources/AppIcon/app_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c9df929cdef4be53bc5e94f0ae938c073d92430a GIT binary patch literal 18105 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 - - - \ No newline at end of file diff --git a/source/Trek-12/Trek-12/Resources/AppIcon/appiconfg.svg b/source/Trek-12/Trek-12/Resources/AppIcon/appiconfg.svg deleted file mode 100644 index 21dfb25..0000000 --- a/source/Trek-12/Trek-12/Resources/AppIcon/appiconfg.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/source/Trek-12/Trek-12/Resources/Images/back_arrow.png b/source/Trek-12/Trek-12/Resources/Images/back_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..fcc3d87888101e6c9d207c6ab15a133a57a38f21 GIT binary patch literal 3282 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 E7dmxKb^rhX literal 0 HcmV?d00001 diff --git a/source/Trek-12/Trek-12/Resources/Images/user.png b/source/Trek-12/Trek-12/Resources/Images/user.png new file mode 100644 index 0000000000000000000000000000000000000000..9c4f84df3fdfe0bf9482ca63f64db0d49f1c3404 GIT binary patch literal 18573 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 FV1nlM9RC0S literal 0 HcmV?d00001 From f8e7dc1d24b367dcb758feb2b438075984886ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 21:14:06 +0200 Subject: [PATCH 2/6] =?UTF-8?q?=E2=9E=95=20Ajout=20des=20DataContract=20&?= =?UTF-8?q?=20DataMembers=20pour=20la=20persistance.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Trek-12/Models/Game/Cell.cs | 9 ++++++++- source/Trek-12/Models/Game/Game.cs | 11 +++++++++-- source/Trek-12/Models/Game/Map.cs | 9 ++++++++- source/Trek-12/Models/Game/OperationCell.cs | 3 +++ source/Trek-12/Models/Game/Position.cs | 4 ++++ 5 files changed, 32 insertions(+), 4 deletions(-) diff --git a/source/Trek-12/Models/Game/Cell.cs b/source/Trek-12/Models/Game/Cell.cs index b2eb151..c14e579 100644 --- a/source/Trek-12/Models/Game/Cell.cs +++ b/source/Trek-12/Models/Game/Cell.cs @@ -1,14 +1,18 @@ -namespace Models.Game +using System.Runtime.Serialization; + +namespace Models.Game { /// /// The Cell class represents a cell in the application. /// + [DataContract] public class Cell : Position, IEquatable { /// /// The value of the cell. /// private int? _value; + [DataMember] public int? Value { get => _value; set @@ -24,14 +28,17 @@ /// /// The fact that the cell is dangerous or not. /// + [DataMember] public bool IsDangerous { get; set; } + [DataMember] public bool Valid { get; set; } /// /// Atribute to know if the cell is a penalty cell. /// + [DataMember] private bool Penalty { get; set; } /// diff --git a/source/Trek-12/Models/Game/Game.cs b/source/Trek-12/Models/Game/Game.cs index e311f62..d715570 100644 --- a/source/Trek-12/Models/Game/Game.cs +++ b/source/Trek-12/Models/Game/Game.cs @@ -5,6 +5,7 @@ using System.Collections.ObjectModel; using System.ComponentModel; using System.Linq; using System.Runtime.CompilerServices; +using System.Runtime.Serialization; using System.Text; using System.Threading.Tasks; using System.Threading.Tasks.Dataflow; @@ -19,6 +20,7 @@ namespace Models.Game /// The Game class represents a game session in the application. /// It contains all the necessary properties and methods to manage a game, including the game loop, dice rolling, and use of the game rules. /// + [DataContract] public class Game : INotifyPropertyChanged { /* Persistence */ @@ -74,19 +76,24 @@ namespace Models.Game } private bool _isRunning; + [DataMember] public bool IsRunning { get => _isRunning; private set => _isRunning = value; } - public Player CurrentPlayer { get; private set; } + [DataMember] + public Player? CurrentPlayer { get; private set; } - public Map UsedMap { get; private set; } + [DataMember] + public Map? UsedMap { get; private set; } public Dice Dice1 { get; private set;} + public Dice Dice2 { get; private set; } + [DataMember] public int Turn { get; private set; } public Rules.Rules GameRules { get; } diff --git a/source/Trek-12/Models/Game/Map.cs b/source/Trek-12/Models/Game/Map.cs index e59c1b2..a4ffadf 100644 --- a/source/Trek-12/Models/Game/Map.cs +++ b/source/Trek-12/Models/Game/Map.cs @@ -1,4 +1,5 @@ using System.Collections.ObjectModel; +using System.Runtime.Serialization; namespace Models.Game { @@ -6,33 +7,39 @@ namespace Models.Game /// /// The Map class is the representation of the game map with the board and the operations table. /// + [DataContract] public class Map { /// /// It is the list of cells on the map. /// + [DataMember] public ReadOnlyObservableCollection Boards { get; private set; } ObservableCollection board = new ObservableCollection(); - + /// /// It is the backgrond image of the map /// + [DataMember] public string Background { get; private set; } /// /// It is the grid of the possible operation in the game /// + [DataMember] public ReadOnlyObservableCollection OperationGrid { get; private set; } ObservableCollection operationGrid = new ObservableCollection(); /// /// It is a list of a list containing user's rope paths in the current game /// + [DataMember] public List> RopePaths { get; private set; } /// /// It is a list of a list containing user's zones in the current game /// + [DataMember] public List> Zones { get; private set; } /// diff --git a/source/Trek-12/Models/Game/OperationCell.cs b/source/Trek-12/Models/Game/OperationCell.cs index 25ebbb1..7a1b19d 100644 --- a/source/Trek-12/Models/Game/OperationCell.cs +++ b/source/Trek-12/Models/Game/OperationCell.cs @@ -1,15 +1,18 @@ using System.ComponentModel; +using System.Runtime.Serialization; namespace Models.Game { /// /// Represents a cell in the operation grid of the game. /// + [DataContract] public class OperationCell : Position { /// /// It tells if the operation is checked or not in the operation grid of the game. /// + [DataMember] public bool IsChecked { get; private set; } /// diff --git a/source/Trek-12/Models/Game/Position.cs b/source/Trek-12/Models/Game/Position.cs index 980e80c..e6edc7a 100644 --- a/source/Trek-12/Models/Game/Position.cs +++ b/source/Trek-12/Models/Game/Position.cs @@ -1,5 +1,6 @@ using System.ComponentModel; using System.Runtime.CompilerServices; +using System.Runtime.Serialization; namespace Models.Game { @@ -7,16 +8,19 @@ namespace Models.Game /// /// The Position (x,y) of a cell in the game. /// + [DataContract] public class Position { /// /// The X coordinate. /// + [DataMember] public int X { get; set; } /// /// The Y coordinate. /// + [DataMember] public int Y { get; set; } /// From f1ff9746619d6a350a30b9e597fe3cc56a4e95ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 21:15:00 +0200 Subject: [PATCH 3/6] Modification mineure du Stub --- source/Trek-12/Stub/Stub.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/source/Trek-12/Stub/Stub.cs b/source/Trek-12/Stub/Stub.cs index a706aa4..5c360bb 100644 --- a/source/Trek-12/Stub/Stub.cs +++ b/source/Trek-12/Stub/Stub.cs @@ -25,8 +25,6 @@ namespace Stub public void LoadPlayer() { - - listplayer.Add(new Player()); listplayer.Add(new Player("Lucas", "profile.jpg")); listplayer.Add(new Player("relavergne", "profile.jpg")); listplayer.Add(new Player("reneveu", "profile.jpg")); From d802a292509a592e4007fb77114eddbfdd937a98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 21:15:48 +0200 Subject: [PATCH 4/6] Modification des bases de navigation de l'application --- source/Trek-12/Trek-12/App.xaml.cs | 14 ++++++++-- source/Trek-12/Trek-12/AppShell.xaml | 37 ++++--------------------- source/Trek-12/Trek-12/AppShell.xaml.cs | 1 + 3 files changed, 17 insertions(+), 35 deletions(-) diff --git a/source/Trek-12/Trek-12/App.xaml.cs b/source/Trek-12/Trek-12/App.xaml.cs index 2265b67..d838b8b 100644 --- a/source/Trek-12/Trek-12/App.xaml.cs +++ b/source/Trek-12/Trek-12/App.xaml.cs @@ -1,11 +1,12 @@ using System.Diagnostics; using System.Runtime.Serialization.DataContracts; -using DataContractPersistence; -using Models.Game; -using Models.Interfaces; namespace Trek_12 { + using Models.Game; + using Models.Interfaces; + using DataContractPersistence; + public partial class App : Application { public string FileName { get; set; } = "data.json"; @@ -33,6 +34,13 @@ namespace Trek_12 Debug.WriteLine("Data loaded from " + fullPath); Manager.LoadData(); } + /* Add the permanent maps if they are not already in the game */ + if (Manager.Maps.Count == 0) + { + Manager.AddMap(new Map("profile.jpg")); + Manager.AddMap(new Map("montagne1.png")); + Manager.AddMap(new Map("tmp1.jpeg")); + } MainPage = new AppShell(); diff --git a/source/Trek-12/Trek-12/AppShell.xaml b/source/Trek-12/Trek-12/AppShell.xaml index 79a9d52..c66ddf6 100644 --- a/source/Trek-12/Trek-12/AppShell.xaml +++ b/source/Trek-12/Trek-12/AppShell.xaml @@ -5,38 +5,11 @@ xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:Trek_12" xmlns:views="clr-namespace:Trek_12.Views" - Shell.FlyoutBehavior="Flyout" + Shell.FlyoutBehavior="Disabled" Title="Trek_12" - Shell.NavBarIsVisible="False"> - - - - - - - - - - - - + Shell.NavBarIsVisible="False" + Shell.FlyoutItemIsVisible="False" + Shell.TabBarIsVisible="False"> + diff --git a/source/Trek-12/Trek-12/AppShell.xaml.cs b/source/Trek-12/Trek-12/AppShell.xaml.cs index 61288b8..eba8dbd 100644 --- a/source/Trek-12/Trek-12/AppShell.xaml.cs +++ b/source/Trek-12/Trek-12/AppShell.xaml.cs @@ -16,6 +16,7 @@ namespace Trek_12 Routing.RegisterRoute(nameof(PageSelectMap), typeof(PageSelectMap)); Routing.RegisterRoute(nameof(PageRegles), typeof(PageRegles)); Routing.RegisterRoute(nameof(PageLeaderBoard), typeof(PageLeaderBoard)); + Routing.RegisterRoute(nameof(PageBoard), typeof(PageBoard)); } } } From 0153fd24a7cadaab5a162a3c968c399458be3d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 21:16:19 +0200 Subject: [PATCH 5/6] =?UTF-8?q?=F0=9F=96=BC=EF=B8=8F=20Modification=20du?= =?UTF-8?q?=20logo=20de=20l'application?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Trek-12/Trek-12/Trek-12.csproj | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/Trek-12/Trek-12/Trek-12.csproj b/source/Trek-12/Trek-12/Trek-12.csproj index 1630103..4d2aac5 100644 --- a/source/Trek-12/Trek-12/Trek-12.csproj +++ b/source/Trek-12/Trek-12/Trek-12.csproj @@ -40,7 +40,7 @@ - + @@ -57,8 +57,11 @@ + + + From 8e9bca4b9a19b69a658bb430016a6e1503d865b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20LAVERGNE?= Date: Wed, 5 Jun 2024 21:17:04 +0200 Subject: [PATCH 6/6] =?UTF-8?q?=F0=9F=9A=A7=20Ajout=20de=20la=20navigation?= =?UTF-8?q?=20entre=20les=20pages,=20utilisation=20de=20la=20persistance?= =?UTF-8?q?=20et=20interactions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/Trek-12/Trek-12/Views/PageBoard.xaml | 10 +-- .../Trek-12/Trek-12/Views/PageBoard.xaml.cs | 21 +++--- .../Trek-12/Views/PageLeaderBoard.xaml | 29 ++++---- .../Trek-12/Views/PageLeaderBoard.xaml.cs | 5 ++ .../Trek-12/Views/PageMenuPrincipal.xaml | 16 +++-- .../Trek-12/Views/PageMenuPrincipal.xaml.cs | 25 +++++++ .../Trek-12/Trek-12/Views/PageSelectMap.xaml | 13 ++-- .../Trek-12/Views/PageSelectMap.xaml.cs | 72 ++++++++++++++++++- .../Trek-12/Trek-12/Views/pageProfiles.xaml | 12 ++++ .../Trek-12/Views/pageProfiles.xaml.cs | 9 +++ source/Trek-12/Trek-12/Views/pageRegles.xaml | 2 +- .../Trek-12/Trek-12/Views/pageRegles.xaml.cs | 4 ++ 12 files changed, 179 insertions(+), 39 deletions(-) diff --git a/source/Trek-12/Trek-12/Views/PageBoard.xaml b/source/Trek-12/Trek-12/Views/PageBoard.xaml index 6dfa23c..e0c2770 100644 --- a/source/Trek-12/Trek-12/Views/PageBoard.xaml +++ b/source/Trek-12/Trek-12/Views/PageBoard.xaml @@ -14,7 +14,7 @@ HorizontalOptions="Center" VerticalOptions="Center" Padding="0"> -