From 3d9dfa517d9a687a2d4adcf9a41a7f0fdae46b50 Mon Sep 17 00:00:00 2001
From: Yan Maniez <yanmaniez@hotmail.com>
Date: Sat, 25 Aug 2018 00:55:08 +0200
Subject: [PATCH] Busy

---
 .../AideDeJeu/ViewModels/MainViewModel.cs     |  1 +
 AideDeJeu/AideDeJeu/ViewModels/Navigator.cs   |  2 +-
 AideDeJeu/AideDeJeu/Views/AboutPage.xaml      |  3 +-
 .../AideDeJeu/Views/FilteredItemsPage.xaml    | 16 ++++++-
 AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml | 32 +++++++++----
 AideDeJeu/AideDeJeu/Views/ItemsPage.xaml      | 48 ++++++++++++-------
 .../AideDeJeu/Views/MainNavigationPage.xaml   |  3 +-
 7 files changed, 73 insertions(+), 32 deletions(-)

diff --git a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
index 1d6a144b..79cd2199 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/MainViewModel.cs
@@ -59,6 +59,7 @@ namespace AideDeJeu.ViewModels
         private Dictionary<string, ItemWithAnchors> _AllItems = new Dictionary<string, ItemWithAnchors>();
         public async Task<Item> GetItemFromDataAsync(string source, string anchor)
         {
+            await Task.Delay(3000);
             if (!_AllItems.ContainsKey(source))
             {
                 //var md = await Tools.Helpers.GetStringFromUrl($"https://raw.githubusercontent.com/Nioux/AideDeJeu/master/Data/{source}.md");
diff --git a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
index eb181cee..7dd734fd 100644
--- a/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
+++ b/AideDeJeu/AideDeJeu/ViewModels/Navigator.cs
@@ -91,7 +91,7 @@ namespace AideDeJeu.ViewModels
                 var with = match.Groups["with"].Value;
                 Main.IsBusy = true;
                 Main.IsLoading = true;
-                var item = await Main.GetItemFromDataAsync(file, anchor);
+                var item = await Task.Run(async () => await Main.GetItemFromDataAsync(file, anchor));
                 Main.IsBusy = false;
                 Main.IsLoading = false;
                 if (item != null)
diff --git a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
index 5bdf8f4c..47e9bd58 100644
--- a/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/AboutPage.xaml
@@ -3,8 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
              x:Class="AideDeJeu.Views.AboutPage"
              xmlns:vm="clr-namespace:AideDeJeu.ViewModels;"
-             Title="{Binding Title}" 
-             IsBusy="{Binding IsBusy}">
+             Title="{Binding Title}">
     <ContentPage.BindingContext>
         <vm:AboutViewModel />
     </ContentPage.BindingContext>
diff --git a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
index 15c1fcae..84d72968 100644
--- a/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/FilteredItemsPage.xaml
@@ -6,8 +6,7 @@
     xmlns:tools="clr-namespace:AideDeJeu.Tools" 
     x:Class="AideDeJeu.Views.FilteredItemsPage" 
     x:Name="This" 
-    Title="{Binding Title}"
-    IsBusy="{Binding Main.IsLoading}">
+    Title="{Binding Title}">
     <MasterDetailPage.ToolbarItems>
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
     </MasterDetailPage.ToolbarItems>
@@ -64,6 +63,19 @@
                         </DataTemplate>
                     </ListView.ItemTemplate>
                 </ListView>
+                <ActivityIndicator 
+                    VerticalOptions="StartAndExpand"
+                    HorizontalOptions="End"
+                    Color="{StaticResource titlered}"
+                    IsRunning="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}" 
+                    IsVisible="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
+                    <ActivityIndicator.WidthRequest>
+                        <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="400" Android="50" />
+                    </ActivityIndicator.WidthRequest>
+                    <ActivityIndicator.HeightRequest>
+                        <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="10" Android="50" />
+                    </ActivityIndicator.HeightRequest>
+                </ActivityIndicator>
             </Grid>
         </ContentPage>
     </MasterDetailPage.Detail>
diff --git a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
index 8f5950f6..da356282 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemDetailPage.xaml
@@ -5,8 +5,7 @@
              xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
              x:Class="AideDeJeu.Views.ItemDetailPage"
              Title="{Binding Title}"
-             x:Name="This"
-             IsBusy="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
+             x:Name="This">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -16,11 +15,26 @@
     <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">
-        <mdview:MarkdownView 
-            Theme="{StaticResource MonsterMarkdownTheme}" 
-            Markdown="{Binding Item.Markdown}" 
-            NavigateToLinkCommand="{Binding BindingContext.Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
-            />
-    </ScrollView>
+    <Grid>
+        <ScrollView Orientation="Vertical" BackgroundColor="#fdf1dc">
+            <mdview:MarkdownView 
+                Theme="{StaticResource MonsterMarkdownTheme}" 
+                Markdown="{Binding Item.Markdown}" 
+                NavigateToLinkCommand="{Binding BindingContext.Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
+                />
+        </ScrollView>
+        <ActivityIndicator 
+            VerticalOptions="StartAndExpand"
+            HorizontalOptions="End"
+            Color="{StaticResource titlered}"
+            IsRunning="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}" 
+            IsVisible="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
+            <ActivityIndicator.WidthRequest>
+                <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="400" Android="50" />
+            </ActivityIndicator.WidthRequest>
+            <ActivityIndicator.HeightRequest>
+                <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="10" Android="50" />
+            </ActivityIndicator.HeightRequest>
+        </ActivityIndicator>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
index ab134065..99ec8a7d 100644
--- a/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/ItemsPage.xaml
@@ -7,8 +7,7 @@
     xmlns:mdview="clr-namespace:Xam.Forms.Markdown"
     x:Class="AideDeJeu.Views.ItemsPage" 
     x:Name="This" 
-    Title="{Binding Title}"
-    IsBusy="{Binding Main.IsLoading}">
+    Title="{Binding Title}">
     <ContentPage.Resources>
         <ResourceDictionary>
             <tools:MonsterMarkdownTheme x:Key="MonsterMarkdownTheme" />
@@ -19,23 +18,38 @@
     <ContentPage.ToolbarItems>
         <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding Main.AboutCommand}" />
     </ContentPage.ToolbarItems>
-    <ListView BackgroundColor="{StaticResource bgtan}" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
-        <ListView.Header>
-            <mdview:MarkdownView 
+    <Grid>
+        <ListView BackgroundColor="{StaticResource bgtan}" x:Name="ItemsListView" ItemsSource="{Binding Items}" VerticalOptions="FillAndExpand" HasUnevenRows="true" CachingStrategy="RecycleElement" SelectedItem="{Binding SelectedItem}" ItemTapped="ItemsListView_ItemTapped">
+            <ListView.Header>
+                <mdview:MarkdownView 
                 Theme="{StaticResource MonsterMarkdownTheme}" 
                 Markdown="{Binding BindingContext.Items.Markdown, Source={x:Reference This}}" 
                 NavigateToLinkCommand="{Binding Main.Navigator.NavigateToLinkCommand, Source={x:Reference This}}"
                 />
-        </ListView.Header>
-        <ListView.ItemTemplate>
-            <DataTemplate>
-                <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
-                    <StackLayout Padding="10" Orientation="Vertical">
-                        <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="#0366d6" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}}" />
-                        <Label Text="{Binding AltNameText}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
-                    </StackLayout>
-                </ViewCell>
-            </DataTemplate>
-        </ListView.ItemTemplate>
-    </ListView>
+            </ListView.Header>
+            <ListView.ItemTemplate>
+                <DataTemplate>
+                    <ViewCell AutomationProperties.IsInAccessibleTree="True" AutomationId="machin" AutomationProperties.Name="hop">
+                        <StackLayout Padding="10" Orientation="Vertical">
+                            <Label Text="{Binding Name}" LineBreakMode="WordWrap" TextColor="#0366d6" Style="{Binding NameLevel,Converter={StaticResource HeaderLevelToStyleConverter}}" />
+                            <Label Text="{Binding AltNameText}" LineBreakMode="WordWrap" Style="{DynamicResource subsubsection}" FontSize="12" />
+                        </StackLayout>
+                    </ViewCell>
+                </DataTemplate>
+            </ListView.ItemTemplate>
+        </ListView>
+        <ActivityIndicator 
+            VerticalOptions="StartAndExpand"
+            HorizontalOptions="End"
+            Color="{StaticResource titlered}"
+            IsRunning="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}" 
+            IsVisible="{Binding BindingContext.Main.IsLoading, Source={x:Reference This}}">
+            <ActivityIndicator.WidthRequest>
+                <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="400" Android="50" />
+            </ActivityIndicator.WidthRequest>
+            <ActivityIndicator.HeightRequest>
+                <OnPlatform x:TypeArguments="x:Double" iOS="50" WinPhone="10" Android="50" />
+            </ActivityIndicator.HeightRequest>
+        </ActivityIndicator>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
index abf9a829..d0cc61a3 100644
--- a/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
+++ b/AideDeJeu/AideDeJeu/Views/MainNavigationPage.xaml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <NavigationPage xmlns="http://xamarin.com/schemas/2014/forms"
              xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="AideDeJeu.Views.MainNavigationPage" IsBusy="{Binding BindingContext.Main.IsLoading}">
+             x:Class="AideDeJeu.Views.MainNavigationPage">
+
 </NavigationPage>
\ No newline at end of file