5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-29 14:35:45 +00:00
Code Issues Projects Releases Wiki Activity

Ajustements

Browse source
This commit is contained in:
Yan Maniez 2020-08-18 17:46:18 +02:00
parent 301350df67
commit bc471103e0
17 changed files with 49 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu.sln
View file

@ -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

6
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -222,7 +222,7 @@
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.2</Version>
<Version>2.0.0.3</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version>
@ -304,9 +304,9 @@
<AndroidResource Include="Resources\font\cinzel_regular.otf" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
<None Include="Properties\AndroidManifest.Hereva.xml" />
<None Include="Properties\AndroidManifest.JoA.xml" />
<None Include="Properties\AndroidManifest.HD.xml" />
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\layout\Tabbar.axml" />

4
AideDeJeu/AideDeJeu.Android/MainActivity.cs
View file

@ -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);

6
AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.HD.xml → AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.Hereva.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="internalOnly" android:versionCode="14002" android:versionName="1.40.02">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu.hereva" android:installLocation="internalOnly" android:versionCode="1" android:versionName="0.01">
<uses-sdk android:targetSdkVersion="28" android:minSdkVersion="16" />
<application android:label="Haches &amp; Dés">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.fileprovider" android:exported="false" android:grantUriPermissions="true">
<application android:label="Sorcières d Hereva">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.hereva.fileprovider" android:exported="false" android:grantUriPermissions="true">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
</provider>
<activity android:name=".SearchActivity" android:label="Aide de Jeu">

6
AideDeJeu/AideDeJeu.Android/Properties/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu.hereva" android:installLocation="internalOnly" android:versionCode="1" android:versionName="0.01">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.nioux.aidedejeu" android:installLocation="auto" android:versionCode="14002" android:versionName="1.40.02">
<uses-sdk android:targetSdkVersion="28" android:minSdkVersion="16" />
<application android:label="Sorcières d Hereva">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.hereva.fileprovider" android:exported="false" android:grantUriPermissions="true">
<application android:label="Haches &amp; Dés">
<provider android:name="android.support.v4.content.FileProvider" android:authorities="com.nioux.aidedejeu.fileprovider" android:exported="false" android:grantUriPermissions="true">
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/file_paths"></meta-data>
</provider>
<activity android:name=".SearchActivity" android:label="Aide de Jeu">

20
AideDeJeu/AideDeJeu.Android/Resources/Resource.designer.cs generated
View file

@ -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()
{

14
AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
View file

@ -10,12 +10,13 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AideDeJeu.GTK</RootNamespace>
<AssemblyName>AideDeJeu.GTK</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<ReleaseVersion>1.32</ReleaseVersion>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -106,8 +107,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\GtkSharp\2.12\lib\gtk-sharp-2.0\gtk-sharp.dll</HintPath>
</Reference>
<Reference Include="Markdig, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll</HintPath>
<Reference Include="Markdig, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
@ -182,8 +183,8 @@
<Reference Include="Remotion.Linq, Version=2.1.0.0, Culture=neutral, PublicKeyToken=fee00910d6e5f53b, processorArchitecture=MSIL">
<HintPath>..\..\packages\Remotion.Linq.2.1.1\lib\net45\Remotion.Linq.dll</HintPath>
</Reference>
<Reference Include="Rg.Plugins.Popup, Version=2.0.0.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Rg.Plugins.Popup.2.0.0.2\lib\netstandard2.0\Rg.Plugins.Popup.dll</HintPath>
<Reference Include="Rg.Plugins.Popup, Version=2.0.0.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Rg.Plugins.Popup.2.0.0.3\lib\net472\Rg.Plugins.Popup.dll</HintPath>
</Reference>
<Reference Include="SkiaSharp, Version=1.68.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\..\packages\SkiaSharp.1.68.3\lib\net462\SkiaSharp.dll</HintPath>
@ -311,6 +312,9 @@
<Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.8.0.1269\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.WPF, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.WPF.4.5.0.530\lib\net45\Xamarin.Forms.Platform.WPF.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.8.0.1269\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>

2
AideDeJeu/AideDeJeu.GTK/Program.cs
View file

@ -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();

2
AideDeJeu/AideDeJeu.GTK/app.config
View file

@ -120,4 +120,4 @@
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

5
AideDeJeu/AideDeJeu.GTK/packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Markdig" version="0.20.0" targetFramework="net471" />
<package id="Markdig" version="0.21.1" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net471" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net471" />
<package id="Microsoft.Data.Sqlite.Core" version="2.0.1" targetFramework="net471" />
@ -26,7 +26,7 @@
<package id="OpenTK" version="3.2" targetFramework="net471" />
<package id="OpenTK.GLControl" version="3.1.0" targetFramework="net471" />
<package id="Remotion.Linq" version="2.1.1" targetFramework="net471" />
<package id="Rg.Plugins.Popup" version="2.0.0.2" targetFramework="net471" />
<package id="Rg.Plugins.Popup" version="2.0.0.3" targetFramework="net472" />
<package id="SkiaSharp" version="1.68.3" targetFramework="net471" />
<package id="SkiaSharp.Views" version="1.68.3" targetFramework="net471" />
<package id="SkiaSharp.Views.Desktop.Common" version="1.68.3" targetFramework="net471" />
@ -67,6 +67,7 @@
<package id="Xamarin.Essentials" version="1.5.3.2" targetFramework="net471" />
<package id="Xamarin.Forms" version="4.8.0.1269" targetFramework="net471" />
<package id="Xamarin.Forms.Platform.GTK" version="4.8.0.1269" targetFramework="net471" />
<package id="Xamarin.Forms.Platform.WPF" version="4.5.0.530" targetFramework="net472" />
<package id="Xamarin.Forms.Visual.Material" version="4.8.0.1269" targetFramework="net471" />
<package id="XamiTextSharpLGPLv2" version="1.0.0" targetFramework="net471" />
<package id="YamlDotNet" version="6.1.2" targetFramework="net471" />

2
AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
View file

@ -391,7 +391,7 @@
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.2</Version>
<Version>2.0.0.3</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version>

4
AideDeJeu/AideDeJeu.WPF/AideDeJeu.WPF.csproj
View file

@ -83,8 +83,8 @@
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Markdig, Version=0.20.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Markdig.0.20.0\lib\netstandard2.0\Markdig.dll</HintPath>
<Reference Include="Markdig, Version=0.21.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Markdig.0.21.1\lib\net452\Markdig.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>

2
AideDeJeu/AideDeJeu.WPF/packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Markdig" version="0.20.0" targetFramework="net472" />
<package id="Markdig" version="0.21.1" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net472" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net472" />
<package id="Microsoft.Data.Sqlite.Core" version="2.0.1" targetFramework="net472" />

2
AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
View file

@ -221,7 +221,7 @@
<Version>2.0.3</Version>
</PackageReference>
<PackageReference Include="Rg.Plugins.Popup">
<Version>2.0.0.2</Version>
<Version>2.0.0.3</Version>
</PackageReference>
<PackageReference Include="SkiaSharp.Svg">
<Version>1.60.0</Version>

4
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -97,11 +97,11 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Markdig" Version="0.20.0" />
<PackageReference Include="Markdig" Version="0.21.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
<PackageReference Include="OnePlat.DiceNotation" Version="2.0.2" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.2" />
<PackageReference Include="Rg.Plugins.Popup" Version="2.0.0.3" />
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views" Version="1.68.3" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.3" />

2
AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
View file

@ -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)
//{

2
AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
View file

@ -13,7 +13,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="HtmlAgilityPack" Version="1.11.23" />
<PackageReference Include="HtmlAgilityPack" Version="1.11.24" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.0.3" />
<PackageReference Include="sqlite-net-pcl" Version="1.6.292" />