feat: fix hide settings

thehrz · Sep 28, 2024 · a38e6a0 · a38e6a0
1 parent 100fa49
commit a38e6a0
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/EarthquakeWaring.App/App.xaml.cs b/EarthquakeWaring.App/App.xaml.cs
@@ -106,6 +106,7 @@ public static void ConfigureServices(IServiceCollection service)
             service.AddTransient<EarthQuakesListPage>();
             service.AddTransient<EarthQuakeDetail>();
             service.AddTransient<SettingsPageViewModel>();
+            service.AddTransient<MainWindowViewModel>();
 
             service.AddSingleton<ITrayIconHolder, TrayIconHolder>();
 

diff --git a/EarthquakeWaring.App/Infrastructure/Models/ViewModels/MainWindowViewModel.cs b/EarthquakeWaring.App/Infrastructure/Models/ViewModels/MainWindowViewModel.cs
@@ -1,11 +1,15 @@
+using EarthquakeWaring.App.Infrastructure.Models.SettingModels;
+using EarthquakeWaring.App.Infrastructure.ServiceAbstraction;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
 namespace EarthquakeWaring.App.Infrastructure.Models.ViewModels;
 
 public class MainWindowViewModel : INotifyPropertyChanged
-{
+{    
+  public ISetting<UpdaterSetting>? UpdateSetting { get; set; }
+
 
     private bool _isHideSettings = false;
     public bool IsHideSettings
@@ -28,4 +32,11 @@ protected bool SetField<T>(ref T field, T value, [CallerMemberName] string? prop
         OnPropertyChanged(propertyName);
         return true;
     }
+
+    public MainWindowViewModel(
+        ISetting<UpdaterSetting>? updateSetting)
+    {
+        UpdateSetting = updateSetting;
+        _isHideSettings = UpdateSetting?.Setting?.HideSettings ?? false;
+    }
 }
diff --git a/EarthquakeWaring.App/Windows/MainWindow.xaml b/EarthquakeWaring.App/Windows/MainWindow.xaml
@@ -13,9 +13,6 @@
     Closed="MainWindow_OnClosed"
     Style="{StaticResource UiWindow}"
     WindowStartupLocation="CenterScreen">
-    <Window.DataContext>
-        <viewModels:MainWindowViewModel/>
-    </Window.DataContext>
     <Window.Resources>
         <extensions:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
     </Window.Resources>

diff --git a/EarthquakeWaring.App/Windows/MainWindow.xaml.cs b/EarthquakeWaring.App/Windows/MainWindow.xaml.cs
@@ -1,10 +1,12 @@
 using EarthquakeWaring.App.Infrastructure.Models.SettingModels;
+using EarthquakeWaring.App.Infrastructure.Models.ViewModels;
 using EarthquakeWaring.App.Infrastructure.ServiceAbstraction;
 using EarthquakeWaring.App.Pages;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System;
 using System.Windows;
+using Wpf.Ui.Mvvm.Interfaces;
 
 namespace EarthquakeWaring.App.Windows
 {
@@ -18,7 +20,9 @@ public partial class MainWindow : Window
         public MainWindow(IServiceProvider services)
         {
             _services = services;
-            InitializeComponent();
+            InitializeComponent();
+
+            this.DataContext = new MainWindowViewModel(_services.GetService<ISetting<UpdaterSetting>>());
         }
 
         protected override void OnInitialized(EventArgs e)