From 0d85424bc5c924975770d419480abe283e1cedb5 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yan.maniez@atos.net>
Date: Tue, 1 Oct 2019 17:38:22 +0200
Subject: [PATCH] Tests

---
 AideDeJeu/AideDeJeu.Android/MainActivity.cs   |  1 +
 .../AideDeJeu/Views/Library/ItemPage.xaml.cs  |  6 +++-
 AideDeJeu/AideDeJeu/Views/MainShell.xaml      | 34 +++++++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/AideDeJeu/AideDeJeu.Android/MainActivity.cs b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
index c9dc7c79..375ab16f 100644
--- a/AideDeJeu/AideDeJeu.Android/MainActivity.cs
+++ b/AideDeJeu/AideDeJeu.Android/MainActivity.cs
@@ -30,6 +30,7 @@ namespace AideDeJeu.Droid
             TaskScheduler.UnobservedTaskException += TaskSchedulerOnUnobservedTaskException;
 
             Xamarin.Essentials.Platform.Init(this, bundle);
+            Xamarin.Forms.Forms.SetFlags("CollectionView_Experimental");
             Xamarin.Essentials.ExperimentalFeatures.Enable(Xamarin.Essentials.ExperimentalFeatures.ShareFileRequest);
 
             Rg.Plugins.Popup.Popup.Init(this, bundle);
diff --git a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
index 2f3ba7bd..291b8859 100644
--- a/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
+++ b/AideDeJeu/AideDeJeu/Views/Library/ItemPage.xaml.cs
@@ -146,7 +146,11 @@ namespace AideDeJeu.Views.Library
         private void ItemsListView_ItemTapped(object sender, ItemTappedEventArgs e)
         {
             if (e.Item == null) return;
-            ((ListView)sender).SelectedItem = null;
+            var lv = sender as ListView;
+            if (lv != null)
+            {
+                lv.SelectedItem = null;
+            }
         }
 
 
diff --git a/AideDeJeu/AideDeJeu/Views/MainShell.xaml b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
index aaf72992..976a079b 100644
--- a/AideDeJeu/AideDeJeu/Views/MainShell.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainShell.xaml
@@ -4,6 +4,7 @@
        xmlns:local="clr-namespace:AideDeJeu.Views"
        xmlns:pc="clr-namespace:AideDeJeu.Views.PlayerCharacter"
        xmlns:library="clr-namespace:AideDeJeu.Views.Library"
+       xmlns:tools="clr-namespace:AideDeJeu.Tools"
        x:Class="AideDeJeu.Views.MainShell"
        BackgroundColor="{DynamicResource HDWhite}"
        FlyoutBackgroundColor="{DynamicResource HDWhite}"
@@ -12,6 +13,11 @@
        Shell.UnselectedColor="{DynamicResource HDLightGrey}"
        >
     <Shell.Resources>
+        <ResourceDictionary>
+            <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
+            <tools:NullToFalseConverter x:Key="NullToFalseConverter" />
+            <tools:HeaderLevelToStyleConverter x:Key="HeaderLevelToStyleConverter" />
+        </ResourceDictionary>
         <ResourceDictionary>
             <Color x:Key="NavigationPrimary">#2196F3</Color>
             <Style x:Key="BaseStyle" TargetType="Element">
@@ -34,6 +40,34 @@
             <Label Text="{Binding CurrentItem.CurrentItem.CurrentItem.Route}" />
             <Label Text="{Binding CurrentItem.CurrentItem.CurrentItem.Content.BindingContext.Item.Title}" />
             <Label Text="{Binding Main.CurrentItem.Item.Name}" />
+            <!--<CollectionView IsVisible="{Binding Main.CurrentItem.Filter, Converter={StaticResource NullToFalseConverter}}" ItemsSource="{Binding Main.CurrentItem.Filter.Filters}" >
+                <CollectionView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <ViewCell.View>
+                                <StackLayout Margin="10,5,10,0" Padding="0" Spacing="0">
+                                    <Label BindingContext="{Binding}" Text="{Binding Name}" Style="{StaticResource Key=heading3}" />
+                                    <Picker HorizontalOptions="FillAndExpand" ItemsSource="{Binding KeyValues, Mode=OneWay}" ItemDisplayBinding="{Binding Value, Mode=OneWay}" SelectedIndex="{Binding Index, Mode=TwoWay}" />
+                                </StackLayout>
+                            </ViewCell.View>
+                        </ViewCell>
+                    </DataTemplate>
+                </CollectionView.ItemTemplate>
+            </CollectionView>-->
+            <ListView BackgroundColor="Red" IsVisible="{Binding Main.CurrentItem.Filter, Converter={StaticResource NullToFalseConverter}}"  SelectionMode="None" ItemsSource="{Binding Main.CurrentItem.Filter.Filters}" HasUnevenRows="True" RowHeight="-1" SeparatorVisibility="None" IsPullToRefreshEnabled="False" HorizontalOptions="FillAndExpand" VerticalOptions="Start">
+                <ListView.ItemTemplate>
+                    <DataTemplate>
+                        <ViewCell>
+                            <ViewCell.View>
+                                <StackLayout Margin="10,5,10,0" Padding="0" Spacing="0">
+                                    <Label BindingContext="{Binding}" Text="{Binding Name}" Style="{StaticResource Key=heading3}" />
+                                    <Picker HorizontalOptions="FillAndExpand" ItemsSource="{Binding KeyValues, Mode=OneWay}" ItemDisplayBinding="{Binding Value, Mode=OneWay}" SelectedIndex="{Binding Index, Mode=TwoWay}" />
+                                </StackLayout>
+                            </ViewCell.View>
+                        </ViewCell>
+                    </DataTemplate>
+                </ListView.ItemTemplate>
+            </ListView>
         </StackLayout>
     </Shell.FlyoutHeader>