diff --git a/Documentations/Instruction b/Documentations/Instruction index 1f9e45a..7f00781 100644 --- a/Documentations/Instruction +++ b/Documentations/Instruction @@ -5,6 +5,12 @@ Mono-utilisateur: - Changer les thèmes et les couleurs (en option) - jeu classique pas extreme - décaler la création du deck et la distribution des cartes dans un stub + - Thème dark + - Jeu solo complet + - Push version sur les stores pour la semaine pro + - Rendre abstract creation deck + - Drag and drop + - Option pour mettre/enlever le pas de 10 The game -> déposé? avant faire fonctionner en local puis on choisira ensemble \ No newline at end of file diff --git a/TheGameExtreme.Android/Resources/Resource.designer.cs b/TheGameExtreme.Android/Resources/Resource.designer.cs index 2254765..5bb9904 100644 --- a/TheGameExtreme.Android/Resources/Resource.designer.cs +++ b/TheGameExtreme.Android/Resources/Resource.designer.cs @@ -1,11 +1,11 @@ #pragma warning disable 1591 //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -5710,88 +5710,91 @@ namespace TheGameExtreme.Droid public const int abc_vector_test = 2131165273; // aapt resource value: 0x7F07005A - public const int avd_hide_password = 2131165274; + public const int Apple = 2131165274; // aapt resource value: 0x7F07005B - public const int avd_show_password = 2131165275; + public const int avd_hide_password = 2131165275; // aapt resource value: 0x7F07005C - public const int design_bottom_navigation_item_background = 2131165276; + public const int avd_show_password = 2131165276; // aapt resource value: 0x7F07005D - public const int design_fab_background = 2131165277; + public const int design_bottom_navigation_item_background = 2131165277; // aapt resource value: 0x7F07005E - public const int design_ic_visibility = 2131165278; + public const int design_fab_background = 2131165278; // aapt resource value: 0x7F07005F - public const int design_ic_visibility_off = 2131165279; + public const int design_ic_visibility = 2131165279; // aapt resource value: 0x7F070060 - public const int design_password_eye = 2131165280; + public const int design_ic_visibility_off = 2131165280; // aapt resource value: 0x7F070061 - public const int design_snackbar_background = 2131165281; + public const int design_password_eye = 2131165281; // aapt resource value: 0x7F070062 - public const int ic_mtrl_chip_checked_black = 2131165282; + public const int design_snackbar_background = 2131165282; // aapt resource value: 0x7F070063 - public const int ic_mtrl_chip_checked_circle = 2131165283; + public const int ic_mtrl_chip_checked_black = 2131165283; // aapt resource value: 0x7F070064 - public const int ic_mtrl_chip_close_circle = 2131165284; + public const int ic_mtrl_chip_checked_circle = 2131165284; // aapt resource value: 0x7F070065 - public const int mtrl_snackbar_background = 2131165285; + public const int ic_mtrl_chip_close_circle = 2131165285; // aapt resource value: 0x7F070066 - public const int mtrl_tabs_default_indicator = 2131165286; + public const int mtrl_snackbar_background = 2131165286; // aapt resource value: 0x7F070067 - public const int navigation_empty_icon = 2131165287; + public const int mtrl_tabs_default_indicator = 2131165287; // aapt resource value: 0x7F070068 - public const int notification_action_background = 2131165288; + public const int navigation_empty_icon = 2131165288; // aapt resource value: 0x7F070069 - public const int notification_bg = 2131165289; + public const int notification_action_background = 2131165289; // aapt resource value: 0x7F07006A - public const int notification_bg_low = 2131165290; + public const int notification_bg = 2131165290; // aapt resource value: 0x7F07006B - public const int notification_bg_low_normal = 2131165291; + public const int notification_bg_low = 2131165291; // aapt resource value: 0x7F07006C - public const int notification_bg_low_pressed = 2131165292; + public const int notification_bg_low_normal = 2131165292; // aapt resource value: 0x7F07006D - public const int notification_bg_normal = 2131165293; + public const int notification_bg_low_pressed = 2131165293; // aapt resource value: 0x7F07006E - public const int notification_bg_normal_pressed = 2131165294; + public const int notification_bg_normal = 2131165294; // aapt resource value: 0x7F07006F - public const int notification_icon_background = 2131165295; + public const int notification_bg_normal_pressed = 2131165295; // aapt resource value: 0x7F070070 - public const int notification_template_icon_bg = 2131165296; + public const int notification_icon_background = 2131165296; // aapt resource value: 0x7F070071 - public const int notification_template_icon_low_bg = 2131165297; + public const int notification_template_icon_bg = 2131165297; // aapt resource value: 0x7F070072 - public const int notification_tile_bg = 2131165298; + public const int notification_template_icon_low_bg = 2131165298; // aapt resource value: 0x7F070073 - public const int notify_panel_notification_icon_bg = 2131165299; + public const int notification_tile_bg = 2131165299; // aapt resource value: 0x7F070074 - public const int tooltip_frame_dark = 2131165300; + public const int notify_panel_notification_icon_bg = 2131165300; // aapt resource value: 0x7F070075 - public const int tooltip_frame_light = 2131165301; + public const int tooltip_frame_dark = 2131165301; + + // aapt resource value: 0x7F070076 + public const int tooltip_frame_light = 2131165302; static Drawable() { diff --git a/TheGameExtreme.Android/Resources/drawable/Apple.png b/TheGameExtreme.Android/Resources/drawable/Apple.png new file mode 100644 index 0000000..a8533f0 Binary files /dev/null and b/TheGameExtreme.Android/Resources/drawable/Apple.png differ diff --git a/TheGameExtreme.Android/TheGameExtreme.Android.csproj b/TheGameExtreme.Android/TheGameExtreme.Android.csproj index 40a6024..867b2fd 100644 --- a/TheGameExtreme.Android/TheGameExtreme.Android.csproj +++ b/TheGameExtreme.Android/TheGameExtreme.Android.csproj @@ -83,6 +83,10 @@ + + + + diff --git a/TheGameExtreme.iOS/Resources/Apple.png b/TheGameExtreme.iOS/Resources/Apple.png new file mode 100644 index 0000000..a8533f0 Binary files /dev/null and b/TheGameExtreme.iOS/Resources/Apple.png differ diff --git a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj index dd40fa1..ed5a436 100644 --- a/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj +++ b/TheGameExtreme.iOS/TheGameExtreme.iOS.csproj @@ -65,6 +65,7 @@ + diff --git a/TheGameExtreme/TheGameExtreme.csproj b/TheGameExtreme/TheGameExtreme.csproj index 9e1e29f..3dc14b0 100644 --- a/TheGameExtreme/TheGameExtreme.csproj +++ b/TheGameExtreme/TheGameExtreme.csproj @@ -13,6 +13,7 @@ + diff --git a/TheGameExtreme/model/deck/ClassicDeck.cs b/TheGameExtreme/model/deck/ClassicDeck.cs new file mode 100644 index 0000000..df3ba5f --- /dev/null +++ b/TheGameExtreme/model/deck/ClassicDeck.cs @@ -0,0 +1,10 @@ +using System; +namespace TheGameExtreme.model.deck +{ + public class ClassicDeck + { + public ClassicDeck() + { + } + } +} diff --git a/TheGameExtreme/model/deck/CreationDack.cs b/TheGameExtreme/model/deck/CreationDack.cs new file mode 100644 index 0000000..1dbf3a7 --- /dev/null +++ b/TheGameExtreme/model/deck/CreationDack.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using TheGameExtreme.model.card; + +namespace TheGameExtreme.model +{ + public abstract class CreationDack + { + + private List deck = new List(); + + public CreationDack() + { + } + } +} diff --git a/TheGameExtreme/model/deck/ExtremeDeck.cs b/TheGameExtreme/model/deck/ExtremeDeck.cs new file mode 100644 index 0000000..b8d6589 --- /dev/null +++ b/TheGameExtreme/model/deck/ExtremeDeck.cs @@ -0,0 +1,10 @@ +using System; +namespace TheGameExtreme.model.deck +{ + public class ExtremeDeck + { + public ExtremeDeck() + { + } + } +} diff --git a/TheGameExtreme/view/MainPage.xaml b/TheGameExtreme/view/MainPage.xaml index 8923746..5ba921d 100644 --- a/TheGameExtreme/view/MainPage.xaml +++ b/TheGameExtreme/view/MainPage.xaml @@ -6,74 +6,89 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" x:Class="TheGameExtreme.MainPage"> - - -