Skip to content

Commit 83124f8

Browse files
fgsfdsfgsfds
committed
moved config to the database
1 parent 100bfb3 commit 83124f8

33 files changed

+721
-585
lines changed

‎Directory.Packages.props

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,29 @@
33
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageVersion Include="AddSealed" Version="0.6.0" />
7-
<PackageVersion Include="Avalonia" Version="11.0.10" />
8-
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
9-
<PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
10-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.10" />
11-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.6" />
12-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.6" />
13-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
14-
<PackageVersion Include="Markdown.Avalonia" Version="11.0.2" />
15-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
16-
<PackageVersion Include="SharpCompress" Version="0.37.2" />
17-
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
18-
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
19-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
20-
<PackageVersion Include="xunit" Version="2.8.1" />
21-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
22-
<PackageVersion Include="AWSSDK.S3" Version="3.7.308.4" />
23-
<PackageVersion Include="ConfigureAwaitAnalyzer" Version="1.0.3" />
24-
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
25-
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.5" />
26-
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
27-
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
6+
<PackageVersion Include="AddSealed" Version="0.6.0" />
7+
<PackageVersion Include="Avalonia" Version="11.0.10" />
8+
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.10" />
9+
<PackageVersion Include="Avalonia.Desktop" Version="11.0.10" />
10+
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.10" />
11+
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.6" />
12+
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.6" />
13+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
14+
<PackageVersion Include="Markdown.Avalonia" Version="11.0.2" />
15+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.6" />
16+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="8.0.6" />
17+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
18+
<PackageVersion Include="SharpCompress" Version="0.37.2" />
19+
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
20+
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
21+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
22+
<PackageVersion Include="xunit" Version="2.8.1" />
23+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1" />
24+
<PackageVersion Include="AWSSDK.S3" Version="3.7.308.5" />
25+
<PackageVersion Include="ConfigureAwaitAnalyzer" Version="1.0.3" />
26+
<PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
27+
<PackageVersion Include="Microsoft.AspNetCore.SpaProxy" Version="8.0.6" />
28+
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.20.1" />
29+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
2830
</ItemGroup>
2931
</Project>

‎src/Avalonia/Core/App.axaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ private static void LoadBindings()
7979
/// </summary>
8080
private void SetTheme()
8181
{
82-
var theme = BindingsManager.Provider.GetRequiredService<ConfigProvider>().Config.Theme;
82+
var theme = BindingsManager.Provider.GetRequiredService<ConfigProvider>().Theme;
8383

8484
var themeEnum = theme switch
8585
{

‎src/Avalonia/Core/ViewModels/CampaignsViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public sealed partial class CampaignsViewModel : RightPanelViewModel, IPortsButt
1818
public readonly IGame Game;
1919

2020
private readonly GamesProvider _gamesProvider;
21-
private readonly ConfigEntity _config;
21+
private readonly ConfigProvider _config;
2222
private readonly PlaytimeProvider _playtimeProvider;
2323

2424

2525
[Obsolete($"Don't create directly. Use {nameof(ViewModelsFactory)}.")]
2626
public CampaignsViewModel(
2727
IGame game,
2828
GamesProvider gamesProvider,
29-
ConfigEntity config,
29+
ConfigProvider config,
3030
PlaytimeProvider playtimeProvider,
3131
ApiInterface apiInterface,
3232
ScoresProvider scoresProvider

‎src/Avalonia/Core/ViewModels/DevViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ namespace BuildLauncher.ViewModels
99
{
1010
internal sealed partial class DevViewModel : ObservableObject
1111
{
12-
private readonly ConfigEntity _config;
12+
private readonly ConfigProvider _config;
1313
private readonly FilesUploader _filesUploader;
1414

1515
public DevViewModel(
1616
ConfigProvider config,
1717
FilesUploader filesUploader
1818
)
1919
{
20-
_config = config.Config;
20+
_config = config;
2121
_filesUploader = filesUploader;
2222

2323
ApiPasswordTextBox = _config.ApiPassword;

‎src/Avalonia/Core/ViewModels/MapsViewModel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ public sealed partial class MapsViewModel : RightPanelViewModel, IPortsButtonCon
1818
public readonly IGame Game;
1919

2020
private readonly GamesProvider _gamesProvider;
21-
private readonly ConfigEntity _config;
21+
private readonly ConfigProvider _config;
2222
private readonly PlaytimeProvider _playtimeProvider;
2323

2424

2525
[Obsolete($"Don't create directly. Use {nameof(ViewModelsFactory)}.")]
2626
public MapsViewModel(
2727
IGame game,
2828
GamesProvider gamesProvider,
29-
ConfigEntity config,
29+
ConfigProvider config,
3030
PlaytimeProvider playtimeProvider,
3131
ApiInterface apiInterface,
3232
ScoresProvider scoresProvider

‎src/Avalonia/Core/ViewModels/ModsViewModel.cs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ public sealed partial class ModsViewModel : RightPanelViewModel, IPortsButtonCon
1717
public readonly IGame Game;
1818

1919
private readonly GamesProvider _gamesProvider;
20-
private readonly ConfigEntity _config;
20+
private readonly ConfigProvider _config;
2121
private readonly PlaytimeProvider _playtimeProvider;
2222

2323

2424
[Obsolete($"Don't create directly. Use {nameof(ViewModelsFactory)}.")]
2525
public ModsViewModel(
2626
IGame game,
2727
GamesProvider gamesProvider,
28-
ConfigEntity config,
28+
ConfigProvider config,
2929
PlaytimeProvider playtimeProvider,
3030
ApiInterface apiInterface,
3131
ScoresProvider scoresProvider
@@ -129,7 +129,7 @@ private void DeleteMod()
129129

130130

131131
/// <summary>
132-
/// Delete selected map/campaign
132+
/// Enable/disable mod
133133
/// </summary>
134134
[RelayCommand]
135135
private void ModCheckboxPressed(object? obj)
@@ -138,12 +138,10 @@ private void ModCheckboxPressed(object? obj)
138138

139139
if (!mod.IsEnabled)
140140
{
141-
_config.AddDisabledAutoloadMod(mod.Id);
142141
Game.InstalledAddonsProvider.DisableAddon(mod.Id);
143142
}
144143
else if (mod.IsEnabled)
145144
{
146-
_config.RemoveDisabledAutoloadMod(mod.Id);
147145
Game.InstalledAddonsProvider.EnableAddon(mod.Id);
148146
}
149147
}

0 commit comments

Comments
 (0)