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

Correctif navigation tab bibliothèque iOS

Browse source
This commit is contained in:
Yan Maniez 2018-12-02 10:37:37 +01:00
parent 55178e5a29
commit 9a06e03298
5 changed files with 45 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

1
AideDeJeu.sln
View file

@ -160,6 +160,7 @@ Global
{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x64.ActiveCfg = Release|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x64.ActiveCfg = Release|iPhone
{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x86.ActiveCfg = Release|iPhone {9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Release|x86.ActiveCfg = Release|iPhone
{9878FADF-BAEA-4B9F-9DF0-A092439AF14D}.Debug|Any CPU.Build.0 = Debug|iPhone
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86 {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.ActiveCfg = Release|x86
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Build.0 = Release|x86 {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Build.0 = Release|x86
{7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86 {7E8B5E35-7000-487A-A5C6-E87376F81631}.Ad-Hoc|Any CPU.Deploy.0 = Release|x86

9
AideDeJeu/AideDeJeu.Android/AideDeJeu.Android.csproj
View file

@ -15,7 +15,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest> <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix> <MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix> <MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -26,9 +25,6 @@
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AndroidLinkMode>None</AndroidLinkMode> <AndroidLinkMode>None</AndroidLinkMode>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
<AndroidSupportedAbis /> <AndroidSupportedAbis />
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType> <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
</PropertyGroup> </PropertyGroup>
@ -41,9 +37,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<AndroidManagedSymbols>true</AndroidManagedSymbols> <AndroidManagedSymbols>true</AndroidManagedSymbols>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime> <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
<AndroidSupportedAbis /> <AndroidSupportedAbis />
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType> <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
<AndroidExplicitCrunch>true</AndroidExplicitCrunch> <AndroidExplicitCrunch>true</AndroidExplicitCrunch>
@ -133,7 +126,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AideDeJeu\AideDeJeu.csproj"> <ProjectReference Include="..\AideDeJeu\AideDeJeu.csproj">
<Project>{D9922DC7-810A-445E-B965-BF7E48E8B0D5}</Project> <Project>{C0597D88-5C09-4314-80A3-64712B02D0E9}</Project>
<Name>AideDeJeu</Name> <Name>AideDeJeu</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>

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

@ -1,11 +1,11 @@
#pragma warning disable 1591 #pragma warning disable 1591
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// <auto-generated> // <auto-generated>
// Ce code a été généré par un outil. // This code was generated by a tool.
// Version du runtime :4.0.30319.42000 // Runtime Version:4.0.30319.42000
// //
// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si // Changes to this file may cause incorrect behavior and will be lost if
// le code est régénéré. // the code is regenerated.
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------

2
AideDeJeu/AideDeJeu.GTK/AideDeJeu.GTK.csproj
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project 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.3.4.0.1008975\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.4.0.1008975\build\Xamarin.Forms.props')" /> <Import Project="..\..\packages\Xamarin.Forms.3.4.0.1008975\build\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.4.0.1008975\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>

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

@ -99,12 +99,13 @@ namespace AideDeJeu.ViewModels
if (item == null) if (item == null)
return; return;
//if (item is Items)
//{
var items = item as Item; var items = item as Item;
var filterViewModel = items.GetNewFilterViewModel(); var filterViewModel = items.GetNewFilterViewModel();
var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel }; var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
itemsViewModel.LoadItemsCommand.Execute(null); itemsViewModel.LoadItemsCommand.Execute(null);
SwitchToMainTab();
if (filterViewModel == null) if (filterViewModel == null)
{ {
await GotoItemsPageAsync(itemsViewModel); await GotoItemsPageAsync(itemsViewModel);
@ -113,12 +114,10 @@ namespace AideDeJeu.ViewModels
{ {
await GotoFilteredItemsPageAsync(itemsViewModel); await GotoFilteredItemsPageAsync(itemsViewModel);
} }
//} }
//else
//{ public void SwitchToMainTab()
// var vm = new ItemDetailViewModel(item); {
// await Navigation.PushAsync(new ItemDetailPage(vm));
//}
var tabbedPage = App.Current.MainPage as MainTabbedPage; var tabbedPage = App.Current.MainPage as MainTabbedPage;
tabbedPage.SelectedItem = null; tabbedPage.SelectedItem = null;
tabbedPage.SelectedItem = tabbedPage.MainNavigationPage; tabbedPage.SelectedItem = tabbedPage.MainNavigationPage;
@ -165,8 +164,6 @@ namespace AideDeJeu.ViewModels
Main.IsLoading = false; Main.IsLoading = false;
if (item != null) if (item != null)
{ {
//if (item is Items)
//{
var items = item; // as Items; var items = item; // as Items;
var filterViewModel = items.GetNewFilterViewModel(); var filterViewModel = items.GetNewFilterViewModel();
var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel }; var itemsViewModel = new ItemsViewModel() { AllItems = items, Filter = filterViewModel };
@ -181,6 +178,7 @@ namespace AideDeJeu.ViewModels
filterViewModel.FilterWith(key, val); filterViewModel.FilterWith(key, val);
} }
} }
SwitchToMainTab();
if (filterViewModel == null) if (filterViewModel == null)
{ {
await GotoItemsPageAsync(itemsViewModel); await GotoItemsPageAsync(itemsViewModel);
@ -189,14 +187,6 @@ namespace AideDeJeu.ViewModels
{ {
await GotoFilteredItemsPageAsync(itemsViewModel); await GotoFilteredItemsPageAsync(itemsViewModel);
} }
//}
//else
//{
// await GotoItemDetailPageAsync(item);
//}
var tabbedPage = App.Current.MainPage as MainTabbedPage;
tabbedPage.SelectedItem = null;
tabbedPage.SelectedItem = tabbedPage.MainNavigationPage;
} }
else else