From 2955adeaf4981595b5a067902ccca89bed15cdf9 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 29 Jul 2022 16:35:51 +0300 Subject: [PATCH 1/2] CLI: Update system as default theme to theme-style --- .../Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs | 5 +++-- .../ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs | 5 ++++- .../Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs | 7 ++++--- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 026b4ca48c..b1de80ac8c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -567,10 +567,11 @@ public abstract class ProjectCreationCommandBase } var themeStyle = commandLineArgs.Options.GetOrNull(Options.ThemeStyle.Long)?.ToLower(); + return themeStyle switch { - // null => ThemeStyle.NotSpecified, TODO: remove it!!! - "dim" or null => ThemeStyle.Dim, + "system" or null => ThemeStyle.System, + "dim" => ThemeStyle.Dim, "light" => ThemeStyle.Light, "dark" => ThemeStyle.Dark, _ => null diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs index ef6a1e9474..5f4a0e5917 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStyleStep.cs @@ -14,6 +14,9 @@ public class ChangeThemeStyleStep : ProjectBuildPipelineStep switch (context.BuildArgs.ThemeStyle) { + case ThemeStyle.Dim: + ChangeThemeStyle(context, themeStyleName: "Dim"); + break; case ThemeStyle.Light: ChangeThemeStyle(context, themeStyleName: "Light"); break; @@ -25,7 +28,7 @@ public class ChangeThemeStyleStep : ProjectBuildPipelineStep private void ChangeThemeStyle(ProjectBuildContext context, string themeStyleName) { - var defaultThemeStyleName = "LeptonXStyleNames.Dim"; + var defaultThemeStyleName = "LeptonXStyleNames.System"; var newThemeStyleName = $"LeptonXStyleNames.{themeStyleName}"; var filePaths = new List diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs index e9a8804f70..ec71ece504 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs @@ -2,7 +2,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building; public enum ThemeStyle : byte { NotSpecified = 0, - Dim = 1, - Light = 2, - Dark = 3 + System = 1, + Dim = 2, + Light = 3, + Dark = 4 } \ No newline at end of file From 10b84d71ce2c172a79f00aae91e5d35530a92e8b Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Fri, 29 Jul 2022 16:44:24 +0300 Subject: [PATCH 2/2] Update ThemeStyle.cs --- .../Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs index ec71ece504..eae3a303ff 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ThemeStyle.cs @@ -1,9 +1,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building; public enum ThemeStyle : byte { - NotSpecified = 0, - System = 1, - Dim = 2, - Light = 3, - Dark = 4 + System = 0, + Dim = 1, + Light = 2, + Dark = 3 } \ No newline at end of file