From d802d1af1587c59009cfd4d78bf4759850bb4fc2 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Tue, 4 Oct 2022 16:44:53 +0800
Subject: [PATCH] avatar info complete 1

---
 .../Control/Image/CompositionImage.cs         |  24 +-
 .../Snap.Hutao/Control/Markup/UriExtension.cs |  32 ++
 .../Control/Text/DescriptionTextBlock.cs      |   2 +-
 .../Model/Binding/AvatarProperty/Weapon.cs    |   2 +-
 .../Metadata/Converter/DescParamDescriptor.cs |   2 +-
 .../Converter/QualityColorConverter.cs        |  28 ++
 .../Resource/Icon/UI_Icon_Locked.png          | Bin 0 -> 1847 bytes
 .../AvatarInfo/Factory/SummaryFactory.cs      |   7 +-
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |   2 +
 .../View/Page/AvatarPropertyPage.xaml         | 279 ++++++++++++++----
 10 files changed, 303 insertions(+), 75 deletions(-)
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Locked.png

diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
index dc77c05c..a9ec0f49 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Image/CompositionImage.cs
@@ -121,19 +121,27 @@ public abstract class CompositionImage : Microsoft.UI.Xaml.Controls.Control
     {
         await HideAsync(token);
 
+        LoadedImageSurface? imageSurface = null;
+        Compositor compositor = ElementCompositionPreview.GetElementVisual(this).Compositor;
+
         if (uri != null)
         {
-            StorageFile storageFile = await imageCache.GetFileFromCacheAsync(uri);
-            Compositor compositor = ElementCompositionPreview.GetElementVisual(this).Compositor;
-
-            LoadedImageSurface? imageSurface = null;
-            try
+            if (uri.Scheme == "ms-appx")
             {
-                imageSurface = await LoadImageSurfaceAsync(storageFile, token);
+                imageSurface = LoadedImageSurface.StartLoadFromUri(uri);
             }
-            catch (COMException)
+            else
             {
-                await imageCache.RemoveAsync(uri.Enumerate());
+                StorageFile storageFile = await imageCache.GetFileFromCacheAsync(uri);
+
+                try
+                {
+                    imageSurface = await LoadImageSurfaceAsync(storageFile, token);
+                }
+                catch (COMException)
+                {
+                    await imageCache.RemoveAsync(uri.Enumerate());
+                }
             }
 
             if (imageSurface != null)
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs b/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
new file mode 100644
index 00000000..08e46afa
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Markup/UriExtension.cs
@@ -0,0 +1,32 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+
+namespace Snap.Hutao.Control.Markup;
+
+/// <summary>
+/// Uri扩展
+/// </summary>
+[MarkupExtensionReturnType(ReturnType = typeof(Uri))]
+public sealed class UriExtension : MarkupExtension
+{
+    /// <summary>
+    /// 构造一个新的Uri扩展
+    /// </summary>
+    public UriExtension()
+    {
+    }
+
+    /// <summary>
+    /// 地址
+    /// </summary>
+    public string? Value { get; set; }
+
+    /// <inheritdoc/>
+    protected override object ProvideValue()
+    {
+        return new Uri(Value ?? string.Empty);
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
index 91636fc1..6f660209 100644
--- a/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Text/DescriptionTextBlock.cs
@@ -102,7 +102,7 @@ public class DescriptionTextBlock : ContentControl
 
             if (i == description.Length - 1)
             {
-                AppendText(text, description[last..i]);
+                AppendText(text, description[last..(i + 1)]);
             }
         }
     }
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Weapon.cs b/src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Weapon.cs
index 46de596b..8079dc66 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Weapon.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Binding/AvatarProperty/Weapon.cs
@@ -16,7 +16,7 @@ public class Weapon : EquipBase
     /// <summary>
     /// 精炼属性
     /// </summary>
-    public int AffixLevel { get; set; }
+    public string AffixLevel { get; set; } = default!;
 
     /// <summary>
     /// 精炼名称
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescParamDescriptor.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescParamDescriptor.cs
index aa3276ab..753800d4 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescParamDescriptor.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/DescParamDescriptor.cs
@@ -28,7 +28,7 @@ internal sealed class DescParamDescriptor : ValueConverterBase<DescParam, IList<
 
         LevelParam<int, double> param = from.Parameters.Single(param => param.Level == level);
 
-        return new LevelParam<string, ParameterInfo>(param.Level.ToString(), GetParameterInfos(formats, param.Parameters));
+        return new LevelParam<string, ParameterInfo>($"Lv.{param.Level}", GetParameterInfos(formats, param.Parameters));
     }
 
     /// <inheritdoc/>
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
new file mode 100644
index 00000000..ff014fbe
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Converter/QualityColorConverter.cs
@@ -0,0 +1,28 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+using Snap.Hutao.Control;
+using Snap.Hutao.Model.Intrinsic;
+using Windows.UI;
+
+namespace Snap.Hutao.Model.Metadata.Converter;
+
+/// <summary>
+/// 品质颜色转换器
+/// </summary>
+internal class QualityColorConverter : ValueConverterBase<ItemQuality, Color>
+{
+    /// <inheritdoc/>
+    public override Color Convert(ItemQuality from)
+    {
+        return from switch
+        {
+            ItemQuality.QUALITY_WHITE => Color.FromArgb(0xFF, 0x72, 0x77, 0x8B),
+            ItemQuality.QUALITY_GREEN => Color.FromArgb(0xFF, 0x2A, 0x8F, 0x72),
+            ItemQuality.QUALITY_BLUE => Color.FromArgb(0xFF, 0x51, 0x80, 0xCB),
+            ItemQuality.QUALITY_PURPLE => Color.FromArgb(0xFF, 0xA1, 0x56, 0xE0),
+            ItemQuality.QUALITY_ORANGE or ItemQuality.QUALITY_ORANGE_SP => Color.FromArgb(0xFF, 0xBC, 0x69, 0x32),
+            _ => Color.FromArgb(0x00, 0x00, 0x00, 0x00),
+        };
+    }
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Locked.png b/src/Snap.Hutao/Snap.Hutao/Resource/Icon/UI_Icon_Locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..db6ba038cdfcb27cd845981e5af4a804d70cb24c
GIT binary patch
literal 1847
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

literal 0
HcmV?d00001

diff --git a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs
index f2dcc4f1..240b6e5c 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/AvatarInfo/Factory/SummaryFactory.cs
@@ -5,7 +5,6 @@ using Snap.Hutao.Extension;
 using Snap.Hutao.Model;
 using Snap.Hutao.Model.Binding.AvatarProperty;
 using Snap.Hutao.Model.Intrinsic;
-using Snap.Hutao.Model.Metadata.Annotation;
 using Snap.Hutao.Model.Metadata.Converter;
 using Snap.Hutao.Model.Metadata.Reliquary;
 using Snap.Hutao.Service.Metadata;
@@ -144,7 +143,7 @@ internal class SummaryFactory : ISummaryFactory
                 Description = reliquary.Description,
 
                 // EquipBase
-                Level = $"+ {equip.Reliquary!.Level - 1}",
+                Level = $"+{equip.Reliquary!.Level - 1}",
                 Quality = reliquary.RankLevel,
                 MainProperty = CreateReliquaryMainProperty(equip.Reliquary.MainPropId, reliquary.RankLevel, equip.Reliquary.Level),
 
@@ -182,13 +181,13 @@ internal class SummaryFactory : ISummaryFactory
                 Description = weapon.Description,
 
                 // EquipBase
-                Level = $"{equip.Weapon!.Level}",
+                Level = $"Lv.{equip.Weapon!.Level}",
                 Quality = weapon.Quality,
                 MainProperty = new(string.Empty, string.Empty), // TODO
 
                 // Weapon
                 SubProperty = new(string.Empty, string.Empty), // TODO
-                AffixLevel = level + 1,
+                AffixLevel = $"精炼{level + 1}",
                 AffixName = weapon.Affix?.Name ?? string.Empty,
                 AffixDescription = weapon.Affix?.Descriptions.Single(a => a.Level == level).Description ?? string.Empty,
             };
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index c7e68e11..98e200cc 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -39,6 +39,7 @@
     <None Remove="Resource\Icon\UI_BtnIcon_Gacha.png" />
     <None Remove="Resource\Icon\UI_Icon_Achievement.png" />
     <None Remove="Resource\Icon\UI_Icon_BoostUp.png" />
+    <None Remove="Resource\Icon\UI_Icon_Locked.png" />
     <None Remove="Resource\Icon\UI_Icon_None.png" />
     <None Remove="Resource\Icon\UI_ItemIcon_201.png" />
     <None Remove="Resource\Segoe Fluent Icons.ttf" />
@@ -87,6 +88,7 @@
     <Content Include="Resource\Icon\UI_BtnIcon_Gacha.png" />
     <Content Include="Resource\Icon\UI_Icon_Achievement.png" />
     <Content Include="Resource\Icon\UI_Icon_BoostUp.png" />
+    <Content Include="Resource\Icon\UI_Icon_Locked.png" />
     <Content Include="Resource\Icon\UI_Icon_None.png" />
     <Content Include="Resource\Icon\UI_ItemIcon_201.png" />
   </ItemGroup>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
index 39340d11..215da3b8 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/AvatarPropertyPage.xaml
@@ -12,8 +12,12 @@
     xmlns:shcb="using:Snap.Hutao.Control.Behavior"
     xmlns:shci="using:Snap.Hutao.Control.Image"
     xmlns:shcm="using:Snap.Hutao.Control.Markup"
-    xmlns:shvc="using:Snap.Hutao.View.Control"
+    xmlns:shct="using:Snap.Hutao.Control.Text"
+    xmlns:shmmc="using:Snap.Hutao.Model.Metadata.Converter"
+    xmlns:shvconv="using:Snap.Hutao.View.Converter"
     xmlns:shv="using:Snap.Hutao.ViewModel"
+    xmlns:sc="using:SettingsUI.Controls"
+    xmlns:shvcont="using:Snap.Hutao.View.Control"
     mc:Ignorable="d"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
     d:DataContext="{d:DesignInstance shv:AvatarPropertyViewModel}">
@@ -28,9 +32,11 @@
                 <x:Double>1</x:Double>
             </cwuconv:BoolToObjectConverter.TrueValue>
             <cwuconv:BoolToObjectConverter.FalseValue>
-                <x:Double>0.3</x:Double>
+                <x:Double>0.5</x:Double>
             </cwuconv:BoolToObjectConverter.FalseValue>
         </cwuconv:BoolToObjectConverter>
+        <shvconv:BoolToVisibilityRevertConverter x:Key="BoolToVisibilityRevertConverter"/>
+        <shmmc:QualityColorConverter x:Key="QualityColorConverter"/>
     </Page.Resources>
     
     <Grid>
@@ -140,15 +146,6 @@
                         <ColumnDefinition/>
                     </Grid.ColumnDefinitions>
                     <StackPanel>
-                        <!--<Border
-                            Margin="12,12,12,0"
-                            CornerRadius="{StaticResource CompatCornerRadius}"
-                            Background="{StaticResource CardBackgroundFillColorSecondary}">
-                            <TextBlock
-                                Margin="12,6"
-                                Style="{StaticResource SubtitleTextBlockStyle}"
-                                Text="{Binding SelectedAvatar.Name}"/>
-                        </Border>-->
                         <Border
                             Margin="12,12,12,0"
                             CornerRadius="{StaticResource CompatCornerRadius}"
@@ -167,11 +164,42 @@
                                             Background="Transparent"
                                             BorderBrush="{x:Null}"
                                             Margin="2,2,0,2">
-                                            <shci:CachedImage
-                                                Width="32"
-                                                Height="32"
-                                                Source="{Binding Icon}"
-                                                Opacity="{Binding IsActiviated,Converter={StaticResource BoolToOpacityConverter}}"/>
+                                            <Button.Content>
+                                                <Grid>
+                                                    <!--#FFDAB79B-->
+                                                    <Ellipse
+                                                        Fill="#FFDAB79B"
+                                                        Stroke="#FFB29880"/>
+                                                    <shci:CachedImage
+                                                        Width="32"
+                                                        Height="32"
+                                                        Source="{Binding Icon}"
+                                                        Opacity="{Binding IsActiviated,Converter={StaticResource BoolToOpacityConverter}}"/>
+                                                    <Image
+                                                        Width="16"
+                                                        Height="16"
+                                                        Source="ms-appx:///Resource/Icon/UI_Icon_Locked.png"
+                                                        Visibility="{Binding IsActiviated,Converter={StaticResource BoolToVisibilityRevertConverter}}">
+                                                    </Image>
+                                                </Grid>
+                                                
+                                            </Button.Content>
+                                            
+                                            <Button.Flyout>
+                                                <Flyout Placement="Bottom">
+                                                    <shct:DescriptionTextBlock
+                                                        MaxWidth="320"
+                                                        Description="{Binding Description}">
+                                                        <shct:DescriptionTextBlock.Resources>
+                                                            <Style
+                                                                TargetType="TextBlock"
+                                                                BasedOn="{StaticResource BodyTextBlockStyle}">
+                                                                <Setter Property="TextWrapping" Value="Wrap"/>
+                                                            </Style>
+                                                        </shct:DescriptionTextBlock.Resources>
+                                                    </shct:DescriptionTextBlock>
+                                                </Flyout>
+                                            </Button.Flyout>
                                         </Button>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
@@ -196,25 +224,126 @@
                                             Background="Transparent"
                                             BorderBrush="{x:Null}"
                                             Margin="2,2,0,2">
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
-                                                    <ColumnDefinition/>
-                                                </Grid.ColumnDefinitions>
-                                                <shci:CachedImage
-                                                    Width="32"
-                                                    Height="32"
-                                                    Source="{Binding Icon}"/>
-                                                <TextBlock
-                                                    VerticalAlignment="Bottom"
-                                                    HorizontalAlignment="Right"
-                                                    Text="{Binding Info.Level}"/>
-                                            </Grid>
+                                            <Button.Content>
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="auto"/>
+                                                        <ColumnDefinition Width="44"/>
+                                                    </Grid.ColumnDefinitions>
+                                                    <Ellipse
+                                                        Grid.Column="0"
+                                                        Fill="#FFDAB79B"
+                                                        Stroke="#FFB29880"/>
+                                                    <shci:CachedImage
+                                                        Grid.Column="0"
+                                                        Width="32"
+                                                        Height="32"
+                                                        Source="{Binding Icon}"/>
+                                                    <Border
+                                                        CornerRadius="{StaticResource CompatCornerRadius}"
+                                                        Background="#FFB29880"
+                                                        Padding="4,0"
+                                                        Width="40"
+                                                        Grid.Column="1"
+                                                        Margin="6,0,0,0"
+                                                        VerticalAlignment="Center"
+                                                        HorizontalAlignment="Center">
+                                                        <TextBlock
+                                                            Margin="0,0,0,2"
+                                                            HorizontalAlignment="Center"
+                                                            Style="{StaticResource BaseTextBlockStyle}"
+                                                            Foreground="#FFFFFFFF"
+                                                            Text="{Binding Info.Level}"/>
+                                                    </Border>
+                                                </Grid>
+                                            </Button.Content>
+                                            <Button.Flyout>
+                                                <Flyout Placement="Bottom">
+                                                    <StackPanel MaxWidth="320">
+                                                        <shct:DescriptionTextBlock
+                                                            Description="{Binding Description}">
+                                                            <shct:DescriptionTextBlock.Resources>
+                                                                <Style
+                                                                    TargetType="TextBlock"
+                                                                    BasedOn="{StaticResource BodyTextBlockStyle}">
+                                                                    <Setter Property="TextWrapping" Value="Wrap"/>
+                                                                </Style>
+                                                            </shct:DescriptionTextBlock.Resources>
+                                                        </shct:DescriptionTextBlock>
+                                                        <ItemsControl Margin="0,12,0,0" ItemsSource="{Binding Info.Parameters}">
+                                                            <ItemsControl.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <sc:Setting Margin="0,2,0,0" Header="{Binding Description}" Padding="12,0">
+                                                                        <sc:Setting.ActionContent>
+                                                                            <TextBlock Text="{Binding Parameter}"/>
+                                                                        </sc:Setting.ActionContent>
+                                                                    </sc:Setting>
+                                                                </DataTemplate>
+                                                            </ItemsControl.ItemTemplate>
+                                                        </ItemsControl>
+                                                    </StackPanel>
+                                                </Flyout>
+                                            </Button.Flyout>
                                         </Button>
                                     </DataTemplate>
                                 </ItemsControl.ItemTemplate>
                             </ItemsControl>
                         </Border>
+                        <Border
+                            Margin="12,12,12,0"
+                            Padding="6"
+                            VerticalAlignment="Top"
+                            CornerRadius="{StaticResource CompatCornerRadius}"
+                            Background="{StaticResource CardBackgroundFillColorSecondary}">
+                            <Grid DataContext="{Binding SelectedAvatar.Weapon}">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="auto"/>
+                                    <ColumnDefinition Width="2*"/>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="*"/>
+                                </Grid.ColumnDefinitions>
+                                <Button Padding="0">
+                                    <Button.Content>
+                                        <shvcont:ItemIcon
+                                            Width="48"
+                                            Height="48"
+                                            Icon="{Binding Icon}"
+                                            Quality="{Binding Quality}"/>
+                                    </Button.Content>
+                                    <Button.Flyout>
+                                        <Flyout Placement="Bottom">
+                                            <shct:DescriptionTextBlock
+                                                        MaxWidth="320"
+                                                        Description="{Binding AffixDescription}">
+                                                <shct:DescriptionTextBlock.Resources>
+                                                    <Style
+                                                                TargetType="TextBlock"
+                                                                BasedOn="{StaticResource BodyTextBlockStyle}">
+                                                        <Setter Property="TextWrapping" Value="Wrap"/>
+                                                    </Style>
+                                                </shct:DescriptionTextBlock.Resources>
+                                            </shct:DescriptionTextBlock>
+                                        </Flyout>
+                                    </Button.Flyout>
+                                </Button>
+
+                                <TextBlock
+                                    Grid.Column="1"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Text="{Binding Name}"/>
+                                <TextBlock
+                                    Grid.Column="2"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Text="{Binding Level}"/>
+                                <TextBlock
+                                    Grid.Column="3"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Text="{Binding AffixLevel}"/>
+                            </Grid>
+                        </Border>
                         <Border
                             Margin="12,12,12,0"
                             Padding="6,6,0,6"
@@ -233,7 +362,7 @@
                                             <Grid>
                                                 <Grid.ColumnDefinitions>
                                                     <ColumnDefinition/>
-                                                    <ColumnDefinition Width="68"/>
+                                                    <ColumnDefinition Width="60"/>
                                                 </Grid.ColumnDefinitions>
                                                 <TextBlock
                                                     Grid.Column="0"
@@ -244,6 +373,7 @@
                                                     Margin="6,0,0,0"
                                                     Grid.Column="1"
                                                     Text="{Binding Value2}"
+                                                    Foreground="LimeGreen"
                                                     Style="{StaticResource CaptionTextBlockStyle}"
                                                     HorizontalAlignment="Left"/>
                                             </Grid>
@@ -254,61 +384,90 @@
                         </Border>
                     </StackPanel>
                     
-                    <ScrollViewer Grid.Column="1" Padding="0,0,12,0">
+                    <ScrollViewer Grid.Column="1" Padding="0,0,0,0">
                         <cwucont:AdaptiveGridView
-                            DesiredWidth="224"
                             cwua:ItemsReorderAnimation.Duration="0:0:0.1"
                             SelectionMode="None"
-                            HorizontalContentAlignment="Stretch"
+                            HorizontalAlignment="Left"
                             ItemsSource="{Binding SelectedAvatar.Reliquaries}"
                             Margin="0,12,0,0">
+                            <cwucont:AdaptiveGridView.ItemContainerStyle>
+                                <Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}">
+                                    <Setter Property="Margin" Value="0,0,12,12"/>
+                                </Style>
+                            </cwucont:AdaptiveGridView.ItemContainerStyle>
                             <ItemsControl.ItemTemplate>
                                 <DataTemplate>
                                     <Border
+                                        Margin="0,0,0,0"
                                         HorizontalAlignment="Stretch"
                                         CornerRadius="{StaticResource CompatCornerRadius}"
                                         Background="{StaticResource CardBackgroundFillColorSecondary}">
-                                        <StackPanel Margin="6" HorizontalAlignment="Stretch">
-                                            <Grid>
+                                        <Grid Margin="6">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="auto"/>
+                                                <RowDefinition Height="auto"/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <Grid Grid.Column="0">
                                                 <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="auto"/>
+                                                    <ColumnDefinition/>
+                                                    <ColumnDefinition Width="6"/>
                                                     <ColumnDefinition/>
                                                 </Grid.ColumnDefinitions>
-                                                <shvc:ItemIcon
-                                                    Grid.Column="0"
-                                                    HorizontalAlignment="Left"
-                                                    Width="48"
-                                                    Height="48"
-                                                    Icon="{Binding Icon}"
-                                                    Quality="{Binding Quality}"/>
-                                                <StackPanel Grid.Column="1" Margin="6,0,0,0">
-                                                    <Grid>
-                                                        <TextBlock
-                                                            Text="{Binding Name}"/>
-                                                        <TextBlock
+
+                                                <Grid
+                                                    Margin="2"
+                                                    Grid.Column="0"> 
+                                                    <TextBlock
+                                                            Text="{Binding Name}"
+                                                            FontWeight="Bold"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"/>
+                                                    <TextBlock
                                                             Margin="12,0,0,0"
                                                             Text="{Binding Level}"
+                                                            FontWeight="Bold"
+                                                            Style="{StaticResource CaptionTextBlockStyle}"
                                                             HorizontalAlignment="Right"/>
-                                                    </Grid>
-                                                    <Grid Margin="0,10,0,0">
-                                                        <TextBlock
+                                                </Grid>
+                                                <Grid Margin="2" Grid.Column="2">
+                                                    <TextBlock
                                                             Text="{Binding MainProperty.Key}"
                                                             FontWeight="Bold"
                                                             Style="{StaticResource CaptionTextBlockStyle}"/>
-                                                        <TextBlock
+                                                    <TextBlock
                                                             Text="{Binding MainProperty.Value}"
                                                             FontWeight="Bold"
                                                             Style="{StaticResource CaptionTextBlockStyle}"
                                                             HorizontalAlignment="Right"/>
-                                                    </Grid>
-                                                </StackPanel>
+                                                </Grid>
                                             </Grid>
-                                            
-                                            <MenuFlyoutSeparator Margin="-2,4,-2,0"/>
-                                            <ItemsControl ItemsSource="{Binding SubProperties}">
+                                            <Rectangle Height="1" Grid.Row="1" Margin="0,6">
+                                                <Rectangle.Fill>
+                                                    <SolidColorBrush Color="{Binding Quality,Converter={StaticResource QualityColorConverter}}"/>
+                                                </Rectangle.Fill>
+                                            </Rectangle>
+                                            <shci:CachedImage
+                                                Opacity="0.3"
+                                                Grid.Row="2"
+                                                HorizontalAlignment="Right"
+                                                VerticalAlignment="Bottom"
+                                                Width="80"
+                                                Height="80"
+                                                Source="{Binding Icon}"/>
+                                            <ItemsControl Grid.Row="2" ItemsSource="{Binding SubProperties}">
+                                                <ItemsControl.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <cwucont:UniformGrid
+                                                            Columns="2"
+                                                            Rows="5"
+                                                            ColumnSpacing="6"
+                                                            Orientation="Vertical"/>
+                                                    </ItemsPanelTemplate>
+                                                </ItemsControl.ItemsPanel>
                                                 <ItemsControl.ItemTemplate>
                                                     <DataTemplate>
-                                                        <Grid Padding="2">
+                                                        <Grid Padding="2" MinWidth="128">
                                                             <TextBlock
                                                                 Text="{Binding Key}"
                                                                 Style="{StaticResource CaptionTextBlockStyle}"/>
@@ -320,7 +479,7 @@
                                                     </DataTemplate>
                                                 </ItemsControl.ItemTemplate>
                                             </ItemsControl>
-                                        </StackPanel>
+                                        </Grid>
                                     </Border>
                                 </DataTemplate>
                             </ItemsControl.ItemTemplate>