diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 6069c703..3aa5beb5 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -41,6 +41,11 @@ 4 true false + false + false + false + + Xamarin.Android.Net.AndroidClientHandler @@ -101,9 +106,6 @@ Designer - - - {D9922DC7-810A-445E-B965-BF7E48E8B0D5} diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs index f2ed5757..b62853de 100644 --- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs +++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs @@ -2192,26 +2192,26 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f020053 public const int avd_hide_password = 2130837587; + // aapt resource value: 0x7f020110 + public const int avd_hide_password_1 = 2130837776; + // aapt resource value: 0x7f020111 - public const int avd_hide_password_1 = 2130837777; + public const int avd_hide_password_2 = 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; + public const int avd_hide_password_3 = 2130837778; // aapt resource value: 0x7f020054 public const int avd_show_password = 2130837588; + // aapt resource value: 0x7f020113 + public const int avd_show_password_1 = 2130837779; + // aapt resource value: 0x7f020114 - public const int avd_show_password_1 = 2130837780; + public const int avd_show_password_2 = 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; + public const int avd_show_password_3 = 2130837781; // aapt resource value: 0x7f020055 public const int black_book = 2130837589; @@ -2762,11 +2762,11 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f02010b public const int notification_icon_background = 2130837771; - // aapt resource value: 0x7f02010f - public const int notification_template_icon_bg = 2130837775; + // aapt resource value: 0x7f02010e + public const int notification_template_icon_bg = 2130837774; - // aapt resource value: 0x7f020110 - public const int notification_template_icon_low_bg = 2130837776; + // aapt resource value: 0x7f02010f + public const int notification_template_icon_low_bg = 2130837775; // aapt resource value: 0x7f02010c public const int notification_tile_bg = 2130837772; @@ -2774,9 +2774,6 @@ namespace AideDeJeu.Droid // 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() { global::Android.Runtime.ResourceIdManager.UpdateIdValues(); @@ -3736,9 +3733,6 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f090038 public const int character_counter_pattern = 2131296312; - // aapt resource value: 0x7f09003e - public const int library_name = 2131296318; - // aapt resource value: 0x7f090000 public const int mr_button_content_description = 2131296256; diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/icon.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/icon.png index 964f110a..6e333710 100644 Binary files a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/icon.png and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/icon.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/icon.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/icon.png index 3c01e60c..dea826f6 100644 Binary files a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/icon.png and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/icon.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/icon.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/icon.png index 0d8c1c57..0bef109d 100644 Binary files a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/icon.png and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/icon.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/icon.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/icon.png index b0ba7150..6e333710 100644 Binary files a/AideDeJeu/AideDeJeu.Android/Resources/drawable/icon.png and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/icon.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/xamarin_logo.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/xamarin_logo.png deleted file mode 100644 index b36d00ed..00000000 Binary files a/AideDeJeu/AideDeJeu.Android/Resources/drawable/xamarin_logo.png and /dev/null differ diff --git a/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000322.png b/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000322.png new file mode 100644 index 00000000..4eb390d0 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000322.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000454.png b/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000454.png new file mode 100644 index 00000000..b4267b8b Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Screenshot_20180501-000454.png differ diff --git a/AideDeJeu/AideDeJeu.Android/icon1024x500.png b/AideDeJeu/AideDeJeu.Android/icon1024x500.png new file mode 100644 index 00000000..a11e7a57 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/icon1024x500.png differ diff --git a/AideDeJeu/AideDeJeu.Android/icon512.png b/AideDeJeu/AideDeJeu.Android/icon512.png new file mode 100644 index 00000000..8bf94a99 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/icon512.png differ diff --git a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs index 12e371d4..945d7bc9 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/MonstersViewModel.cs @@ -170,7 +170,7 @@ namespace AideDeJeu.ViewModels LoadItemsCommand.Execute(null); } } - private int _Source = 0; + private int _Source = 1; public int Source { get diff --git a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs index 97e249f4..23ec254d 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/SpellsViewModel.cs @@ -141,7 +141,7 @@ namespace AideDeJeu.ViewModels LoadItemsCommand.Execute(null); } } - private int _Source = 0; + private int _Source = 1; public int Source { get diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml index 68b8b578..dd666358 100644 --- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml @@ -37,6 +37,7 @@ + diff --git a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml index 59271606..27bfd12e 100644 --- a/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/MonstersPage.xaml @@ -54,7 +54,7 @@