diff --git a/VDownload.Core/VDownload.Core.Strings/StringResource.cs b/VDownload.Core/VDownload.Core.Strings/StringResource.cs index 86dec6d..5b2fc9f 100644 --- a/VDownload.Core/VDownload.Core.Strings/StringResource.cs +++ b/VDownload.Core/VDownload.Core.Strings/StringResource.cs @@ -1,9 +1,10 @@ -using Microsoft.Windows.ApplicationModel.Resources; +using Windows.ApplicationModel.Resources; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.IO; namespace VDownload.Core.Strings { @@ -30,7 +31,10 @@ namespace VDownload.Core.Strings #region PUBLIC METHODS - public string Get(string key) => _resourceLoader.GetString(key); + public string Get(string key) + { + return _resourceLoader.GetString(key); + } #endregion } diff --git a/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs b/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs index f5913b3..3bcdad2 100644 --- a/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs +++ b/VDownload.Core/VDownload.Core.Strings/StringResourcesManager.cs @@ -1,10 +1,11 @@ using Microsoft.UI.Xaml; -using Microsoft.Windows.ApplicationModel.Resources; +using Windows.ApplicationModel.Resources; using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using System.IO; namespace VDownload.Core.Strings { @@ -35,7 +36,19 @@ namespace VDownload.Core.Strings private static StringResource BuildResource(string resourceName) { - ResourceLoader loader = new ResourceLoader(resourceName); + File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"teststring {resourceName}\n"); + ResourceLoader loader; + try + { + loader = new ResourceLoader($"VDownload.Core.Strings/{resourceName}"); + File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"afterteststring {resourceName}\n"); + } + catch (Exception e) + { + + File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"teststringerror {e.Message}\n"); + throw; + } return new StringResource(loader); } diff --git a/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj index 7a200cb..146088e 100644 --- a/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj +++ b/VDownload.Core/VDownload.Core.Strings/VDownload.Core.Strings.csproj @@ -15,8 +15,48 @@ + + Always + + + Always + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always + + + Always diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs index da21750..f855683 100644 --- a/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs +++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTask.cs @@ -11,11 +11,11 @@ using System.Linq; using Windows.Storage; using System.IO; using VDownload.Services.UI.Notifications; -using VDownload.Services.UI.StringResources; using System.Collections.Generic; using System.Net.Http; using Instances.Exceptions; using FFMpegCore.Exceptions; +using VDownload.Core.Strings; namespace VDownload.Core.Tasks { @@ -39,7 +39,6 @@ namespace VDownload.Core.Tasks protected readonly IConfigurationService _configurationService; protected readonly ISettingsService _settingsService; protected readonly IFFmpegService _ffmpegService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly INotificationsService _notificationsService; #endregion @@ -87,12 +86,11 @@ namespace VDownload.Core.Tasks #region CONSTRUCTORS - internal DownloadTask(Video video, VideoDownloadOptions downloadOptions, IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, IStringResourcesService stringResourcesService, INotificationsService notificationsService) + internal DownloadTask(Video video, VideoDownloadOptions downloadOptions, IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, INotificationsService notificationsService) { _configurationService = configurationService; _settingsService = settingsService; _ffmpegService = ffmpegService; - _stringResourcesService = stringResourcesService; _notificationsService = notificationsService; _video = video; @@ -165,8 +163,8 @@ namespace VDownload.Core.Tasks List content = new List() { - $"{_stringResourcesService.NotificationsResources.Get("Title")}: {Video.Title}", - $"{_stringResourcesService.NotificationsResources.Get("Author")}: {Video.Author}" + $"{StringResourcesManager.Notifications.Get("Title")}: {Video.Title}", + $"{StringResourcesManager.Notifications.Get("Author")}: {Video.Author}" }; string errorMessage = null; @@ -222,15 +220,15 @@ namespace VDownload.Core.Tasks if (ex is TaskCanceledException || ex is HttpRequestException) { - message = _stringResourcesService.HomeDownloadsViewResources.Get("ErrorDownloadingTimeout"); + message = StringResourcesManager.HomeDownloadsView.Get("ErrorDownloadingTimeout"); } else if (ex is InstanceFileNotFoundException) { - message = _stringResourcesService.HomeDownloadsViewResources.Get("ErrorFFmpegPath"); + message = StringResourcesManager.HomeDownloadsView.Get("ErrorFFmpegPath"); } else if (ex is FFMpegException) { - message = _stringResourcesService.HomeDownloadsViewResources.Get("ErrorFFmpeg"); + message = StringResourcesManager.HomeDownloadsView.Get("ErrorFFmpeg"); } else { @@ -249,15 +247,15 @@ namespace VDownload.Core.Tasks case TaskResult.Error: if (_settingsService.Data.Common.Notifications.OnUnsuccessful) { - string title = _stringResourcesService.NotificationsResources.Get("OnUnsuccessfulTitle"); - content.Add($"{_stringResourcesService.NotificationsResources.Get("Message")}: {errorMessage}"); + string title = StringResourcesManager.Notifications.Get("OnUnsuccessfulTitle"); + content.Add($"{StringResourcesManager.Notifications.Get("Message")}: {errorMessage}"); _notificationsService.SendNotification(title, content); } break; case TaskResult.Success: if (_settingsService.Data.Common.Notifications.OnSuccessful) { - string title = _stringResourcesService.NotificationsResources.Get("OnSuccessfulTitle"); + string title = StringResourcesManager.Notifications.Get("OnSuccessfulTitle"); _notificationsService.SendNotification(title, content); } break; diff --git a/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs index ff2b3f2..1e25a64 100644 --- a/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs +++ b/VDownload.Core/VDownload.Core.Tasks/DownloadTaskFactoryService.cs @@ -7,7 +7,6 @@ using VDownload.Models; using VDownload.Services.Data.Configuration; using VDownload.Services.Data.Settings; using VDownload.Services.UI.Notifications; -using VDownload.Services.UI.StringResources; using VDownload.Services.Utility.FFmpeg; namespace VDownload.Core.Tasks @@ -26,7 +25,6 @@ namespace VDownload.Core.Tasks protected readonly IConfigurationService _configurationService; protected readonly ISettingsService _settingsService; protected readonly IFFmpegService _ffmpegService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly INotificationsService _notificationsService; #endregion @@ -35,12 +33,11 @@ namespace VDownload.Core.Tasks #region CONSTRUCTORS - public DownloadTaskFactoryService(IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, IStringResourcesService stringResourcesService, INotificationsService notificationsService) + public DownloadTaskFactoryService(IConfigurationService configurationService, ISettingsService settingsService, IFFmpegService ffmpegService, INotificationsService notificationsService) { _configurationService = configurationService; _settingsService = settingsService; _ffmpegService = ffmpegService; - _stringResourcesService = stringResourcesService; _notificationsService = notificationsService; } @@ -52,7 +49,7 @@ namespace VDownload.Core.Tasks public DownloadTask Create(Video video, VideoDownloadOptions downloadOptions) { - return new DownloadTask(video, downloadOptions, _configurationService, _settingsService, _ffmpegService, _stringResourcesService, _notificationsService); + return new DownloadTask(video, downloadOptions, _configurationService, _settingsService, _ffmpegService, _notificationsService); } #endregion diff --git a/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj index 29a2a02..ae5c5fc 100644 --- a/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj +++ b/VDownload.Core/VDownload.Core.Tasks/VDownload.Core.Tasks.csproj @@ -19,8 +19,8 @@ - + diff --git a/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs index 938ad57..6d824a3 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs @@ -9,10 +9,10 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Core.ViewModels.About.Helpers; using VDownload.Services.Data.Configuration; using VDownload.Services.Data.Configuration.Models; -using VDownload.Services.UI.StringResources; using Windows.System.UserProfile; namespace VDownload.Core.ViewModels.About @@ -21,7 +21,6 @@ namespace VDownload.Core.ViewModels.About { #region SERVICES - protected readonly IStringResourcesService _stringResourcesService; protected readonly IConfigurationService _configurationService; #endregion @@ -51,15 +50,14 @@ namespace VDownload.Core.ViewModels.About #region CONSTRUCTORS - public AboutViewModel(IStringResourcesService stringResourcesService, IConfigurationService configurationService) + public AboutViewModel(IConfigurationService configurationService) { - _stringResourcesService = stringResourcesService; _configurationService = configurationService; string version = Assembly.GetEntryAssembly().GetCustomAttribute()?.InformationalVersion; if (version == "0.0.0") { - version = _stringResourcesService.AboutViewResources.Get("SelfbuiltVersion"); + version = StringResourcesManager.AboutView.Get("SelfbuiltVersion"); } _version = version; diff --git a/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs index 4356c02..1c210df 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Authentication/AuthenticationViewModel.cs @@ -8,9 +8,9 @@ using System.Net.Http; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Services.Data.Configuration; using VDownload.Services.UI.Dialogs; -using VDownload.Services.UI.StringResources; using VDownload.Services.UI.WebView; using VDownload.Sources.Twitch.Authentication; @@ -36,7 +36,6 @@ namespace VDownload.Core.ViewModels.Authentication protected readonly IDialogsService _dialogsService; protected readonly IWebViewService _webViewService; protected readonly IConfigurationService _configurationService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly ITwitchAuthenticationService _twitchAuthenticationService; #endregion @@ -60,12 +59,11 @@ namespace VDownload.Core.ViewModels.Authentication #region CONSTRUCTORS - public AuthenticationViewModel(IDialogsService dialogsService, IWebViewService webViewService, IConfigurationService configurationService, IStringResourcesService stringResourcesService, ITwitchAuthenticationService twitchAuthenticationService) + public AuthenticationViewModel(IDialogsService dialogsService, IWebViewService webViewService, IConfigurationService configurationService, ITwitchAuthenticationService twitchAuthenticationService) { _dialogsService = dialogsService; _webViewService = webViewService; _configurationService = configurationService; - _stringResourcesService = stringResourcesService; _twitchAuthenticationService = twitchAuthenticationService; } @@ -100,7 +98,7 @@ namespace VDownload.Core.ViewModels.Authentication Sources.Twitch.Configuration.Models.Authentication auth = _configurationService.Twitch.Authentication; string authUrl = string.Format(auth.Url, auth.ClientId, auth.RedirectUrl, auth.ResponseType, string.Join(' ', auth.Scopes)); - string url = await _webViewService.Show(new Uri(authUrl), (url) => url.StartsWith(auth.RedirectUrl), _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationWindowTitle")); + string url = await _webViewService.Show(new Uri(authUrl), (url) => url.StartsWith(auth.RedirectUrl), StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationWindowTitle")); Regex regex = new Regex(auth.RedirectUrlRegex); Match match = regex.Match(url); @@ -112,8 +110,8 @@ namespace VDownload.Core.ViewModels.Authentication } else { - string title = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDialogTitle"); - string message = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDialogMessage"); + string title = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDialogTitle"); + string message = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDialogMessage"); await _dialogsService.ShowOk(title, message); } } @@ -138,11 +136,11 @@ namespace VDownload.Core.ViewModels.Authentication if (!NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable) { TwitchButtonEnable = false; - TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionNotAuthenticatedNoInternetConnection"); + TwitchDescription = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDescriptionNotAuthenticatedNoInternetConnection"); } else { - TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionNotAuthenticated"); + TwitchDescription = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDescriptionNotAuthenticated"); } TwitchButtonState = AuthenticationButton.SignIn; } @@ -155,7 +153,7 @@ namespace VDownload.Core.ViewModels.Authentication } catch (Exception ex) when (ex is TaskCanceledException || ex is HttpRequestException) { - TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionCannotValidate"); + TwitchDescription = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDescriptionCannotValidate"); TwitchButtonState = AuthenticationButton.SignIn; TwitchButtonEnable = false; return; @@ -163,13 +161,13 @@ namespace VDownload.Core.ViewModels.Authentication if (validationResult.Success) { - TwitchDescription = string.Format(_stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionAuthenticated"), validationResult.TokenData.Login, validationResult.TokenData.ExpirationDate); + TwitchDescription = string.Format(StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDescriptionAuthenticated"), validationResult.TokenData.Login, validationResult.TokenData.ExpirationDate); TwitchButtonState = AuthenticationButton.SignOut; } else { await _twitchAuthenticationService.DeleteToken(); - TwitchDescription = _stringResourcesService.AuthenticationViewResources.Get("TwitchAuthenticationDescriptionAuthenticationInvalid"); + TwitchDescription = StringResourcesManager.AuthenticationView.Get("TwitchAuthenticationDescriptionAuthenticationInvalid"); TwitchButtonState = AuthenticationButton.SignIn; } } diff --git a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs index cd7ff21..4c36354 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs @@ -10,10 +10,10 @@ using VDownload.Core.ViewModels.Authentication; using VDownload.Core.ViewModels.Home; using VDownload.Core.ViewModels.Settings; using VDownload.Services.UI.DictionaryResources; -using VDownload.Services.UI.StringResources; using SimpleToolkit.UI.Models; using VDownload.Core.ViewModels.About; using VDownload.Core.ViewModels.Subscriptions; +using VDownload.Core.Strings; namespace VDownload.Core.ViewModels { @@ -21,7 +21,6 @@ namespace VDownload.Core.ViewModels { #region SERVICES - protected readonly IStringResourcesService _stringResourcesService; protected readonly IDictionaryResourcesService _dictionaryResourcesService; #endregion @@ -53,9 +52,8 @@ namespace VDownload.Core.ViewModels #region CONSTRUCTORS - public BaseViewModel(IStringResourcesService stringResourcesService, IDictionaryResourcesService dictionaryResourcesService) + public BaseViewModel(IDictionaryResourcesService dictionaryResourcesService) { - _stringResourcesService = stringResourcesService; _dictionaryResourcesService = dictionaryResourcesService; Items = new ReadOnlyObservableCollection @@ -64,13 +62,13 @@ namespace VDownload.Core.ViewModels { new NavigationViewItem() { - Name = _stringResourcesService.BaseViewResources.Get("HomeNavigationViewItem"), + Name = StringResourcesManager.BaseView.Get("HomeNavigationViewItem"), IconSource = _dictionaryResourcesService.Get("ImageBaseViewHome"), ViewModel = typeof(HomeViewModel), }, new NavigationViewItem() { - Name = _stringResourcesService.BaseViewResources.Get("SubscriptionsNavigationViewItem"), + Name = StringResourcesManager.BaseView.Get("SubscriptionsNavigationViewItem"), IconSource = _dictionaryResourcesService.Get("ImageBaseViewSubscriptions"), ViewModel = typeof(SubscriptionsViewModel), }, @@ -82,13 +80,13 @@ namespace VDownload.Core.ViewModels { new NavigationViewItem() { - Name = _stringResourcesService.BaseViewResources.Get("AboutNavigationViewItem"), + Name = StringResourcesManager.BaseView.Get("AboutNavigationViewItem"), IconSource = _dictionaryResourcesService.Get("ImageBaseViewAbout"), ViewModel = typeof(AboutViewModel), }, new NavigationViewItem() { - Name = _stringResourcesService.BaseViewResources.Get("AuthenticationNavigationViewItem"), + Name = StringResourcesManager.BaseView.Get("AuthenticationNavigationViewItem"), IconSource = _dictionaryResourcesService.Get("ImageBaseViewAuthentication"), ViewModel = typeof(AuthenticationViewModel), } diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs index 47e53a5..e32dbc4 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeDownloadsViewModel.cs @@ -7,10 +7,10 @@ using System.Collections.ObjectModel; using System.Linq; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Core.Tasks; using VDownload.Services.Data.Settings; using VDownload.Services.UI.Dialogs; -using VDownload.Services.UI.StringResources; namespace VDownload.Core.ViewModels.Home { @@ -21,7 +21,6 @@ namespace VDownload.Core.ViewModels.Home protected readonly IDownloadTaskManager _tasksManager; protected readonly IDialogsService _dialogsService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly ISettingsService _settingsService; #endregion @@ -41,13 +40,12 @@ namespace VDownload.Core.ViewModels.Home #region CONSTRUCTORS - public HomeDownloadsViewModel(IDownloadTaskManager tasksManager, IDialogsService dialogsService, IStringResourcesService stringResourcesService, ISettingsService settingsService) + public HomeDownloadsViewModel(IDownloadTaskManager tasksManager, IDialogsService dialogsService, ISettingsService settingsService) { _tasksManager = tasksManager; _tasksManager.TaskCollectionChanged += Tasks_CollectionChanged; _dialogsService = dialogsService; - _stringResourcesService = stringResourcesService; _settingsService = settingsService; _taskListIsEmpty = _tasksManager.Tasks.Count == 0; @@ -73,8 +71,8 @@ namespace VDownload.Core.ViewModels.Home { if (!NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable) { - string title = _stringResourcesService.HomeDownloadsViewResources.Get("DialogErrorTitle"); - string message = _stringResourcesService.HomeDownloadsViewResources.Get("DialogErrorMessageNoInternetConnection"); + string title = StringResourcesManager.HomeDownloadsView.Get("DialogErrorTitle"); + string message = StringResourcesManager.HomeDownloadsView.Get("DialogErrorMessageNoInternetConnection"); await _dialogsService.ShowOk(title, message); return; } @@ -87,8 +85,8 @@ namespace VDownload.Core.ViewModels.Home NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection ) { - string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle"); - string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage"); + string title = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogTitle"); + string message = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogMessage"); DialogResultYesNo result = await _dialogsService.ShowYesNo(title, message); continueEnqueue = result == DialogResultYesNo.Yes; } diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs index ca3fe15..430cb2b 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs @@ -18,9 +18,9 @@ using SimpleToolkit.MVVM; using System.Text.RegularExpressions; using VDownload.Services.Utility.Filename; using VDownload.Services.UI.Dialogs; -using VDownload.Services.UI.StringResources; using CommunityToolkit.WinUI.Helpers; using VDownload.Services.Data.Application; +using VDownload.Core.Strings; namespace VDownload.Core.ViewModels.Home { @@ -34,7 +34,6 @@ namespace VDownload.Core.ViewModels.Home protected readonly IStoragePickerService _storagePickerService; protected readonly IFilenameService _filenameService; protected readonly IDialogsService _dialogsService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly IApplicationDataService _applicationDataService; #endregion @@ -181,14 +180,13 @@ namespace VDownload.Core.ViewModels.Home #region CONSTRUCTORS - public HomeVideoCollectionViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IStringResourcesService stringResourcesService, IApplicationDataService applicationDataService) + public HomeVideoCollectionViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IApplicationDataService applicationDataService) { _tasksManager = tasksManager; _settingsService = settingsService; _storagePickerService = storagePickerService; _filenameService = filenameService; _dialogsService = dialogsService; - _stringResourcesService = stringResourcesService; _applicationDataService = applicationDataService; _removedVideos = new List(); @@ -306,8 +304,8 @@ namespace VDownload.Core.ViewModels.Home NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection ) { - string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle"); - string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage"); + string title = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogTitle"); + string message = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogMessage"); DialogResultYesNo result = await _dialogsService.ShowYesNo(title, message); download = result == DialogResultYesNo.Yes; } diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs index 4c4e483..8ebb554 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoViewModel.cs @@ -8,13 +8,13 @@ using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Core.Tasks; using VDownload.Models; using VDownload.Services.Data.Application; using VDownload.Services.Data.Settings; using VDownload.Services.UI.Dialogs; using VDownload.Services.UI.StoragePicker; -using VDownload.Services.UI.StringResources; using VDownload.Services.Utility.Filename; namespace VDownload.Core.ViewModels.Home @@ -29,7 +29,6 @@ namespace VDownload.Core.ViewModels.Home protected readonly IStoragePickerService _storagePickerService; protected readonly IFilenameService _filenameService; protected readonly IDialogsService _dialogsService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly IApplicationDataService _applicationDataService; #endregion @@ -98,14 +97,13 @@ namespace VDownload.Core.ViewModels.Home #region CONSTRUCTORS - public HomeVideoViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IStringResourcesService stringResourcesService, IApplicationDataService applicationDataService) + public HomeVideoViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IApplicationDataService applicationDataService) { _tasksManager = tasksManager; _settingsService = settingsService; _storagePickerService = storagePickerService; _filenameService = filenameService; _dialogsService = dialogsService; - _stringResourcesService = stringResourcesService; _applicationDataService = applicationDataService; } @@ -184,8 +182,8 @@ namespace VDownload.Core.ViewModels.Home NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection ) { - string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle"); - string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage"); + string title = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogTitle"); + string message = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogMessage"); DialogResultYesNo result = await _dialogsService.ShowYesNo(title, message); download = result == DialogResultYesNo.Yes; } diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs index 9319f71..050750e 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs @@ -7,13 +7,13 @@ using System.Linq; using System.Net.Http; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Core.Tasks; using VDownload.Models; using VDownload.Services.Data.Configuration; using VDownload.Services.Data.Settings; using VDownload.Services.Data.Subscriptions; using VDownload.Services.UI.Dialogs; -using VDownload.Services.UI.StringResources; using VDownload.Sources; using VDownload.Sources.Common; using VDownload.Sources.Twitch.Configuration.Models; @@ -45,7 +45,6 @@ namespace VDownload.Core.ViewModels.Home protected readonly IConfigurationService _configurationService; protected readonly ISettingsService _settingsService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly ISearchService _searchService; protected readonly ISubscriptionsDataService _subscriptionsDataService; protected readonly IDialogsService _dialogsService; @@ -116,11 +115,10 @@ namespace VDownload.Core.ViewModels.Home #region CONSTRUCTORS - public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, ISubscriptionsDataService subscriptionsDataService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel videoCollectionViewModel) + public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, ISearchService searchService, ISubscriptionsDataService subscriptionsDataService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel videoCollectionViewModel) { _configurationService = configurationService; _settingsService = settingsService; - _stringResourcesService = stringResourcesService; _searchService = searchService; _subscriptionsDataService = subscriptionsDataService; _dialogsService = dialogsService; @@ -181,7 +179,7 @@ namespace VDownload.Core.ViewModels.Home StartSearch(); - SubscriptionsVideoList subList = new SubscriptionsVideoList { Name = _stringResourcesService.CommonResources.Get("SubscriptionVideoListName") }; + SubscriptionsVideoList subList = new SubscriptionsVideoList { Name = StringResourcesManager.Common.Get("SubscriptionVideoListName") }; List tasks = new List(); try { @@ -218,14 +216,14 @@ namespace VDownload.Core.ViewModels.Home if (subList.Count > 0) { - OptionBarMessage = $"{_stringResourcesService.HomeViewResources.Get("OptionBarMessageVideosFound")} {subList.Count}"; + OptionBarMessage = $"{StringResourcesManager.HomeView.Get("OptionBarMessageVideosFound")} {subList.Count}"; _videoCollectionViewModel.LoadCollection(subList); MainContent = _videoCollectionView; } else { - OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageVideosNotFound"); + OptionBarMessage = StringResourcesManager.HomeView.Get("OptionBarMessageVideosNotFound"); } OptionBarSearchNotPending = true; @@ -285,7 +283,7 @@ namespace VDownload.Core.ViewModels.Home } catch (MediaSearchException ex) { - ShowError(_stringResourcesService.SearchResources.Get(ex.StringCode)); + ShowError(StringResourcesManager.Search.Get(ex.StringCode)); return; } catch (Exception ex) when (ex is TaskCanceledException || ex is HttpRequestException) @@ -321,7 +319,7 @@ namespace VDownload.Core.ViewModels.Home } catch (MediaSearchException ex) { - ShowError(_stringResourcesService.SearchResources.Get(ex.StringCode)); + ShowError(StringResourcesManager.Search.Get(ex.StringCode)); return; } catch (Exception ex) when (ex is TaskCanceledException || ex is HttpRequestException) @@ -357,8 +355,8 @@ namespace VDownload.Core.ViewModels.Home NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection ) { - string title = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogTitle"); - string message = _stringResourcesService.CommonResources.Get("StartAtMeteredConnectionDialogMessage"); + string title = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogTitle"); + string message = StringResourcesManager.Common.Get("StartAtMeteredConnectionDialogMessage"); DialogResultYesNo result = await _dialogsService.ShowYesNo(title, message); if (result == DialogResultYesNo.No) { @@ -417,14 +415,14 @@ namespace VDownload.Core.ViewModels.Home { OptionBarSearchNotPending = false; OptionBarLoading = true; - OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageLoading"); + OptionBarMessage = StringResourcesManager.HomeView.Get("OptionBarMessageLoading"); } protected async void BackToDownload_EventHandler(object sender, EventArgs e) => await Navigation(); - protected string ErrorNoInternetConnection() => _stringResourcesService.HomeViewResources.Get("ErrorInfoBarNoInternetConnection"); + protected string ErrorNoInternetConnection() => StringResourcesManager.HomeView.Get("ErrorInfoBarNoInternetConnection"); - protected string ErrorSearchTimeout() => _stringResourcesService.SearchResources.Get("SearchTimeout"); + protected string ErrorSearchTimeout() => StringResourcesManager.Search.Get("SearchTimeout"); #endregion } diff --git a/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs index cfa9784..1330ecc 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Settings/SettingsViewModel.cs @@ -6,11 +6,11 @@ using System.Linq; using System.Reflection; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Models; using VDownload.Services.Data.Configuration; using VDownload.Services.Data.Settings; using VDownload.Services.UI.StoragePicker; -using VDownload.Services.UI.StringResources; namespace VDownload.Core.ViewModels.Settings { @@ -20,7 +20,6 @@ namespace VDownload.Core.ViewModels.Settings protected readonly ISettingsService _settingsService; protected readonly IConfigurationService _configurationService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly IStoragePickerService _storagePickerService; #endregion @@ -176,16 +175,15 @@ namespace VDownload.Core.ViewModels.Settings #region CONSTRUCTORS - public SettingsViewModel(ISettingsService settingsService, IConfigurationService configurationService, IStringResourcesService stringResourcesService, IStoragePickerService storagePickerService) + public SettingsViewModel(ISettingsService settingsService, IConfigurationService configurationService, IStoragePickerService storagePickerService) { _settingsService = settingsService; _configurationService = configurationService; - _stringResourcesService = stringResourcesService; _storagePickerService = storagePickerService; base.PropertyChanged += PropertyChangedEventHandler; - _tasksFilenameTemplateTooltip = string.Join('\n', _configurationService.Common.FilenameTemplates.Select(x => _stringResourcesService.FilenameTemplateResources.Get(x.Name))); + _tasksFilenameTemplateTooltip = string.Join('\n', _configurationService.Common.FilenameTemplates.Select(x => StringResourcesManager.FilenameTemplate.Get(x.Name))); } #endregion diff --git a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs index 31d8712..63bfefb 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs @@ -9,10 +9,10 @@ using System.Linq; using System.Net.Http; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Core.ViewModels.Subscriptions.Helpers; using VDownload.Models; using VDownload.Services.Data.Subscriptions; -using VDownload.Services.UI.StringResources; using VDownload.Sources; using VDownload.Sources.Common; @@ -23,7 +23,6 @@ namespace VDownload.Core.ViewModels.Subscriptions #region SERVICES protected readonly ISearchService _searchService; - protected readonly IStringResourcesService _stringResourcesService; protected readonly ISubscriptionsDataService _subscriptionsDataService; #endregion @@ -53,10 +52,9 @@ namespace VDownload.Core.ViewModels.Subscriptions #region CONSTRUCTORS - public SubscriptionsViewModel(ISearchService searchService, IStringResourcesService stringResourcesService, ISubscriptionsDataService subscriptionsDataService) + public SubscriptionsViewModel(ISearchService searchService, ISubscriptionsDataService subscriptionsDataService) { _searchService = searchService; - _stringResourcesService = stringResourcesService; _subscriptionsDataService = subscriptionsDataService; _playlists = new ObservableCollection(); @@ -96,7 +94,7 @@ namespace VDownload.Core.ViewModels.Subscriptions { if (!NetworkHelper.Instance.ConnectionInformation.IsInternetAvailable) { - ShowError(_stringResourcesService.SubscriptionsViewResources.Get("NoInternetConnectionError")); + ShowError(StringResourcesManager.SubscriptionsView.Get("NoInternetConnectionError")); return; } @@ -109,18 +107,18 @@ namespace VDownload.Core.ViewModels.Subscriptions } catch (MediaSearchException ex) { - ShowError(_stringResourcesService.SearchResources.Get(ex.StringCode)); + ShowError(StringResourcesManager.Search.Get(ex.StringCode)); return; } catch (Exception ex) when (ex is TaskCanceledException || ex is HttpRequestException) { - ShowError(_stringResourcesService.SearchResources.Get("SearchTimeout")); + ShowError(StringResourcesManager.Search.Get("SearchTimeout")); return; } if (_subscriptionsDataService.Data.Any(x => x.Source == playlist.Source && x.Name == playlist.Name)) { - ShowError(_stringResourcesService.SubscriptionsViewResources.Get("DuplicateError")); + ShowError(StringResourcesManager.SubscriptionsView.Get("DuplicateError")); return; } diff --git a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj index e493bd7..bf03ae7 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj +++ b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj @@ -24,7 +24,6 @@ - diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs index 6a80b3b..2e91dea 100644 --- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs +++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/DialogsService.cs @@ -6,8 +6,8 @@ using System.Linq; using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; +using VDownload.Core.Strings; using VDownload.Services.Common; -using VDownload.Services.UI.StringResources; namespace VDownload.Services.UI.Dialogs { @@ -27,21 +27,13 @@ namespace VDownload.Services.UI.Dialogs public class DialogsService : IDialogsService { - #region SERVICES - - protected readonly IStringResourcesService _stringResourcesService; - - #endregion - - - #region FIELDS - protected string _okString; - protected string _closeString; - protected string _cancelString; - protected string _yesString; - protected string _noString; + protected string _okString = StringResourcesManager.DialogButtons.Get("OK"); + protected string _closeString = StringResourcesManager.DialogButtons.Get("Close"); + protected string _cancelString = StringResourcesManager.DialogButtons.Get("Cancel"); + protected string _yesString = StringResourcesManager.DialogButtons.Get("Yes"); + protected string _noString = StringResourcesManager.DialogButtons.Get("No"); protected XamlRoot _root; @@ -49,22 +41,6 @@ namespace VDownload.Services.UI.Dialogs - #region CONSTRUCTORS - - public DialogsService(IStringResourcesService stringResourcesService) - { - _stringResourcesService = stringResourcesService; - _okString = _stringResourcesService.DialogButtonsResources.Get("OK"); - _closeString = _stringResourcesService.DialogButtonsResources.Get("Close"); - _cancelString = _stringResourcesService.DialogButtonsResources.Get("Cancel"); - _yesString = _stringResourcesService.DialogButtonsResources.Get("Yes"); - _noString = _stringResourcesService.DialogButtonsResources.Get("No"); - } - - #endregion - - - #region PUBLIC METHODS public async Task Initialize(XamlRoot arg) => await Task.Run(() => _root = arg); diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj index fd60d13..6167d47 100644 --- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj +++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Dialogs/VDownload.Services.UI.Dialogs.csproj @@ -15,7 +15,7 @@ + - diff --git a/VDownload.sln b/VDownload.sln index 9e75b74..0261eef 100644 --- a/VDownload.sln +++ b/VDownload.sln @@ -53,8 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VDownload.Core", "VDownload EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Models", "VDownload.Models\VDownload.Models.csproj", "{16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.StringResources", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.StringResources\VDownload.Services.UI.StringResources.csproj", "{6F6CA153-1AC6-454A-ACDC-2C706E2A437E}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.UI.DictionaryResources", "VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.DictionaryResources\VDownload.Services.UI.DictionaryResources.csproj", "{8DC55331-B9F3-4811-8474-348662963260}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Sources.Twitch.Settings", "VDownload.Sources\VDownload.Sources.Twitch\VDownload.Sources.Twitch.Settings\VDownload.Sources.Twitch.Settings.csproj", "{A726FD43-B111-423B-BAF6-D65B4C0E37B5}" @@ -75,7 +73,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.App EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.Subscriptions", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Subscriptions\VDownload.Services.Data.Subscriptions.csproj", "{3193DABC-87F8-4256-9449-3CF42FEF7098}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VDownload.Services.Common", "VDownload.Services\VDownload.Services.Common\VDownload.Services.Common.csproj", "{267F5A31-1257-4820-9FE5-C11D26CC3C55}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Common", "VDownload.Services\VDownload.Services.Common\VDownload.Services.Common.csproj", "{267F5A31-1257-4820-9FE5-C11D26CC3C55}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -383,22 +381,6 @@ Global {16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x64.Build.0 = Release|Any CPU {16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x86.ActiveCfg = Release|Any CPU {16B56EA9-C218-4A8E-B3DE-29F200EF2EE2}.Release|x86.Build.0 = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|ARM64.Build.0 = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x64.ActiveCfg = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x64.Build.0 = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x86.ActiveCfg = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Debug|x86.Build.0 = Debug|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|Any CPU.Build.0 = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|ARM64.ActiveCfg = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|ARM64.Build.0 = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x64.ActiveCfg = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x64.Build.0 = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x86.ActiveCfg = Release|Any CPU - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E}.Release|x86.Build.0 = Release|Any CPU {8DC55331-B9F3-4811-8474-348662963260}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8DC55331-B9F3-4811-8474-348662963260}.Debug|Any CPU.Build.0 = Debug|Any CPU {8DC55331-B9F3-4811-8474-348662963260}.Debug|ARM64.ActiveCfg = Debug|Any CPU @@ -600,7 +582,6 @@ Global {711FA7BE-27DA-425D-9777-967F6E519CFF} = {8D94F264-4EE9-4C24-AB77-2CCA36858309} {8E850249-E79D-40E7-B02D-393632DF8B8E} = {9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC} {64A217AE-4E95-468E-85C3-67C27D689FF4} = {9A8EB967-1EAB-439E-8FDB-B9ACAC6499EC} - {6F6CA153-1AC6-454A-ACDC-2C706E2A437E} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F} {8DC55331-B9F3-4811-8474-348662963260} = {4CC2DC7D-27D2-4F52-89DF-7D45B41BB40F} {A726FD43-B111-423B-BAF6-D65B4C0E37B5} = {8D94F264-4EE9-4C24-AB77-2CCA36858309} {E1D4352C-51AC-4572-8515-0B4E89A2442F} = {8539067C-9968-4AEB-928C-FEDC43989A79} diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs index a766bef..22ce65d 100644 --- a/VDownload/App.xaml.cs +++ b/VDownload/App.xaml.cs @@ -36,7 +36,6 @@ using VDownload.Services.UI.Dialogs; using VDownload.Services.UI.DictionaryResources; using VDownload.Services.UI.Notifications; using VDownload.Services.UI.StoragePicker; -using VDownload.Services.UI.StringResources; using VDownload.Services.UI.WebView; using VDownload.Services.Utility.Encryption; using VDownload.Services.Utility.FFmpeg; @@ -130,8 +129,8 @@ namespace VDownload protected void UnhandledExceptionCatched(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e) { - File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"test {e.Message}\n"); - throw new NotImplementedException(); + File.AppendAllText("C:\\Users\\mateusz\\Desktop\\test.txt", $"test {e.Message} {e.Exception.StackTrace}\n"); + Environment.Exit(0); } #endregion @@ -152,7 +151,6 @@ namespace VDownload protected void BuildUIServices(IServiceCollection services) { - services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj index efaa3fc..eefb73b 100644 --- a/VDownload/VDownload.csproj +++ b/VDownload/VDownload.csproj @@ -204,7 +204,6 @@ -