From 67009fc9b6782fe22965da69c429ce0d65213b1f Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Sat, 16 May 2020 23:29:36 +0800
Subject: [PATCH] little optimized

---
 Pixiview/Illust/IllustCollectionPage.cs | 5 +++++
 Pixiview/Illust/ViewIllustPage.xaml     | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Pixiview/Illust/IllustCollectionPage.cs b/Pixiview/Illust/IllustCollectionPage.cs
index 0e233a9..c5dcc6d 100644
--- a/Pixiview/Illust/IllustCollectionPage.cs
+++ b/Pixiview/Illust/IllustCollectionPage.cs
@@ -94,6 +94,7 @@ namespace Pixiview.Illust
 
         public override void OnUnload()
         {
+            InvalidateCollection();
             Illusts = null;
             lastUpdated = default;
         }
@@ -298,7 +299,11 @@ namespace Pixiview.Illust
         {
             if (scrollView.ScrollY > -topOffset)
             {
+#if __IOS__
                 await scrollView.ScrollToAsync(0, -topOffset, true);
+#else
+                await scrollView.ScrollToAsync(0, -topOffset, false);
+#endif
             }
         }
 
diff --git a/Pixiview/Illust/ViewIllustPage.xaml b/Pixiview/Illust/ViewIllustPage.xaml
index 69e29fa..5f62139 100644
--- a/Pixiview/Illust/ViewIllustPage.xaml
+++ b/Pixiview/Illust/ViewIllustPage.xaml
@@ -31,7 +31,11 @@
 
         <ProgressBar x:Name="progress" IsVisible="{Binding ProgressVisible}"
                      Progress="0.05"
-                     VerticalOptions="Start"/>
+                     VerticalOptions="Start">
+            <ProgressBar.Margin>
+                <OnPlatform x:TypeArguments="Thickness" Android="0, -6, 0, 0"/>
+            </ProgressBar.Margin>
+        </ProgressBar>
 
         <u:RoundLabel Text="{Binding PagePositionText}"
                       BackgroundColor="{DynamicResource MaskColor}" Margin="0, 6, 6, 0"