tsanie/Pixiview
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature: loading UI adjustment

Browse Source
This commit is contained in:
Tsanie Lily 2020-05-16 04:01:33 +08:00
parent ffb789b8b7
commit 72b6c77c3d
20 changed files with 293 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Pixiview.Android/Properties/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.515" package="org.tsanie.pixiview" android:versionCode="5">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.516" package="org.tsanie.pixiview" android:versionCode="6">
<uses-sdk android:minSdkVersion="25" android:targetSdkVersion="28" />
<application android:label="Pixiview" android:icon="@mipmap/icon" android:roundIcon="@mipmap/icon_round"></application>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

4
Pixiview.iOS.OpenExtension/Info.plist
View File

@ -29,8 +29,8 @@
<string>com.apple.share-services</string>
</dict>
<key>CFBundleShortVersionString</key>
<string>1.0.515</string>
<string>1.0.516</string>
<key>CFBundleVersion</key>
<string>5</string>
<string>6</string>
</dict>
</plist>

4
Pixiview.iOS/Info.plist
View File

@ -79,8 +79,8 @@
</dict>
</array>
<key>CFBundleShortVersionString</key>
<string>1.0.515</string>
<string>1.0.516</string>
<key>CFBundleVersion</key>
<string>5</string>
<string>6</string>
</dict>
</plist>

7
Pixiview/App.cs
View File

@ -176,8 +176,7 @@ namespace Pixiview
if (result == opReplace)
{
// replace favorite file
File.Delete(path);
File.Move(url, path);
File.Copy(url, path, true);
}
else if (result == opCombine)
{
@ -191,8 +190,6 @@ namespace Pixiview
Stores.SaveFavoritesIllusts();
}
File.Delete(url);
if (Shell.Current.CurrentState.Location.OriginalString.EndsWith(Routes.Favorites))
{
var sc = (IShellSectionController)Shell.Current.CurrentItem.CurrentItem;
@ -205,7 +202,7 @@ namespace Pixiview
}
else
{
File.Move(url, path);
File.Copy(url, path);
if (Shell.Current.CurrentState.Location.OriginalString.EndsWith(Routes.Favorites))
{
var sc = (IShellSectionController)Shell.Current.CurrentItem.CurrentItem;

17
Pixiview/Illust/FavoritesPage.xaml
View File

@ -8,15 +8,24 @@
BackgroundColor="{DynamicResource WindowColor}"
Title="{r:Text Favorites}">
<ContentPage.ToolbarItems>
<ToolbarItem Order="Primary" Clicked="Refresh_Clicked"
IconImageSource="{DynamicResource FontIconRefresh}"/>
<ToolbarItem Order="Primary" Clicked="ShareFavorites_Clicked"
IconImageSource="{DynamicResource FontIconShare}"/>
</ContentPage.ToolbarItems>
<Grid>
<ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
<u:FlowLayout ItemsSource="{Binding Illusts}"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Illusts}"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16"
RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
</StackLayout>
</ScrollView>
</Grid>
</i:FavoriteIllustCollectionPage>

28
Pixiview/Illust/FavoritesPage.xaml.cs
View File

@ -9,6 +9,8 @@ namespace Pixiview.Illust
{
public partial class FavoritesPage : FavoriteIllustCollectionPage
{
private bool flag = false;
public FavoritesPage()
{
Resources.Add("cardView", GetCardViewTemplate());
@ -16,16 +18,8 @@ namespace Pixiview.Illust
}
protected override bool IsFavoriteVisible => false;
protected override void OnAppearing()
{
//base.OnAppearing();
Device.StartTimer(TimeSpan.FromMilliseconds(200), () =>
{
Reload();
return false;
});
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
protected override bool IsDelayLoading => true;
protected override IEnumerable<IllustItem> DoGetIllustList(IllustItem[] data)
{
@ -34,7 +28,8 @@ namespace Pixiview.Illust
protected override IllustItem[] DoLoadIllustData(bool force)
{
var favorites = Stores.GetFavoriteObject(force);
var favorites = Stores.GetFavoriteObject(flag);
flag = false;
if (favorites == null)
{
return null;
@ -54,9 +49,20 @@ namespace Pixiview.Illust
public void Reload(bool force = false)
{
lastUpdated = default;
if (force)
{
flag = true;
}
StartLoad(force);
}
private void Refresh_Clicked(object sender, EventArgs e)
{
flag = false;
lastUpdated = default;
StartLoad(true);
}
private async void ShareFavorites_Clicked(object sender, EventArgs e)
{
var file = Stores.FavoritesPath;

184
Pixiview/Illust/IllustCollectionPage.cs
View File

@ -7,7 +7,6 @@ using Pixiview.Resources;
using Pixiview.UI;
using Pixiview.UI.Theme;
using Pixiview.Utils;
using Xamarin.Essentials;
using Xamarin.Forms;
namespace Pixiview.Illust
@ -24,6 +23,9 @@ namespace Pixiview.Illust
}
public abstract class IllustCollectionPage<T> : AdaptedPage, IIllustCollectionPage
{
protected static readonly Thickness normalMargin = new Thickness(16);
protected static readonly Thickness loadingMargin = new Thickness(16, 46, 0, 0);
#region - Properties -
public static readonly BindableProperty IllustsProperty = BindableProperty.Create(
@ -32,6 +34,8 @@ namespace Pixiview.Illust
nameof(Columns), typeof(int), typeof(IllustCollectionPage<T>), 2);
public static readonly BindableProperty IsLoadingProperty = BindableProperty.Create(
nameof(IsLoading), typeof(bool), typeof(IllustCollectionPage<T>), true);
public static readonly BindableProperty IsBottomLoadingProperty = BindableProperty.Create(
nameof(IsBottomLoading), typeof(bool), typeof(IllustCollectionPage<T>), false);
public IllustCollection Illusts
{
@ -48,6 +52,11 @@ namespace Pixiview.Illust
get => (bool)GetValue(IsLoadingProperty);
set => SetValue(IsLoadingProperty, value);
}
public bool IsBottomLoading
{
get => (bool)GetValue(IsBottomLoadingProperty);
set => SetValue(IsBottomLoadingProperty, value);
}
#endregion
@ -56,6 +65,10 @@ namespace Pixiview.Illust
public IllustCollection IllustCollection { get; set; }
protected virtual bool IsFavoriteVisible => true;
protected virtual ActivityIndicator LoadingIndicator => null;
protected virtual bool IsDelayLoading => false;
protected virtual double IndicatorMarginTop => 16;
protected readonly Command<IllustItem> commandIllustImageTapped;
protected DateTime lastUpdated;
protected double topOffset;
@ -88,15 +101,10 @@ namespace Pixiview.Illust
protected override void OnAppearing()
{
base.OnAppearing();
Connectivity.ConnectivityChanged += Connectivity_ConnectivityChanged;
if (lastUpdated != LastUpdated)
{
Device.StartTimer(TimeSpan.FromMilliseconds(200), () =>
{
StartLoad();
return false;
});
StartLoad();
}
else if (IsFavoriteVisible && IllustCollection != null)
{
@ -108,23 +116,6 @@ namespace Pixiview.Illust
}
}
protected override void OnDisappearing()
{
Connectivity.ConnectivityChanged -= Connectivity_ConnectivityChanged;
base.OnDisappearing();
}
private void Connectivity_ConnectivityChanged(object sender, ConnectivityChangedEventArgs e)
{
if (e.NetworkAccess == NetworkAccess.Internet)
{
if (lastUpdated != LastUpdated)
{
StartLoad(true);
}
}
}
protected override void OnSizeAllocated(double width, double height)
{
base.OnSizeAllocated(width, height);
@ -188,19 +179,87 @@ namespace Pixiview.Illust
var page = new ViewIllustPage(illust, IsFavoriteVisible);
Navigation.PushAsync(page);
}
protected virtual void DoIllustsLoaded(IllustCollection collection)
protected virtual void DoIllustsLoaded(IllustCollection collection, bool bottom)
{
IllustCollection = collection;
Illusts = collection;
var indicator = LoadingIndicator;
if (indicator == null)
{
Illusts = collection;
IsLoading = false;
IsBottomLoading = false;
}
else
{
var offset = 16 - IndicatorMarginTop;
indicator.Animate("margin", top =>
{
indicator.Margin = new Thickness(0, top, 0, offset);
},
16 - offset, -40 - offset, easing: Easing.CubicIn, finished: (v, r) =>
{
IsLoading = false;
IsBottomLoading = false;
if (IsDelayLoading)
{
Device.StartTimer(TimeSpan.FromMilliseconds(250), () =>
{
Illusts = collection;
return false;
});
}
else
{
Illusts = collection;
}
});
}
}
protected void StartLoad(bool force = false)
protected virtual void StartLoad(bool force = false, bool isBottom = false)
{
if (force || lastUpdated != LastUpdated)
{
lastUpdated = LastUpdated;
IsLoading = true;
Task.Run(() => DoLoadIllusts(force));
var indicator = LoadingIndicator;
if (indicator == null)
{
if (isBottom)
{
IsBottomLoading = true;
}
else
{
IsLoading = true;
}
Device.StartTimer(TimeSpan.FromMilliseconds(250), () =>
{
Task.Run(() => DoLoadIllusts(force, isBottom));
return false;
});
}
else
{
var offset = 16 - IndicatorMarginTop;
indicator.Margin = new Thickness(0, -40 - offset, 0, offset);
if (isBottom)
{
IsBottomLoading = true;
}
else
{
IsLoading = true;
}
indicator.Animate("margin", top =>
{
indicator.Margin = new Thickness(0, top, 0, offset);
},
-40 - offset, 16 - offset, easing: Easing.CubicOut, finished: (v, r) =>
{
Task.Run(() => DoLoadIllusts(force, isBottom));
});
}
}
}
@ -425,7 +484,7 @@ namespace Pixiview.Illust
#region - Illust Tasks -
protected void DoLoadIllusts(bool force = false)
protected void DoLoadIllusts(bool force = false, bool bottom = false)
{
App.DebugPrint($"start loading data, force: {force}");
illustData = DoLoadIllustData(force);
@ -433,6 +492,7 @@ namespace Pixiview.Illust
{
//App.DebugError("illusts.load", "failed to load illusts data.");
IsLoading = false;
IsBottomLoading = false;
return;
}
if (force && IsFavoriteVisible)
@ -458,8 +518,7 @@ namespace Pixiview.Illust
item.IsFavorite = favorites.Any(i => i.Id == item.Id);
}
}
DoIllustsLoaded(collection);
IsLoading = false;
DoIllustsLoaded(collection, bottom);
DoLoadImages(collection);
}
@ -505,9 +564,9 @@ namespace Pixiview.Illust
public abstract class IllustScrollableCollectionPage<T> : IllustCollectionPage<T>
{
protected const int SCROLL_OFFSET = 33;
protected readonly object sync = new object();
private double lastScrollY = double.MinValue;
private double lastRefreshY = double.MinValue;
private double offset;
protected bool ScrollingDown(double y)
@ -521,19 +580,48 @@ namespace Pixiview.Illust
protected abstract bool CheckRefresh();
protected override void DoIllustsLoaded(IllustCollection collection)
protected override void StartLoad(bool force = false, bool isBottom = false)
{
if (!isBottom)
{
lastRefreshY = double.MinValue;
}
base.StartLoad(force, isBottom);
}
protected override void DoIllustsLoaded(IllustCollection collection, bool bottom)
{
var now = IllustCollection;
if (now == null)
{
IllustCollection = collection;
Illusts = collection;
now = collection;
}
else
{
now = new IllustCollection(now.Concat(collection));
IllustCollection = now;
}
IllustCollection = now;
var indicator = LoadingIndicator;
if (indicator == null)
{
Illusts = now;
IsLoading = false;
IsBottomLoading = false;
}
else
{
var offset = 16 - IndicatorMarginTop;
indicator.Animate("margin", top =>
{
indicator.Margin = new Thickness(0, top, 0, offset);
},
16 - offset, -40 - offset, easing: Easing.CubicIn, finished: (v, r) =>
{
IsLoading = false;
IsBottomLoading = false;
Illusts = now;
});
}
}
@ -543,23 +631,19 @@ namespace Pixiview.Illust
if (y > 0 && offset > 0 && y - topOffset > offset)
{
bool refresh = false;
lock (sync)
if (IsLoading || IsBottomLoading)
{
return;
}
if (y - lastRefreshY > 100)
{
if (IsLoading)
{
return;
}
if (CheckRefresh())
{
refresh = true;
lastRefreshY = y;
App.DebugPrint("start to load next page");
StartLoad(true, true);
}
}
if (refresh)
{
App.DebugPrint("start to load next page");
StartLoad(true);
}
}
}
}
@ -684,6 +768,8 @@ namespace Pixiview.Illust
[JsonProperty]
public string Id { get; set; }
[JsonProperty]
public DateTime FavoriteDateUtc { get; set; }
[JsonProperty]
public string ImageUrl { get; set; }
[JsonProperty]
public bool IsRestrict { get; set; }

33
Pixiview/Illust/MainPage.xaml
View File

@ -14,16 +14,22 @@
<Grid>
<ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never"
Scrolled="ScrollView_Scrolled">
<u:FlowLayout ItemsSource="{Binding Illusts}"
HorizontalOptions="Fill" Column="{Binding Columns}"
RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}">
<u:FlowLayout.Margin>
<OnPlatform x:TypeArguments="Thickness"
iOS="16, 66, 16, 16"
Android="16, 56, 16, 16"/>
</u:FlowLayout.Margin>
</u:FlowLayout>
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 66, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Illusts}"
HorizontalOptions="Fill" Column="{Binding Columns}"
RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}">
<u:FlowLayout.Margin>
<OnPlatform x:TypeArguments="Thickness"
iOS="16, 66, 16, 16"
Android="16, 56, 16, 16"/>
</u:FlowLayout.Margin>
</u:FlowLayout>
</StackLayout>
</ScrollView>
<u:BlurryPanel x:Name="panelBar" VerticalOptions="Start"
HeightRequest="{OnPlatform Android=40, iOS=50}"
@ -35,12 +41,5 @@
CancelButtonColor="{DynamicResource TintColor}"
Text="{Binding Keywords, Mode=TwoWay}"
SearchButtonPressed="SearchBar_SearchButtonPressed"/>
<Frame HasShadow="False" Margin="0" Padding="20" CornerRadius="8"
IsVisible="{Binding IsLoading}"
HorizontalOptions="Center" VerticalOptions="Center"
BackgroundColor="{DynamicResource MaskColor}">
<ActivityIndicator IsRunning="True" IsVisible="True"
Color="{DynamicResource WindowColor}"/>
</Frame>
</Grid>
</i:IllustDataCollectionPage>

3
Pixiview/Illust/MainPage.xaml.cs
View File

@ -35,6 +35,9 @@ namespace Pixiview.Illust
#endif
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
protected override double IndicatorMarginTop => 66;
protected override IEnumerable<IllustItem> DoGetIllustList(IllustData data)
{
if (data.body == null)

25
Pixiview/Illust/RankingPage.xaml
View File

@ -48,10 +48,20 @@
<Grid>
<ScrollView x:Name="scrollView" Scrolled="ScrollView_Scrolled"
HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<ActivityIndicator x:Name="activityBottomLoading" Margin="0, 0, 0, 16"
HeightRequest="40"
IsRunning="{Binding IsBottomLoading}"
IsVisible="{Binding IsBottomLoading}"/>
</StackLayout>
</ScrollView>
<u:BlurryPanel x:Name="panelFilter" VerticalOptions="Start" Opacity="0"
Margin="{Binding PanelTopMargin}"
@ -95,13 +105,6 @@
Clicked="Filter_Clicked"/>
</Grid>
</Grid>
<Frame HasShadow="False" Margin="0" Padding="20" CornerRadius="8"
IsVisible="{Binding IsLoading}"
HorizontalOptions="Center" VerticalOptions="Center"
BackgroundColor="{DynamicResource MaskColor}">
<ActivityIndicator IsRunning="True" IsVisible="True"
Color="{DynamicResource WindowColor}"/>
</Frame>
<DatePicker x:Name="datePicker" IsVisible="False"
ios:DatePicker.UpdateMode="WhenFinished"

9
Pixiview/Illust/RankingPage.xaml.cs
View File

@ -115,6 +115,8 @@ namespace Pixiview.Illust
MaximumDate = DateTime.Today;
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
protected override void OnAppearing()
{
var r18 = Configs.IsOnR18;
@ -341,12 +343,9 @@ namespace Pixiview.Illust
var query = QueryKey;
ToggleFilterPanel(false);
lock (sync)
if (IsLoading)
{
if (IsLoading)
{
return;
}
return;
}
//if (lastQueryKey != query)
{

11
Pixiview/Illust/RecommendsPage.xaml
View File

@ -14,6 +14,10 @@
<Grid>
<ScrollView HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Users}" IsVisible="{Binding UserRecommendsVisible}"
HorizontalOptions="Fill" Column="{Binding UserColumns}"
Margin="16" RowSpacing="16"
@ -24,12 +28,5 @@
ItemTemplate="{StaticResource cardView}"/>
</StackLayout>
</ScrollView>
<Frame HasShadow="False" Margin="0" Padding="20" CornerRadius="8"
IsVisible="{Binding IsLoading}"
HorizontalOptions="Center" VerticalOptions="Center"
BackgroundColor="{DynamicResource MaskColor}">
<ActivityIndicator IsRunning="True" IsVisible="True"
Color="{DynamicResource WindowColor}"/>
</Frame>
</Grid>
</i:IllustDataCollectionPage>

34
Pixiview/Illust/RecommendsPage.xaml.cs
View File

@ -36,6 +36,8 @@ namespace Pixiview.Illust
private readonly Command<IllustUserItem> commandUserTapped;
private IllustData illustData;
public RecommendsPage()
{
Resources.Add("cardView", GetCardViewTemplate());
@ -45,6 +47,8 @@ namespace Pixiview.Illust
commandUserTapped = new Command<IllustUserItem>(OnIllustUserItemTapped);
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
private void OnIllustUserItemTapped(IllustUserItem item)
{
Start(async () =>
@ -184,9 +188,18 @@ namespace Pixiview.Illust
}
}
protected override void DoIllustsLoaded(IllustCollection collection)
protected override void DoIllustsLoaded(IllustCollection collection, bool bottom)
{
IllustCollection = collection;
//IsLoading = false;
if (illustData != null)
{
IllustCollection = collection;
Task.Run(() => DoLoadUserRecommendsData(illustData));
}
else
{
base.DoIllustsLoaded(collection, bottom);
}
}
protected override IEnumerable<IllustItem> DoGetIllustList(IllustData data)
@ -201,8 +214,7 @@ namespace Pixiview.Illust
protected override IllustData DoLoadIllustData(bool force)
{
var illustData = Stores.LoadIllustData(force);
Task.Run(() => DoLoadUserRecommendsData(illustData));
illustData = Stores.LoadIllustData(force);
return illustData;
}
@ -259,9 +271,17 @@ namespace Pixiview.Illust
}).Where(u => u != null);
var list = new List<IllustUserItem>(users);
UserRecommendsVisible = list.Count > 0;
Users = list;
Illusts = IllustCollection;
activityLoading.Animate("margin", top =>
{
activityLoading.Margin = new Thickness(0, top, 0, 0);
},
16, -40, easing: Easing.CubicIn, finished: (v, r) =>
{
IsLoading = false;
UserRecommendsVisible = list.Count > 0;
Users = list;
Illusts = IllustCollection;
});
DoLoadUserRecommendsImages(list);
}

25
Pixiview/Illust/RelatedIllustsPage.xaml
View File

@ -14,17 +14,20 @@
<Grid>
<ScrollView x:Name="scrollView" Scrolled="ScrollView_Scrolled"
HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<ActivityIndicator x:Name="activityBottomLoading" Margin="0, 0, 0, 16"
HeightRequest="40"
IsRunning="{Binding IsBottomLoading}"
IsVisible="{Binding IsBottomLoading}"/>
</StackLayout>
</ScrollView>
<Frame HasShadow="False" Margin="0" Padding="20" CornerRadius="8"
IsVisible="{Binding IsLoading}"
HorizontalOptions="Center" VerticalOptions="Center"
BackgroundColor="{DynamicResource MaskColor}">
<ActivityIndicator IsRunning="True" IsVisible="True"
Color="{DynamicResource WindowColor}"/>
</Frame>
</Grid>
</i:IllustRecommendsCollectionPage>

5
Pixiview/Illust/RelatedIllustsPage.xaml.cs
View File

@ -27,6 +27,8 @@ namespace Pixiview.Illust
nextIndex = 0;
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
protected override IEnumerable<IllustItem> DoGetIllustList(IllustRecommendsData data)
{
if (data.body == null)
@ -92,12 +94,13 @@ namespace Pixiview.Illust
OnScrolled(y);
}
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);
// release
var collection = IllustCollection;
if (collection != null)

25
Pixiview/Illust/UserIllustPage.xaml
View File

@ -26,17 +26,20 @@
<Grid>
<ScrollView x:Name="scrollView" Scrolled="ScrollView_Scrolled"
HorizontalOptions="Fill" HorizontalScrollBarVisibility="Never">
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<StackLayout>
<ActivityIndicator x:Name="activityLoading" Margin="0, 16, 0, 0"
HeightRequest="40"
IsRunning="{Binding IsLoading}"
IsVisible="{Binding IsLoading}"/>
<u:FlowLayout ItemsSource="{Binding Illusts}" MaxHeightChanged="FlowLayout_MaxHeightChanged"
HorizontalOptions="Fill" Column="{Binding Columns}"
Margin="16" RowSpacing="16" ColumnSpacing="16"
ItemTemplate="{StaticResource cardView}"/>
<ActivityIndicator x:Name="activityBottomLoading" Margin="0, 0, 0, 16"
HeightRequest="40"
IsRunning="{Binding IsBottomLoading}"
IsVisible="{Binding IsBottomLoading}"/>
</StackLayout>
</ScrollView>
<Frame HasShadow="False" Margin="0" Padding="20" CornerRadius="8"
IsVisible="{Binding IsLoading}"
HorizontalOptions="Center" VerticalOptions="Center"
BackgroundColor="{DynamicResource MaskColor}">
<ActivityIndicator IsRunning="True" IsVisible="True"
Color="{DynamicResource WindowColor}"/>
</Frame>
</Grid>
</i:IllustUserDataCollectionPage>

6
Pixiview/Illust/UserIllustPage.xaml.cs
View File

@ -38,6 +38,8 @@ namespace Pixiview.Illust
nextIndex = 0;
}
protected override ActivityIndicator LoadingIndicator => activityLoading;
protected override IEnumerable<IllustItem> DoGetIllustList(IllustUserData data)
{
if (data.body == null)
@ -58,6 +60,7 @@ namespace Pixiview.Illust
return null;
}
illustIds = init.body.illusts.Keys.OrderByDescending(i => i).ToArray();
App.DebugPrint($"user has ({illustIds.Length}) illusts.");
startIndex = 0;
}
@ -101,12 +104,13 @@ namespace Pixiview.Illust
OnScrolled(y);
}
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);
// release
var collection = IllustCollection;
if (collection != null)

2
Pixiview/Illust/ViewIllustPage.xaml
View File

@ -10,6 +10,8 @@
<ContentPage.ToolbarItems>
<ToolbarItem Order="Primary" Clicked="Favorite_Clicked"
IconImageSource="{Binding FavoriteIcon}"/>
<ToolbarItem Order="Primary" Clicked="Refresh_Clicked"
IconImageSource="{DynamicResource FontIconRefresh}"/>
<ToolbarItem Order="Primary" Clicked="More_Clicked"
IconImageSource="{DynamicResource FontIconMore}"/>
</ContentPage.ToolbarItems>

14
Pixiview/Illust/ViewIllustPage.xaml.cs
View File

@ -359,7 +359,7 @@ namespace Pixiview.Illust
ParallelTask.Start(0, items.Length, Configs.MaxPageThreads, i =>
{
DoLoadImage(i, i == 0);
DoLoadImage(i);
return true;
});
@ -385,16 +385,16 @@ namespace Pixiview.Illust
}
var item = items[index];
if (!force)
if (index > 0)
{
if (item.Loading || (index > 0 && item.Image != null))
if (item.Loading || item.Image != null)
{
App.DebugPrint($"skipped, loading or already loaded, index: {index}, loading: {item.Loading}");
return;
}
}
item.Loading = true;
var image = Stores.LoadPreviewImage(item.PreviewUrl);
var image = Stores.LoadPreviewImage(item.PreviewUrl, force: force);
if (image != null)
{
item.Image = image;
@ -472,6 +472,7 @@ namespace Pixiview.Illust
if (index < 0)
{
illust.IsFavorite = true;
illust.FavoriteDateUtc = DateTime.UtcNow;
favorites.Insert(0, illust);
FavoriteIcon = fontIconLove;
}
@ -518,6 +519,11 @@ namespace Pixiview.Illust
CurrentAnimeFrame = e.FrameIndex;
}
private void Refresh_Clicked(object sender, EventArgs e)
{
Task.Run(() => DoLoadImage(CurrentPage, true));
}
private async void More_Clicked(object sender, EventArgs e)
{
int p = CurrentPage;

8
Pixiview/Utils/Stores.cs
View File

@ -382,9 +382,9 @@ namespace Pixiview.Utils
return LoadImage(url, PersonalFolder, imageFolder);
}
public static ImageSource LoadPreviewImage(string url, bool downloading = true)
public static ImageSource LoadPreviewImage(string url, bool downloading = true, bool force = false)
{
return LoadImage(url, PersonalFolder, previewFolder, downloading);
return LoadImage(url, PersonalFolder, previewFolder, downloading, force);
}
public static ImageSource LoadThumbnailImage(string url)
@ -418,11 +418,11 @@ namespace Pixiview.Utils
return null;
}
private static ImageSource LoadImage(string url, string working, string folder, bool downloading = true)
private static ImageSource LoadImage(string url, string working, string folder, bool downloading = true, bool force = false)
{
var file = Path.Combine(working, folder, Path.GetFileName(url));
ImageSource image;
if (File.Exists(file))
if (!force && File.Exists(file))
{
try
{