diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj index 0a66660c..506cce82 100644 --- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj +++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj @@ -224,5 +224,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs index cbf87192..be25ec9a 100644 --- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs +++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs @@ -2219,26 +2219,26 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f020053 public const int avd_hide_password = 2130837587; - // aapt resource value: 0x7f020118 - public const int avd_hide_password_1 = 2130837784; + // aapt resource value: 0x7f02011b + public const int avd_hide_password_1 = 2130837787; - // aapt resource value: 0x7f020119 - public const int avd_hide_password_2 = 2130837785; + // aapt resource value: 0x7f02011c + public const int avd_hide_password_2 = 2130837788; - // aapt resource value: 0x7f02011a - public const int avd_hide_password_3 = 2130837786; + // aapt resource value: 0x7f02011d + public const int avd_hide_password_3 = 2130837789; // aapt resource value: 0x7f020054 public const int avd_show_password = 2130837588; - // aapt resource value: 0x7f02011b - public const int avd_show_password_1 = 2130837787; + // aapt resource value: 0x7f02011e + public const int avd_show_password_1 = 2130837790; - // aapt resource value: 0x7f02011c - public const int avd_show_password_2 = 2130837788; + // aapt resource value: 0x7f02011f + public const int avd_show_password_2 = 2130837791; - // aapt resource value: 0x7f02011d - public const int avd_show_password_3 = 2130837789; + // aapt resource value: 0x7f020120 + public const int avd_show_password_3 = 2130837792; // aapt resource value: 0x7f020055 public const int crystal_ball = 2130837589; @@ -2795,11 +2795,11 @@ namespace AideDeJeu.Droid // aapt resource value: 0x7f02010d public const int notification_icon_background = 2130837773; - // aapt resource value: 0x7f020116 - public const int notification_template_icon_bg = 2130837782; + // aapt resource value: 0x7f020119 + public const int notification_template_icon_bg = 2130837785; - // aapt resource value: 0x7f020117 - public const int notification_template_icon_low_bg = 2130837783; + // aapt resource value: 0x7f02011a + public const int notification_template_icon_low_bg = 2130837786; // aapt resource value: 0x7f02010e public const int notification_tile_bg = 2130837774; @@ -2808,22 +2808,31 @@ namespace AideDeJeu.Droid public const int notify_panel_notification_icon_bg = 2130837775; // aapt resource value: 0x7f020110 - public const int round_star = 2130837776; + public const int plain_arrow_down = 2130837776; // aapt resource value: 0x7f020111 - public const int settings_knobs = 2130837777; + public const int plain_arrow_up = 2130837777; // aapt resource value: 0x7f020112 - public const int spell_book = 2130837778; + public const int round_star = 2130837778; // aapt resource value: 0x7f020113 - public const int splash = 2130837779; + public const int settings_knobs = 2130837779; // aapt resource value: 0x7f020114 - public const int stars_stack = 2130837780; + public const int spell_book = 2130837780; // aapt resource value: 0x7f020115 - public const int wooden_sign = 2130837781; + public const int splash = 2130837781; + + // aapt resource value: 0x7f020116 + public const int stars_stack = 2130837782; + + // aapt resource value: 0x7f020117 + public const int trash_can = 2130837783; + + // aapt resource value: 0x7f020118 + public const int wooden_sign = 2130837784; static Drawable() { diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_down.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_down.png new file mode 100644 index 00000000..ece402da Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_up.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_up.png new file mode 100644 index 00000000..1cf3059c Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/trash_can.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/trash_can.png new file mode 100644 index 00000000..4b150f6b Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-hdpi/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_down.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_down.png new file mode 100644 index 00000000..872fdf2f Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_up.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_up.png new file mode 100644 index 00000000..cdab7859 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/trash_can.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/trash_can.png new file mode 100644 index 00000000..21f29815 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xhdpi/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_down.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_down.png new file mode 100644 index 00000000..8743fcf0 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_up.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_up.png new file mode 100644 index 00000000..2c8a6e17 Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/trash_can.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/trash_can.png new file mode 100644 index 00000000..ad3d836e Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable-xxhdpi/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_down.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_down.png new file mode 100644 index 00000000..ece402da Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_up.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_up.png new file mode 100644 index 00000000..1cf3059c Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.Android/Resources/drawable/trash_can.png b/AideDeJeu/AideDeJeu.Android/Resources/drawable/trash_can.png new file mode 100644 index 00000000..4b150f6b Binary files /dev/null and b/AideDeJeu/AideDeJeu.Android/Resources/drawable/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/plain_arrow_down.png b/AideDeJeu/AideDeJeu.UWP/plain_arrow_down.png new file mode 100644 index 00000000..8743fcf0 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/plain_arrow_down.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/plain_arrow_up.png b/AideDeJeu/AideDeJeu.UWP/plain_arrow_up.png new file mode 100644 index 00000000..2c8a6e17 Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/plain_arrow_up.png differ diff --git a/AideDeJeu/AideDeJeu.UWP/trash_can.png b/AideDeJeu/AideDeJeu.UWP/trash_can.png new file mode 100644 index 00000000..ad3d836e Binary files /dev/null and b/AideDeJeu/AideDeJeu.UWP/trash_can.png differ diff --git a/AideDeJeu/AideDeJeu/Tools/Converters.cs b/AideDeJeu/AideDeJeu/Tools/Converters.cs index b18ee70d..c3d3c12e 100644 --- a/AideDeJeu/AideDeJeu/Tools/Converters.cs +++ b/AideDeJeu/AideDeJeu/Tools/Converters.cs @@ -69,21 +69,28 @@ namespace AideDeJeu.Tools { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var level = value as int?; - if(level.HasValue) + try { - int finallevel = level.Value; - int baselevel = 1; - if(int.TryParse(parameter as string, out baselevel)) + var level = value as int?; + if (level.HasValue) { - finallevel += baselevel; - } - finallevel = Math.Max(1, Math.Min(6, finallevel)); - var heading = $"heading{finallevel}"; - if (Application.Current.Resources.ContainsKey(heading)) - { - return Application.Current.Resources[heading]; + int finallevel = level.Value; + int baselevel = 1; + if (int.TryParse(parameter as string, out baselevel)) + { + finallevel += baselevel; + } + finallevel = Math.Max(1, Math.Min(6, finallevel)); + var heading = $"heading{finallevel}"; + if (Application.Current.Resources.ContainsKey(heading)) + { + return Application.Current.Resources[heading]; + } } + } + catch(Exception) + { + } return Application.Current.Resources["paragraph"]; } diff --git a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml index 6e363bc4..3a86e899 100644 --- a/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/BookmarksEditPage.xaml @@ -22,7 +22,7 @@ - + @@ -34,7 +34,7 @@