[style] 规范命名

zxbmmmmmmmmm · zxbmmmmmmmmm · commit efd4cfcbde26 · 2023-12-16T19:25:34.000+08:00
diff --git a/FluentWeather.Uwp/Behaviors/ButtonContentSnapBehavior.cs b/FluentWeather.Uwp/Behaviors/ButtonContentSnapBehavior.cs
@@ -16,17 +16,17 @@ public class ButtonContentSnapBehavior : Behavior<ButtonBase>
 {
     private const double DurationSeconds = 0.3;
 
-    private bool attached;
-    private long paddingChangedEventToken;
-    private long contentChangedEventToken;
-    private VisualStateGroup? visualStateGroup;
-    private ContentPresenter? contentPresenter;
-    private Visual? contentVisual;
-
-    private Compositor compositor;
-    private CompositionPropertySet propSet;
-    private Vector3KeyFrameAnimation translationAnimation1;
-    private Vector3KeyFrameAnimation translationAnimation2;
+    private bool _attached;
+    private long _paddingChangedEventToken;
+    private long _contentChangedEventToken;
+    private VisualStateGroup? _visualStateGroup;
+    private ContentPresenter? _contentPresenter;
+    private Visual? _contentVisual;
+
+    private Compositor _compositor;
+    private CompositionPropertySet _propSet;
+    private Vector3KeyFrameAnimation _translationAnimation1;
+    private Vector3KeyFrameAnimation _translationAnimation2;
 
     
 
@@ -47,22 +47,22 @@ public ButtonContentSnapType SnapType
 
     private void AssociatedObject_Loaded(object sender, RoutedEventArgs e)
     {
-        compositor = ElementCompositionPreview.GetElementVisual(AssociatedObject).Compositor;
+        _compositor = ElementCompositionPreview.GetElementVisual(AssociatedObject).Compositor;
         //compositor = CompositionTarget.GetCompositorForCurrentThread();
 
-        propSet = compositor.CreatePropertySet();
-        propSet.InsertVector3("Offset", Vector3.Zero);
+        _propSet = _compositor.CreatePropertySet();
+        _propSet.InsertVector3("Offset", Vector3.Zero);
 
-        translationAnimation1 = compositor.CreateVector3KeyFrameAnimation();
-        translationAnimation1.InsertKeyFrame(1, Vector3.Zero);
-        translationAnimation1.Duration = TimeSpan.FromSeconds(DurationSeconds);
-        translationAnimation1.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
+        _translationAnimation1 = _compositor.CreateVector3KeyFrameAnimation();
+        _translationAnimation1.InsertKeyFrame(1, Vector3.Zero);
+        _translationAnimation1.Duration = TimeSpan.FromSeconds(DurationSeconds);
+        _translationAnimation1.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
 
-        translationAnimation2 = compositor.CreateVector3KeyFrameAnimation();
-        translationAnimation2.InsertExpressionKeyFrame(1, "propSet.Offset");
-        translationAnimation2.Duration = TimeSpan.FromSeconds(DurationSeconds);
-        translationAnimation2.SetReferenceParameter("propSet", propSet);
-        translationAnimation2.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
+        _translationAnimation2 = _compositor.CreateVector3KeyFrameAnimation();
+        _translationAnimation2.InsertExpressionKeyFrame(1, "propSet.Offset");
+        _translationAnimation2.Duration = TimeSpan.FromSeconds(DurationSeconds);
+        _translationAnimation2.SetReferenceParameter("propSet", _propSet);
+        _translationAnimation2.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;
         TryLoadContent((ButtonBase)sender);
     }
 
@@ -101,66 +101,66 @@ private void TryLoadContent(ButtonBase? button)
 
     private void LoadContent(ButtonBase button)
     {
-        if (attached) return;
+        if (_attached) return;
 
-        paddingChangedEventToken = button.RegisterPropertyChangedCallback(Control.PaddingProperty, OnPaddingPropertyChanged);
-        visualStateGroup = VisualStateManager.GetVisualStateGroups((FrameworkElement)VisualTreeHelper.GetChild(button, 0)).FirstOrDefault(c => c.Name == "CommonStates");
+        _paddingChangedEventToken = button.RegisterPropertyChangedCallback(Control.PaddingProperty, OnPaddingPropertyChanged);
+        _visualStateGroup = VisualStateManager.GetVisualStateGroups((FrameworkElement)VisualTreeHelper.GetChild(button, 0)).FirstOrDefault(c => c.Name == "CommonStates");
 
-        if (visualStateGroup != null)
+        if (_visualStateGroup != null)
         {
-            visualStateGroup.CurrentStateChanging += VisualStateGroup_CurrentStateChanging;
+            _visualStateGroup.CurrentStateChanging += VisualStateGroup_CurrentStateChanging;
         }
 
-        contentPresenter = FindChild<ContentPresenter>(button);
+        _contentPresenter = FindChild<ContentPresenter>(button);
 
-        if (contentPresenter != null)
+        if (_contentPresenter != null)
         {
-            contentChangedEventToken = contentPresenter.RegisterPropertyChangedCallback(ContentPresenter.ContentProperty, OnContentChanged);
-            var actualContent = VisualTreeHelper.GetChild(contentPresenter, 0) as UIElement;
+            _contentChangedEventToken = _contentPresenter.RegisterPropertyChangedCallback(ContentPresenter.ContentProperty, OnContentChanged);
+            var actualContent = VisualTreeHelper.GetChild(_contentPresenter, 0) as UIElement;
 
             if (actualContent != null)
             {
-                contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);
-                contentVisual.IsPixelSnappingEnabled = true;
+                _contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);
+                _contentVisual.IsPixelSnappingEnabled = true;
                 ElementCompositionPreview.SetIsTranslationEnabled(actualContent, true);
             }
         }
 
-        attached = true;
+        _attached = true;
         UpdateSnapType();
     }
 
     private void UnloadContent(ButtonBase button)
     {
-        if (!attached) return;
+        if (!_attached) return;
 
-        attached = false;
+        _attached = false;
 
         button.LayoutUpdated += AssociatedObject_LayoutUpdated;
 
-        button.UnregisterPropertyChangedCallback(Control.PaddingProperty, paddingChangedEventToken);
-        paddingChangedEventToken = 0;
+        button.UnregisterPropertyChangedCallback(Control.PaddingProperty, _paddingChangedEventToken);
+        _paddingChangedEventToken = 0;
 
-        if (visualStateGroup != null)
+        if (_visualStateGroup != null)
         {
-            visualStateGroup.CurrentStateChanging -= VisualStateGroup_CurrentStateChanging;
+            _visualStateGroup.CurrentStateChanging -= VisualStateGroup_CurrentStateChanging;
         }
-        visualStateGroup = null;
+        _visualStateGroup = null;
 
-        if (contentPresenter != null)
+        if (_contentPresenter != null)
         {
-            contentPresenter.UnregisterPropertyChangedCallback(ContentPresenter.ContentProperty, contentChangedEventToken);
-            contentChangedEventToken = 0;
-            contentPresenter = null;
+            _contentPresenter.UnregisterPropertyChangedCallback(ContentPresenter.ContentProperty, _contentChangedEventToken);
+            _contentChangedEventToken = 0;
+            _contentPresenter = null;
         }
 
-        if (contentVisual != null)
+        if (_contentVisual != null)
         {
-            contentVisual.StopAnimation("Translation");
-            contentVisual = null;
+            _contentVisual.StopAnimation("Translation");
+            _contentVisual = null;
         }
 
-        propSet.InsertVector3("Offset", Vector3.Zero);
+        _propSet.InsertVector3("Offset", Vector3.Zero);
     }
 
     protected override void OnAttached()
@@ -194,36 +194,36 @@ private void OnPaddingPropertyChanged(DependencyObject sender, DependencyPropert
 
     private void OnContentChanged(DependencyObject sender, DependencyProperty dp)
     {
-        if (attached && contentPresenter != null)
+        if (_attached && _contentPresenter != null)
         {
-            if (contentVisual != null)
+            if (_contentVisual != null)
             {
-                contentVisual.StopAnimation("Translation");
-                contentVisual = null;
+                _contentVisual.StopAnimation("Translation");
+                _contentVisual = null;
             }
 
-            var actualContent = VisualTreeHelper.GetChild(contentPresenter, 0) as UIElement;
+            var actualContent = VisualTreeHelper.GetChild(_contentPresenter, 0) as UIElement;
 
             if (actualContent != null)
             {
-                contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);
-                contentVisual.IsPixelSnappingEnabled = true;
+                _contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);
+                _contentVisual.IsPixelSnappingEnabled = true;
                 ElementCompositionPreview.SetIsTranslationEnabled(actualContent, true);
             }
         }
     }
 
     private void VisualStateGroup_CurrentStateChanging(object sender, VisualStateChangedEventArgs e)
     {
-        if (!attached || contentVisual == null) return;
+        if (!_attached || _contentVisual == null) return;
 
         if (e.NewState?.Name == "PointerOver" || e.NewState?.Name == "Pressed")
         {
-            contentVisual.StartAnimation("Translation", translationAnimation1);
+            _contentVisual.StartAnimation("Translation", _translationAnimation1);
         }
         else
         {
-            contentVisual.StartAnimation("Translation", translationAnimation2);
+            _contentVisual.StartAnimation("Translation", _translationAnimation2);
         }
     }
 
@@ -233,14 +233,14 @@ private void UpdateSnapType()
         var button = AssociatedObject;
         if (button == null) return;
 
-        if (attached)
+        if (_attached)
         {
             var hover = false;
 
-            if (visualStateGroup != null)
+            if (_visualStateGroup != null)
             {
-                hover = visualStateGroup.CurrentState?.Name == "PointerOver"
-                    || visualStateGroup.CurrentState?.Name == "Pressed";
+                hover = _visualStateGroup.CurrentState?.Name == "PointerOver"
+                    || _visualStateGroup.CurrentState?.Name == "Pressed";
             }
 
             var padding = button.Padding;
@@ -254,19 +254,19 @@ private void UpdateSnapType()
                 _ => Vector3.Zero
             };
 
-            propSet.InsertVector3("Offset", offset);
+            _propSet.InsertVector3("Offset", offset);
 
-            if (contentVisual != null)
+            if (_contentVisual != null)
             {
-                contentVisual.StopAnimation("Translation");
+                _contentVisual.StopAnimation("Translation");
 
                 if (hover)
                 {
-                    contentVisual.Properties.InsertVector3("Translation", Vector3.Zero);
+                    _contentVisual.Properties.InsertVector3("Translation", Vector3.Zero);
                 }
                 else
                 {
-                    contentVisual.Properties.InsertVector3("Translation", offset);
+                    _contentVisual.Properties.InsertVector3("Translation", offset);
                 }
             }
         }
diff --git a/FluentWeather.Uwp/Controls/Dialogs/SetLocationDialog.xaml.cs b/FluentWeather.Uwp/Controls/Dialogs/SetLocationDialog.xaml.cs
@@ -38,11 +38,11 @@ public SetLocationDialog()
         }
     }
     [ObservableProperty]
-    private string query;
+    private string _query;
     [ObservableProperty]
-    private ObservableCollection<GeolocationBase> suggestedCities = new();
+    private ObservableCollection<GeolocationBase> _suggestedCities = new();
     [ObservableProperty]
-    private GeolocationBase chosenGeolocation;
+    private GeolocationBase _chosenGeolocation;
 
     private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
     {
diff --git a/FluentWeather.Uwp/Controls/Dialogs/TyphoonDialog.xaml b/FluentWeather.Uwp/Controls/Dialogs/TyphoonDialog.xaml
@@ -49,14 +49,14 @@
                     <TextBlock
                         Width="20"
                         Margin="4,4,0,0"
-                        maps:MapControl.Location="{x:Bind point24}"
+                        maps:MapControl.Location="{x:Bind _point24}"
                         Foreground="#CCFFFF00"
                         Text="24小时警戒线"
                         TextWrapping="Wrap" />
                     <TextBlock
                         Width="20"
                         Margin="4,4,0,0"
-                        maps:MapControl.Location="{x:Bind point48}"
+                        maps:MapControl.Location="{x:Bind _point48}"
                         Foreground="#99FFFF00"
                         Text="48小时警戒线"
                         TextWrapping="Wrap" />
diff --git a/FluentWeather.Uwp/Controls/Dialogs/TyphoonDialog.xaml.cs b/FluentWeather.Uwp/Controls/Dialogs/TyphoonDialog.xaml.cs
@@ -43,9 +43,9 @@ public TyphoonDialog()
         }
         public const string MapStyleSheetJson = "{\"version\":\"1.*\",\"settings\":{},\"elements\":{\"transportation\":{\"visible\":false},\"road\":{\"labelVisible\":false}}}";
         [ObservableProperty]
-        private ObservableCollection<TyphoonTrackBase> tracks = new();
+        private ObservableCollection<TyphoonTrackBase> _tracks = new();
         [ObservableProperty]
-        private ObservableCollection<TyphoonBase> typhoons = new();
+        private ObservableCollection<TyphoonBase> _typhoons = new();
         public async void GetTyphoons()
         {
             if(Common.Settings.QWeatherDomain is "devapi.qweather.com")
@@ -217,8 +217,8 @@ public void ShowWarningLines()
             TyphoonMap.MapElements.Add(line24);
             TyphoonMap.MapElements.Add(line48);
         }
-        private readonly Geopoint point24 = new Geopoint(new BasicGeoposition { Longitude = 127, Latitude = 34 });
-        private readonly Geopoint point48 = new Geopoint(new BasicGeoposition { Longitude = 132, Latitude = 34 });
+        private readonly Geopoint _point24 = new Geopoint(new BasicGeoposition { Longitude = 127, Latitude = 34 });
+        private readonly Geopoint _point48 = new Geopoint(new BasicGeoposition { Longitude = 132, Latitude = 34 });
 
         [RelayCommand]
         public void Close()
diff --git a/FluentWeather.Uwp/Controls/Settings/PersonalizationSettingSection.xaml b/FluentWeather.Uwp/Controls/Settings/PersonalizationSettingSection.xaml
@@ -106,7 +106,7 @@
                                     <controls1:MarkdownTextBlock
                                         Width="400"
                                         Background="Transparent"
-                                        Text="{x:Bind backgroundImageSettingInfo}"
+                                        Text="{x:Bind _backgroundImageSettingInfo}"
                                         TextWrapping="Wrap" />
                                 </Flyout>
                             </Button.Flyout>
diff --git a/FluentWeather.Uwp/Controls/Settings/PersonalizationSettingSection.xaml.cs b/FluentWeather.Uwp/Controls/Settings/PersonalizationSettingSection.xaml.cs
@@ -35,7 +35,7 @@ public PersonalizationSettingSection()
         {
             this.InitializeComponent();
         }
-        private readonly string backgroundImageSettingInfo = "你也可以根据不同天气使用不同的背景\r\n\r\n方法:点击\"打开背景文件夹\"，将背景图片**(PNG格式)**复制到此文件夹内，将图片按照以下格式重命名即可:\r\n\r\n|  天气   | 文件命名              |\r\n|-------|-------------------|\r\n| 晴     | Clear             |\r\n| 多云    | PartlyCloudy      |\r\n| 阴     | Cloudy            |\r\n| 大雨    | HeavyRain         |\r\n| 小雨/中雨 | LightRain         |\r\n| 大雪    | HeavySnow         |\r\n| 小雪/中雪 | LightSnow         |\r\n| 雷阵雨   | ThunderyShowers   |\r\n| 雷电    | ThunderyHeavyRain |\r\n| 雾/霾   | Fog             ";
+        private readonly string _backgroundImageSettingInfo = "你也可以根据不同天气使用不同的背景\r\n\r\n方法:点击\"打开背景文件夹\"，将背景图片**(PNG格式)**复制到此文件夹内，将图片按照以下格式重命名即可:\r\n\r\n|  天气   | 文件命名              |\r\n|-------|-------------------|\r\n| 晴     | Clear             |\r\n| 多云    | PartlyCloudy      |\r\n| 阴     | Cloudy            |\r\n| 大雨    | HeavyRain         |\r\n| 小雨/中雨 | LightRain         |\r\n| 大雪    | HeavySnow         |\r\n| 小雪/中雪 | LightSnow         |\r\n| 雷阵雨   | ThunderyShowers   |\r\n| 雷电    | ThunderyHeavyRain |\r\n| 雾/霾   | Fog             ";
         [RelayCommand]
         public async Task SetBackground(string type)
         {
diff --git a/FluentWeather.Uwp/Pages/RootPage.xaml.cs b/FluentWeather.Uwp/Pages/RootPage.xaml.cs
@@ -92,7 +92,7 @@ public void SetTitleBar()
         ThemeHelper.SetTitleBarColor(Common.Settings.ApplicationTheme);
     }
     [ObservableProperty]
-    public bool canGoBack;
+    private bool _canGoBack;
     
     private void BackButton_Click(object sender, RoutedEventArgs e)
     {
diff --git a/FluentWeather.Uwp/ViewModels/CitiesPageViewModel.cs b/FluentWeather.Uwp/ViewModels/CitiesPageViewModel.cs
@@ -25,13 +25,13 @@ namespace FluentWeather.Uwp.ViewModels;
 public partial class CitiesPageViewModel:ObservableObject
 {
     [ObservableProperty]
-    private ObservableCollection<GeolocationBase> cities;
+    private ObservableCollection<GeolocationBase> _cities;
     [ObservableProperty]
-    private GeolocationBase currentCity;
+    private GeolocationBase _currentCity;
     [ObservableProperty]
-    private string query;
+    private string _query;
     [ObservableProperty]
-    private List<GeolocationBase> suggestedCities;
+    private List<GeolocationBase> _suggestedCities;
     public static CitiesPageViewModel Instance { get; private set; }
     public CitiesPageViewModel()
     {
diff --git a/FluentWeather.Uwp/ViewModels/MainPageViewModel.cs b/FluentWeather.Uwp/ViewModels/MainPageViewModel.cs
diff --git a/FluentWeather.Uwp/ViewModels/RootPageViewModel.cs b/FluentWeather.Uwp/ViewModels/RootPageViewModel.cs

Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,17 @@ public class ButtonContentSnapBehavior : Behavior<ButtonBase>`
`16`	`16`	`{`
`17`	`17`	`private const double DurationSeconds = 0.3;`
`18`	`18`
`19`		`- private bool attached;`
`20`		`- private long paddingChangedEventToken;`
`21`		`- private long contentChangedEventToken;`
`22`		`- private VisualStateGroup? visualStateGroup;`
`23`		`- private ContentPresenter? contentPresenter;`
`24`		`- private Visual? contentVisual;`
`25`		`-`
`26`		`- private Compositor compositor;`
`27`		`- private CompositionPropertySet propSet;`
`28`		`- private Vector3KeyFrameAnimation translationAnimation1;`
`29`		`- private Vector3KeyFrameAnimation translationAnimation2;`
	`19`	`+ private bool _attached;`
	`20`	`+ private long _paddingChangedEventToken;`
	`21`	`+ private long _contentChangedEventToken;`
	`22`	`+ private VisualStateGroup? _visualStateGroup;`
	`23`	`+ private ContentPresenter? _contentPresenter;`
	`24`	`+ private Visual? _contentVisual;`
	`25`	`+`
	`26`	`+ private Compositor _compositor;`
	`27`	`+ private CompositionPropertySet _propSet;`
	`28`	`+ private Vector3KeyFrameAnimation _translationAnimation1;`
	`29`	`+ private Vector3KeyFrameAnimation _translationAnimation2;`
`30`	`30`
`31`	`31`
`32`	`32`
`@@ -47,22 +47,22 @@ public ButtonContentSnapType SnapType`
`47`	`47`
`48`	`48`	`private void AssociatedObject_Loaded(object sender, RoutedEventArgs e)`
`49`	`49`	`{`
`50`		`- compositor = ElementCompositionPreview.GetElementVisual(AssociatedObject).Compositor;`
	`50`	`+ _compositor = ElementCompositionPreview.GetElementVisual(AssociatedObject).Compositor;`
`51`	`51`	`//compositor = CompositionTarget.GetCompositorForCurrentThread();`
`52`	`52`
`53`		`- propSet = compositor.CreatePropertySet();`
`54`		`- propSet.InsertVector3("Offset", Vector3.Zero);`
	`53`	`+ _propSet = _compositor.CreatePropertySet();`
	`54`	`+ _propSet.InsertVector3("Offset", Vector3.Zero);`
`55`	`55`
`56`		`- translationAnimation1 = compositor.CreateVector3KeyFrameAnimation();`
`57`		`- translationAnimation1.InsertKeyFrame(1, Vector3.Zero);`
`58`		`- translationAnimation1.Duration = TimeSpan.FromSeconds(DurationSeconds);`
`59`		`- translationAnimation1.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;`
	`56`	`+ _translationAnimation1 = _compositor.CreateVector3KeyFrameAnimation();`
	`57`	`+ _translationAnimation1.InsertKeyFrame(1, Vector3.Zero);`
	`58`	`+ _translationAnimation1.Duration = TimeSpan.FromSeconds(DurationSeconds);`
	`59`	`+ _translationAnimation1.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;`
`60`	`60`
`61`		`- translationAnimation2 = compositor.CreateVector3KeyFrameAnimation();`
`62`		`- translationAnimation2.InsertExpressionKeyFrame(1, "propSet.Offset");`
`63`		`- translationAnimation2.Duration = TimeSpan.FromSeconds(DurationSeconds);`
`64`		`- translationAnimation2.SetReferenceParameter("propSet", propSet);`
`65`		`- translationAnimation2.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;`
	`61`	`+ _translationAnimation2 = _compositor.CreateVector3KeyFrameAnimation();`
	`62`	`+ _translationAnimation2.InsertExpressionKeyFrame(1, "propSet.Offset");`
	`63`	`+ _translationAnimation2.Duration = TimeSpan.FromSeconds(DurationSeconds);`
	`64`	`+ _translationAnimation2.SetReferenceParameter("propSet", _propSet);`
	`65`	`+ _translationAnimation2.StopBehavior = AnimationStopBehavior.LeaveCurrentValue;`
`66`	`66`	`TryLoadContent((ButtonBase)sender);`
`67`	`67`	`}`
`68`	`68`
`@@ -101,66 +101,66 @@ private void TryLoadContent(ButtonBase? button)`
`101`	`101`
`102`	`102`	`private void LoadContent(ButtonBase button)`
`103`	`103`	`{`
`104`		`- if (attached) return;`
	`104`	`+ if (_attached) return;`
`105`	`105`
`106`		`- paddingChangedEventToken = button.RegisterPropertyChangedCallback(Control.PaddingProperty, OnPaddingPropertyChanged);`
`107`		`- visualStateGroup = VisualStateManager.GetVisualStateGroups((FrameworkElement)VisualTreeHelper.GetChild(button, 0)).FirstOrDefault(c => c.Name == "CommonStates");`
	`106`	`+ _paddingChangedEventToken = button.RegisterPropertyChangedCallback(Control.PaddingProperty, OnPaddingPropertyChanged);`
	`107`	`+ _visualStateGroup = VisualStateManager.GetVisualStateGroups((FrameworkElement)VisualTreeHelper.GetChild(button, 0)).FirstOrDefault(c => c.Name == "CommonStates");`
`108`	`108`
`109`		`- if (visualStateGroup != null)`
	`109`	`+ if (_visualStateGroup != null)`
`110`	`110`	`{`
`111`		`- visualStateGroup.CurrentStateChanging += VisualStateGroup_CurrentStateChanging;`
	`111`	`+ _visualStateGroup.CurrentStateChanging += VisualStateGroup_CurrentStateChanging;`
`112`	`112`	`}`
`113`	`113`
`114`		`- contentPresenter = FindChild<ContentPresenter>(button);`
	`114`	`+ _contentPresenter = FindChild<ContentPresenter>(button);`
`115`	`115`
`116`		`- if (contentPresenter != null)`
	`116`	`+ if (_contentPresenter != null)`
`117`	`117`	`{`
`118`		`- contentChangedEventToken = contentPresenter.RegisterPropertyChangedCallback(ContentPresenter.ContentProperty, OnContentChanged);`
`119`		`- var actualContent = VisualTreeHelper.GetChild(contentPresenter, 0) as UIElement;`
	`118`	`+ _contentChangedEventToken = _contentPresenter.RegisterPropertyChangedCallback(ContentPresenter.ContentProperty, OnContentChanged);`
	`119`	`+ var actualContent = VisualTreeHelper.GetChild(_contentPresenter, 0) as UIElement;`
`120`	`120`
`121`	`121`	`if (actualContent != null)`
`122`	`122`	`{`
`123`		`- contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);`
`124`		`- contentVisual.IsPixelSnappingEnabled = true;`
	`123`	`+ _contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);`
	`124`	`+ _contentVisual.IsPixelSnappingEnabled = true;`
`125`	`125`	`ElementCompositionPreview.SetIsTranslationEnabled(actualContent, true);`
`126`	`126`	`}`
`127`	`127`	`}`
`128`	`128`
`129`		`- attached = true;`
	`129`	`+ _attached = true;`
`130`	`130`	`UpdateSnapType();`
`131`	`131`	`}`
`132`	`132`
`133`	`133`	`private void UnloadContent(ButtonBase button)`
`134`	`134`	`{`
`135`		`- if (!attached) return;`
	`135`	`+ if (!_attached) return;`
`136`	`136`
`137`		`- attached = false;`
	`137`	`+ _attached = false;`
`138`	`138`
`139`	`139`	`button.LayoutUpdated += AssociatedObject_LayoutUpdated;`
`140`	`140`
`141`		`- button.UnregisterPropertyChangedCallback(Control.PaddingProperty, paddingChangedEventToken);`
`142`		`- paddingChangedEventToken = 0;`
	`141`	`+ button.UnregisterPropertyChangedCallback(Control.PaddingProperty, _paddingChangedEventToken);`
	`142`	`+ _paddingChangedEventToken = 0;`
`143`	`143`
`144`		`- if (visualStateGroup != null)`
	`144`	`+ if (_visualStateGroup != null)`
`145`	`145`	`{`
`146`		`- visualStateGroup.CurrentStateChanging -= VisualStateGroup_CurrentStateChanging;`
	`146`	`+ _visualStateGroup.CurrentStateChanging -= VisualStateGroup_CurrentStateChanging;`
`147`	`147`	`}`
`148`		`- visualStateGroup = null;`
	`148`	`+ _visualStateGroup = null;`
`149`	`149`
`150`		`- if (contentPresenter != null)`
	`150`	`+ if (_contentPresenter != null)`
`151`	`151`	`{`
`152`		`- contentPresenter.UnregisterPropertyChangedCallback(ContentPresenter.ContentProperty, contentChangedEventToken);`
`153`		`- contentChangedEventToken = 0;`
`154`		`- contentPresenter = null;`
	`152`	`+ _contentPresenter.UnregisterPropertyChangedCallback(ContentPresenter.ContentProperty, _contentChangedEventToken);`
	`153`	`+ _contentChangedEventToken = 0;`
	`154`	`+ _contentPresenter = null;`
`155`	`155`	`}`
`156`	`156`
`157`		`- if (contentVisual != null)`
	`157`	`+ if (_contentVisual != null)`
`158`	`158`	`{`
`159`		`- contentVisual.StopAnimation("Translation");`
`160`		`- contentVisual = null;`
	`159`	`+ _contentVisual.StopAnimation("Translation");`
	`160`	`+ _contentVisual = null;`
`161`	`161`	`}`
`162`	`162`
`163`		`- propSet.InsertVector3("Offset", Vector3.Zero);`
	`163`	`+ _propSet.InsertVector3("Offset", Vector3.Zero);`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`protected override void OnAttached()`
`@@ -194,36 +194,36 @@ private void OnPaddingPropertyChanged(DependencyObject sender, DependencyPropert`
`194`	`194`
`195`	`195`	`private void OnContentChanged(DependencyObject sender, DependencyProperty dp)`
`196`	`196`	`{`
`197`		`- if (attached && contentPresenter != null)`
	`197`	`+ if (_attached && _contentPresenter != null)`
`198`	`198`	`{`
`199`		`- if (contentVisual != null)`
	`199`	`+ if (_contentVisual != null)`
`200`	`200`	`{`
`201`		`- contentVisual.StopAnimation("Translation");`
`202`		`- contentVisual = null;`
	`201`	`+ _contentVisual.StopAnimation("Translation");`
	`202`	`+ _contentVisual = null;`
`203`	`203`	`}`
`204`	`204`
`205`		`- var actualContent = VisualTreeHelper.GetChild(contentPresenter, 0) as UIElement;`
	`205`	`+ var actualContent = VisualTreeHelper.GetChild(_contentPresenter, 0) as UIElement;`
`206`	`206`
`207`	`207`	`if (actualContent != null)`
`208`	`208`	`{`
`209`		`- contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);`
`210`		`- contentVisual.IsPixelSnappingEnabled = true;`
	`209`	`+ _contentVisual = ElementCompositionPreview.GetElementVisual(actualContent);`
	`210`	`+ _contentVisual.IsPixelSnappingEnabled = true;`
`211`	`211`	`ElementCompositionPreview.SetIsTranslationEnabled(actualContent, true);`
`212`	`212`	`}`
`213`	`213`	`}`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`private void VisualStateGroup_CurrentStateChanging(object sender, VisualStateChangedEventArgs e)`
`217`	`217`	`{`
`218`		`- if (!attached \|\| contentVisual == null) return;`
	`218`	`+ if (!_attached \|\| _contentVisual == null) return;`
`219`	`219`
`220`	`220`	`if (e.NewState?.Name == "PointerOver" \|\| e.NewState?.Name == "Pressed")`
`221`	`221`	`{`
`222`		`- contentVisual.StartAnimation("Translation", translationAnimation1);`
	`222`	`+ _contentVisual.StartAnimation("Translation", _translationAnimation1);`
`223`	`223`	`}`
`224`	`224`	`else`
`225`	`225`	`{`
`226`		`- contentVisual.StartAnimation("Translation", translationAnimation2);`
	`226`	`+ _contentVisual.StartAnimation("Translation", _translationAnimation2);`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`
`@@ -233,14 +233,14 @@ private void UpdateSnapType()`
`233`	`233`	`var button = AssociatedObject;`
`234`	`234`	`if (button == null) return;`
`235`	`235`
`236`		`- if (attached)`
	`236`	`+ if (_attached)`
`237`	`237`	`{`
`238`	`238`	`var hover = false;`
`239`	`239`
`240`		`- if (visualStateGroup != null)`
	`240`	`+ if (_visualStateGroup != null)`
`241`	`241`	`{`
`242`		`- hover = visualStateGroup.CurrentState?.Name == "PointerOver"`
`243`		`- \|\| visualStateGroup.CurrentState?.Name == "Pressed";`
	`242`	`+ hover = _visualStateGroup.CurrentState?.Name == "PointerOver"`
	`243`	`+ \|\| _visualStateGroup.CurrentState?.Name == "Pressed";`
`244`	`244`	`}`
`245`	`245`
`246`	`246`	`var padding = button.Padding;`
`@@ -254,19 +254,19 @@ private void UpdateSnapType()`
`254`	`254`	`_ => Vector3.Zero`
`255`	`255`	`};`
`256`	`256`
`257`		`- propSet.InsertVector3("Offset", offset);`
	`257`	`+ _propSet.InsertVector3("Offset", offset);`
`258`	`258`
`259`		`- if (contentVisual != null)`
	`259`	`+ if (_contentVisual != null)`
`260`	`260`	`{`
`261`		`- contentVisual.StopAnimation("Translation");`
	`261`	`+ _contentVisual.StopAnimation("Translation");`
`262`	`262`
`263`	`263`	`if (hover)`
`264`	`264`	`{`
`265`		`- contentVisual.Properties.InsertVector3("Translation", Vector3.Zero);`
	`265`	`+ _contentVisual.Properties.InsertVector3("Translation", Vector3.Zero);`
`266`	`266`	`}`
`267`	`267`	`else`
`268`	`268`	`{`
`269`		`- contentVisual.Properties.InsertVector3("Translation", offset);`
	`269`	`+ _contentVisual.Properties.InsertVector3("Translation", offset);`
`270`	`270`	`}`
`271`	`271`	`}`
`272`	`272`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,11 +38,11 @@ public SetLocationDialog()`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`[ObservableProperty]`
`41`		`- private string query;`
	`41`	`+ private string _query;`
`42`	`42`	`[ObservableProperty]`
`43`		`- private ObservableCollection<GeolocationBase> suggestedCities = new();`
	`43`	`+ private ObservableCollection<GeolocationBase> _suggestedCities = new();`
`44`	`44`	`[ObservableProperty]`
`45`		`- private GeolocationBase chosenGeolocation;`
	`45`	`+ private GeolocationBase _chosenGeolocation;`
`46`	`46`
`47`	`47`	`private void ContentDialog_SecondaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)`
`48`	`48`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public PersonalizationSettingSection()`
`35`	`35`	`{`
`36`	`36`	`this.InitializeComponent();`
`37`	`37`	`}`
`38`		- private readonly string backgroundImageSettingInfo = "你也可以根据不同天气使用不同的背景\r\n\r\n方法:点击\"打开背景文件夹\"，将背景图片(PNG格式)复制到此文件夹内，将图片按照以下格式重命名即可:\r\n\r\n\| 天气 \| 文件命名 \|\r\n\|-------\|-------------------\|\r\n\| 晴 \| Clear \|\r\n\| 多云 \| PartlyCloudy \|\r\n\| 阴 \| Cloudy \|\r\n\| 大雨 \| HeavyRain \|\r\n\| 小雨/中雨 \| LightRain \|\r\n\| 大雪 \| HeavySnow \|\r\n\| 小雪/中雪 \| LightSnow \|\r\n\| 雷阵雨 \| ThunderyShowers \|\r\n\| 雷电 \| ThunderyHeavyRain \|\r\n\| 雾/霾 \| Fog ";
	`38`	+ private readonly string _backgroundImageSettingInfo = "你也可以根据不同天气使用不同的背景\r\n\r\n方法:点击\"打开背景文件夹\"，将背景图片(PNG格式)复制到此文件夹内，将图片按照以下格式重命名即可:\r\n\r\n\| 天气 \| 文件命名 \|\r\n\|-------\|-------------------\|\r\n\| 晴 \| Clear \|\r\n\| 多云 \| PartlyCloudy \|\r\n\| 阴 \| Cloudy \|\r\n\| 大雨 \| HeavyRain \|\r\n\| 小雨/中雨 \| LightRain \|\r\n\| 大雪 \| HeavySnow \|\r\n\| 小雪/中雪 \| LightSnow \|\r\n\| 雷阵雨 \| ThunderyShowers \|\r\n\| 雷电 \| ThunderyHeavyRain \|\r\n\| 雾/霾 \| Fog ";
`39`	`39`	`[RelayCommand]`
`40`	`40`	`public async Task SetBackground(string type)`
`41`	`41`	`{`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public void SetTitleBar()`
`92`	`92`	`ThemeHelper.SetTitleBarColor(Common.Settings.ApplicationTheme);`
`93`	`93`	`}`
`94`	`94`	`[ObservableProperty]`
`95`		`- public bool canGoBack;`
	`95`	`+ private bool _canGoBack;`
`96`	`96`
`97`	`97`	`private void BackButton_Click(object sender, RoutedEventArgs e)`
`98`	`98`	`{`