From 913a7b5ee2ee94ba0b164111ea2ed35b0e18684c Mon Sep 17 00:00:00 2001 From: Yan Maniez Date: Wed, 25 Apr 2018 21:50:15 +0200 Subject: [PATCH] Un peu de tout --- .../AideDeJeu.Android.csproj | 6 + AideDeJeu/AideDeJeu.Android/MainActivity.cs | 2 +- .../Properties/AndroidManifest.xml | 4 +- .../Properties/AssemblyInfo.cs | 2 +- .../Resources/Resource.designer.cs | 414 +++++++++--------- .../Resources/drawable/black_book.png | Bin 0 -> 10657 bytes .../Resources/drawable/ic_home.png | Bin 0 -> 310 bytes .../AideDeJeu.UWP/Properties/AssemblyInfo.cs | 2 +- .../AideDeJeu.iOS/Properties/AssemblyInfo.cs | 2 +- AideDeJeu/AideDeJeu/Services/IDataStore.cs | 2 +- AideDeJeu/AideDeJeu/Services/MockDataStore.cs | 2 +- .../AideDeJeu/Services/SpellDataStore.cs | 4 +- .../AideDeJeu/ViewModels/SpellsViewModel.cs | 90 +++- AideDeJeu/AideDeJeu/Views/MainPage.xaml | 64 +-- 14 files changed, 323 insertions(+), 271 deletions(-) create mode 100644 AideDeJeu/AideDeJeu.Android/Resources/drawable/black_book.png create mode 100644 AideDeJeu/AideDeJeu.Android/Resources/drawable/ic_home.png diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index b956b3b5..da933556 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -107,5 +107,11 @@ AideDeJeu + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.Android/MainActivity.cs b/AideDeJeu/AideDeJeu.Android/MainActivity.cs index 7dbc875d..57f835b7 100644 --- a/AideDeJeu/AideDeJeu.Android/MainActivity.cs +++ b/AideDeJeu/AideDeJeu.Android/MainActivity.cs @@ -9,7 +9,7 @@ using Android.OS; namespace AideDeJeu.Droid { - [Activity(Label = "AideDeJeu", Icon = "@drawable/icon", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] + [Activity(Label = "Aide de Jeu", Icon = "@drawable/black_book", Theme = "@style/MainTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)] public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity { protected override void OnCreate(Bundle bundle) diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml index ba7742e4..aeff36d3 100644 --- a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml +++ b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml @@ -1,6 +1,6 @@  - + - + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AssemblyInfo.cs b/AideDeJeu/AideDeJeu.Android/Properties/AssemblyInfo.cs index 5dd3b7b7..172836f4 100644 --- a/AideDeJeu/AideDeJeu.Android/Properties/AssemblyInfo.cs +++ b/AideDeJeu/AideDeJeu.Android/Properties/AssemblyInfo.cs @@ -11,7 +11,7 @@ using Android.App; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("AideDeJeu.Android")] -[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs index 567353b2..0853c4c2 100644 --- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs +++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs @@ -2193,584 +2193,590 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f020053 public const int avd_hide_password = 2130837587; - // aapt resource value: 0x7f02010f - public const int avd_hide_password_1 = 2130837775; - - // aapt resource value: 0x7f020110 - public const int avd_hide_password_2 = 2130837776; - // aapt resource value: 0x7f020111 - public const int avd_hide_password_3 = 2130837777; + public const int avd_hide_password_1 = 2130837777; + + // aapt resource value: 0x7f020112 + public const int avd_hide_password_2 = 2130837778; + + // aapt resource value: 0x7f020113 + public const int avd_hide_password_3 = 2130837779; // aapt resource value: 0x7f020054 public const int avd_show_password = 2130837588; - // aapt resource value: 0x7f020112 - public const int avd_show_password_1 = 2130837778; - - // aapt resource value: 0x7f020113 - public const int avd_show_password_2 = 2130837779; - // aapt resource value: 0x7f020114 - public const int avd_show_password_3 = 2130837780; + public const int avd_show_password_1 = 2130837780; + + // aapt resource value: 0x7f020115 + public const int avd_show_password_2 = 2130837781; + + // aapt resource value: 0x7f020116 + public const int avd_show_password_3 = 2130837782; // aapt resource value: 0x7f020055 - public const int design_bottom_navigation_item_background = 2130837589; + public const int black_book = 2130837589; // aapt resource value: 0x7f020056 - public const int design_fab_background = 2130837590; + public const int design_bottom_navigation_item_background = 2130837590; // aapt resource value: 0x7f020057 - public const int design_ic_visibility = 2130837591; + public const int design_fab_background = 2130837591; // aapt resource value: 0x7f020058 - public const int design_ic_visibility_off = 2130837592; + public const int design_ic_visibility = 2130837592; // aapt resource value: 0x7f020059 - public const int design_password_eye = 2130837593; + public const int design_ic_visibility_off = 2130837593; // aapt resource value: 0x7f02005a - public const int design_snackbar_background = 2130837594; + public const int design_password_eye = 2130837594; // aapt resource value: 0x7f02005b - public const int ic_audiotrack_dark = 2130837595; + public const int design_snackbar_background = 2130837595; // aapt resource value: 0x7f02005c - public const int ic_audiotrack_light = 2130837596; + public const int ic_audiotrack_dark = 2130837596; // aapt resource value: 0x7f02005d - public const int ic_dialog_close_dark = 2130837597; + public const int ic_audiotrack_light = 2130837597; // aapt resource value: 0x7f02005e - public const int ic_dialog_close_light = 2130837598; + public const int ic_dialog_close_dark = 2130837598; // aapt resource value: 0x7f02005f - public const int ic_group_collapse_00 = 2130837599; + public const int ic_dialog_close_light = 2130837599; // aapt resource value: 0x7f020060 - public const int ic_group_collapse_01 = 2130837600; + public const int ic_group_collapse_00 = 2130837600; // aapt resource value: 0x7f020061 - public const int ic_group_collapse_02 = 2130837601; + public const int ic_group_collapse_01 = 2130837601; // aapt resource value: 0x7f020062 - public const int ic_group_collapse_03 = 2130837602; + public const int ic_group_collapse_02 = 2130837602; // aapt resource value: 0x7f020063 - public const int ic_group_collapse_04 = 2130837603; + public const int ic_group_collapse_03 = 2130837603; // aapt resource value: 0x7f020064 - public const int ic_group_collapse_05 = 2130837604; + public const int ic_group_collapse_04 = 2130837604; // aapt resource value: 0x7f020065 - public const int ic_group_collapse_06 = 2130837605; + public const int ic_group_collapse_05 = 2130837605; // aapt resource value: 0x7f020066 - public const int ic_group_collapse_07 = 2130837606; + public const int ic_group_collapse_06 = 2130837606; // aapt resource value: 0x7f020067 - public const int ic_group_collapse_08 = 2130837607; + public const int ic_group_collapse_07 = 2130837607; // aapt resource value: 0x7f020068 - public const int ic_group_collapse_09 = 2130837608; + public const int ic_group_collapse_08 = 2130837608; // aapt resource value: 0x7f020069 - public const int ic_group_collapse_10 = 2130837609; + public const int ic_group_collapse_09 = 2130837609; // aapt resource value: 0x7f02006a - public const int ic_group_collapse_11 = 2130837610; + public const int ic_group_collapse_10 = 2130837610; // aapt resource value: 0x7f02006b - public const int ic_group_collapse_12 = 2130837611; + public const int ic_group_collapse_11 = 2130837611; // aapt resource value: 0x7f02006c - public const int ic_group_collapse_13 = 2130837612; + public const int ic_group_collapse_12 = 2130837612; // aapt resource value: 0x7f02006d - public const int ic_group_collapse_14 = 2130837613; + public const int ic_group_collapse_13 = 2130837613; // aapt resource value: 0x7f02006e - public const int ic_group_collapse_15 = 2130837614; + public const int ic_group_collapse_14 = 2130837614; // aapt resource value: 0x7f02006f - public const int ic_group_expand_00 = 2130837615; + public const int ic_group_collapse_15 = 2130837615; // aapt resource value: 0x7f020070 - public const int ic_group_expand_01 = 2130837616; + public const int ic_group_expand_00 = 2130837616; // aapt resource value: 0x7f020071 - public const int ic_group_expand_02 = 2130837617; + public const int ic_group_expand_01 = 2130837617; // aapt resource value: 0x7f020072 - public const int ic_group_expand_03 = 2130837618; + public const int ic_group_expand_02 = 2130837618; // aapt resource value: 0x7f020073 - public const int ic_group_expand_04 = 2130837619; + public const int ic_group_expand_03 = 2130837619; // aapt resource value: 0x7f020074 - public const int ic_group_expand_05 = 2130837620; + public const int ic_group_expand_04 = 2130837620; // aapt resource value: 0x7f020075 - public const int ic_group_expand_06 = 2130837621; + public const int ic_group_expand_05 = 2130837621; // aapt resource value: 0x7f020076 - public const int ic_group_expand_07 = 2130837622; + public const int ic_group_expand_06 = 2130837622; // aapt resource value: 0x7f020077 - public const int ic_group_expand_08 = 2130837623; + public const int ic_group_expand_07 = 2130837623; // aapt resource value: 0x7f020078 - public const int ic_group_expand_09 = 2130837624; + public const int ic_group_expand_08 = 2130837624; // aapt resource value: 0x7f020079 - public const int ic_group_expand_10 = 2130837625; + public const int ic_group_expand_09 = 2130837625; // aapt resource value: 0x7f02007a - public const int ic_group_expand_11 = 2130837626; + public const int ic_group_expand_10 = 2130837626; // aapt resource value: 0x7f02007b - public const int ic_group_expand_12 = 2130837627; + public const int ic_group_expand_11 = 2130837627; // aapt resource value: 0x7f02007c - public const int ic_group_expand_13 = 2130837628; + public const int ic_group_expand_12 = 2130837628; // aapt resource value: 0x7f02007d - public const int ic_group_expand_14 = 2130837629; + public const int ic_group_expand_13 = 2130837629; // aapt resource value: 0x7f02007e - public const int ic_group_expand_15 = 2130837630; + public const int ic_group_expand_14 = 2130837630; // aapt resource value: 0x7f02007f - public const int ic_media_pause_dark = 2130837631; + public const int ic_group_expand_15 = 2130837631; // aapt resource value: 0x7f020080 - public const int ic_media_pause_light = 2130837632; + public const int ic_home = 2130837632; // aapt resource value: 0x7f020081 - public const int ic_media_play_dark = 2130837633; + public const int ic_media_pause_dark = 2130837633; // aapt resource value: 0x7f020082 - public const int ic_media_play_light = 2130837634; + public const int ic_media_pause_light = 2130837634; // aapt resource value: 0x7f020083 - public const int ic_media_stop_dark = 2130837635; + public const int ic_media_play_dark = 2130837635; // aapt resource value: 0x7f020084 - public const int ic_media_stop_light = 2130837636; + public const int ic_media_play_light = 2130837636; // aapt resource value: 0x7f020085 - public const int ic_mr_button_connected_00_dark = 2130837637; + public const int ic_media_stop_dark = 2130837637; // aapt resource value: 0x7f020086 - public const int ic_mr_button_connected_00_light = 2130837638; + public const int ic_media_stop_light = 2130837638; // aapt resource value: 0x7f020087 - public const int ic_mr_button_connected_01_dark = 2130837639; + public const int ic_mr_button_connected_00_dark = 2130837639; // aapt resource value: 0x7f020088 - public const int ic_mr_button_connected_01_light = 2130837640; + public const int ic_mr_button_connected_00_light = 2130837640; // aapt resource value: 0x7f020089 - public const int ic_mr_button_connected_02_dark = 2130837641; + public const int ic_mr_button_connected_01_dark = 2130837641; // aapt resource value: 0x7f02008a - public const int ic_mr_button_connected_02_light = 2130837642; + public const int ic_mr_button_connected_01_light = 2130837642; // aapt resource value: 0x7f02008b - public const int ic_mr_button_connected_03_dark = 2130837643; + public const int ic_mr_button_connected_02_dark = 2130837643; // aapt resource value: 0x7f02008c - public const int ic_mr_button_connected_03_light = 2130837644; + public const int ic_mr_button_connected_02_light = 2130837644; // aapt resource value: 0x7f02008d - public const int ic_mr_button_connected_04_dark = 2130837645; + public const int ic_mr_button_connected_03_dark = 2130837645; // aapt resource value: 0x7f02008e - public const int ic_mr_button_connected_04_light = 2130837646; + public const int ic_mr_button_connected_03_light = 2130837646; // aapt resource value: 0x7f02008f - public const int ic_mr_button_connected_05_dark = 2130837647; + public const int ic_mr_button_connected_04_dark = 2130837647; // aapt resource value: 0x7f020090 - public const int ic_mr_button_connected_05_light = 2130837648; + public const int ic_mr_button_connected_04_light = 2130837648; // aapt resource value: 0x7f020091 - public const int ic_mr_button_connected_06_dark = 2130837649; + public const int ic_mr_button_connected_05_dark = 2130837649; // aapt resource value: 0x7f020092 - public const int ic_mr_button_connected_06_light = 2130837650; + public const int ic_mr_button_connected_05_light = 2130837650; // aapt resource value: 0x7f020093 - public const int ic_mr_button_connected_07_dark = 2130837651; + public const int ic_mr_button_connected_06_dark = 2130837651; // aapt resource value: 0x7f020094 - public const int ic_mr_button_connected_07_light = 2130837652; + public const int ic_mr_button_connected_06_light = 2130837652; // aapt resource value: 0x7f020095 - public const int ic_mr_button_connected_08_dark = 2130837653; + public const int ic_mr_button_connected_07_dark = 2130837653; // aapt resource value: 0x7f020096 - public const int ic_mr_button_connected_08_light = 2130837654; + public const int ic_mr_button_connected_07_light = 2130837654; // aapt resource value: 0x7f020097 - public const int ic_mr_button_connected_09_dark = 2130837655; + public const int ic_mr_button_connected_08_dark = 2130837655; // aapt resource value: 0x7f020098 - public const int ic_mr_button_connected_09_light = 2130837656; + public const int ic_mr_button_connected_08_light = 2130837656; // aapt resource value: 0x7f020099 - public const int ic_mr_button_connected_10_dark = 2130837657; + public const int ic_mr_button_connected_09_dark = 2130837657; // aapt resource value: 0x7f02009a - public const int ic_mr_button_connected_10_light = 2130837658; + public const int ic_mr_button_connected_09_light = 2130837658; // aapt resource value: 0x7f02009b - public const int ic_mr_button_connected_11_dark = 2130837659; + public const int ic_mr_button_connected_10_dark = 2130837659; // aapt resource value: 0x7f02009c - public const int ic_mr_button_connected_11_light = 2130837660; + public const int ic_mr_button_connected_10_light = 2130837660; // aapt resource value: 0x7f02009d - public const int ic_mr_button_connected_12_dark = 2130837661; + public const int ic_mr_button_connected_11_dark = 2130837661; // aapt resource value: 0x7f02009e - public const int ic_mr_button_connected_12_light = 2130837662; + public const int ic_mr_button_connected_11_light = 2130837662; // aapt resource value: 0x7f02009f - public const int ic_mr_button_connected_13_dark = 2130837663; + public const int ic_mr_button_connected_12_dark = 2130837663; // aapt resource value: 0x7f0200a0 - public const int ic_mr_button_connected_13_light = 2130837664; + public const int ic_mr_button_connected_12_light = 2130837664; // aapt resource value: 0x7f0200a1 - public const int ic_mr_button_connected_14_dark = 2130837665; + public const int ic_mr_button_connected_13_dark = 2130837665; // aapt resource value: 0x7f0200a2 - public const int ic_mr_button_connected_14_light = 2130837666; + public const int ic_mr_button_connected_13_light = 2130837666; // aapt resource value: 0x7f0200a3 - public const int ic_mr_button_connected_15_dark = 2130837667; + public const int ic_mr_button_connected_14_dark = 2130837667; // aapt resource value: 0x7f0200a4 - public const int ic_mr_button_connected_15_light = 2130837668; + public const int ic_mr_button_connected_14_light = 2130837668; // aapt resource value: 0x7f0200a5 - public const int ic_mr_button_connected_16_dark = 2130837669; + public const int ic_mr_button_connected_15_dark = 2130837669; // aapt resource value: 0x7f0200a6 - public const int ic_mr_button_connected_16_light = 2130837670; + public const int ic_mr_button_connected_15_light = 2130837670; // aapt resource value: 0x7f0200a7 - public const int ic_mr_button_connected_17_dark = 2130837671; + public const int ic_mr_button_connected_16_dark = 2130837671; // aapt resource value: 0x7f0200a8 - public const int ic_mr_button_connected_17_light = 2130837672; + public const int ic_mr_button_connected_16_light = 2130837672; // aapt resource value: 0x7f0200a9 - public const int ic_mr_button_connected_18_dark = 2130837673; + public const int ic_mr_button_connected_17_dark = 2130837673; // aapt resource value: 0x7f0200aa - public const int ic_mr_button_connected_18_light = 2130837674; + public const int ic_mr_button_connected_17_light = 2130837674; // aapt resource value: 0x7f0200ab - public const int ic_mr_button_connected_19_dark = 2130837675; + public const int ic_mr_button_connected_18_dark = 2130837675; // aapt resource value: 0x7f0200ac - public const int ic_mr_button_connected_19_light = 2130837676; + public const int ic_mr_button_connected_18_light = 2130837676; // aapt resource value: 0x7f0200ad - public const int ic_mr_button_connected_20_dark = 2130837677; + public const int ic_mr_button_connected_19_dark = 2130837677; // aapt resource value: 0x7f0200ae - public const int ic_mr_button_connected_20_light = 2130837678; + public const int ic_mr_button_connected_19_light = 2130837678; // aapt resource value: 0x7f0200af - public const int ic_mr_button_connected_21_dark = 2130837679; + public const int ic_mr_button_connected_20_dark = 2130837679; // aapt resource value: 0x7f0200b0 - public const int ic_mr_button_connected_21_light = 2130837680; + public const int ic_mr_button_connected_20_light = 2130837680; // aapt resource value: 0x7f0200b1 - public const int ic_mr_button_connected_22_dark = 2130837681; + public const int ic_mr_button_connected_21_dark = 2130837681; // aapt resource value: 0x7f0200b2 - public const int ic_mr_button_connected_22_light = 2130837682; + public const int ic_mr_button_connected_21_light = 2130837682; // aapt resource value: 0x7f0200b3 - public const int ic_mr_button_connecting_00_dark = 2130837683; + public const int ic_mr_button_connected_22_dark = 2130837683; // aapt resource value: 0x7f0200b4 - public const int ic_mr_button_connecting_00_light = 2130837684; + public const int ic_mr_button_connected_22_light = 2130837684; // aapt resource value: 0x7f0200b5 - public const int ic_mr_button_connecting_01_dark = 2130837685; + public const int ic_mr_button_connecting_00_dark = 2130837685; // aapt resource value: 0x7f0200b6 - public const int ic_mr_button_connecting_01_light = 2130837686; + public const int ic_mr_button_connecting_00_light = 2130837686; // aapt resource value: 0x7f0200b7 - public const int ic_mr_button_connecting_02_dark = 2130837687; + public const int ic_mr_button_connecting_01_dark = 2130837687; // aapt resource value: 0x7f0200b8 - public const int ic_mr_button_connecting_02_light = 2130837688; + public const int ic_mr_button_connecting_01_light = 2130837688; // aapt resource value: 0x7f0200b9 - public const int ic_mr_button_connecting_03_dark = 2130837689; + public const int ic_mr_button_connecting_02_dark = 2130837689; // aapt resource value: 0x7f0200ba - public const int ic_mr_button_connecting_03_light = 2130837690; + public const int ic_mr_button_connecting_02_light = 2130837690; // aapt resource value: 0x7f0200bb - public const int ic_mr_button_connecting_04_dark = 2130837691; + public const int ic_mr_button_connecting_03_dark = 2130837691; // aapt resource value: 0x7f0200bc - public const int ic_mr_button_connecting_04_light = 2130837692; + public const int ic_mr_button_connecting_03_light = 2130837692; // aapt resource value: 0x7f0200bd - public const int ic_mr_button_connecting_05_dark = 2130837693; + public const int ic_mr_button_connecting_04_dark = 2130837693; // aapt resource value: 0x7f0200be - public const int ic_mr_button_connecting_05_light = 2130837694; + public const int ic_mr_button_connecting_04_light = 2130837694; // aapt resource value: 0x7f0200bf - public const int ic_mr_button_connecting_06_dark = 2130837695; + public const int ic_mr_button_connecting_05_dark = 2130837695; // aapt resource value: 0x7f0200c0 - public const int ic_mr_button_connecting_06_light = 2130837696; + public const int ic_mr_button_connecting_05_light = 2130837696; // aapt resource value: 0x7f0200c1 - public const int ic_mr_button_connecting_07_dark = 2130837697; + public const int ic_mr_button_connecting_06_dark = 2130837697; // aapt resource value: 0x7f0200c2 - public const int ic_mr_button_connecting_07_light = 2130837698; + public const int ic_mr_button_connecting_06_light = 2130837698; // aapt resource value: 0x7f0200c3 - public const int ic_mr_button_connecting_08_dark = 2130837699; + public const int ic_mr_button_connecting_07_dark = 2130837699; // aapt resource value: 0x7f0200c4 - public const int ic_mr_button_connecting_08_light = 2130837700; + public const int ic_mr_button_connecting_07_light = 2130837700; // aapt resource value: 0x7f0200c5 - public const int ic_mr_button_connecting_09_dark = 2130837701; + public const int ic_mr_button_connecting_08_dark = 2130837701; // aapt resource value: 0x7f0200c6 - public const int ic_mr_button_connecting_09_light = 2130837702; + public const int ic_mr_button_connecting_08_light = 2130837702; // aapt resource value: 0x7f0200c7 - public const int ic_mr_button_connecting_10_dark = 2130837703; + public const int ic_mr_button_connecting_09_dark = 2130837703; // aapt resource value: 0x7f0200c8 - public const int ic_mr_button_connecting_10_light = 2130837704; + public const int ic_mr_button_connecting_09_light = 2130837704; // aapt resource value: 0x7f0200c9 - public const int ic_mr_button_connecting_11_dark = 2130837705; + public const int ic_mr_button_connecting_10_dark = 2130837705; // aapt resource value: 0x7f0200ca - public const int ic_mr_button_connecting_11_light = 2130837706; + public const int ic_mr_button_connecting_10_light = 2130837706; // aapt resource value: 0x7f0200cb - public const int ic_mr_button_connecting_12_dark = 2130837707; + public const int ic_mr_button_connecting_11_dark = 2130837707; // aapt resource value: 0x7f0200cc - public const int ic_mr_button_connecting_12_light = 2130837708; + public const int ic_mr_button_connecting_11_light = 2130837708; // aapt resource value: 0x7f0200cd - public const int ic_mr_button_connecting_13_dark = 2130837709; + public const int ic_mr_button_connecting_12_dark = 2130837709; // aapt resource value: 0x7f0200ce - public const int ic_mr_button_connecting_13_light = 2130837710; + public const int ic_mr_button_connecting_12_light = 2130837710; // aapt resource value: 0x7f0200cf - public const int ic_mr_button_connecting_14_dark = 2130837711; + public const int ic_mr_button_connecting_13_dark = 2130837711; // aapt resource value: 0x7f0200d0 - public const int ic_mr_button_connecting_14_light = 2130837712; + public const int ic_mr_button_connecting_13_light = 2130837712; // aapt resource value: 0x7f0200d1 - public const int ic_mr_button_connecting_15_dark = 2130837713; + public const int ic_mr_button_connecting_14_dark = 2130837713; // aapt resource value: 0x7f0200d2 - public const int ic_mr_button_connecting_15_light = 2130837714; + public const int ic_mr_button_connecting_14_light = 2130837714; // aapt resource value: 0x7f0200d3 - public const int ic_mr_button_connecting_16_dark = 2130837715; + public const int ic_mr_button_connecting_15_dark = 2130837715; // aapt resource value: 0x7f0200d4 - public const int ic_mr_button_connecting_16_light = 2130837716; + public const int ic_mr_button_connecting_15_light = 2130837716; // aapt resource value: 0x7f0200d5 - public const int ic_mr_button_connecting_17_dark = 2130837717; + public const int ic_mr_button_connecting_16_dark = 2130837717; // aapt resource value: 0x7f0200d6 - public const int ic_mr_button_connecting_17_light = 2130837718; + public const int ic_mr_button_connecting_16_light = 2130837718; // aapt resource value: 0x7f0200d7 - public const int ic_mr_button_connecting_18_dark = 2130837719; + public const int ic_mr_button_connecting_17_dark = 2130837719; // aapt resource value: 0x7f0200d8 - public const int ic_mr_button_connecting_18_light = 2130837720; + public const int ic_mr_button_connecting_17_light = 2130837720; // aapt resource value: 0x7f0200d9 - public const int ic_mr_button_connecting_19_dark = 2130837721; + public const int ic_mr_button_connecting_18_dark = 2130837721; // aapt resource value: 0x7f0200da - public const int ic_mr_button_connecting_19_light = 2130837722; + public const int ic_mr_button_connecting_18_light = 2130837722; // aapt resource value: 0x7f0200db - public const int ic_mr_button_connecting_20_dark = 2130837723; + public const int ic_mr_button_connecting_19_dark = 2130837723; // aapt resource value: 0x7f0200dc - public const int ic_mr_button_connecting_20_light = 2130837724; + public const int ic_mr_button_connecting_19_light = 2130837724; // aapt resource value: 0x7f0200dd - public const int ic_mr_button_connecting_21_dark = 2130837725; + public const int ic_mr_button_connecting_20_dark = 2130837725; // aapt resource value: 0x7f0200de - public const int ic_mr_button_connecting_21_light = 2130837726; + public const int ic_mr_button_connecting_20_light = 2130837726; // aapt resource value: 0x7f0200df - public const int ic_mr_button_connecting_22_dark = 2130837727; + public const int ic_mr_button_connecting_21_dark = 2130837727; // aapt resource value: 0x7f0200e0 - public const int ic_mr_button_connecting_22_light = 2130837728; + public const int ic_mr_button_connecting_21_light = 2130837728; // aapt resource value: 0x7f0200e1 - public const int ic_mr_button_disabled_dark = 2130837729; + public const int ic_mr_button_connecting_22_dark = 2130837729; // aapt resource value: 0x7f0200e2 - public const int ic_mr_button_disabled_light = 2130837730; + public const int ic_mr_button_connecting_22_light = 2130837730; // aapt resource value: 0x7f0200e3 - public const int ic_mr_button_disconnected_dark = 2130837731; + public const int ic_mr_button_disabled_dark = 2130837731; // aapt resource value: 0x7f0200e4 - public const int ic_mr_button_disconnected_light = 2130837732; + public const int ic_mr_button_disabled_light = 2130837732; // aapt resource value: 0x7f0200e5 - public const int ic_mr_button_grey = 2130837733; + public const int ic_mr_button_disconnected_dark = 2130837733; // aapt resource value: 0x7f0200e6 - public const int ic_vol_type_speaker_dark = 2130837734; + public const int ic_mr_button_disconnected_light = 2130837734; // aapt resource value: 0x7f0200e7 - public const int ic_vol_type_speaker_group_dark = 2130837735; + public const int ic_mr_button_grey = 2130837735; // aapt resource value: 0x7f0200e8 - public const int ic_vol_type_speaker_group_light = 2130837736; + public const int ic_vol_type_speaker_dark = 2130837736; // aapt resource value: 0x7f0200e9 - public const int ic_vol_type_speaker_light = 2130837737; + public const int ic_vol_type_speaker_group_dark = 2130837737; // aapt resource value: 0x7f0200ea - public const int ic_vol_type_tv_dark = 2130837738; + public const int ic_vol_type_speaker_group_light = 2130837738; // aapt resource value: 0x7f0200eb - public const int ic_vol_type_tv_light = 2130837739; + public const int ic_vol_type_speaker_light = 2130837739; // aapt resource value: 0x7f0200ec - public const int icon = 2130837740; + public const int ic_vol_type_tv_dark = 2130837740; // aapt resource value: 0x7f0200ed - public const int mr_button_connected_dark = 2130837741; + public const int ic_vol_type_tv_light = 2130837741; // aapt resource value: 0x7f0200ee - public const int mr_button_connected_light = 2130837742; + public const int icon = 2130837742; // aapt resource value: 0x7f0200ef - public const int mr_button_connecting_dark = 2130837743; + public const int mr_button_connected_dark = 2130837743; // aapt resource value: 0x7f0200f0 - public const int mr_button_connecting_light = 2130837744; + public const int mr_button_connected_light = 2130837744; // aapt resource value: 0x7f0200f1 - public const int mr_button_dark = 2130837745; + public const int mr_button_connecting_dark = 2130837745; // aapt resource value: 0x7f0200f2 - public const int mr_button_light = 2130837746; + public const int mr_button_connecting_light = 2130837746; // aapt resource value: 0x7f0200f3 - public const int mr_dialog_close_dark = 2130837747; + public const int mr_button_dark = 2130837747; // aapt resource value: 0x7f0200f4 - public const int mr_dialog_close_light = 2130837748; + public const int mr_button_light = 2130837748; // aapt resource value: 0x7f0200f5 - public const int mr_dialog_material_background_dark = 2130837749; + public const int mr_dialog_close_dark = 2130837749; // aapt resource value: 0x7f0200f6 - public const int mr_dialog_material_background_light = 2130837750; + public const int mr_dialog_close_light = 2130837750; // aapt resource value: 0x7f0200f7 - public const int mr_group_collapse = 2130837751; + public const int mr_dialog_material_background_dark = 2130837751; // aapt resource value: 0x7f0200f8 - public const int mr_group_expand = 2130837752; + public const int mr_dialog_material_background_light = 2130837752; // aapt resource value: 0x7f0200f9 - public const int mr_media_pause_dark = 2130837753; + public const int mr_group_collapse = 2130837753; // aapt resource value: 0x7f0200fa - public const int mr_media_pause_light = 2130837754; + public const int mr_group_expand = 2130837754; // aapt resource value: 0x7f0200fb - public const int mr_media_play_dark = 2130837755; + public const int mr_media_pause_dark = 2130837755; // aapt resource value: 0x7f0200fc - public const int mr_media_play_light = 2130837756; + public const int mr_media_pause_light = 2130837756; // aapt resource value: 0x7f0200fd - public const int mr_media_stop_dark = 2130837757; + public const int mr_media_play_dark = 2130837757; // aapt resource value: 0x7f0200fe - public const int mr_media_stop_light = 2130837758; + public const int mr_media_play_light = 2130837758; // aapt resource value: 0x7f0200ff - public const int mr_vol_type_audiotrack_dark = 2130837759; + public const int mr_media_stop_dark = 2130837759; // aapt resource value: 0x7f020100 - public const int mr_vol_type_audiotrack_light = 2130837760; + public const int mr_media_stop_light = 2130837760; // aapt resource value: 0x7f020101 - public const int navigation_empty_icon = 2130837761; + public const int mr_vol_type_audiotrack_dark = 2130837761; // aapt resource value: 0x7f020102 - public const int notification_action_background = 2130837762; + public const int mr_vol_type_audiotrack_light = 2130837762; // aapt resource value: 0x7f020103 - public const int notification_bg = 2130837763; + public const int navigation_empty_icon = 2130837763; // aapt resource value: 0x7f020104 - public const int notification_bg_low = 2130837764; + public const int notification_action_background = 2130837764; // aapt resource value: 0x7f020105 - public const int notification_bg_low_normal = 2130837765; + public const int notification_bg = 2130837765; // aapt resource value: 0x7f020106 - public const int notification_bg_low_pressed = 2130837766; + public const int notification_bg_low = 2130837766; // aapt resource value: 0x7f020107 - public const int notification_bg_normal = 2130837767; + public const int notification_bg_low_normal = 2130837767; // aapt resource value: 0x7f020108 - public const int notification_bg_normal_pressed = 2130837768; + public const int notification_bg_low_pressed = 2130837768; // aapt resource value: 0x7f020109 - public const int notification_icon_background = 2130837769; - - // aapt resource value: 0x7f02010d - public const int notification_template_icon_bg = 2130837773; - - // aapt resource value: 0x7f02010e - public const int notification_template_icon_low_bg = 2130837774; + public const int notification_bg_normal = 2130837769; // aapt resource value: 0x7f02010a - public const int notification_tile_bg = 2130837770; + public const int notification_bg_normal_pressed = 2130837770; // aapt resource value: 0x7f02010b - public const int notify_panel_notification_icon_bg = 2130837771; + public const int notification_icon_background = 2130837771; + + // aapt resource value: 0x7f02010f + public const int notification_template_icon_bg = 2130837775; + + // aapt resource value: 0x7f020110 + public const int notification_template_icon_low_bg = 2130837776; // aapt resource value: 0x7f02010c - public const int xamarin_logo = 2130837772; + public const int notification_tile_bg = 2130837772; + + // aapt resource value: 0x7f02010d + public const int notify_panel_notification_icon_bg = 2130837773; + + // aapt resource value: 0x7f02010e + public const int xamarin_logo = 2130837774; static Drawable() { diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/black_book.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/black_book.png new file mode 100644 index 0000000000000000000000000000000000000000..f6428780985b0168392f0d2b853fabdc5853feed GIT binary patch literal 10657 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 Qw_L^N;^=Xp9vPVWUsKC%+yDRo literal 0 HcmV?d00001 diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/ic_home.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/ic_home.png new file mode 100644 index 0000000000000000000000000000000000000000..f7dc554c694b991f8c7149aedd7f1db895ece0c7 GIT binary patch literal 310 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw{(8DNhGg7(du6X+6N7+DBIgN{ zt&DFENNwTJJ#6*HY4!rPw+(C^CwXezto{|BkbSU2|NhM0eFq&hmrkiy$+Ap7eLnt4x9M8V#y=ekOzm~F z1-CqFUdrj1?YnVJYl6+Rt%5yAKWVc(-tb52poEUJ;*0*&WR}{EC5{*Pz0Fx_HucOXhnoC38TQkpozmAvBDe^clAQ(Jd{an^LB{Ts5 DrEY}G literal 0 HcmV?d00001 diff --git a/AideDeJeu/AideDeJeu.UWP/Properties/AssemblyInfo.cs b/AideDeJeu/AideDeJeu.UWP/Properties/AssemblyInfo.cs index 74625dac..73b997aa 100644 --- a/AideDeJeu/AideDeJeu.UWP/Properties/AssemblyInfo.cs +++ b/AideDeJeu/AideDeJeu.UWP/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("AideDeJeu.UWP")] -[assembly: AssemblyCopyright("Copyright © 2015")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/AideDeJeu/AideDeJeu.iOS/Properties/AssemblyInfo.cs b/AideDeJeu/AideDeJeu.iOS/Properties/AssemblyInfo.cs index b62e4104..70253e8f 100644 --- a/AideDeJeu/AideDeJeu.iOS/Properties/AssemblyInfo.cs +++ b/AideDeJeu/AideDeJeu.iOS/Properties/AssemblyInfo.cs @@ -10,7 +10,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("AideDeJeu.iOS")] -[assembly: AssemblyCopyright("Copyright © 2014")] +[assembly: AssemblyCopyright("Copyright © 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/AideDeJeu/AideDeJeu/Services/IDataStore.cs b/AideDeJeu/AideDeJeu/Services/IDataStore.cs index abe15a43..f57a5901 100644 --- a/AideDeJeu/AideDeJeu/Services/IDataStore.cs +++ b/AideDeJeu/AideDeJeu/Services/IDataStore.cs @@ -11,6 +11,6 @@ namespace AideDeJeu.Services Task DeleteItemAsync(T item); Task GetItemAsync(string id); Task> GetItemsAsync(bool forceRefresh = false); - Task> GetItemsAsync(string classe, int niveauMin, int niveauMax); + Task> GetItemsAsync(string classe, int niveauMin, int niveauMax, string ecole, string rituel, string source); } } diff --git a/AideDeJeu/AideDeJeu/Services/MockDataStore.cs b/AideDeJeu/AideDeJeu/Services/MockDataStore.cs index 82468a3a..1a37797c 100644 --- a/AideDeJeu/AideDeJeu/Services/MockDataStore.cs +++ b/AideDeJeu/AideDeJeu/Services/MockDataStore.cs @@ -69,7 +69,7 @@ namespace AideDeJeu.Services items = spells.Select(spell => new Item() { Text = spell.Title, Description = spell.DescriptionText }).ToList(); return await Task.FromResult(items); } - public async Task> GetItemsAsync(string classe, int minLevel, int maxLevel) + public async Task> GetItemsAsync(string classe, int minLevel, int maxLevel, string ecole, string rituel, string source) { return await GetItemsAsync(); } diff --git a/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs b/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs index 9e888072..2db6a1e3 100644 --- a/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs +++ b/AideDeJeu/AideDeJeu/Services/SpellDataStore.cs @@ -66,10 +66,10 @@ namespace AideDeJeu.Services return await Task.FromResult(items); } - public async Task> GetItemsAsync(string classe, int niveauMin, int niveauMax) + public async Task> GetItemsAsync(string classe, int niveauMin, int niveauMax, string ecole, string rituel, string source) { var scrapper = new Scrappers(); - items = (await scrapper.GetSpells(classe, niveauMin, niveauMax)).ToList(); + items = (await scrapper.GetSpells(classe: classe, niveauMin: niveauMin, niveauMax: niveauMax, ecole: ecole, rituel: rituel, source: source)).ToList(); return await Task.FromResult(items); } diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs index 1acbcd73..d67cfad4 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs @@ -19,15 +19,15 @@ namespace AideDeJeu.ViewModels public List> Classes { get; set; } = new List>() { - new KeyValuePair("", "Toutes"), - new KeyValuePair("b", "Barde"), - new KeyValuePair("c", "Clerc"), - new KeyValuePair("d", "Druide"), - new KeyValuePair("s", "Ensorceleur"), - new KeyValuePair("w", "Magicien"), - new KeyValuePair("p", "Paladin"), - new KeyValuePair("r", "Rôdeur"), - new KeyValuePair("k", "Sorcier"), + new KeyValuePair("", "Toutes" ), + new KeyValuePair("b", "Barde" ), + new KeyValuePair("c", "Clerc" ), + new KeyValuePair("d", "Druide" ), + new KeyValuePair("s", "Ensorceleur" ), + new KeyValuePair("w", "Magicien" ), + new KeyValuePair("p", "Paladin" ), + new KeyValuePair("r", "Rôdeur" ), + new KeyValuePair("k", "Sorcier" ), }; public List> Niveaux { get; set; } = new List>() @@ -44,6 +44,33 @@ namespace AideDeJeu.ViewModels new KeyValuePair(9, "Niveau 9"), }; + public List> Ecoles { get; set; } = new List>() + { + new KeyValuePair("", "Toutes"), + new KeyValuePair("abjuration", "Abjuration"), + new KeyValuePair("divination", "Divination"), + new KeyValuePair("enchantement", "Enchantement"), + new KeyValuePair("evocation", "Évocation"), + new KeyValuePair("illusion", "Illusion"), + new KeyValuePair("invocation", "Invocation"), + new KeyValuePair("necromancie", "Nécromancie"), + new KeyValuePair("transmutation", "Transmutation"), + }; + + public List> Rituels { get; set; } = new List>() + { + new KeyValuePair("", "Tous"), + new KeyValuePair("1", "Rituel"), + }; + + public List> Sources { get; set; } = new List>() + { + new KeyValuePair("", "Toutes"), + new KeyValuePair("srd", "SRD"), + new KeyValuePair("ph", "PHB"), + new KeyValuePair("sup", "SCAG, XGtE"), + }; + private int _Classe = 0; public int Classe { @@ -91,12 +118,52 @@ namespace AideDeJeu.ViewModels LoadItemsCommand.Execute(null); } } + private int _Ecole = 0; + public int Ecole + { + get + { + return _Ecole; + } + set + { + SetProperty(ref _Ecole, value); + LoadItemsCommand.Execute(null); + } + } + private int _Rituel = 0; + public int Rituel + { + get + { + return _Rituel; + } + set + { + SetProperty(ref _Rituel, value); + LoadItemsCommand.Execute(null); + } + } + private int _Source = 0; + public int Source + { + get + { + return _Source; + } + set + { + SetProperty(ref _Source, value); + LoadItemsCommand.Execute(null); + } + } + public Command LoadItemsCommand { get; set; } public SpellsViewModel() { - Title = "Browse"; + //Title = "Browse"; Items = new ObservableCollection(); LoadItemsCommand = new Command(async () => await ExecuteLoadItemsCommand()); @@ -126,9 +193,8 @@ namespace AideDeJeu.ViewModels // // - string[] classes = new string[] { "", "b", "c", "d", "s", "w", "p", "r", "k" }; Items.Clear(); - var items = await SpellDataStore.GetItemsAsync(classe: classes[Classe], niveauMin: NiveauMin, niveauMax: NiveauMax); + var items = await SpellDataStore.GetItemsAsync(classe: Classes[Classe].Key, niveauMin: NiveauMin, niveauMax: NiveauMax, ecole: Ecoles[Ecole].Key, rituel: Rituels[Rituel].Key, source: Sources[Source].Key); foreach (var item in items) { Items.Add(item); diff --git a/AideDeJeu/AideDeJeu/Views/MainPage.xaml b/AideDeJeu/AideDeJeu/Views/MainPage.xaml index d345e18a..53bf945f 100644 --- a/AideDeJeu/AideDeJeu/Views/MainPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MainPage.xaml @@ -8,7 +8,7 @@ > - + -