diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java index a68c9b8667..303c4ff7a2 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/domains/Application.java @@ -423,6 +423,9 @@ public class Application extends BaseDomain implements ImportableArtifact { @JsonView(Views.Public.class) Type colorMode; + @JsonView(Views.Public.class) + IconStyle iconStyle; + public ThemeSetting(Type colorMode) { this.colorMode = colorMode; } @@ -431,5 +434,10 @@ public class Application extends BaseDomain implements ImportableArtifact { LIGHT, DARK } + + public enum IconStyle { + OUTLINED, + FILLED + } } } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java index 4e30fca83a..929fea15f3 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/ApplicationServiceCETest.java @@ -2809,6 +2809,7 @@ public class ApplicationServiceCETest { themeSettings.setDensity(1); themeSettings.setSizing(1); themeSettings.setColorMode(Application.ThemeSetting.Type.LIGHT); + themeSettings.setIconStyle(Application.ThemeSetting.IconStyle.OUTLINED); testApplication.getUnpublishedApplicationDetail().setThemeSetting(themeSettings); Mono applicationMono = applicationPageService diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java index a846f9b237..3ebd2543af 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/ce/GitServiceCETest.java @@ -2864,6 +2864,7 @@ public class GitServiceCETest { themeSettings.setAccentColor("#FFFFFF"); themeSettings.setFontFamily("#000000"); themeSettings.setColorMode(Application.ThemeSetting.Type.LIGHT); + themeSettings.setIconStyle(Application.ThemeSetting.IconStyle.OUTLINED); branchedApplication.getUnpublishedApplicationDetail().setThemeSetting(themeSettings); return Mono.just(branchedApplication); }) @@ -2892,6 +2893,7 @@ public class GitServiceCETest { assertThat(themes.getDensity()).isEqualTo(1); assertThat(themes.getFontFamily()).isEqualTo("#000000"); assertThat(themes.getSizing()).isEqualTo(1); + assertThat(themes.getIconStyle()).isEqualTo(Application.ThemeSetting.IconStyle.OUTLINED); }) .verifyComplete(); } diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java index 20b453c498..ff4791acb8 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/solutions/ImportApplicationServiceTests.java @@ -841,6 +841,11 @@ public class ImportApplicationServiceTests { .getThemeSetting() .getSizing()) .isEqualTo(1); + assertThat(exportedApp + .getApplicationDetail() + .getThemeSetting() + .getIconStyle()) + .isEqualTo(Application.ThemeSetting.IconStyle.OUTLINED); assertThat(exportedApp.getPolicies()).isNull(); assertThat(exportedApp.getUserPermissions()).isNull(); @@ -2500,6 +2505,7 @@ public class ImportApplicationServiceTests { assertThat(themes.getDensity()).isEqualTo(1); assertThat(themes.getFontFamily()).isEqualTo("#000000"); assertThat(themes.getSizing()).isEqualTo(1); + assertThat(themes.getIconStyle()).isEqualTo(Application.ThemeSetting.IconStyle.OUTLINED); }) .verifyComplete(); // Import the same application again @@ -2535,6 +2541,7 @@ public class ImportApplicationServiceTests { themeSettings.setAccentColor("#FFFFFF"); themeSettings.setFontFamily("#000000"); themeSettings.setColorMode(Application.ThemeSetting.Type.LIGHT); + themeSettings.setIconStyle(Application.ThemeSetting.IconStyle.OUTLINED); return themeSettings; }