[fix] 禁用DailyView内页面刷新

Fix #66
zxbmmmmmmmmm · Dec 1, 2024 · d0f0a0d · d0f0a0d
1 parent b1a1676
commit d0f0a0d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/FluentWeather.Uwp/Pages/MainPage.xaml b/FluentWeather.Uwp/Pages/MainPage.xaml
@@ -28,19 +28,6 @@
     xmlns:viewmodels="using:FluentWeather.Uwp.ViewModels"
     d:RequestedTheme="Dark"
     mc:Ignorable="d">
-    <Page.ContextFlyout>
-        <MenuFlyout Placement="BottomEdgeAlignedLeft">
-            <MenuFlyoutItem
-                x:Uid="RefreshMenuItem"
-                Command="{x:Bind ViewModel.RefreshCommand}"
-                Icon="Refresh" />
-            <MenuFlyoutItem x:Uid="SpeechMenuItem" Command="{x:Bind ViewModel.SpeechWeatherCommand}">
-                <MenuFlyoutItem.Icon>
-                    <FontIcon Glyph="&#xF83B;" />
-                </MenuFlyoutItem.Icon>
-            </MenuFlyoutItem>
-        </MenuFlyout>
-    </Page.ContextFlyout>
     <Grid>
         <Border
             Background="{ThemeResource LayerFillColorDefaultBrush}"
@@ -126,7 +113,6 @@
                 </animations:ImplicitAnimationSet>
 
             </animations:Implicit.ShowAnimations>
-
         </local:DailyViewPage>
         <RefreshContainer x:Name="MainContentContainer" ui:VisualExtensions.NormalizedCenterPoint="0.5">
             <animations:Implicit.ShowAnimations>
@@ -929,9 +915,21 @@
                             </DataTemplate>
                         </ListView.ItemTemplate>
                     </ListView>
-
                 </Grid>
             </ScrollViewer>
+            <RefreshContainer.ContextFlyout>
+                <MenuFlyout Placement="BottomEdgeAlignedLeft">
+                    <MenuFlyoutItem
+                        x:Uid="RefreshMenuItem"
+                        Command="{x:Bind ViewModel.RefreshCommand}"
+                        Icon="Refresh" />
+                    <MenuFlyoutItem x:Uid="SpeechMenuItem" Command="{x:Bind ViewModel.SpeechWeatherCommand}">
+                        <MenuFlyoutItem.Icon>
+                            <FontIcon Glyph="&#xF83B;" />
+                        </MenuFlyoutItem.Icon>
+                    </MenuFlyoutItem>
+                </MenuFlyout>
+                </RefreshContainer.ContextFlyout>
         </RefreshContainer>
         <VisualStateManager.VisualStateGroups>
             <VisualStateGroup>

diff --git a/FluentWeather.Uwp/Themes/Generic.xaml b/FluentWeather.Uwp/Themes/Generic.xaml
@@ -1004,7 +1004,8 @@
     <DataTemplate x:Key="WeatherForecastTemplate" x:DataType="models:WeatherDailyBase">
         <UserControl>
             <StackPanel Spacing="4">
-                <TextBlock Margin="0,4,0,0"
+                <TextBlock
+                    Margin="0,4,0,0"
                     HorizontalAlignment="Center"
                     FontSize="17"
                     Text="{x:Bind Time, Converter={StaticResource DateConverter}}" />