From 9f9a5670bc51f8cfef8064e15d79c3059553d0db Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Wed, 1 Nov 2023 10:45:47 +0800
Subject: [PATCH] fix dailynote webhook error

---
 src/Snap.Hutao/Snap.Hutao/App.xaml            |   1 +
 .../Snap.Hutao/Control/Theme/FlyoutStyle.xaml |   9 +
 .../Model/Entity/SettingEntry.Constant.cs     |   5 +
 .../Service/DailyNote/DailyNoteOptions.cs     |   4 +-
 src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj   |   7 +
 .../Snap.Hutao/View/Page/CultivationPage.xaml | 411 ++++++++----------
 .../Snap.Hutao/View/Page/DailyNotePage.xaml   |  56 +--
 7 files changed, 236 insertions(+), 257 deletions(-)
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml

diff --git a/src/Snap.Hutao/Snap.Hutao/App.xaml b/src/Snap.Hutao/Snap.Hutao/App.xaml
index dd980061..590d52a5 100644
--- a/src/Snap.Hutao/Snap.Hutao/App.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/App.xaml
@@ -12,6 +12,7 @@
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Color.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Converter.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/CornerRadius.xaml"/>
+                <ResourceDictionary Source="ms-appx:///Control/Theme/FlyoutStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/FontStyle.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/Glyph.xaml"/>
                 <ResourceDictionary Source="ms-appx:///Control/Theme/InfoBarOverride.xaml"/>
diff --git a/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
new file mode 100644
index 00000000..801b8137
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Control/Theme/FlyoutStyle.xaml
@@ -0,0 +1,9 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Style x:Key="WebViewerFlyoutPresenterStyle" TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
+    </Style>
+    <Style x:Key="FlyoutPresenterPadding0And2Style" BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
+        <Setter Property="Padding" Value="0,2"/>
+    </Style>
+</ResourceDictionary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
index e0884f67..964cd127 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
@@ -48,6 +48,11 @@ internal sealed partial class SettingEntry
     /// </summary>
     public const string DailyNoteSilentWhenPlayingGame = "DailyNote.SilentWhenPlayingGame";
 
+    /// <summary>
+    /// 实时便笺 WebhookUrl
+    /// </summary>
+    public const string DailyNoteWebhookUrl = "DailyNote.WebhookUrl";
+
     /// <summary>
     /// 启动游戏 独占全屏
     /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs
index 215137e8..3786ef2e 100644
--- a/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Service/DailyNote/DailyNoteOptions.cs
@@ -126,7 +126,7 @@ internal sealed partial class DailyNoteOptions : DbStoreOptions
 
     public string? WebhookUrl
     {
-        get => GetOption(ref webhookUrl, SettingEntry.DailyNoteSilentWhenPlayingGame);
-        set => SetOption(ref webhookUrl, SettingEntry.DailyNoteSilentWhenPlayingGame, value);
+        get => GetOption(ref webhookUrl, SettingEntry.DailyNoteWebhookUrl);
+        set => SetOption(ref webhookUrl, SettingEntry.DailyNoteWebhookUrl, value);
     }
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
index 7782e62a..3b267b78 100644
--- a/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
+++ b/src/Snap.Hutao/Snap.Hutao/Snap.Hutao.csproj
@@ -79,6 +79,7 @@
     <None Remove="Control\Theme\Color.xaml" />
     <None Remove="Control\Theme\Converter.xaml" />
     <None Remove="Control\Theme\CornerRadius.xaml" />
+    <None Remove="Control\Theme\FlyoutStyle.xaml" />
     <None Remove="Control\Theme\FontStyle.xaml" />
     <None Remove="Control\Theme\Glyph.xaml" />
     <None Remove="Control\Theme\InfoBarOverride.xaml" />
@@ -307,6 +308,12 @@
     <AdditionalFiles Include="Resource\Localization\SH.resx" />
   </ItemGroup>
   
+  <ItemGroup>
+    <Page Update="Control\Theme\FlyoutStyle.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  
   <ItemGroup>
     <Page Update="View\Dialog\HutaoPassportUnregisterDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
index 0dea4549..538ed33d 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/CultivationPage.xaml
@@ -52,6 +52,189 @@
                 x:Key="BoolToStyleSelector"
                 FalseValue="{StaticResource BodyTextBlockStyle}"
                 TrueValue="{StaticResource BaseTextBlockStyle}"/>
+
+            <DataTemplate x:Key="CultivateEntryItemTemplate">
+                <Grid Margin="0,4,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="auto"/>
+                        <ColumnDefinition/>
+                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <shvco:ItemIcon
+                            Width="32"
+                            Height="32"
+                            Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                            Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
+                            Quality="{Binding Inner.RankLevel}"/>
+                        <FontIcon
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            FontSize="24"
+                            Glyph="&#xE73E;"
+                            Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    </Grid>
+                    <Button
+                        Grid.Column="1"
+                        Height="32"
+                        Margin="6,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        HorizontalContentAlignment="Stretch"
+                        Background="{Binding IsToday, Converter={ThemeResource BoolToBrushSelector}}"
+                        Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
+                        CommandParameter="{Binding}"
+                        Style="{StaticResource ButtonRevealStyle}">
+                        <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                Margin="0,0,0,0"
+                                VerticalAlignment="Center"
+                                Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                Text="{Binding Inner.Name}"
+                                TextTrimming="CharacterEllipsis"/>
+                            <TextBlock
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Center"
+                                Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
+                                Text="{Binding Entity.Count}"/>
+                        </Grid>
+                    </Button>
+                </Grid>
+            </DataTemplate>
+
+            <DataTemplate x:Key="CultivateEntryTemplate">
+                <ItemContainer Margin="0,0,0,16">
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Grid Style="{ThemeResource GridCardStyle}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                            <RowDefinition Height="auto"/>
+                        </Grid.RowDefinitions>
+                        <Grid Grid.Row="0" Margin="8">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"/>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="auto"/>
+                            </Grid.ColumnDefinitions>
+                            <shvco:ItemIcon
+                                Width="48"
+                                Height="48"
+                                Icon="{Binding Icon}"
+                                Quality="{Binding Quality}"/>
+                            <TextBlock
+                                Grid.Column="1"
+                                Margin="8,0,0,0"
+                                VerticalAlignment="Center"
+                                Text="{Binding Name}"/>
+                            <StackPanel
+                                Grid.Column="2"
+                                Orientation="Horizontal"
+                                Visibility="Collapsed">
+                                <Button
+                                    Width="48"
+                                    Height="48"
+                                    Margin="8,0,0,0"
+                                    Background="Transparent"
+                                    Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
+                                    CommandParameter="{Binding}"
+                                    Content="&#xE74D;"
+                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                                    Style="{StaticResource ButtonRevealStyle}"
+                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
+                            </StackPanel>
+                        </Grid>
+                        <MenuFlyoutSeparator Grid.Row="1"/>
+                        <ScrollViewer
+                            Grid.Row="2"
+                            Height="296"
+                            Margin="0,2,0,0">
+                            <ItemsControl
+                                Margin="8,0,8,8"
+                                ItemTemplate="{StaticResource CultivateEntryItemTemplate}"
+                                ItemsSource="{Binding Items}"/>
+                        </ScrollViewer>
+                    </Grid>
+                </ItemContainer>
+            </DataTemplate>
+
+            <DataTemplate x:Key="StatisticsItemTemplate">
+                <ItemContainer Margin="0,0,0,16">
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="auto"/>
+                            <ColumnDefinition/>
+                            <ColumnDefinition Width="auto"/>
+                        </Grid.ColumnDefinitions>
+                        <shvco:ItemIcon
+                            Grid.Column="0"
+                            Width="32"
+                            Height="32"
+                            Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
+                            Quality="{Binding Inner.RankLevel}"/>
+                        <TextBlock
+                            Grid.Column="1"
+                            Margin="16,0,0,0"
+                            VerticalAlignment="Center"
+                            Text="{Binding Inner.Name}"
+                            TextTrimming="CharacterEllipsis"/>
+                        <TextBlock
+                            Grid.Column="2"
+                            Margin="16,0,4,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Center"
+                            Text="{Binding CountFormatted}"/>
+                    </Grid>
+                </ItemContainer>
+            </DataTemplate>
+
+            <DataTemplate x:Key="InventoryItemTemplate">
+                <ItemContainer>
+                    <ItemContainer.Resources>
+                        <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
+                        <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
+                    </ItemContainer.Resources>
+                    <Button
+                        Padding="0"
+                        Background="Transparent"
+                        BorderBrush="{x:Null}"
+                        BorderThickness="0">
+                        <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
+                            <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
+                        </shvco:BottomTextControl>
+                        <Button.Flyout>
+                            <Flyout>
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
+                                    <NumberBox
+                                        Grid.Row="1"
+                                        MinWidth="160"
+                                        Margin="0,16,0,0"
+                                        Maximum="4294967295"
+                                        Minimum="0"
+                                        Value="{Binding Count, Mode=TwoWay}"/>
+                                </Grid>
+                            </Flyout>
+                        </Button.Flyout>
+                    </Button>
+                </ItemContainer>
+            </DataTemplate>
         </ResourceDictionary>
     </Page.Resources>
 
@@ -97,6 +280,7 @@
                                 <ItemsView
                                     Padding="16,0"
                                     IsItemInvokedEnabled="False"
+                                    ItemTemplate="{StaticResource CultivateEntryTemplate}"
                                     ItemsSource="{Binding CultivateEntries}"
                                     SelectionMode="None">
                                     <ItemsView.Layout>
@@ -107,158 +291,13 @@
                                             MinItemWidth="300"
                                             MinRowSpacing="-4"/>
                                     </ItemsView.Layout>
-                                    <ItemsView.ItemTemplate>
-                                        <DataTemplate>
-                                            <ItemContainer Margin="0,0,0,16">
-                                                <ItemContainer.Resources>
-                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                                </ItemContainer.Resources>
-                                                <Border Style="{StaticResource BorderCardStyle}">
-                                                    <Grid Background="Transparent">
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition Height="auto"/>
-                                                            <RowDefinition Height="auto"/>
-                                                            <RowDefinition Height="auto"/>
-                                                        </Grid.RowDefinitions>
-                                                        <Grid Grid.Row="0" Margin="8">
-                                                            <Grid.ColumnDefinitions>
-                                                                <ColumnDefinition Width="auto"/>
-                                                                <ColumnDefinition/>
-                                                                <ColumnDefinition Width="auto"/>
-                                                            </Grid.ColumnDefinitions>
-                                                            <shvco:ItemIcon
-                                                                Width="48"
-                                                                Height="48"
-                                                                Icon="{Binding Icon}"
-                                                                Quality="{Binding Quality}"/>
-                                                            <TextBlock
-                                                                Grid.Column="1"
-                                                                Margin="8,0,0,0"
-                                                                VerticalAlignment="Center"
-                                                                Text="{Binding Name}"/>
-                                                            <StackPanel
-                                                                x:Name="ButtonPanel"
-                                                                Grid.Column="2"
-                                                                Orientation="Horizontal"
-                                                                Visibility="Collapsed">
-                                                                <Button
-                                                                    Width="48"
-                                                                    Height="48"
-                                                                    Margin="8,0,0,0"
-                                                                    Background="Transparent"
-                                                                    Command="{Binding Path=DataContext.RemoveEntryCommand, Source={StaticResource BindingProxy}}"
-                                                                    CommandParameter="{Binding}"
-                                                                    Content="&#xE74D;"
-                                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                                    Style="{StaticResource ButtonRevealStyle}"
-                                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageCultivationRemoveEntry}"/>
-                                                            </StackPanel>
-                                                        </Grid>
-                                                        <MenuFlyoutSeparator Grid.Row="1"/>
-                                                        <ScrollViewer
-                                                            Grid.Row="2"
-                                                            Height="296"
-                                                            Margin="0,2,0,0">
-                                                            <ItemsControl Margin="8,0,8,8" ItemsSource="{Binding Items}">
-                                                                <ItemsControl.ItemTemplate>
-                                                                    <DataTemplate>
-                                                                        <Grid Margin="0,4,0,0">
-                                                                            <Grid.ColumnDefinitions>
-                                                                                <ColumnDefinition Width="auto"/>
-                                                                                <ColumnDefinition/>
-                                                                            </Grid.ColumnDefinitions>
-                                                                            <Grid>
-                                                                                <shvco:ItemIcon
-                                                                                    Width="32"
-                                                                                    Height="32"
-                                                                                    Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                                                    Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}"
-                                                                                    Quality="{Binding Inner.RankLevel}"/>
-                                                                                <FontIcon
-                                                                                    HorizontalAlignment="Center"
-                                                                                    VerticalAlignment="Center"
-                                                                                    FontSize="24"
-                                                                                    Glyph="&#xE73E;"
-                                                                                    Visibility="{Binding IsFinished, Converter={StaticResource BoolToVisibilityConverter}}"/>
-                                                                            </Grid>
-                                                                            <Button
-                                                                                Grid.Column="1"
-                                                                                Height="32"
-                                                                                Margin="6,0,0,0"
-                                                                                HorizontalAlignment="Stretch"
-                                                                                HorizontalContentAlignment="Stretch"
-                                                                                Background="{Binding IsToday, Converter={ThemeResource BoolToBrushSelector}}"
-                                                                                Command="{Binding Path=DataContext.FinishStateCommand, Source={StaticResource BindingProxy}}"
-                                                                                CommandParameter="{Binding}"
-                                                                                Style="{StaticResource ButtonRevealStyle}">
-                                                                                <Grid Opacity="{Binding IsFinished, Converter={StaticResource BoolToOpacityConverter}}">
-                                                                                    <Grid.ColumnDefinitions>
-                                                                                        <ColumnDefinition Width="auto"/>
-                                                                                        <ColumnDefinition/>
-                                                                                    </Grid.ColumnDefinitions>
-                                                                                    <TextBlock
-                                                                                        Grid.Column="0"
-                                                                                        Margin="0,0,0,0"
-                                                                                        VerticalAlignment="Center"
-                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                        Text="{Binding Inner.Name}"
-                                                                                        TextTrimming="CharacterEllipsis"/>
-                                                                                    <TextBlock
-                                                                                        Grid.Column="1"
-                                                                                        HorizontalAlignment="Right"
-                                                                                        VerticalAlignment="Center"
-                                                                                        Style="{Binding IsToday, Converter={StaticResource BoolToStyleSelector}}"
-                                                                                        Text="{Binding Entity.Count}"/>
-                                                                                </Grid>
-                                                                            </Button>
-                                                                        </Grid>
-                                                                    </DataTemplate>
-                                                                </ItemsControl.ItemTemplate>
-                                                            </ItemsControl>
-                                                        </ScrollViewer>
-
-                                                        <Grid.Resources>
-                                                            <Storyboard x:Name="ButtonPanelVisibleStoryboard">
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                                        <DiscreteObjectKeyFrame.Value>
-                                                                            <Visibility>Visible</Visibility>
-                                                                        </DiscreteObjectKeyFrame.Value>
-                                                                    </DiscreteObjectKeyFrame>
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-
-                                                            <Storyboard x:Name="ButtonPanelCollapsedStoryboard">
-                                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ButtonPanel" Storyboard.TargetProperty="Visibility">
-                                                                    <DiscreteObjectKeyFrame KeyTime="0">
-                                                                        <DiscreteObjectKeyFrame.Value>
-                                                                            <Visibility>Collapsed</Visibility>
-                                                                        </DiscreteObjectKeyFrame.Value>
-                                                                    </DiscreteObjectKeyFrame>
-                                                                </ObjectAnimationUsingKeyFrames>
-                                                            </Storyboard>
-                                                        </Grid.Resources>
-
-                                                        <mxi:Interaction.Behaviors>
-                                                            <mxic:EventTriggerBehavior EventName="PointerEntered">
-                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelVisibleStoryboard}"/>
-                                                            </mxic:EventTriggerBehavior>
-                                                            <mxic:EventTriggerBehavior EventName="PointerExited">
-                                                                <mxim:ControlStoryboardAction Storyboard="{StaticResource ButtonPanelCollapsedStoryboard}"/>
-                                                            </mxic:EventTriggerBehavior>
-                                                        </mxi:Interaction.Behaviors>
-                                                    </Grid>
-                                                </Border>
-                                            </ItemContainer>
-                                        </DataTemplate>
-                                    </ItemsView.ItemTemplate>
                                 </ItemsView>
                             </PivotItem>
                             <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationMaterialStatistics}">
                                 <ItemsView
                                     Padding="16,0"
                                     IsItemInvokedEnabled="False"
+                                    ItemTemplate="{StaticResource StatisticsItemTemplate}"
                                     ItemsSource="{Binding StatisticsItems}"
                                     SelectionMode="None">
                                     <ItemsView.Layout>
@@ -269,42 +308,6 @@
                                             MinItemWidth="300"
                                             MinRowSpacing="-4"/>
                                     </ItemsView.Layout>
-                                    <ItemsView.ItemTemplate>
-                                        <DataTemplate>
-                                            <ItemContainer Margin="0,0,0,16">
-                                                <ItemContainer.Resources>
-                                                    <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                                    <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                                </ItemContainer.Resources>
-                                                <Grid>
-                                                    <Grid.ColumnDefinitions>
-                                                        <ColumnDefinition Width="auto"/>
-                                                        <ColumnDefinition/>
-                                                        <ColumnDefinition Width="auto"/>
-                                                    </Grid.ColumnDefinitions>
-                                                    <shvco:ItemIcon
-                                                        Grid.Column="0"
-                                                        Width="32"
-                                                        Height="32"
-                                                        Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}"
-                                                        Quality="{Binding Inner.RankLevel}"/>
-                                                    <TextBlock
-                                                        Grid.Column="1"
-                                                        Margin="16,0,0,0"
-                                                        VerticalAlignment="Center"
-                                                        Text="{Binding Inner.Name}"
-                                                        TextTrimming="CharacterEllipsis"/>
-                                                    <TextBlock
-                                                        Grid.Column="2"
-                                                        Margin="16,0,4,0"
-                                                        HorizontalAlignment="Right"
-                                                        VerticalAlignment="Center"
-                                                        Text="{Binding CountFormatted}"/>
-                                                </Grid>
-                                            </ItemContainer>
-
-                                        </DataTemplate>
-                                    </ItemsView.ItemTemplate>
                                 </ItemsView>
                             </PivotItem>
                         </Pivot>
@@ -348,51 +351,15 @@
                 </PivotItem>
                 <PivotItem Header="{shcm:ResourceString Name=ViewPageCultivationInventoryItem}">
                     <ScrollView HorizontalScrollBarVisibility="Hidden">
-                        <ItemsRepeater Margin="16" ItemsSource="{Binding InventoryItems}">
+                        <ItemsRepeater
+                            Margin="16"
+                            ItemTemplate="{StaticResource InventoryItemTemplate}"
+                            ItemsSource="{Binding InventoryItems}">
                             <ItemsRepeater.Layout>
                                 <cwcont:WrapLayout HorizontalSpacing="12" VerticalSpacing="12"/>
                             </ItemsRepeater.Layout>
-                            <ItemsRepeater.ItemTemplate>
-                                <DataTemplate>
-                                    <ItemContainer>
-                                        <ItemContainer.Resources>
-                                            <SolidColorBrush x:Key="ItemContainerPointerOverBackground" Color="Transparent"/>
-                                            <SolidColorBrush x:Key="ItemContainerPressedBackground" Color="Transparent"/>
-                                        </ItemContainer.Resources>
-                                        <Button
-                                            Padding="0"
-                                            Background="Transparent"
-                                            BorderBrush="{x:Null}"
-                                            BorderThickness="0">
-                                            <shvco:BottomTextControl Text="{Binding Count, Mode=OneWay}">
-                                                <shvco:ItemIcon Icon="{Binding Inner.Icon, Converter={StaticResource ItemIconConverter}}" Quality="{Binding Inner.RankLevel}"/>
-                                            </shvco:BottomTextControl>
-                                            <Button.Flyout>
-                                                <Flyout>
-                                                    <Grid>
-                                                        <Grid.RowDefinitions>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                            <RowDefinition/>
-                                                        </Grid.RowDefinitions>
-                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{Binding Inner.Name}"/>
-                                                        <NumberBox
-                                                            Grid.Row="1"
-                                                            MinWidth="160"
-                                                            Margin="0,16,0,0"
-                                                            Maximum="4294967295"
-                                                            Minimum="0"
-                                                            Value="{Binding Count, Mode=TwoWay}"/>
-                                                    </Grid>
-                                                </Flyout>
-                                            </Button.Flyout>
-                                        </Button>
-                                    </ItemContainer>
-                                </DataTemplate>
-                            </ItemsRepeater.ItemTemplate>
                         </ItemsRepeater>
                     </ScrollView>
-
                 </PivotItem>
             </Pivot>
         </Grid>
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index 9ccec67a..97b6eb56 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -27,6 +27,23 @@
 
     <Page.Resources>
         <shc:BindingProxy x:Key="ViewModelBindingProxy" DataContext="{Binding}"/>
+
+        <DataTemplate x:Key="UserAndUidTemplate">
+            <Grid Padding="0,0,0,16">
+                <TextBlock VerticalAlignment="Center" Text="{Binding Uid}"/>
+                <Button
+                    Margin="16,0,0,0"
+                    Padding="6"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Center"
+                    Command="{Binding DataContext.TrackRoleCommand, Source={StaticResource ViewModelBindingProxy}}"
+                    CommandParameter="{Binding}"
+                    Content="&#xE710;"
+                    FontFamily="{StaticResource SymbolThemeFontFamily}"
+                    Style="{StaticResource ButtonRevealStyle}"
+                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryToolTip}"/>
+            </Grid>
+        </DataTemplate>
     </Page.Resources>
 
     <Grid>
@@ -46,54 +63,27 @@
                 Label="{shcm:ResourceString Name=ViewPageDailyNoteVerify}">
                 <AppBarButton.Flyout>
                     <Flyout
+                        FlyoutPresenterStyle="{ThemeResource WebViewerFlyoutPresenterStyle}"
                         LightDismissOverlayMode="On"
                         Placement="Full"
                         ShowMode="Standard">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style TargetType="FlyoutPresenter">
-                                <Setter Property="Padding" Value="0"/>
-                                <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}"/>
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
                         <shvc:WebViewer SourceProvider="{Binding VerifyUrlSource, Mode=OneWay}"/>
                     </Flyout>
                 </AppBarButton.Flyout>
             </AppBarButton>
             <AppBarButton Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentAdd}}" Label="{shcm:ResourceString Name=ViewPageDailyNoteAddEntry}">
                 <AppBarButton.Flyout>
-                    <Flyout LightDismissOverlayMode="On" Placement="Bottom">
-                        <Flyout.FlyoutPresenterStyle>
-                            <Style BasedOn="{StaticResource DefaultFlyoutPresenterStyle}" TargetType="FlyoutPresenter">
-                                <Setter Property="Padding" Value="0,2,0,2"/>
-                                <Setter Property="Background" Value="{ThemeResource FlyoutPresenterBackground}"/>
-                            </Style>
-                        </Flyout.FlyoutPresenterStyle>
+                    <Flyout
+                        FlyoutPresenterStyle="{StaticResource FlyoutPresenterPadding0And2Style}"
+                        LightDismissOverlayMode="On"
+                        Placement="Bottom">
                         <StackPanel>
                             <TextBlock
                                 Margin="16,12,16,16"
                                 Style="{StaticResource BaseTextBlockStyle}"
                                 Text="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryHint}"/>
                             <ScrollViewer MaxHeight="320" Padding="16,0">
-                                <ItemsControl ItemsSource="{Binding UserAndUids}">
-                                    <ItemsControl.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid Padding="0,0,0,16">
-                                                <TextBlock VerticalAlignment="Center" Text="{Binding Uid}"/>
-                                                <Button
-                                                    Margin="16,0,0,0"
-                                                    Padding="6"
-                                                    HorizontalAlignment="Right"
-                                                    VerticalAlignment="Center"
-                                                    Command="{Binding DataContext.TrackRoleCommand, Source={StaticResource ViewModelBindingProxy}}"
-                                                    CommandParameter="{Binding}"
-                                                    Content="&#xE710;"
-                                                    FontFamily="{StaticResource SymbolThemeFontFamily}"
-                                                    Style="{StaticResource ButtonRevealStyle}"
-                                                    ToolTipService.ToolTip="{shcm:ResourceString Name=ViewPageDailyNoteAddEntryToolTip}"/>
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ItemsControl.ItemTemplate>
-                                </ItemsControl>
+                                <ItemsControl ItemTemplate="{StaticResource UserAndUidTemplate}" ItemsSource="{Binding UserAndUids}"/>
                             </ScrollViewer>
                         </StackPanel>
                     </Flyout>