1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-30 15:06:06 +00:00

Modifs barres

This commit is contained in:
Yan Maniez 2018-07-09 19:23:46 +02:00
parent 6ce0f56757
commit 89647c11de
3 changed files with 25 additions and 13 deletions

View file

@ -12,6 +12,9 @@
<tools:StringListToStringConverter x:Key="StringListToStringConverter" /> <tools:StringListToStringConverter x:Key="StringListToStringConverter" />
</ResourceDictionary> </ResourceDictionary>
</ContentPage.Resources> </ContentPage.Resources>
<ContentPage.ToolbarItems>
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
</ContentPage.ToolbarItems>
<ScrollView Orientation="Vertical" BackgroundColor="#fdf1dc"> <ScrollView Orientation="Vertical" BackgroundColor="#fdf1dc">
<mdview:MarkdownView x:Name="mdMarkdown" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Item.Markdown}" /> <mdview:MarkdownView x:Name="mdMarkdown" Theme="{StaticResource MonsterMarkdownTheme}" Markdown="{Binding Item.Markdown}" />
</ScrollView> </ScrollView>

View file

@ -8,6 +8,9 @@
x:Name="This" x:Name="This"
IsPresented="False" IsPresented="False"
Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}"> Title="{Binding ItemSourceType,Converter={StaticResource ItemSourceTypeToTitleConverter}}">
<MasterDetailPage.ToolbarItems>
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
</MasterDetailPage.ToolbarItems>
<MasterDetailPage.Resources> <MasterDetailPage.Resources>
<ResourceDictionary> <ResourceDictionary>
<tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVO="Spells" SpellHD="Sorts (H&amp;D)" MonsterVO="Monsters" MonsterHD="Créatures (H&amp;D)" /> <tools:ItemSourceTypeToStringConverter x:Key="ItemSourceTypeToTitleConverter" SpellVO="Spells" SpellHD="Sorts (H&amp;D)" MonsterVO="Monsters" MonsterHD="Créatures (H&amp;D)" />
@ -43,16 +46,22 @@
<!--<ContentPage.ToolbarItems> <!--<ContentPage.ToolbarItems>
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" /> <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"> <Grid VerticalOptions="Fill" HorizontalOptions="Fill">
<StackLayout Orientation="Horizontal"> <Grid.ColumnDefinitions>
<Button Text="=" Clicked="Button_Clicked"/> <ColumnDefinition Width="auto" />
<SearchBar x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}"> <ColumnDefinition Width="*" />
<SearchBar.Behaviors> </Grid.ColumnDefinitions>
<tools:TextChangedBehavior /> <Grid.RowDefinitions>
</SearchBar.Behaviors> <RowDefinition Height="auto" />
</SearchBar> <RowDefinition Height="*" />
</StackLayout> </Grid.RowDefinitions>
<ListView x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped"> <Button Grid.Column="0" Grid.Row="0" Text="=" Clicked="Button_Clicked"/>
<SearchBar Grid.Column="1" Grid.Row="0" x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
<SearchBar.Behaviors>
<tools:TextChangedBehavior />
</SearchBar.Behaviors>
</SearchBar>
<ListView Grid.Column="0" Grid.Row="1" Grid.ColumnSpan="2" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate> <DataTemplate>
<ViewCell> <ViewCell>
@ -64,7 +73,7 @@
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
</StackLayout> </Grid>
</ContentPage> </ContentPage>
</MasterDetailPage.Detail> </MasterDetailPage.Detail>
</MasterDetailPage> </MasterDetailPage>

View file

@ -35,8 +35,8 @@ namespace AideDeJeu.Views
{ {
base.OnAppearing(); base.OnAppearing();
this.MasterBehavior = MasterBehavior.Default; //this.MasterBehavior = MasterBehavior.Default;
this.MasterBehavior = MasterBehavior.Popover; //this.MasterBehavior = MasterBehavior.Popover;
if (Main.Items.Count() == 0) if (Main.Items.Count() == 0)
Main.LoadItemsCommand.Execute(null); Main.LoadItemsCommand.Execute(null);
} }