From b19acf5d284a365c86c4b6ad76e501b26d69453d Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 15 Oct 2019 16:03:03 +0300 Subject: [PATCH] ThemingOptions to AbpThemingOptions --- .../AbpAspNetCoreMvcUIBasicThemeModule.cs | 2 +- .../UI/Theming/{ThemingOptions.cs => AbpThemingOptions.cs} | 4 ++-- .../Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs | 6 +++--- .../app/Volo.BloggingTestApp/BloggingTestAppModule.cs | 2 +- modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) rename framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/{ThemingOptions.cs => AbpThemingOptions.cs} (76%) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs index 1d4e99d089..ec2a323a05 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/AbpAspNetCoreMvcUIBasicThemeModule.cs @@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic public override void ConfigureServices(ServiceConfigurationContext context) { - Configure(options => + Configure(options => { options.Themes.Add(); diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs similarity index 76% rename from framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs rename to framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs index 58de144e88..3214c30367 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/ThemingOptions.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/AbpThemingOptions.cs @@ -1,12 +1,12 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { - public class ThemingOptions + public class AbpThemingOptions { public ThemeDictionary Themes { get; } public string DefaultThemeName { get; set; } - public ThemingOptions() + public AbpThemingOptions() { Themes = new ThemeDictionary(); } diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs index e5f4329b47..3af9d29b89 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo/Abp/AspNetCore/Mvc/UI/Theming/DefaultThemeSelector.cs @@ -6,9 +6,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { public class DefaultThemeSelector : IThemeSelector, ITransientDependency { - protected ThemingOptions Options { get; } + protected AbpThemingOptions Options { get; } - public DefaultThemeSelector(IOptions options) + public DefaultThemeSelector(IOptions options) { Options = options.Value; } @@ -17,7 +17,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theming { if (!Options.Themes.Any()) { - throw new AbpException($"No theme registered! Use {nameof(ThemingOptions)} to register themes."); + throw new AbpException($"No theme registered! Use {nameof(AbpThemingOptions)} to register themes."); } if (Options.DefaultThemeName == null) diff --git a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs index 5037d4dc31..4fcdb5ea25 100644 --- a/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs +++ b/modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs @@ -119,7 +119,7 @@ namespace Volo.BloggingTestApp options.SupportedUICultures = cultures; }); - Configure(options => + Configure(options => { options.DefaultThemeName = BasicTheme.Name; }); diff --git a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs index 16869e1b87..3825bb25a8 100644 --- a/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs +++ b/modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs @@ -124,7 +124,7 @@ namespace VoloDocs.Web .AddVirtualJson("/Localization/Resources/VoloDocs/Web"); }); - Configure(options => + Configure(options => { options.DefaultThemeName = BasicTheme.Name; });