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

Amélioration chargement listes + maj nuget + test shell

Browse source
This commit is contained in:
Yan Maniez 2019-04-04 23:55:03 +02:00
parent f2c1f0673a
commit 5ffbb0143a
16 changed files with 1676 additions and 1599 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -87,10 +87,10 @@
<Version>4.5.2</Version> <Version>4.5.2</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material"> <PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

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

@ -22,10 +22,10 @@ namespace AideDeJeu.Droid
Rg.Plugins.Popup.Popup.Init(this, bundle); Rg.Plugins.Popup.Popup.Init(this, bundle);
Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental"); global::Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
Xamarin.Forms.Forms.SetFlags("Shell_Experimental"); global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental");
global::Xamarin.Forms.Forms.Init(this, bundle); global::Xamarin.Forms.Forms.Init(this, bundle);
Xamarin.Forms.FormsMaterial.Init(this, bundle); global::Xamarin.Forms.FormsMaterial.Init(this, bundle);
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3()); SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3());
LoadApplication(new App()); LoadApplication(new App());

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

File diff suppressed because it is too large Load diff

18
AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.props')" /> <Import Project="..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@ -196,19 +196,19 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
<Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL"> <Reference Include="webkit-sharp, Version=1.1.15.0, Culture=neutral, PublicKeyToken=eaa1d335d2e19745, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.0.0.250467-pre7\lib\net45\webkit-sharp.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.0.0.304370-pre8\lib\net45\webkit-sharp.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Core, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\lib\netstandard2.0\Xamarin.Forms.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\lib\netstandard2.0\Xamarin.Forms.Platform.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Platform.GTK, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.0.0.250467-pre7\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.Platform.GTK.4.0.0.304370-pre8\lib\net45\Xamarin.Forms.Platform.GTK.dll</HintPath>
</Reference> </Reference>
<Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="Xamarin.Forms.Xaml, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath> <HintPath>..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\lib\netstandard2.0\Xamarin.Forms.Xaml.dll</HintPath>
</Reference> </Reference>
<Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL"> <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
<HintPath>..\..\packages\YamlDotNet.6.0.0\lib\net45\YamlDotNet.dll</HintPath> <HintPath>..\..\packages\YamlDotNet.6.0.0\lib\net45\YamlDotNet.dll</HintPath>
@ -290,11 +290,11 @@
<Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" /> <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets'))" />
<Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" /> <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets'))" />
<Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" /> <Error Condition="!Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.props'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.props'))" />
<Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.targets'))" /> <Error Condition="!Exists('..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.targets'))" />
</Target> </Target>
<Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" /> <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.linux.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.linux.targets')" />
<Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" /> <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.osx.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.osx.targets')" />
<Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" /> <Import Project="..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets" Condition="Exists('..\..\packages\SQLitePCLRaw.lib.e_sqlite3.v110_xp.1.1.13\build\net35\SQLitePCLRaw.lib.e_sqlite3.v110_xp.targets')" />
<Import Project="..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.250467-pre7\build\Xamarin.Forms.targets')" /> <Import Project="..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.4.0.0.304370-pre8\build\Xamarin.Forms.targets')" />
</Project> </Project>

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

@ -42,8 +42,8 @@
<package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0-preview3.19128.7" targetFramework="net471" /> <package id="System.Runtime.CompilerServices.Unsafe" version="4.6.0-preview3.19128.7" targetFramework="net471" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" /> <package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net471" />
<package id="System.Threading.Tasks.Extensions" version="4.6.0-preview.18571.3" targetFramework="net471" /> <package id="System.Threading.Tasks.Extensions" version="4.6.0-preview.18571.3" targetFramework="net471" />
<package id="Xamarin.Forms" version="4.0.0.250467-pre7" targetFramework="net471" /> <package id="Xamarin.Forms" version="4.0.0.304370-pre8" targetFramework="net471" />
<package id="Xamarin.Forms.Platform.GTK" version="4.0.0.250467-pre7" targetFramework="net471" /> <package id="Xamarin.Forms.Platform.GTK" version="4.0.0.304370-pre8" targetFramework="net471" />
<package id="Xamarin.Forms.Visual.Material" version="4.0.0.250467-pre7" targetFramework="net471" /> <package id="Xamarin.Forms.Visual.Material" version="4.0.0.304370-pre8" targetFramework="net471" />
<package id="YamlDotNet" version="6.0.0" targetFramework="net471" /> <package id="YamlDotNet" version="6.0.0" targetFramework="net471" />
</packages> </packages>

4
AideDeJeu/AideDeJeu.UWP/AideDeJeu.UWP.csproj
View file

@ -213,10 +213,10 @@
<Version>1.6.258-beta</Version> <Version>1.6.258-beta</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material"> <PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

1
AideDeJeu/AideDeJeu.UWP/App.xaml.cs
View file

@ -55,6 +55,7 @@ namespace AideDeJeu.UWP
Rg.Plugins.Popup.Popup.Init(); Rg.Plugins.Popup.Popup.Init();
//Xamarin.Forms.Forms.Init(e); //Xamarin.Forms.Forms.Init(e);
//Xamarin.Forms.SetFlags("Shell_Experimental");
Xamarin.Forms.Forms.Init(e, Rg.Plugins.Popup.Popup.GetExtraAssemblies()); Xamarin.Forms.Forms.Init(e, Rg.Plugins.Popup.Popup.GetExtraAssemblies());
SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3()); SQLitePCL.raw.SetProvider(new SQLitePCL.SQLite3Provider_e_sqlite3());

4
AideDeJeu/AideDeJeu.iOS/AideDeJeu.iOS.csproj
View file

@ -143,10 +143,10 @@
<Version>1.6.258-beta</Version> <Version>1.6.258-beta</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms"> <PackageReference Include="Xamarin.Forms">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Xamarin.Forms.Visual.Material"> <PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>4.0.0.250467-pre7</Version> <Version>4.0.0.304370-pre8</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

7
AideDeJeu/AideDeJeu/AideDeJeu.csproj
View file

@ -36,8 +36,8 @@
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" /> <PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
<PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" /> <PackageReference Include="SkiaSharp.Views.Forms" Version="1.68.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.250467-pre7" /> <PackageReference Include="Xamarin.Forms" Version="4.0.0.304370-pre8" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.250467-pre7" /> <PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.304370-pre8" />
<PackageReference Include="YamlDotNet" Version="6.0.0" /> <PackageReference Include="YamlDotNet" Version="6.0.0" />
</ItemGroup> </ItemGroup>
@ -91,6 +91,9 @@
<EmbeddedResource Update="Views\MainPage.xaml"> <EmbeddedResource Update="Views\MainPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Update="Views\MainShell.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource>
<EmbeddedResource Update="Views\MainTabbedPage.xaml"> <EmbeddedResource Update="Views\MainTabbedPage.xaml">
<Generator>MSBuild:UpdateDesignTimeXaml</Generator> <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
</EmbeddedResource> </EmbeddedResource>

10
AideDeJeu/AideDeJeu/App.xaml.cs
View file

@ -24,16 +24,8 @@ namespace AideDeJeu
var bgtan = (Color)Resources["HDWhite"]; var bgtan = (Color)Resources["HDWhite"];
//MainPage = new MainShell();
var mainNavigationPage = new MainNavigationPage(); var mainNavigationPage = new MainNavigationPage();
//MainPage = new PlayerCharacterEditorPage();
//MainPage = new MainPage();
//var tabbeddPage = new AideDeJeu.Views.MainTabbedPage();
//var navigationPage = tabbeddPage.MainNavigationPage;
vm.Navigator = new Navigator(mainNavigationPage.Navigation); vm.Navigator = new Navigator(mainNavigationPage.Navigation);
MainPage = mainNavigationPage; MainPage = mainNavigationPage;
mainNavigationPage.Navigation.PushAsync(new MainPage()); mainNavigationPage.Navigation.PushAsync(new MainPage());

40
AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs
View file

@ -15,6 +15,10 @@ namespace AideDeJeu.ViewModels
{ {
get get
{ {
if(_Races == null || _Races.Count == 0)
{
Task.Run(() => LoadRacesAsync().ConfigureAwait(false));
}
return _Races; return _Races;
} }
set set
@ -32,7 +36,10 @@ namespace AideDeJeu.ViewModels
set set
{ {
SetProperty(ref _RaceSelectedIndex, value); SetProperty(ref _RaceSelectedIndex, value);
SelectedPlayerCharacter.Race = Races[_RaceSelectedIndex]; if (Races.Count > _RaceSelectedIndex && _RaceSelectedIndex >= 0)
{
SelectedPlayerCharacter.Race = Races[_RaceSelectedIndex];
}
} }
} }
private List<ClassItem> _Classes = new List<ClassItem>(); private List<ClassItem> _Classes = new List<ClassItem>();
@ -40,6 +47,10 @@ namespace AideDeJeu.ViewModels
{ {
get get
{ {
if (_Classes == null || _Classes.Count == 0)
{
Task.Run(() => LoadClassesAsync().ConfigureAwait(false));
}
return _Classes; return _Classes;
} }
set set
@ -65,6 +76,10 @@ namespace AideDeJeu.ViewModels
{ {
get get
{ {
if (_Backgrounds == null || _Backgrounds.Count == 0)
{
Task.Run(() => LoadBackgroundsAsync().ConfigureAwait(false));
}
return _Backgrounds; return _Backgrounds;
} }
set set
@ -107,14 +122,35 @@ namespace AideDeJeu.ViewModels
"1", //"2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20" "1", //"2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20"
}; };
public async Task InitAsync() public async Task LoadRacesAsync()
{ {
using (var context = await StoreViewModel.GetLibraryContextAsync()) using (var context = await StoreViewModel.GetLibraryContextAsync())
{ {
Races = await context.Races.Where(r => !r.HasSubRaces).OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync(); Races = await context.Races.Where(r => !r.HasSubRaces).OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync();
}
}
public async Task LoadClassesAsync()
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
Classes = await context.Classes.Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).ToListAsync(); Classes = await context.Classes.Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).ToListAsync();
}
}
public async Task LoadBackgroundsAsync()
{
using (var context = await StoreViewModel.GetLibraryContextAsync())
{
Backgrounds = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync(); Backgrounds = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync();
} }
} }
public async Task InitAsync()
{
// using (var context = await StoreViewModel.GetLibraryContextAsync())
// {
// Races = await context.Races.Where(r => !r.HasSubRaces).OrderBy(r => Tools.Helpers.RemoveDiacritics(r.Name)).ToListAsync();
// Classes = await context.Classes.Where(c => !(c is SubClassItem)).OrderBy(c => Tools.Helpers.RemoveDiacritics(c.Name)).ToListAsync();
// Backgrounds = await context.Backgrounds.Where(b => b.GetType() == typeof(BackgroundItem)).OrderBy(b => Tools.Helpers.RemoveDiacritics(b.Name)).ToListAsync();
// }
}
} }
} }

13
AideDeJeu/AideDeJeu/Views/MainShell.xaml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8" ?>
<Shell xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:AideDeJeu.Views"
x:Class="AideDeJeu.Views.MainShell">
<ShellItem>
<ShellSection>
<ShellContent>
<local:MainPage/>
</ShellContent>
</ShellSection>
</ShellItem>
</Shell>

20
AideDeJeu/AideDeJeu/Views/MainShell.xaml.cs Normal file
View file

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
namespace AideDeJeu.Views
{
[XamlCompilation(XamlCompilationOptions.Compile)]
public partial class MainShell : Shell
{
public MainShell()
{
InitializeComponent();
}
}
}

2
AideDeJeu/AideDeJeuCmd/AideDeJeuCmd.csproj
View file

@ -14,7 +14,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.0.0-preview3.19153.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.250467-pre7" /> <PackageReference Include="Xamarin.Forms" Version="4.0.0.304370-pre8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
AideDeJeu/AideDeJeuUnitTest/AideDeJeuUnitTest.csproj
View file

@ -13,7 +13,7 @@
<PackageReference Include="MSTest.TestAdapter" Version="2.0.0-beta2" /> <PackageReference Include="MSTest.TestAdapter" Version="2.0.0-beta2" />
<PackageReference Include="MSTest.TestFramework" Version="2.0.0-beta2" /> <PackageReference Include="MSTest.TestFramework" Version="2.0.0-beta2" />
<PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.250467-pre7" /> <PackageReference Include="Xamarin.Forms" Version="4.0.0.304370-pre8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
AideDeJeu/AideDeJeuWeb/AideDeJeuWeb.csproj
View file

@ -13,7 +13,7 @@
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.6" /> <PackageReference Include="Microsoft.AspNetCore.All" Version="2.1.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.0.0-preview3.19153.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="3.0.0-preview3.19153.1" />
<PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" /> <PackageReference Include="sqlite-net-pcl" Version="1.6.258-beta" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.250467-pre7" /> <PackageReference Include="Xamarin.Forms" Version="4.0.0.304370-pre8" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>