ZionNetworks/BetterRaid_OLD
Archived
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Minor post-pr fixes due to previous api changes

Browse Source
This commit is contained in:
Enrico Ludwig 2024-09-05 16:50:11 +02:00
parent 35818c7915
commit 1ee2333ead
4 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
App.axaml.cs
View File

@ -1,13 +1,11 @@
using System; using System;
using System.Diagnostics;
using Avalonia; using Avalonia;
using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Data.Core.Plugins; using Avalonia.Data.Core.Plugins;
using Avalonia.Markup.Xaml; using Avalonia.Markup.Xaml;
using Avalonia.Threading; using Avalonia.Threading;
using BetterRaid.Extensions;
using BetterRaid.Services; using BetterRaid.Services;
using BetterRaid.ViewModels; using BetterRaid.Services.Implementations;
using BetterRaid.Views; using BetterRaid.Views;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -25,12 +23,12 @@ public class App : Application
private ServiceProvider InitializeServices() private ServiceProvider InitializeServices()
{ {
var Services = new ServiceCollection(); var services = new ServiceCollection();
Services.AddSingleton<ITwitchService, TwitchService>(); services.AddSingleton<ITwitchService, TwitchService>();
Services.AddSingleton<ISynchronizaionService, DispatcherService>(serviceProvider => new DispatcherService(Dispatcher.UIThread)); services.AddSingleton<ISynchronizaionService, DispatcherService>(serviceProvider => new DispatcherService(Dispatcher.UIThread));
Services.AddTransient<IMainViewModelFactory, MainWindowViewModelFactory>(); services.AddTransient<IMainViewModelFactory, MainWindowViewModelFactory>();
return Services.BuildServiceProvider(); return services.BuildServiceProvider();
} }
public override void OnFrameworkInitializationCompleted() public override void OnFrameworkInitializationCompleted()
@ -44,7 +42,7 @@ public class App : Application
var viewModelFactory = _serviceProvider.GetRequiredService<IMainViewModelFactory>(); var viewModelFactory = _serviceProvider.GetRequiredService<IMainViewModelFactory>();
var mainWindowViewModel = viewModelFactory.CreateMainWindowViewModel(); var mainWindowViewModel = viewModelFactory.CreateMainWindowViewModel();
var mainWindow = new MainWindow() var mainWindow = new MainWindow
{ {
DataContext = mainWindowViewModel DataContext = mainWindowViewModel
}; };

1
Services/Implementations/DispatcherService.cs
View File

@ -1,6 +1,5 @@
using Avalonia.Threading; using Avalonia.Threading;
using System; using System;
using System.Threading;
namespace BetterRaid.Services.Implementations; namespace BetterRaid.Services.Implementations;
public class DispatcherService : ISynchronizaionService public class DispatcherService : ISynchronizaionService

14
Services/Implementations/MainWindowViewModelFactory.cs
View File

@ -4,19 +4,17 @@ namespace BetterRaid.Services.Implementations;
public class MainWindowViewModelFactory : IMainViewModelFactory public class MainWindowViewModelFactory : IMainViewModelFactory
{ {
private readonly ITwitchPubSubService twitchPubSubService; private readonly ITwitchService _twitchService;
private readonly ITwitchDataService twitchDataService; private readonly ISynchronizaionService _synchronizaionService;
private readonly ISynchronizaionService synchronizaionService;
public MainWindowViewModelFactory(ITwitchPubSubService twitchPubSubService, ITwitchDataService twitchDataService, ISynchronizaionService synchronizaionService) public MainWindowViewModelFactory(ITwitchService twitchService, ISynchronizaionService synchronizaionService)
{ {
this.twitchPubSubService = twitchPubSubService; _twitchService = twitchService;
this.twitchDataService = twitchDataService; _synchronizaionService = synchronizaionService;
this.synchronizaionService = synchronizaionService;
} }
public MainWindowViewModel CreateMainWindowViewModel() public MainWindowViewModel CreateMainWindowViewModel()
{ {
return new MainWindowViewModel(twitchPubSubService, twitchDataService, synchronizaionService); return new MainWindowViewModel(_twitchService, _synchronizaionService);
} }
} }

2
Services/TwitchService.cs
View File

@ -10,8 +10,6 @@ using TwitchLib.Api;
using TwitchLib.Api.Helix.Models.Users.GetUsers; using TwitchLib.Api.Helix.Models.Users.GetUsers;
using TwitchLib.PubSub; using TwitchLib.PubSub;
using TwitchLib.PubSub.Events; using TwitchLib.PubSub.Events;
using OnEmoteOnlyArgs = TwitchLib.PubSub.Events.OnEmoteOnlyArgs;
using OnLogArgs = TwitchLib.PubSub.Events.OnLogArgs;
namespace BetterRaid.Services; namespace BetterRaid.Services;