diff --git a/AideDeJeu.sln b/AideDeJeu.sln
index b70f1cba..cc1de603 100644
--- a/AideDeJeu.sln
+++ b/AideDeJeu.sln
@@ -389,6 +389,8 @@ Global
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug_JoA|x86.Build.0 = Debug_JoA|x86
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug_JoA|x86.Deploy.0 = Debug_JoA|x86
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|Any CPU.Build.0 = Debug|x86
+ {7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|Any CPU.Deploy.0 = Debug|x86
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|ARM.ActiveCfg = Debug|ARM
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|ARM.Build.0 = Debug|ARM
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Debug|ARM.Deploy.0 = Debug|ARM
diff --git a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
index f53fe269..82a31eab 100644
--- a/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
+++ b/AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
@@ -222,7 +222,7 @@
2.0.3
- 2.0.0.2
+ 2.0.0.3
1.60.0
@@ -304,9 +304,9 @@
-
+
-
+
diff --git a/AideDeJeu/AideDeJeu.Android/MainActivity.cs b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
index 0e1c9349..55a66d5d 100644
--- a/AideDeJeu/AideDeJeu.Android/MainActivity.cs
+++ b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
@@ -28,8 +28,8 @@ namespace AideDeJeu.Droid
{
protected override void OnCreate(Bundle bundle)
{
- TabLayoutResource = Resource.Layout.Tabbar;
- ToolbarResource = Resource.Layout.Toolbar;
+ //TabLayoutResource = Resource.Layout.Tabbar;
+ //ToolbarResource = Resource.Layout.Toolbar;
base.OnCreate(bundle);
diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.HD.xml b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.Hereva.xml
similarity index 73%
rename from AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.HD.xml
rename to AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.Hereva.xml
index 6a31a0b2..7770a2b1 100644
--- a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.HD.xml
+++ b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.Hereva.xml
@@ -1,8 +1,8 @@
-
+
-
-
+
+
diff --git a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
index 7770a2b1..2acc9a95 100644
--- a/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
+++ b/AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
@@ -1,8 +1,8 @@
-
+
-
-
+
+
diff --git a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
index 5547e972..e6afc479 100644
--- a/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
+++ b/AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs
@@ -6670,6 +6670,7 @@ namespace AideDeJeu.Droid
global::Xamarin.Forms.Material.Android.Resource.String.fab_transformation_sheet_behavior = global::AideDeJeu.Droid.Resource.String.fab_transformation_sheet_behavior;
global::Xamarin.Forms.Material.Android.Resource.String.hide_bottom_view_on_scroll_behavior = global::AideDeJeu.Droid.Resource.String.hide_bottom_view_on_scroll_behavior;
global::Xamarin.Forms.Material.Android.Resource.String.mtrl_chip_close_icon_content_description = global::AideDeJeu.Droid.Resource.String.mtrl_chip_close_icon_content_description;
+ global::Xamarin.Forms.Material.Android.Resource.String.overflow_tab_title = global::AideDeJeu.Droid.Resource.String.overflow_tab_title;
global::Xamarin.Forms.Material.Android.Resource.String.password_toggle_content_description = global::AideDeJeu.Droid.Resource.String.password_toggle_content_description;
global::Xamarin.Forms.Material.Android.Resource.String.path_password_eye = global::AideDeJeu.Droid.Resource.String.path_password_eye;
global::Xamarin.Forms.Material.Android.Resource.String.path_password_eye_mask_strike_through = global::AideDeJeu.Droid.Resource.String.path_password_eye_mask_strike_through;
@@ -9248,6 +9249,7 @@ namespace AideDeJeu.Droid
global::Xamarin.Forms.Platform.Android.Resource.String.fab_transformation_sheet_behavior = global::AideDeJeu.Droid.Resource.String.fab_transformation_sheet_behavior;
global::Xamarin.Forms.Platform.Android.Resource.String.hide_bottom_view_on_scroll_behavior = global::AideDeJeu.Droid.Resource.String.hide_bottom_view_on_scroll_behavior;
global::Xamarin.Forms.Platform.Android.Resource.String.mtrl_chip_close_icon_content_description = global::AideDeJeu.Droid.Resource.String.mtrl_chip_close_icon_content_description;
+ global::Xamarin.Forms.Platform.Android.Resource.String.overflow_tab_title = global::AideDeJeu.Droid.Resource.String.overflow_tab_title;
global::Xamarin.Forms.Platform.Android.Resource.String.password_toggle_content_description = global::AideDeJeu.Droid.Resource.String.password_toggle_content_description;
global::Xamarin.Forms.Platform.Android.Resource.String.path_password_eye = global::AideDeJeu.Droid.Resource.String.path_password_eye;
global::Xamarin.Forms.Platform.Android.Resource.String.path_password_eye_mask_strike_through = global::AideDeJeu.Droid.Resource.String.path_password_eye_mask_strike_through;
@@ -11817,6 +11819,7 @@ namespace AideDeJeu.Droid
global::Xamarin.Forms.Platform.Resource.String.fab_transformation_sheet_behavior = global::AideDeJeu.Droid.Resource.String.fab_transformation_sheet_behavior;
global::Xamarin.Forms.Platform.Resource.String.hide_bottom_view_on_scroll_behavior = global::AideDeJeu.Droid.Resource.String.hide_bottom_view_on_scroll_behavior;
global::Xamarin.Forms.Platform.Resource.String.mtrl_chip_close_icon_content_description = global::AideDeJeu.Droid.Resource.String.mtrl_chip_close_icon_content_description;
+ global::Xamarin.Forms.Platform.Resource.String.overflow_tab_title = global::AideDeJeu.Droid.Resource.String.overflow_tab_title;
global::Xamarin.Forms.Platform.Resource.String.password_toggle_content_description = global::AideDeJeu.Droid.Resource.String.password_toggle_content_description;
global::Xamarin.Forms.Platform.Resource.String.path_password_eye = global::AideDeJeu.Droid.Resource.String.path_password_eye;
global::Xamarin.Forms.Platform.Resource.String.path_password_eye_mask_strike_through = global::AideDeJeu.Droid.Resource.String.path_password_eye_mask_strike_through;
@@ -17366,25 +17369,28 @@ namespace AideDeJeu.Droid
public const int mtrl_chip_close_icon_content_description = 2131558447;
// aapt resource value: 0x7F0D0030
- public const int password_toggle_content_description = 2131558448;
+ public const int overflow_tab_title = 2131558448;
// aapt resource value: 0x7F0D0031
- public const int path_password_eye = 2131558449;
+ public const int password_toggle_content_description = 2131558449;
// aapt resource value: 0x7F0D0032
- public const int path_password_eye_mask_strike_through = 2131558450;
+ public const int path_password_eye = 2131558450;
// aapt resource value: 0x7F0D0033
- public const int path_password_eye_mask_visible = 2131558451;
+ public const int path_password_eye_mask_strike_through = 2131558451;
// aapt resource value: 0x7F0D0034
- public const int path_password_strike_through = 2131558452;
+ public const int path_password_eye_mask_visible = 2131558452;
// aapt resource value: 0x7F0D0035
- public const int search_menu_title = 2131558453;
+ public const int path_password_strike_through = 2131558453;
// aapt resource value: 0x7F0D0036
- public const int status_bar_notification_info_overflow = 2131558454;
+ public const int search_menu_title = 2131558454;
+
+ // aapt resource value: 0x7F0D0037
+ public const int status_bar_notification_info_overflow = 2131558455;
static String()
{
diff --git a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
index 847724da..fe237323 100644
--- a/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
+++ b/AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
@@ -10,12 +10,13 @@
Properties
AideDeJeu.GTK
AideDeJeu.GTK
- v4.7.1
+ v4.7.2
512
true
1.32
+
true
@@ -106,8 +107,8 @@
False
..\..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\gtk-sharp.dll
-
- ..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll
+
+ ..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll
..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
@@ -182,8 +183,8 @@
..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll
-
- ..\..\packages\Rg.Plugins.Popup.2.0.0.2\lib\netstandard2.0\Rg.Plugins.Popup.dll
+
+ ..\..\packages\Rg.Plugins.Popup.2.0.0.3\lib\net472\Rg.Plugins.Popup.dll
..\..\packages\SkiaSharp.1.68.3\lib\net462\SkiaSharp.dll
@@ -311,6 +312,9 @@
..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1269\lib\net45\Xamarin.Forms.Platform.GTK.dll
+
+ ..\..\packages\Xamarin.Forms.Platform.WPF.4.5.0.530\lib\net45\Xamarin.Forms.Platform.WPF.dll
+
..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Xaml.dll
diff --git a/AideDeJeu/AideDeJeu.GTK/Program.cs b/AideDeJeu/AideDeJeu.GTK/Program.cs
index 053703e9..5225f062 100644
--- a/AideDeJeu/AideDeJeu.GTK/Program.cs
+++ b/AideDeJeu/AideDeJeu.GTK/Program.cs
@@ -15,7 +15,7 @@ namespace AideDeJeu.GTK
public static void Main(string[] args)
{
Gtk.Application.Init();
- Forms.Init();
+ //Forms.Init();
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3());
var app = new App();
diff --git a/AideDeJeu/AideDeJeu.GTK/app.config b/AideDeJeu/AideDeJeu.GTK/app.config
index 17c92472..a8b6c3cc 100644
--- a/AideDeJeu/AideDeJeu.GTK/app.config
+++ b/AideDeJeu/AideDeJeu.GTK/app.config
@@ -120,4 +120,4 @@
-
\ No newline at end of file
+
diff --git a/AideDeJeu/AideDeJeu.GTK/packages.config b/AideDeJeu/AideDeJeu.GTK/packages.config
index 3560aa36..baaca5ce 100644
--- a/AideDeJeu/AideDeJeu.GTK/packages.config
+++ b/AideDeJeu/AideDeJeu.GTK/packages.config
@@ -1,6 +1,6 @@
-
+
@@ -26,7 +26,7 @@
-
+
@@ -67,6 +67,7 @@
+
diff --git a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
index 0ca6cc77..59600e2f 100644
--- a/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
+++ b/AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
@@ -391,7 +391,7 @@
2.0.3
- 2.0.0.2
+ 2.0.0.3
1.60.0
diff --git a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
index 48295f7c..08b922e5 100644
--- a/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
+++ b/AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
@@ -83,8 +83,8 @@
true
-
- ..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll
+
+ ..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll
..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll
diff --git a/AideDeJeu/AideDeJeu.WPF/packages.config b/AideDeJeu/AideDeJeu.WPF/packages.config
index c4649fc4..c7a759cc 100644
--- a/AideDeJeu/AideDeJeu.WPF/packages.config
+++ b/AideDeJeu/AideDeJeu.WPF/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
index 86744b65..51dadab5 100644
--- a/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
+++ b/AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
@@ -221,7 +221,7 @@
2.0.3
- 2.0.0.2
+ 2.0.0.3
1.60.0
diff --git a/AideDeJeu/AideDeJeu/AideDeJeu.csproj b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
index b62c3eef..20c973d6 100644
--- a/AideDeJeu/AideDeJeu/AideDeJeu.csproj
+++ b/AideDeJeu/AideDeJeu/AideDeJeu.csproj
@@ -97,11 +97,11 @@
-
+
-
+
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index f14664cd..529d3454 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -225,7 +225,7 @@ namespace AideDeJeu.ViewModels
public async Task SwitchToMainTabAsync()
{
- await Shell.Current.GoToAsync("//library");
+ //await Shell.Current.GoToAsync("//library");
//var tabbedPage = App.Current.MainPage as MainTabbedPage;
//if (tabbedPage != null)
//{
diff --git a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
index f6d928d6..a20b759e 100644
--- a/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
+++ b/AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
@@ -13,7 +13,7 @@
-
+