From d8f9f3da99e986d8d514cf0a0a2de1a70f167715 Mon Sep 17 00:00:00 2001
From: Tsanie Lily <tsorgy@gmail.com>
Date: Thu, 14 May 2020 11:20:08 +0800
Subject: [PATCH] fix: title name in user page
---
Pixiview/Illust/UserIllustPage.xaml | 2 +-
Pixiview/Illust/UserIllustPage.xaml.cs | 23 +++++++----------------
2 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/Pixiview/Illust/UserIllustPage.xaml b/Pixiview/Illust/UserIllustPage.xaml
index d18b7cf..265c122 100644
--- a/Pixiview/Illust/UserIllustPage.xaml
+++ b/Pixiview/Illust/UserIllustPage.xaml
@@ -13,7 +13,7 @@
<OnPlatform x:TypeArguments="Thickness" Android="0, 5, 0, 5"/>
</u:CircleImage.Margin>
</u:CircleImage>
- <Label Text="{Binding IllustItem.UserName}" Margin="10, 0, 0, 0"
+ <Label Text="{Binding UserItem.UserName}" Margin="10, 0, 0, 0"
VerticalOptions="Center" LineBreakMode="TailTruncation"
TextColor="{DynamicResource TextColor}"/>
</StackLayout>
diff --git a/Pixiview/Illust/UserIllustPage.xaml.cs b/Pixiview/Illust/UserIllustPage.xaml.cs
index 7e33591..8a70df2 100644
--- a/Pixiview/Illust/UserIllustPage.xaml.cs
+++ b/Pixiview/Illust/UserIllustPage.xaml.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Windows.Input;
using Pixiview.Utils;
using Xamarin.Forms;
@@ -18,33 +17,25 @@ namespace Pixiview.Illust
set => SetValue(UserIconProperty, value);
}
- public IllustItem IllustItem { get; }
+ public IIllustUser UserItem { get; }
- public UserIllustPage(IllustItem illust)
+ public UserIllustPage(IIllustUser item)
{
- IllustItem = illust;
- UserIcon = illust.ProfileImage;
+ UserItem = item;
+ UserIcon = item.ProfileImage;
Resources.Add("cardView", GetCardViewTemplate(true));
InitializeComponent();
}
- protected override IEnumerable<IllustItem> DoGetIllustList(IllustUserData data, ICommand command)
+ protected override IEnumerable<IllustItem> DoGetIllustList(IllustUserData data)
{
- return data.body.works.Select(i =>
- {
- var item = i.Value?.ConvertToItem();
- if (item != null)
- {
- item.IllustTapped = command;
- }
- return item;
- });
+ return data.body.works.Select(i => i.Value?.ConvertToItem());
}
protected override IllustUserData DoLoadIllustData(bool force)
{
- return Stores.LoadIllustUserData(IllustItem.UserId, force);
+ return Stores.LoadIllustUserData(UserItem.UserId, force);
}
private void Refresh_Clicked(object sender, EventArgs e)