From 350ef1464773b8223ff20204d53b69cb25f8a3a9 Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Sat, 16 May 2020 19:20:16 +0800
Subject: [PATCH] change: scroll back to top when refreshing

---
 Pixiview/Illust/FavoritesPage.xaml     | 2 +-
 Pixiview/Illust/FavoritesPage.xaml.cs  | 7 ++++++-
 Pixiview/Illust/MainPage.xaml          | 4 ++--
 Pixiview/Illust/MainPage.xaml.cs       | 3 ++-
 Pixiview/Illust/RecommendsPage.xaml    | 2 +-
 Pixiview/Illust/RecommendsPage.xaml.cs | 3 ++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Pixiview/Illust/FavoritesPage.xaml b/Pixiview/Illust/FavoritesPage.xaml
index f59cb82..eefc9ca 100644
--- a/Pixiview/Illust/FavoritesPage.xaml
+++ b/Pixiview/Illust/FavoritesPage.xaml
@@ -14,7 +14,7 @@
                      IconImageSource="{DynamicResource FontIconShare}"/>
     </ContentPage.ToolbarItems>
     <Grid>
-        <ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
+        <ScrollView x:Name="scrollView" HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
             <StackLayout>
                 <ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
                                    HeightRequest="40"
diff --git a/Pixiview/Illust/FavoritesPage.xaml.cs b/Pixiview/Illust/FavoritesPage.xaml.cs
index 5427292..a77bd32 100644
--- a/Pixiview/Illust/FavoritesPage.xaml.cs
+++ b/Pixiview/Illust/FavoritesPage.xaml.cs
@@ -74,8 +74,13 @@ namespace Pixiview.Illust
             StartLoad(force);
         }
 
-        private void Refresh_Clicked(object sender, EventArgs e)
+        private async void Refresh_Clicked(object sender, EventArgs e)
         {
+            if (IsLoading)
+            {
+                return;
+            }
+            await scrollView.ScrollToAsync(0, -topOffset, true);
             flag = false;
             lastUpdated = default;
             StartLoad(true);
diff --git a/Pixiview/Illust/MainPage.xaml b/Pixiview/Illust/MainPage.xaml
index 9b865ee..28e3486 100644
--- a/Pixiview/Illust/MainPage.xaml
+++ b/Pixiview/Illust/MainPage.xaml
@@ -12,8 +12,8 @@
                      IconImageSource="{DynamicResource FontIconRefresh}"/>
     </ContentPage.ToolbarItems>
     <Grid>
-        <ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never"
-                    Scrolled="ScrollView_Scrolled">
+        <ScrollView x:Name="scrollView" Scrolled="ScrollView_Scrolled"
+                    HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
             <StackLayout>
                 <ActivityIndicator x:Name="activityLoading" Margin="0, 66, 0, 0"
                                    HeightRequest="40"
diff --git a/Pixiview/Illust/MainPage.xaml.cs b/Pixiview/Illust/MainPage.xaml.cs
index ef3c125..6bbe48b 100644
--- a/Pixiview/Illust/MainPage.xaml.cs
+++ b/Pixiview/Illust/MainPage.xaml.cs
@@ -53,12 +53,13 @@ namespace Pixiview.Illust
             return Stores.LoadIllustData(force);
         }
 
-        private void Refresh_Clicked(object sender, EventArgs e)
+        private async void Refresh_Clicked(object sender, EventArgs e)
         {
             if (IsLoading)
             {
                 return;
             }
+            await scrollView.ScrollToAsync(0, -topOffset, true);
             StartLoad(true);
         }
 
diff --git a/Pixiview/Illust/RecommendsPage.xaml b/Pixiview/Illust/RecommendsPage.xaml
index 44d5987..983244d 100644
--- a/Pixiview/Illust/RecommendsPage.xaml
+++ b/Pixiview/Illust/RecommendsPage.xaml
@@ -12,7 +12,7 @@
                      IconImageSource="{DynamicResource FontIconRefresh}"/>
     </ContentPage.ToolbarItems>
     <Grid>
-        <ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
+        <ScrollView x:Name="scrollView" HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
             <StackLayout>
                 <ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
                                    HeightRequest="40"
diff --git a/Pixiview/Illust/RecommendsPage.xaml.cs b/Pixiview/Illust/RecommendsPage.xaml.cs
index c036078..5194f2c 100644
--- a/Pixiview/Illust/RecommendsPage.xaml.cs
+++ b/Pixiview/Illust/RecommendsPage.xaml.cs
@@ -337,12 +337,13 @@ namespace Pixiview.Illust
             }
         }
 
-        private void Refresh_Clicked(object sender, EventArgs e)
+        private async void Refresh_Clicked(object sender, EventArgs e)
         {
             if (IsLoading)
             {
                 return;
             }
+            await scrollView.ScrollToAsync(0, -topOffset, true);
             StartLoad(true);
         }
     }