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

Début refonte navigation

Browse source
This commit is contained in:
Yan Maniez 2018-07-08 23:36:40 +02:00
parent 615181650d
commit 77e2eff092
6 changed files with 96 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,7 @@
using System;
using AideDeJeu.ViewModels;
using AideDeJeu.Views;
using AideDeJeuLib.Models;
using Xamarin.Forms;
using Xamarin.Forms.Xaml;
@ -16,9 +17,10 @@ namespace AideDeJeu
DependencyService.Register<MainViewModel>();
var vm = DependencyService.Get<MainViewModel>();
var mainPage = new MainPage();
vm.Navigator = new Navigator(mainPage.Detail.Navigation);
MainPage = mainPage;
var mainPage = new ItemDetailPage(new ItemDetailViewModel(new HomeItem()));// new MainPage();
var navigationPage = new NavigationPage(mainPage);
vm.Navigator = new Navigator(navigationPage.Navigation); //mainPage.Detail.Navigation);
MainPage = navigationPage;
}
protected override void OnStart ()

23
AideDeJeu/AideDeJeu/Models/HomeItem.cs Normal file
View file

@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace AideDeJeuLib.Models
{
public class HomeItem : Item
{
public override string Markdown
{
get
{
return
"# [Sorts](spells_hd.md)\n\n" +
"# [Créatures](monsters_hd.md)\n\n" +
"# [Etats spéciaux](conditions_hd.md)\n\n" +
"# [Spells](spells_vo.md)\n\n" +
"# [Monsters](monsters_vo.md)\n\n" +
"# [Conditions](conditions_vo.md)\n\n";
}
}
}
}

7
AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
View file

@ -195,6 +195,8 @@ namespace AideDeJeu.ViewModels
public async Task NavigateToLink(string s)
{
if (s != null)
{
if (s.Contains("#"))
{
var regex = new Regex("/(?<file>.*)\\.md#(?<anchor>.*)");
var match = regex.Match(s);
@ -208,6 +210,11 @@ namespace AideDeJeu.ViewModels
await Navigator.GotoItemDetailPageAsync(spell);
}
}
else
{
await Navigator.GotoItemsPageAsync(null);
}
}
}
}

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

@ -40,6 +40,15 @@ namespace AideDeJeu.ViewModels
await Navigation.PushAsync(new ItemDetailPage(vm));
}
public async Task GotoItemsPageAsync(Item item)
{
//if (item == null)
// return;
//var vm = new ItemDetailViewModel(item);
//vm.LoadItemCommand.Execute(null);
await Navigation.PushAsync(new MainPage());
}
}
}

27
AideDeJeu/AideDeJeu/Views/MainPage.xaml
View file

@ -1,5 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<MasterDetailPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" xmlns:local="clr-namespace:AideDeJeu.Views" xmlns:tools="clr-namespace:AideDeJeu.Tools" x:Class="AideDeJeu.Views.MainPage" x:Name="This" IsPresented="False" Title="">
<MasterDetailPage
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:local="clr-namespace:AideDeJeu.Views"
xmlns:tools="clr-namespace:AideDeJeu.Tools"
x:Class="AideDeJeu.Views.MainPage"
x:Name="This"
IsPresented="False"
Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}">
<MasterDetailPage.Resources>
<ResourceDictionary>
<tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVO="Spells" SpellHD="Sorts (H&amp;D)" MonsterVO="Monsters" MonsterHD="Créatures (H&amp;D)" />
@ -31,22 +39,19 @@
</ContentPage>
</MasterDetailPage.Master>
<MasterDetailPage.Detail>
<NavigationPage>
<x:Arguments>
<ContentPage Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}">
<ContentPage.ToolbarItems>
<!--<ToolbarItem Name="Sorts (H&amp;D)" Text="Sorts (H&amp;D)" Order="Secondary" Command="{Binding SwitchToSpellsHD}" />
<ToolbarItem Name="Creatures (H&amp;D)" Text="Créatures (H&amp;D)" Order="Secondary" Command="{Binding SwitchToMonstersHD}" />
<ToolbarItem Name="Spells (VO)" Text="Spells (VO)" Order="Secondary" Icon="spell_book.png" Command="{Binding SwitchToSpellsVO}" />
<ToolbarItem Name="Monsters (VO)" Text="Monsters (VO)" Order="Secondary" Icon="dragon_head.png" Command="{Binding SwitchToMonstersVO}" />-->
<ContentPage Title="">
<!--<ContentPage.ToolbarItems>
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
</ContentPage.ToolbarItems>
</ContentPage.ToolbarItems>-->
<StackLayout Orientation="Vertical" VerticalOptions="Fill" HorizontalOptions="Fill">
<StackLayout Orientation="Horizontal">
<Button Text="=" Clicked="Button_Clicked"/>
<SearchBar x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
<SearchBar.Behaviors>
<tools:TextChangedBehavior />
</SearchBar.Behaviors>
</SearchBar>
</StackLayout>
<ListView x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
<ListView.ItemTemplate>
<DataTemplate>
@ -61,7 +66,5 @@
</ListView>
</StackLayout>
</ContentPage>
</x:Arguments>
</NavigationPage>
</MasterDetailPage.Detail>
</MasterDetailPage>

7
AideDeJeu/AideDeJeu/Views/MainPage.xaml.cs
View file

@ -35,6 +35,8 @@ namespace AideDeJeu.Views
{
base.OnAppearing();
this.MasterBehavior = MasterBehavior.Default;
this.MasterBehavior = MasterBehavior.Popover;
if (Main.Items.Count() == 0)
Main.LoadItemsCommand.Execute(null);
}
@ -44,5 +46,10 @@ namespace AideDeJeu.Views
if (e.Item == null) return;
((ListView)sender).SelectedItem = null;
}
private void Button_Clicked(object sender, EventArgs e)
{
this.IsPresented = !this.IsPresented;
}
}
}