From 22327721105542fa68cc356ad1835d8b692a76b9 Mon Sep 17 00:00:00 2001
From: DismissedLight <1686188646@qq.com>
Date: Thu, 30 May 2024 21:59:49 +0800
Subject: [PATCH] adjust daily note settings to flyout

---
 .../Snap.Hutao/Properties/launchSettings.json |   2 +-
 .../Snap.Hutao/View/Page/DailyNotePage.xaml   | 178 +++++++++---------
 2 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
index 7ae76b9e..a5fb2a14 100644
--- a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
+++ b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Snap.Hutao": {
       "commandName": "MsixPackage",
       "nativeDebugging": false,
-      "doNotLaunchApp": true,
+      "doNotLaunchApp": false,
       "allowLocalNetworkLoopbackProperty": true
     },
     "[Unpackaged] Snap.Hutao": {
diff --git a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
index b770e2e2..5fa4cd32 100644
--- a/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
+++ b/src/Snap.Hutao/Snap.Hutao/View/Page/DailyNotePage.xaml
@@ -476,10 +476,95 @@
                             </Flyout>
                         </AppBarButton.Flyout>
                     </AppBarButton>
-                    <AppBarToggleButton
-                        Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentSetting}}"
-                        IsChecked="{x:Bind SettingPaneSplitView.IsPaneOpen, Mode=TwoWay}"
-                        Label="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}"/>
+                    <AppBarButton Icon="{shcm:FontIcon Glyph={StaticResource FontIconContentSetting}}" Label="{shcm:ResourceString Name=ViewPageDailyNoteNotificationSetting}">
+                        <AppBarButton.Flyout>
+                            <Flyout Placement="BottomEdgeAlignedRight">
+                                <ScrollViewer>
+                                    <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                                        <StackPanel.Resources>
+                                            <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
+                                            <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
+                                            <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
+                                        </StackPanel.Resources>
+
+                                        <cwcont:HeaderedContentControl HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
+                                            <cwcont:HeaderedContentControl.Header>
+                                                <TextBlock
+                                                    Margin="1,0,0,5"
+                                                    Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
+                                                    Text="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshHeader}"/>
+                                            </cwcont:HeaderedContentControl.Header>
+                                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                                                <InfoBar
+                                                    Title="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshNotifyIconDisabledHint}"
+                                                    IsClosable="False"
+                                                    IsOpen="True"
+                                                    Severity="Warning"
+                                                    Visibility="{Binding AppOptions.IsNotifyIconEnabled, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                                <cwcont:SettingsCard
+                                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefreshDescription}"
+                                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefresh}"
+                                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE72C;}">
+                                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsAutoRefreshEnabled, Mode=TwoWay}"/>
+                                                </cwcont:SettingsCard>
+                                                <RadioButtons
+                                                    Margin="1,11,0,5"
+                                                    IsEnabled="{Binding DailyNoteOptions.IsAutoRefreshEnabled}"
+                                                    ItemsSource="{Binding DailyNoteOptions.RefreshTimes}"
+                                                    SelectedItem="{Binding DailyNoteOptions.SelectedRefreshTime, Mode=TwoWay}">
+                                                    <RadioButtons.Header>
+                                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteRefreshTime}"/>
+                                                    </RadioButtons.Header>
+                                                    <RadioButtons.ItemTemplate>
+                                                        <DataTemplate>
+                                                            <TextBlock Margin="0,0,0,0" Text="{Binding Name}"/>
+                                                        </DataTemplate>
+                                                    </RadioButtons.ItemTemplate>
+                                                </RadioButtons>
+                                            </StackPanel>
+                                        </cwcont:HeaderedContentControl>
+
+                                        <cwcont:HeaderedContentControl
+                                            HorizontalAlignment="Stretch"
+                                            HorizontalContentAlignment="Stretch"
+                                            IsEnabled="{Binding RuntimeOptions.IsToastAvailable}">
+                                            <cwcont:HeaderedContentControl.Header>
+                                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteNotificationHeader}"/>
+                                            </cwcont:HeaderedContentControl.Header>
+                                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
+                                                <InfoBar
+                                                    Title="{shcm:ResourceString Name=ViewPageDailyNoteNotificationUnavailableHint}"
+                                                    IsClosable="False"
+                                                    IsOpen="True"
+                                                    Severity="Warning"
+                                                    Visibility="{Binding RuntimeOptions.IsToastAvailable, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
+                                                <cwcont:SettingsCard
+                                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeDescription}"
+                                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeHeader}"
+                                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE7ED;}">
+                                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsSilentWhenPlayingGame, Mode=TwoWay}"/>
+                                                </cwcont:SettingsCard>
+                                                <cwcont:SettingsCard
+                                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteReminderDescription}"
+                                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteReminderHeader}"
+                                                    HeaderIcon="{shcm:FontIcon Glyph=&#xEA8F;}">
+                                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsReminderNotification, Mode=TwoWay}"/>
+                                                </cwcont:SettingsCard>
+                                            </StackPanel>
+                                        </cwcont:HeaderedContentControl>
+
+                                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteDataInteropHeader}"/>
+                                        <cwcont:SettingsCard
+                                            Command="{Binding ConfigDailyNoteWebhookUrlCommand}"
+                                            Description="{shcm:ResourceString Name=ViewPageDailyNoteConfigWebhookDescription}"
+                                            Header="{shcm:ResourceString Name=ViewPageDailyNoteConfigWebhookHeader}"
+                                            HeaderIcon="{shcm:FontIcon Glyph=&#xEE94;}"
+                                            IsClickEnabled="True"/>
+                                    </StackPanel>
+                                </ScrollViewer>
+                            </Flyout>
+                        </AppBarButton.Flyout>
+                    </AppBarButton>
                 </CommandBar>
             </Border>
         </Border>
@@ -490,91 +575,6 @@
             OpenPaneLength="480"
             PaneBackground="{ThemeResource SystemControlAcrylicElementMediumHighBrush}"
             PanePlacement="Right">
-            <SplitView.Pane>
-                <ScrollViewer>
-                    <StackPanel Margin="16" Spacing="{StaticResource SettingsCardSpacing}">
-                        <StackPanel.Resources>
-                            <x:Double x:Key="SettingsCardMinHeight">0</x:Double>
-                            <x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
-                            <x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
-                        </StackPanel.Resources>
-
-                        <cwcont:HeaderedContentControl HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch">
-                            <cwcont:HeaderedContentControl.Header>
-                                <TextBlock
-                                    Margin="1,0,0,5"
-                                    Style="{StaticResource SettingsSectionHeaderTextBlockStyle}"
-                                    Text="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshHeader}"/>
-                            </cwcont:HeaderedContentControl.Header>
-                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                                <InfoBar
-                                    Title="{shcm:ResourceString Name=ViewPageDailyNoteSettingRefreshNotifyIconDisabledHint}"
-                                    IsClosable="False"
-                                    IsOpen="True"
-                                    Severity="Warning"
-                                    Visibility="{Binding AppOptions.IsNotifyIconEnabled, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                                <cwcont:SettingsCard
-                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefreshDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteSettingAutoRefresh}"
-                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE72C;}">
-                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsAutoRefreshEnabled, Mode=TwoWay}"/>
-                                </cwcont:SettingsCard>
-                                <RadioButtons
-                                    Margin="1,11,0,5"
-                                    IsEnabled="{Binding DailyNoteOptions.IsAutoRefreshEnabled}"
-                                    ItemsSource="{Binding DailyNoteOptions.RefreshTimes}"
-                                    SelectedItem="{Binding DailyNoteOptions.SelectedRefreshTime, Mode=TwoWay}">
-                                    <RadioButtons.Header>
-                                        <TextBlock Style="{StaticResource BaseTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteRefreshTime}"/>
-                                    </RadioButtons.Header>
-                                    <RadioButtons.ItemTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Margin="0,0,0,0" Text="{Binding Name}"/>
-                                        </DataTemplate>
-                                    </RadioButtons.ItemTemplate>
-                                </RadioButtons>
-                            </StackPanel>
-                        </cwcont:HeaderedContentControl>
-
-                        <cwcont:HeaderedContentControl
-                            HorizontalAlignment="Stretch"
-                            HorizontalContentAlignment="Stretch"
-                            IsEnabled="{Binding RuntimeOptions.IsToastAvailable}">
-                            <cwcont:HeaderedContentControl.Header>
-                                <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteNotificationHeader}"/>
-                            </cwcont:HeaderedContentControl.Header>
-                            <StackPanel Spacing="{StaticResource SettingsCardSpacing}">
-                                <InfoBar
-                                    Title="{shcm:ResourceString Name=ViewPageDailyNoteNotificationUnavailableHint}"
-                                    IsClosable="False"
-                                    IsOpen="True"
-                                    Severity="Warning"
-                                    Visibility="{Binding RuntimeOptions.IsToastAvailable, Converter={StaticResource BoolToVisibilityRevertConverter}}"/>
-                                <cwcont:SettingsCard
-                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteSlientModeHeader}"
-                                    HeaderIcon="{shcm:FontIcon Glyph=&#xE7ED;}">
-                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsSilentWhenPlayingGame, Mode=TwoWay}"/>
-                                </cwcont:SettingsCard>
-                                <cwcont:SettingsCard
-                                    Description="{shcm:ResourceString Name=ViewPageDailyNoteReminderDescription}"
-                                    Header="{shcm:ResourceString Name=ViewPageDailyNoteReminderHeader}"
-                                    HeaderIcon="{shcm:FontIcon Glyph=&#xEA8F;}">
-                                    <ToggleSwitch Margin="24,0,0,0" IsOn="{Binding DailyNoteOptions.IsReminderNotification, Mode=TwoWay}"/>
-                                </cwcont:SettingsCard>
-                            </StackPanel>
-                        </cwcont:HeaderedContentControl>
-
-                        <TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{shcm:ResourceString Name=ViewPageDailyNoteDataInteropHeader}"/>
-                        <cwcont:SettingsCard
-                            Command="{Binding ConfigDailyNoteWebhookUrlCommand}"
-                            Description="{shcm:ResourceString Name=ViewPageDailyNoteConfigWebhookDescription}"
-                            Header="{shcm:ResourceString Name=ViewPageDailyNoteConfigWebhookHeader}"
-                            HeaderIcon="{shcm:FontIcon Glyph=&#xEE94;}"
-                            IsClickEnabled="True"/>
-                    </StackPanel>
-                </ScrollViewer>
-            </SplitView.Pane>
             <ScrollView>
                 <ItemsRepeater
                     Margin="16"