From fe0822fd533e075b73aec5134b00e88b08e4cdfe Mon Sep 17 00:00:00 2001
From: Betta_Fish <zxbmmmmmmmmm@qq.com>
Date: Sat, 15 Jun 2024 22:58:08 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E5=8E=86=E5=8F=B2=E5=A4=A9=E6=B0=94?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E4=BA=AE=E8=89=B2=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FluentWeather.Uwp/Pages/MainPage.xaml | 21 +++++++++++----------
 FluentWeather.Uwp/Themes/Generic.xaml | 13 ++++++++++++-
 desktop.ini                           |  2 ++
 3 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 desktop.ini

diff --git a/FluentWeather.Uwp/Pages/MainPage.xaml b/FluentWeather.Uwp/Pages/MainPage.xaml
index a5010b6..3572187 100644
--- a/FluentWeather.Uwp/Pages/MainPage.xaml
+++ b/FluentWeather.Uwp/Pages/MainPage.xaml
@@ -870,18 +870,19 @@
                             <dv:RadLinearGauge.LabelTemplate>
                                 <DataTemplate />
                             </dv:RadLinearGauge.LabelTemplate>
+                            <!--历史最高/最低温 指示条-->
                             <dv:SegmentedLinearGaugeIndicator Value="{x:Bind ViewModel.HistoricalWeather.HistoricalMaxTemperature}">
                                 <dv:BarIndicatorSegment
                                     Length="{x:Bind converters1:ConverterMethods.Subtract(ViewModel.HistoricalWeather.AverageMinTemperature, ViewModel.HistoricalWeather.HistoricalMinTemperature)}"
-                                    Stroke="#1AB3B3B3"
+                                    Stroke="{ThemeResource HistoricalWeatherBaseRangeStroke}"
                                     Thickness="4" />
                                 <dv:BarIndicatorSegment
                                     Length="{x:Bind converters1:ConverterMethods.Subtract(ViewModel.HistoricalWeather.AverageMaxTemperature, ViewModel.HistoricalWeather.AverageMinTemperature)}"
-                                    Stroke="#80B3B3B3"
+                                    Stroke="{ThemeResource HistoricalWeatherAverageRangeStroke}"
                                     Thickness="4" />
                                 <dv:BarIndicatorSegment
                                     Length="{x:Bind converters1:ConverterMethods.Subtract(ViewModel.HistoricalWeather.HistoricalMaxTemperature, ViewModel.HistoricalWeather.AverageMaxTemperature)}"
-                                    Stroke="#1AB3B3B3"
+                                    Stroke="{ThemeResource HistoricalWeatherBaseRangeStroke}"
                                     Thickness="4" />
                             </dv:SegmentedLinearGaugeIndicator>
                             <!--  平均低温  -->
@@ -902,7 +903,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FFCCCCCC" />
+                                            Fill="{ThemeResource HistoricalWeatherAveragePointFill}" />
                                     </StackPanel>
                                 </dv:MarkerGaugeIndicator.Content>
                             </dv:MarkerGaugeIndicator>
@@ -926,7 +927,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FFCCCCCC" />
+                                            Fill="{ThemeResource HistoricalWeatherAveragePointFill}" />
                                     </StackPanel>
                                 </dv:MarkerGaugeIndicator.Content>
                             </dv:MarkerGaugeIndicator>
@@ -955,7 +956,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FF666666" />
+                                            Fill="{ThemeResource HistoricalWeatherHighestLowestPointFill}" />
                                     </StackPanel>
                                 </dv:MarkerGaugeIndicator.Content>
                             </dv:MarkerGaugeIndicator>
@@ -983,7 +984,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FF666666" />
+                                            Fill="{ThemeResource HistoricalWeatherHighestLowestPointFill}" />
                                     </StackPanel>
                                 </dv:MarkerGaugeIndicator.Content>
                             </dv:MarkerGaugeIndicator>
@@ -999,7 +1000,7 @@
 
                                 <dv:BarIndicatorSegment
                                     Length="{x:Bind converters1:ConverterMethods.Subtract(ViewModel.WeatherToday.MaxTemperature, ViewModel.WeatherToday.MinTemperature)}"
-                                    Stroke="#66808080"
+                                    Stroke="{ThemeResource HistoricalWeatherTodayRangeStroke}"
                                     Thickness="4" />
                                 <dv:BarIndicatorSegment
                                     Length="{x:Bind converters1:ConverterMethods.Subtract(ViewModel.HistoricalWeather.HistoricalMaxTemperature, ViewModel.WeatherToday.MaxTemperature)}"
@@ -1018,7 +1019,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FF808080" />
+                                            Fill="{ThemeResource HistoricalWeatherTodayPointFill}" />
                                         <TextBlock
                                             Margin="2,0,0,0"
                                             HorizontalAlignment="Center"
@@ -1045,7 +1046,7 @@
                                             Width="8"
                                             Height="8"
                                             HorizontalAlignment="Center"
-                                            Fill="#FF808080" />
+                                            Fill="{ThemeResource HistoricalWeatherTodayPointFill}" />
                                         <TextBlock
                                             Margin="2,0,0,0"
                                             HorizontalAlignment="Center"
diff --git a/FluentWeather.Uwp/Themes/Generic.xaml b/FluentWeather.Uwp/Themes/Generic.xaml
index 3760b84..d682964 100644
--- a/FluentWeather.Uwp/Themes/Generic.xaml
+++ b/FluentWeather.Uwp/Themes/Generic.xaml
@@ -17,7 +17,12 @@
             <StaticResource x:Key="ContentDialogSeparatorBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
             <StaticResource x:Key="AutoSuggestBoxBorderBrush" ResourceKey="TextControlBorderBrush" />
             <StaticResource x:Key="InfoBarInformationalSeverityBackgroundBrush" ResourceKey="SystemControlAcrylicElementBrush" />
-
+            <SolidColorBrush x:Key="HistoricalWeatherAverageRangeStroke" Color="#66666666"/>
+            <SolidColorBrush x:Key="HistoricalWeatherBaseRangeStroke" Color="#4D999999"/>
+            <SolidColorBrush x:Key="HistoricalWeatherTodayRangeStroke" Color="#45808080"/>
+            <SolidColorBrush x:Key="HistoricalWeatherHighestLowestPointFill" Color="#FFBABABA"/>
+            <SolidColorBrush x:Key="HistoricalWeatherAveragePointFill" Color="#FF8C8C8C"/>
+            <SolidColorBrush x:Key="HistoricalWeatherTodayPointFill" Color="#FFAEAEAE"/>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush" />
@@ -29,6 +34,12 @@
             <StaticResource x:Key="ContentDialogSeparatorBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />
             <StaticResource x:Key="AutoSuggestBoxBorderBrush" ResourceKey="TextControlBorderBrush" />
             <StaticResource x:Key="InfoBarInformationalSeverityBackgroundBrush" ResourceKey="SystemControlAcrylicElementBrush" />
+            <SolidColorBrush x:Key="HistoricalWeatherAverageRangeStroke" Color="#80B3B3B3"/>
+            <SolidColorBrush x:Key="HistoricalWeatherBaseRangeStroke" Color="#21BFBFBF"/>
+            <SolidColorBrush x:Key="HistoricalWeatherTodayRangeStroke" Color="#66808080"/>
+            <SolidColorBrush x:Key="HistoricalWeatherHighestLowestPointFill" Color="#FF666666"/>
+            <SolidColorBrush x:Key="HistoricalWeatherAveragePointFill" Color="#FFCCCCCC"/>
+            <SolidColorBrush x:Key="HistoricalWeatherTodayPointFill" Color="#FF808080"/>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
diff --git a/desktop.ini b/desktop.ini
new file mode 100644
index 0000000..0fc2ac6
--- /dev/null
+++ b/desktop.ini
@@ -0,0 +1,2 @@
+[.ShellClassInfo]
+IconResource=C:\Users\zxbmm\Pictures\a3way-cs6qn-001.ico,0