From d831f43951b7c5f33996589bdf336a45acf7ac13 Mon Sep 17 00:00:00 2001 From: DemchaAV Date: Sat, 27 Jun 2026 23:39:10 +0100 Subject: [PATCH] refactor(templates): extract the text layer to templates.core.text MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move the neutral text-rendering primitives into com.demcha.compose.document.templates.core.text so every template family shares them without depending on cv: MarkdownText (from templates.components), plus CvTextStyles -> TextStyles, MarkdownInline, RichParagraphRenderer, and TextOrnaments (from cv.v2.components). ParagraphPrimitive and ParagraphRenderer stay in cv.v2.components — they are CV-section plumbing used only by the CV section renderers. Repoint all callers (cv.v2, coverletter.v2, the Gen-2 cv/coverletter presets, and the invoice/proposal builders that already used MarkdownText); relocate MarkdownInlineTest to core.text. Render is byte-identical (1607 tests green, zero snapshot updates); the move is a deliberate binary break on the 2.0 line (japicmp report-only). Markdown docs follow in the docs refresh. --- .../document/templates/components/Module.java | 2 + .../text}/MarkdownInline.java | 7 ++-- .../text}/MarkdownText.java | 2 +- .../text}/RichParagraphRenderer.java | 4 +- .../text}/TextOrnaments.java | 2 +- .../text/TextStyles.java} | 6 +-- .../templates/core/text/package-info.java | 23 ++++++++++ .../builder/CoverLetterBuilder.java | 2 +- .../coverletter/v2/components/LetterBody.java | 8 ++-- .../v2/presets/CenteredHeadlineLetter.java | 4 +- .../v2/presets/ClassicSerifLetter.java | 8 ++-- .../v2/presets/CompactMonoLetter.java | 10 ++--- .../v2/presets/EditorialBlueLetter.java | 8 ++-- .../v2/presets/EngineeringResumeLetter.java | 12 +++--- .../v2/presets/ExecutiveLetter.java | 12 +++--- .../v2/presets/MintEditorialLetter.java | 8 ++-- .../v2/presets/ModernProfessionalLetter.java | 10 ++--- .../v2/presets/MonogramSidebarLetter.java | 16 +++---- .../v2/presets/NordicCleanLetter.java | 12 +++--- .../coverletter/v2/presets/PanelLetter.java | 12 +++--- .../v2/presets/SidebarPortraitLetter.java | 12 +++--- .../v2/presets/TimelineMinimalLetter.java | 12 +++--- .../templates/cv/presets/BlueBanner.java | 2 +- .../templates/cv/presets/BoxedSections.java | 2 +- .../cv/presets/CenteredHeadline.java | 2 +- .../templates/cv/presets/EditorialBlue.java | 2 +- .../templates/cv/presets/MonogramSidebar.java | 2 +- .../document/templates/cv/presets/Panel.java | 2 +- .../templates/cv/presets/SidebarPortrait.java | 2 +- .../v2/components/EntryCompactRenderer.java | 3 ++ .../cv/v2/components/LabelValueRenderer.java | 2 + .../cv/v2/components/ParagraphPrimitive.java | 2 + .../cv/v2/components/ProjectLabel.java | 2 + .../cv/v2/components/ProjectRenderer.java | 3 ++ .../cv/v2/components/SkillLineRenderer.java | 2 + .../cv/v2/components/package-info.java | 6 +-- .../templates/cv/v2/package-info.java | 4 +- .../templates/cv/v2/presets/BlueBanner.java | 8 ++-- .../templates/cv/v2/presets/ClassicSerif.java | 20 +++++---- .../templates/cv/v2/presets/CompactMono.java | 19 +++++---- .../cv/v2/presets/EditorialBlue.java | 33 ++++++++------- .../cv/v2/presets/EngineeringResume.java | 42 +++++++++---------- .../templates/cv/v2/presets/Executive.java | 10 ++--- .../cv/v2/presets/MintEditorial.java | 22 +++++----- .../cv/v2/presets/MonogramSidebar.java | 30 +++++++------ .../templates/cv/v2/presets/NordicClean.java | 23 +++++----- .../templates/cv/v2/presets/Panel.java | 12 +++--- .../cv/v2/presets/SidebarPortrait.java | 34 +++++++-------- .../cv/v2/presets/TimelineMinimal.java | 22 +++++----- .../templates/cv/v2/widgets/Headline.java | 2 +- .../templates/cv/v2/widgets/ProfileBand.java | 2 +- .../cv/v2/widgets/SectionHeader.java | 2 +- .../templates/cv/v2/widgets/SkillBar.java | 6 +-- .../templates/cv/v2/widgets/Subheadline.java | 2 +- .../invoice/builder/InvoiceBuilder.java | 2 +- .../proposal/builder/ProposalBuilder.java | 2 +- .../text}/MarkdownInlineTest.java | 2 +- .../components/CvV2ComponentUtilityTest.java | 2 + .../cv/v2/components/ProjectLabelTest.java | 2 + 59 files changed, 295 insertions(+), 234 deletions(-) rename src/main/java/com/demcha/compose/document/templates/{cv/v2/components => core/text}/MarkdownInline.java (95%) rename src/main/java/com/demcha/compose/document/templates/{components => core/text}/MarkdownText.java (98%) rename src/main/java/com/demcha/compose/document/templates/{cv/v2/components => core/text}/RichParagraphRenderer.java (94%) rename src/main/java/com/demcha/compose/document/templates/{cv/v2/components => core/text}/TextOrnaments.java (97%) rename src/main/java/com/demcha/compose/document/templates/{cv/v2/components/CvTextStyles.java => core/text/TextStyles.java} (89%) create mode 100644 src/main/java/com/demcha/compose/document/templates/core/text/package-info.java rename src/test/java/com/demcha/compose/document/templates/{cv/v2/components => core/text}/MarkdownInlineTest.java (99%) diff --git a/src/main/java/com/demcha/compose/document/templates/components/Module.java b/src/main/java/com/demcha/compose/document/templates/components/Module.java index 3d63141c1..29d94c091 100644 --- a/src/main/java/com/demcha/compose/document/templates/components/Module.java +++ b/src/main/java/com/demcha/compose/document/templates/components/Module.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.components; +import com.demcha.compose.document.templates.core.text.MarkdownText; + import com.demcha.compose.document.node.*; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInline.java b/src/main/java/com/demcha/compose/document/templates/core/text/MarkdownInline.java similarity index 95% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInline.java rename to src/main/java/com/demcha/compose/document/templates/core/text/MarkdownInline.java index 2557ae519..2ad3cf293 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInline.java +++ b/src/main/java/com/demcha/compose/document/templates/core/text/MarkdownInline.java @@ -1,10 +1,9 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.core.text; import com.demcha.compose.document.dsl.RichText; import com.demcha.compose.document.node.InlineRun; import com.demcha.compose.document.node.InlineTextRun; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.components.MarkdownText; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -15,8 +14,8 @@ * (non-emphasised) segments. * *

Honours {@code **bold**}, {@code *italic*}, {@code _italic_} via - * the shared {@link MarkdownText} parser. Lives in the components - * layer because every body / row / entry renderer calls it.

+ * the shared {@link MarkdownText} parser. Part of the neutral core text + * layer, shared by every template family's body / row / entry rendering.

* *

Inline links (since v1.6.8). Recognises the * standard Markdown {@code [label](url)} syntax and emits a clickable diff --git a/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java b/src/main/java/com/demcha/compose/document/templates/core/text/MarkdownText.java similarity index 98% rename from src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java rename to src/main/java/com/demcha/compose/document/templates/core/text/MarkdownText.java index 88c3275fd..6046e4162 100644 --- a/src/main/java/com/demcha/compose/document/templates/components/MarkdownText.java +++ b/src/main/java/com/demcha/compose/document/templates/core/text/MarkdownText.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.components; +package com.demcha.compose.document.templates.core.text; import com.demcha.compose.document.node.InlineRun; import com.demcha.compose.document.node.InlineTextRun; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/RichParagraphRenderer.java b/src/main/java/com/demcha/compose/document/templates/core/text/RichParagraphRenderer.java similarity index 94% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/RichParagraphRenderer.java rename to src/main/java/com/demcha/compose/document/templates/core/text/RichParagraphRenderer.java index 3681cc1db..148a4f42d 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/RichParagraphRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/core/text/RichParagraphRenderer.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.core.text; import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; @@ -6,7 +6,7 @@ import com.demcha.compose.document.style.DocumentTextStyle; /** - * Reusable rich paragraph primitive for CV presets that need explicit + * Reusable rich paragraph primitive for any preset that needs explicit * style, line spacing, and margin while still honouring inline markdown. */ public final class RichParagraphRenderer { diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java b/src/main/java/com/demcha/compose/document/templates/core/text/TextOrnaments.java similarity index 97% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java rename to src/main/java/com/demcha/compose/document/templates/core/text/TextOrnaments.java index bca437e11..8ed5f625c 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/TextOrnaments.java +++ b/src/main/java/com/demcha/compose/document/templates/core/text/TextOrnaments.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.core.text; import java.util.Locale; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/CvTextStyles.java b/src/main/java/com/demcha/compose/document/templates/core/text/TextStyles.java similarity index 89% rename from src/main/java/com/demcha/compose/document/templates/cv/v2/components/CvTextStyles.java rename to src/main/java/com/demcha/compose/document/templates/core/text/TextStyles.java index b429131b3..e88e5a821 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/CvTextStyles.java +++ b/src/main/java/com/demcha/compose/document/templates/core/text/TextStyles.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.core.text; import com.demcha.compose.document.style.DocumentColor; import com.demcha.compose.document.style.DocumentTextDecoration; @@ -8,8 +8,8 @@ /** * Small factory for preset-local text styles. */ -public final class CvTextStyles { - private CvTextStyles() { +public final class TextStyles { + private TextStyles() { } /** diff --git a/src/main/java/com/demcha/compose/document/templates/core/text/package-info.java b/src/main/java/com/demcha/compose/document/templates/core/text/package-info.java new file mode 100644 index 000000000..0ff186f8d --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/core/text/package-info.java @@ -0,0 +1,23 @@ +/** + *

Core — neutral text rendering (text)

+ * + *

Family-agnostic text primitives shared by every template family. They turn + * text plus a {@link com.demcha.compose.document.style.DocumentTextStyle} (or a + * theme-derived style) into DSL nodes, and depend on no document family's data + * model — so invoice, proposal, CV, and cover-letter all build on the same text + * layer.

+ * + * + */ +package com.demcha.compose.document.templates.core.text; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/builder/CoverLetterBuilder.java b/src/main/java/com/demcha/compose/document/templates/coverletter/builder/CoverLetterBuilder.java index e41a8818e..6b976eece 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/builder/CoverLetterBuilder.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/builder/CoverLetterBuilder.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.components.Header; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.coverletter.layouts.LetterFormat; import com.demcha.compose.document.templates.coverletter.spec.CoverLetterHeader; import com.demcha.compose.document.templates.coverletter.spec.CoverLetterSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java index cc8a75968..c12592697 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/components/LetterBody.java @@ -5,8 +5,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.RichParagraphRenderer; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; import com.demcha.compose.document.templates.core.theme.BrandTheme; /** @@ -58,7 +58,7 @@ public static void render(SectionBuilder host, CoverLetterDocument doc, */ public static void render(SectionBuilder host, CoverLetterDocument doc, BrandTheme theme, double bodySize) { - DocumentTextStyle bodyStyle = CvTextStyles.of( + DocumentTextStyle bodyStyle = TextStyles.of( theme.typography().bodyFont(), bodySize, DocumentTextDecoration.DEFAULT, @@ -80,7 +80,7 @@ public static void render(SectionBuilder host, CoverLetterDocument doc, // The signed name sits on the line directly below the sign-off // (standard letter convention), so it gets only a small gap. double signatureGap = bodySize * 0.4; - DocumentTextStyle signatureStyle = CvTextStyles.of( + DocumentTextStyle signatureStyle = TextStyles.of( theme.typography().bodyFont(), bodySize, DocumentTextDecoration.ITALIC, diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java index 34d40fd89..9c79ab580 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CenteredHeadlineLetter.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; @@ -122,7 +122,7 @@ public void compose(DocumentSession document, CoverLetterDocument doc) { } private DocumentTextStyle subheadlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 8.6, + return TextStyles.of(theme.typography().headlineFont(), 8.6, DocumentTextDecoration.DEFAULT, theme.palette().muted()); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java index 45537a74d..1422cc7df 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ClassicSerifLetter.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; @@ -128,21 +128,21 @@ private void addHeader(PageFlowBuilder flow, CvIdentity identity, } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().rule()); diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java index 2facfba67..43b3f046b 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/CompactMonoLetter.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; @@ -150,25 +150,25 @@ private void addHeader(PageFlowBuilder flow, CvIdentity identity, } private DocumentTextStyle headerNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, DocumentColor.WHITE); } private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, HEADER_SOFT); } private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, LINK_CYAN); } private DocumentTextStyle headerSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, SEPARATOR_GRAY); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java index 449ca391e..e970ae1c1 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EditorialBlueLetter.java @@ -9,7 +9,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.Masthead; import com.demcha.compose.font.FontName; @@ -110,13 +110,13 @@ public void compose(DocumentSession document, CoverLetterDocument doc) { } private Masthead.Style mastheadStyle() { - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle nameStyle = TextStyles.of(FontName.HELVETICA_BOLD, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle titleStyle = TextStyles.of(FontName.HELVETICA, 10.0, DocumentTextDecoration.DEFAULT, theme.palette().ink()); - DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle linkStyle = TextStyles.of(FontName.HELVETICA, theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, theme.palette().rule()); diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java index ca2de2d1a..c5678f14c 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/EngineeringResumeLetter.java @@ -9,8 +9,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvLink; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -182,24 +182,24 @@ private void addContactStack(SectionBuilder section, CvIdentity identity) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, DocumentColor.WHITE); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), 7.6, + return TextStyles.of(theme.typography().bodyFont(), 7.6, DocumentTextDecoration.BOLD, SUBTITLE_COLOR); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, CONTACT_META); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, CONTACT_LINK); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java index 4499ed926..47d027dc7 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ExecutiveLetter.java @@ -12,8 +12,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvLink; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -195,28 +195,28 @@ private void addLinkRow(SectionBuilder section, CvIdentity identity) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, + return TextStyles.of(FontName.POPPINS, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, PRIMARY_NAME); } private DocumentTextStyle metaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle linkRowBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle linkRowLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.UNDERLINE, ACCENT); diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java index 73f8dfb6d..21a08cb18 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MintEditorialLetter.java @@ -12,8 +12,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -388,13 +388,13 @@ private void addBandedMasthead(SectionBuilder section, } private DocumentTextStyle mastheadNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, nameColor); } private DocumentTextStyle taglineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, accent); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java index 01fcb0b8a..5dc58d788 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/ModernProfessionalLetter.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -102,16 +102,16 @@ public void compose(DocumentSession document, CoverLetterDocument doc) { Objects.requireNonNull(document, "document"); Objects.requireNonNull(doc, "doc"); - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle nameStyle = TextStyles.of(FontName.HELVETICA_BOLD, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle contactBodyStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle contactBodyStyle = TextStyles.of(FontName.HELVETICA, theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); - DocumentTextStyle contactLinkStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle contactLinkStyle = TextStyles.of(FontName.HELVETICA, theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, LINK_COLOR); - DocumentTextStyle contactSeparatorStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle contactSeparatorStyle = TextStyles.of(FontName.HELVETICA, theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().rule()); diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java index 54ce6f295..21de2f00e 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/MonogramSidebarLetter.java @@ -10,8 +10,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvName; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -158,7 +158,7 @@ private void addMonogramBlock(SectionBuilder section, String initialsText, .layer(new ParagraphBuilder() .name("CoverLetterV2MonogramSidebarInitials") .text(initialsText) - .textStyle(CvTextStyles.of(MONOGRAM_FONT, 44.0, + .textStyle(TextStyles.of(MONOGRAM_FONT, 44.0, DocumentTextDecoration.BOLD, MONOGRAM_RING)) .align(TextAlign.LEFT) .build(), LayerAlign.CENTER) @@ -214,31 +214,31 @@ private void addNameBlock(SectionBuilder section, CvIdentity identity) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, ACCENT); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().rule()); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java index a896c4cc1..78208d202 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/NordicCleanLetter.java @@ -9,8 +9,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; @@ -129,7 +129,7 @@ private void addHeader(PageFlowBuilder flow, CvIdentity identity) { id.addParagraph(paragraph -> paragraph .text(MarkdownInline.plainText(identity.jobTitle()) .toUpperCase(Locale.ROOT)) - .textStyle(CvTextStyles.of( + .textStyle(TextStyles.of( theme.typography().bodyFont(), 7.7, DocumentTextDecoration.BOLD, theme.palette().muted())) @@ -142,19 +142,19 @@ private void addHeader(PageFlowBuilder flow, CvIdentity identity) { } private DocumentTextStyle headlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java index 54b7f3ea3..0d6f19490 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/PanelLetter.java @@ -9,8 +9,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvLink; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -212,25 +212,25 @@ private CardWidget.Style headerStyle() { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, + return TextStyles.of(FontName.POPPINS, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, HEADER_TEXT); } private DocumentTextStyle headerBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java index e85a2115a..5a7c5b4be 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/SidebarPortraitLetter.java @@ -9,8 +9,8 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.ContactLine; @@ -138,25 +138,25 @@ private void addContact(PageFlowBuilder flow, CvIdentity identity) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle contactStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, theme.palette().muted()); } diff --git a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java index 9a099b30e..e9245e21a 100644 --- a/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java +++ b/src/main/java/com/demcha/compose/document/templates/coverletter/v2/presets/TimelineMinimalLetter.java @@ -13,9 +13,9 @@ import com.demcha.compose.document.templates.api.DocumentTemplate; import com.demcha.compose.document.templates.coverletter.v2.components.LetterBody; import com.demcha.compose.document.templates.coverletter.v2.data.CoverLetterDocument; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvIdentity; import com.demcha.compose.document.templates.cv.v2.data.CvLink; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -210,24 +210,24 @@ private SvgGlyph glyph(String iconFile) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle jobTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 9.5, + return TextStyles.of(theme.typography().headlineFont(), 9.5, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle contactTextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, theme.palette().muted()); } private DocumentTextStyle fallbackIconStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), 8.0, + return TextStyles.of(theme.typography().headlineFont(), 8.0, DocumentTextDecoration.BOLD, theme.palette().muted()); } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/BlueBanner.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/BlueBanner.java index da72f90b2..a949edfa2 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/BlueBanner.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/BlueBanner.java @@ -20,7 +20,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/BoxedSections.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/BoxedSections.java index f86bb769a..8be210874 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/BoxedSections.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/BoxedSections.java @@ -14,7 +14,7 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.blocks.Block; import com.demcha.compose.document.templates.blocks.BulletListBlock; import com.demcha.compose.document.templates.blocks.IndentedBlock; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/CenteredHeadline.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/CenteredHeadline.java index 865b10bcf..ff7ff5f6e 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/CenteredHeadline.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/CenteredHeadline.java @@ -21,7 +21,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/EditorialBlue.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/EditorialBlue.java index 858f76668..6b790b6ae 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/EditorialBlue.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/EditorialBlue.java @@ -22,7 +22,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/MonogramSidebar.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/MonogramSidebar.java index 15cebbe5d..101a532dc 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/MonogramSidebar.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/MonogramSidebar.java @@ -28,7 +28,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/Panel.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/Panel.java index f167a8cd6..61a7a7239 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/Panel.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/Panel.java @@ -21,7 +21,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/presets/SidebarPortrait.java b/src/main/java/com/demcha/compose/document/templates/cv/presets/SidebarPortrait.java index 0ba2c0347..d6d6f8cc4 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/presets/SidebarPortrait.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/presets/SidebarPortrait.java @@ -22,7 +22,7 @@ import com.demcha.compose.document.templates.blocks.MultiParagraphBlock; import com.demcha.compose.document.templates.blocks.NumberedListBlock; import com.demcha.compose.document.templates.blocks.ParagraphBlock; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.cv.spec.CvHeader; import com.demcha.compose.document.templates.cv.spec.CvModule; import com.demcha.compose.document.templates.cv.spec.CvSpec; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java index daf693074..543157952 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/EntryCompactRenderer.java @@ -1,5 +1,8 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; + import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java index 613d1d457..be1fbf89d 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/LabelValueRenderer.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java index 5aeac8234..344da4403 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ParagraphPrimitive.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java index f1a878f24..896dc0773 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabel.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java index b1333906e..e0c6990c9 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/ProjectRenderer.java @@ -1,5 +1,8 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; + import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java index d108a2e82..fb0dad185 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/SkillLineRenderer.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import com.demcha.compose.document.dsl.SectionBuilder; import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java index c6e2afd97..deece6d3f 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/components/package-info.java @@ -13,9 +13,9 @@ * so the same component renders any theme without reflection * or singletons; *
  • own business parsing — specs own the semantic model; shared - * adapters may normalize legacy free-form labels or bridge - * markdown into rich text, but presets should not duplicate - * local parsers;
    • + * adapters may normalize legacy free-form labels, but presets + * should not duplicate local parsers (markdown parsing lives in + * the neutral {@code core.text} layer); *
  • read magic numbers — every value reads from the theme.
    • * * diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/package-info.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/package-info.java index f2eb17163..59ef9ab40 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/package-info.java @@ -51,9 +51,7 @@ * │ ParagraphRenderer │ │ Spacing (margins) │ * │ SectionDispatcher │ │ Decoration (glyphs) │ * │ ParagraphPrimitive│ │ BrandTheme (bundle) │ - * │ MarkdownInline │ └──────────────────────────┘ - * │ TextOrnaments │ - * └──────────────────────┘ + * └──────────────────────┘ └──────────────────────────┘ * │ renders * ▼ * ┌─────────────────────────────────────────────────────────────┐ diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java index b905ccefb..769b956ca 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/BlueBanner.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -108,7 +110,7 @@ public void compose(DocumentSession document, CvDocument doc) { Objects.requireNonNull(document, "document"); Objects.requireNonNull(doc, "doc"); - DocumentTextStyle bannerTitleStyle = CvTextStyles.of( + DocumentTextStyle bannerTitleStyle = TextStyles.of( theme.typography().bodyFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, @@ -191,11 +193,11 @@ private static void renderEntry(SectionBuilder section, CvEntry entry, BrandTheme theme) { DocumentTextStyle titleStyle = theme.entryTitleStyle(); - DocumentTextStyle dateStyle = CvTextStyles.of(theme.typography().bodyFont(), + DocumentTextStyle dateStyle = TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.BOLD, theme.palette().ink()); - DocumentTextStyle subtitleStyle = CvTextStyles.of(theme.typography().bodyFont(), + DocumentTextStyle subtitleStyle = TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntrySubtitle(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java index 05d710add..a281d8cf1 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/ClassicSerif.java @@ -1,5 +1,9 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; +import com.demcha.compose.document.templates.core.text.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -158,7 +162,7 @@ private void addSummary(PageFlowBuilder flow, CvSection section) { .accentBottom(theme.palette().rule(), 0.45); addCenteredTitle(host, "Professional Profile"); RichParagraphRenderer.render(host, summary.body(), - CvTextStyles.of(theme.typography().bodyFont(), 9.8, + TextStyles.of(theme.typography().bodyFont(), 9.8, DocumentTextDecoration.DEFAULT, theme.palette().ink()), 1.55, DocumentInsets.zero(), TextAlign.CENTER); @@ -244,7 +248,7 @@ private void renderEntry(SectionBuilder host, CvEntry entry) { "CvV2ClassicSerifEntryHeader", theme.entryTitleStyle(), theme.entryDateStyle(), theme.entrySubtitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), 8.8, + TextStyles.of(theme.typography().bodyFont(), 8.8, DocumentTextDecoration.DEFAULT, theme.palette().ink()), theme.spacing().entryHeaderRowSpacing(), @@ -272,10 +276,10 @@ private void renderRows(SectionBuilder host, RowsSection rows) { private void renderProject(SectionBuilder host, CvRow row) { ProjectRenderer.titleThenBody(host, row, theme.entryTitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), 8.7, + TextStyles.of(theme.typography().bodyFont(), 8.7, DocumentTextDecoration.ITALIC, theme.palette().muted()), - CvTextStyles.of(theme.typography().bodyFont(), 8.8, + TextStyles.of(theme.typography().bodyFont(), 8.8, DocumentTextDecoration.DEFAULT, theme.palette().ink()), theme.typography().bodyLineSpacing(), @@ -306,28 +310,28 @@ private void addCenteredTitle(SectionBuilder host, String title) { } private DocumentTextStyle titleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, ACCENT); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } private DocumentTextStyle contactSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().rule()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java index fdd818e25..b00d9bb62 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/CompactMono.java @@ -1,5 +1,8 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -310,52 +313,52 @@ private void addProject(SectionBuilder host, CvRow row) { } private DocumentTextStyle headerNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, DocumentColor.rgb(255, 255, 255)); } private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, HEADER_SOFT); } private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, LINK_CYAN); } private DocumentTextStyle headerSeparatorStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, SEPARATOR_GRAY); } private DocumentTextStyle moduleLabelStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, ACCENT); } private DocumentTextStyle bodyStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, + return TextStyles.of(theme.typography().bodyFont(), size, DocumentTextDecoration.DEFAULT, color); } private DocumentTextStyle bodyBoldStyle(double size) { - return CvTextStyles.of(theme.typography().bodyFont(), size, + return TextStyles.of(theme.typography().bodyFont(), size, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle italicStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, + return TextStyles.of(theme.typography().bodyFont(), size, DocumentTextDecoration.ITALIC, color); } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java index f9c8d89b9..ff52ebd27 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EditorialBlue.java @@ -1,5 +1,8 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.RichParagraphRenderer; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -163,11 +166,11 @@ private void renderEntries(SectionBuilder section, EntriesSection entries) { } private void renderExperienceEntry(SectionBuilder section, CvEntry entry) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle titleStyle = TextStyles.of(FontName.HELVETICA_BOLD, 11.0, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle dateStyle = TextStyles.of(FontName.HELVETICA_BOLD, 11.0, DocumentTextDecoration.BOLD, theme.palette().rule()); - DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle subtitleStyle = TextStyles.of(FontName.HELVETICA, 9.4, DocumentTextDecoration.ITALIC, theme.palette().ink()); EntryCompactRenderer.titleDateBody(section, entry, titleStyle, @@ -177,11 +180,11 @@ private void renderExperienceEntry(SectionBuilder section, CvEntry entry) { } private void renderEducationEntry(SectionBuilder section, CvEntry entry) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle titleStyle = TextStyles.of(FontName.HELVETICA_BOLD, 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle dateStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle dateStyle = TextStyles.of(FontName.HELVETICA_BOLD, 10.0, DocumentTextDecoration.BOLD, theme.palette().rule()); - DocumentTextStyle subtitleStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle subtitleStyle = TextStyles.of(FontName.HELVETICA, 9.2, DocumentTextDecoration.ITALIC, theme.palette().ink()); EntryCompactRenderer.titleDateBody(section, entry, titleStyle, @@ -207,9 +210,9 @@ private void renderRows(SectionBuilder section, RowsSection rows) { } private void renderProject(SectionBuilder section, CvRow row) { - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle titleStyle = TextStyles.of(FontName.HELVETICA_BOLD, 10.6, DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle stackStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle stackStyle = TextStyles.of(FontName.HELVETICA, 9.3, DocumentTextDecoration.ITALIC, theme.palette().rule()); ProjectRenderer.titleThenBody(section, row, titleStyle, stackStyle, theme.bodyStyle(), 1.45, DocumentInsets.top(1), @@ -217,7 +220,7 @@ private void renderProject(SectionBuilder section, CvRow row) { } private void renderKeyValue(SectionBuilder section, CvRow row) { - DocumentTextStyle keyStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle keyStyle = TextStyles.of(FontName.HELVETICA_BOLD, theme.typography().sizeBody(), DocumentTextDecoration.BOLD, NAME_COLOR); LabelValueRenderer.render(section, row.label(), row.body(), @@ -239,7 +242,7 @@ private void renderSkills(SectionBuilder section, List groups, if (groups.isEmpty()) { return; } - DocumentTextStyle cellStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle cellStyle = TextStyles.of(FontName.HELVETICA, 8.6, DocumentTextDecoration.DEFAULT, theme.palette().ink()); TableWidget.Style tableStyle = TableWidget.Style.builder() .name("CvV2EditorialBlueSkillsTable") @@ -264,7 +267,7 @@ private void addFooter(PageFlowBuilder pageFlow, double width) { .padding(new DocumentInsets(2, 0, 0, 0)) .addParagraph(paragraph -> paragraph .text("References available upon request.") - .textStyle(CvTextStyles.of(FontName.HELVETICA, + .textStyle(TextStyles.of(FontName.HELVETICA, 8.4, DocumentTextDecoration.ITALIC, theme.palette().muted())) .align(TextAlign.CENTER) @@ -297,20 +300,20 @@ private String displayTitle(String title) { } private DocumentTextStyle sectionTitleStyle() { - return CvTextStyles.of(FontName.HELVETICA_BOLD, + return TextStyles.of(FontName.HELVETICA_BOLD, theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, theme.palette().rule()); } private Masthead.Style mastheadStyle() { - DocumentTextStyle nameStyle = CvTextStyles.of(FontName.HELVETICA_BOLD, + DocumentTextStyle nameStyle = TextStyles.of(FontName.HELVETICA_BOLD, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, NAME_COLOR); - DocumentTextStyle titleStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle titleStyle = TextStyles.of(FontName.HELVETICA, 10.0, DocumentTextDecoration.DEFAULT, theme.palette().ink()); - DocumentTextStyle linkStyle = CvTextStyles.of(FontName.HELVETICA, + DocumentTextStyle linkStyle = TextStyles.of(FontName.HELVETICA, theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, theme.palette().rule()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java index 1bbfe066c..a8372b465 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/EngineeringResume.java @@ -7,8 +7,8 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.*; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.ProjectLabel; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; import com.demcha.compose.document.templates.cv.v2.data.*; @@ -535,133 +535,133 @@ private void addRoleHeader(SectionBuilder card, CvEntry entry) { // -- Style factories ------------------------------------------------ private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, DocumentColor.WHITE); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.6, DocumentTextDecoration.BOLD, SUBTITLE_COLOR); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, CONTACT_META); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, CONTACT_LINK); } private DocumentTextStyle railHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), 7.4, DocumentTextDecoration.BOLD, GREEN); } private DocumentTextStyle railBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 6.95, DocumentTextDecoration.DEFAULT, RAIL_TEXT); } private DocumentTextStyle railLabelStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 6.95, DocumentTextDecoration.BOLD, GREEN); } private DocumentTextStyle railTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 6.95, DocumentTextDecoration.BOLD, DocumentColor.WHITE); } private DocumentTextStyle railDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 6.7, DocumentTextDecoration.DEFAULT, RAIL_DATE); } private DocumentTextStyle mainHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, GREEN); } private DocumentTextStyle profileHeadingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), 8.0, DocumentTextDecoration.BOLD, GREEN); } private DocumentTextStyle profileBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.75, DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle roleTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle roleDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.BOLD, GREEN); } private DocumentTextStyle subtitleBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntrySubtitle(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle roleBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle projectTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.35, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle projectContextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 6.85, DocumentTextDecoration.DEFAULT, GREEN); } private DocumentTextStyle projectBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.1, DocumentTextDecoration.DEFAULT, theme.palette().ink()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java index 729573351..0d0705c21 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Executive.java @@ -10,7 +10,7 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; +import com.demcha.compose.document.templates.core.text.TextStyles; import com.demcha.compose.document.templates.cv.v2.components.SectionDispatcher; import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -199,28 +199,28 @@ private void addLinkRow(SectionBuilder section, CvIdentity identity) { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, + return TextStyles.of(FontName.POPPINS, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, PRIMARY_NAME); } private DocumentTextStyle metaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle linkRowBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle linkRowLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.UNDERLINE, ACCENT); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java index b3cce4efc..c76daf780 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MintEditorial.java @@ -14,10 +14,10 @@ import com.demcha.compose.document.table.DocumentTableColumn; import com.demcha.compose.document.table.DocumentTableStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.core.theme.BrandTheme; import com.demcha.compose.document.templates.cv.v2.widgets.Headline; @@ -1074,7 +1074,7 @@ private DocumentTableCell referenceLineCell(String line, return gridCell(line, cellStyle); } DocumentLinkOptions link = new DocumentLinkOptions("mailto:" + email); - DocumentTextStyle linkStyle = CvTextStyles.of( + DocumentTextStyle linkStyle = TextStyles.of( theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.UNDERLINE, theme.palette().muted()); @@ -1123,43 +1123,43 @@ private DocumentTableCell gridCell(String text, DocumentTableStyle style) { * colour differs when a caller overrides {@code nameColor}. */ private DocumentTextStyle mastheadNameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, nameColor); } private DocumentTextStyle taglineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, accent); } private DocumentTextStyle headingStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, accent); } private DocumentTextStyle labelStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle bodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle contactStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle smallStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java index f4eec8a9a..1d5939dbe 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/MonogramSidebar.java @@ -1,5 +1,9 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.api.PageBackgroundFill; import com.demcha.compose.document.dsl.EllipseBuilder; @@ -396,7 +400,7 @@ private void addMonogramBlock(SectionBuilder section, .layer(new ParagraphBuilder() .name("CvV2MonogramSidebarInitials") .text(initialsText) - .textStyle(CvTextStyles.of(MONOGRAM_FONT, 44.0, + .textStyle(TextStyles.of(MONOGRAM_FONT, 44.0, DocumentTextDecoration.BOLD, monogramRing)) .align(TextAlign.LEFT) .build(), LayerAlign.CENTER) @@ -725,84 +729,84 @@ private void addExperienceEntries(SectionBuilder section, // -- Style factories ---------------------------------------------- private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, accent); } private DocumentTextStyle sidebarHeaderStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 8.0, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle sidebarEntryTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.6, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarEntrySubtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle sidebarEntryDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.2, DocumentTextDecoration.DEFAULT, accent); } private DocumentTextStyle sidebarSkillStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle mainHeaderStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle mainEntryTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainEntryDateStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.BOLD, accent); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java index 2b3c7c71f..f65274e5b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/NordicClean.java @@ -1,5 +1,8 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -307,7 +310,7 @@ private void addHeader(PageFlowBuilder flow, CvDocument doc) { .text(MarkdownInline.plainText( doc.identity().jobTitle()) .toUpperCase(Locale.ROOT)) - .textStyle(CvTextStyles.of(theme.typography().bodyFont(), + .textStyle(TextStyles.of(theme.typography().bodyFont(), 7.7, DocumentTextDecoration.BOLD, theme.palette().muted())) @@ -402,7 +405,7 @@ private void addEducation(SectionBuilder parent, CvSection section) { options.accentColor(), 82, host -> { for (CvEntry entry : education.entries()) { EntryCompactRenderer.slashSubtitleDate(host, entry, - CvTextStyles.of(theme.typography().bodyFont(), 7.05, + TextStyles.of(theme.typography().bodyFont(), 7.05, DocumentTextDecoration.BOLD, theme.palette().ink()), bodyStyle(7.05, theme.palette().muted()), @@ -460,7 +463,7 @@ private void addProjects(SectionBuilder parent, CvSection section) { private void addWorkEntry(SectionBuilder host, CvEntry entry) { EntryCompactRenderer.titleDateBody(host, entry, theme.entryTitleStyle(), - CvTextStyles.of(theme.typography().bodyFont(), + TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.BOLD, options.accentColor()), @@ -477,7 +480,7 @@ private void addWorkEntry(SectionBuilder host, CvEntry entry) { private void addProject(SectionBuilder host, CvRow row) { ProjectRenderer.inline(host, row, - CvTextStyles.of(theme.typography().bodyFont(), 7.35, + TextStyles.of(theme.typography().bodyFont(), 7.35, DocumentTextDecoration.BOLD, theme.palette().ink()), bodyStyle(6.95, theme.palette().muted()), bodyStyle(7.2, theme.palette().ink()), @@ -487,7 +490,7 @@ private void addProject(SectionBuilder host, CvRow row) { private void addLabelValueLine(SectionBuilder host, String label, String value, double size, double lineSpacing) { - DocumentTextStyle labelStyle = CvTextStyles.of(theme.typography().bodyFont(), + DocumentTextStyle labelStyle = TextStyles.of(theme.typography().bodyFont(), size, DocumentTextDecoration.BOLD, theme.palette().ink()); DocumentTextStyle valueStyle = bodyStyle(size, theme.palette().muted()); @@ -497,35 +500,35 @@ private void addLabelValueLine(SectionBuilder host, String label, } private DocumentTextStyle headlineStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sectionTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, options.accentColor()); } private DocumentTextStyle contactMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle contactLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, options.accentColor()); } private DocumentTextStyle bodyStyle(double size, DocumentColor color) { - return CvTextStyles.of(theme.typography().bodyFont(), size, + return TextStyles.of(theme.typography().bodyFont(), size, DocumentTextDecoration.DEFAULT, color); } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java index 7ee52a4b6..7c118c4c7 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/Panel.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.presets; +import com.demcha.compose.document.templates.core.text.TextStyles; + import com.demcha.compose.document.api.DocumentSession; import com.demcha.compose.document.dsl.PageFlowBuilder; import com.demcha.compose.document.dsl.SectionBuilder; @@ -450,35 +452,35 @@ private CardWidget.Style headerStyle() { } private DocumentTextStyle nameStyle() { - return CvTextStyles.of(FontName.POPPINS, + return TextStyles.of(FontName.POPPINS, theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, HEADER_TEXT); } private DocumentTextStyle headerBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle headerMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle headerLinkStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.UNDERLINE, ACCENT); } private DocumentTextStyle moduleTitleStyle() { - return CvTextStyles.of(FontName.POPPINS, + return TextStyles.of(FontName.POPPINS, theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, ACCENT); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java index aa5b1b5ee..f8563ee58 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/SidebarPortrait.java @@ -12,8 +12,8 @@ import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.svg.SvgIcon; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.ProjectLabel; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; import com.demcha.compose.document.templates.cv.v2.data.*; @@ -772,105 +772,105 @@ private void addProjectsList(SectionBuilder section, // -- Style factories ------------------------------------------------ private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle subtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle contactStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle sidebarHeaderStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 10.8, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarEntryTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 8.4, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarEntryMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.8, DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle sidebarSkillStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntrySubtitle(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle sidebarLanguageNameStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 8.1, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarLanguageMetaStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 7.9, DocumentTextDecoration.DEFAULT, theme.palette().muted()); } private DocumentTextStyle mainHeaderStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle mainEntryTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainEntrySubtitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), 9.2, DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle mainProjectTitleStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainProjectContextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.ITALIC, theme.palette().muted()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java index d983db7b3..e9c905c06 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/presets/TimelineMinimal.java @@ -12,8 +12,8 @@ import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import com.demcha.compose.document.templates.cv.v2.components.SectionLookup; import com.demcha.compose.document.templates.cv.v2.data.*; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -404,63 +404,63 @@ private void addMainModule(SectionBuilder main, String title, // -- style factories --------------------------------------------- private DocumentTextStyle nameStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeHeadline(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle jobTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), 9.5, DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle contactTextStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeContact(), DocumentTextDecoration.BOLD, theme.palette().muted()); } private DocumentTextStyle fallbackIconStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), 8.0, DocumentTextDecoration.BOLD, theme.palette().muted()); } private DocumentTextStyle sidebarTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle sidebarBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntrySubtitle(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainTitleStyle() { - return CvTextStyles.of(theme.typography().headlineFont(), + return TextStyles.of(theme.typography().headlineFont(), theme.typography().sizeBanner(), DocumentTextDecoration.BOLD, theme.palette().ink()); } private DocumentTextStyle mainBulletStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeBody(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); } private DocumentTextStyle mainBodyStyle() { - return CvTextStyles.of(theme.typography().bodyFont(), + return TextStyles.of(theme.typography().bodyFont(), theme.typography().sizeEntryDate(), DocumentTextDecoration.DEFAULT, theme.palette().ink()); diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Headline.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Headline.java index 9806162b2..e3e6cf78c 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Headline.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Headline.java @@ -4,7 +4,7 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvName; import com.demcha.compose.document.templates.core.theme.BrandTheme; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java index 6e853d00d..60d5ffe2f 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/ProfileBand.java @@ -7,7 +7,7 @@ import com.demcha.compose.document.style.DocumentCornerRadius; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.components.MarkdownInline; +import com.demcha.compose.document.templates.core.text.MarkdownInline; import java.util.Objects; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java index 826100d8c..f765f31a0 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SectionHeader.java @@ -6,7 +6,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.core.theme.BrandTheme; import java.util.Locale; diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java index 693be4ae3..94f4d5b24 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/SkillBar.java @@ -5,8 +5,8 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextDecoration; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.components.CvTextStyles; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextStyles; +import com.demcha.compose.document.templates.core.text.TextOrnaments; import com.demcha.compose.document.templates.cv.v2.data.CvSkill; import com.demcha.compose.document.templates.core.theme.BrandTheme; @@ -109,7 +109,7 @@ public static void render(SectionBuilder host, CvSkill skill, Objects.requireNonNull(theme, "theme"); boolean levelled = skill.level().isPresent(); - DocumentTextStyle labelStyle = CvTextStyles.of( + DocumentTextStyle labelStyle = TextStyles.of( theme.typography().bodyFont(), theme.typography().sizeEntryTitle(), DocumentTextDecoration.BOLD, diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Subheadline.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Subheadline.java index 60b6e59df..bcc56eb8e 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Subheadline.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Subheadline.java @@ -4,7 +4,7 @@ import com.demcha.compose.document.node.TextAlign; import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; -import com.demcha.compose.document.templates.cv.v2.components.TextOrnaments; +import com.demcha.compose.document.templates.core.text.TextOrnaments; /** * Secondary headline widget — the small spaced-caps tagline rendered diff --git a/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java b/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java index db08b69b6..78c75895f 100644 --- a/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java +++ b/src/main/java/com/demcha/compose/document/templates/invoice/builder/InvoiceBuilder.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.invoice.spec.InvoiceSpec; import com.demcha.compose.document.templates.themes.Spacing; diff --git a/src/main/java/com/demcha/compose/document/templates/proposal/builder/ProposalBuilder.java b/src/main/java/com/demcha/compose/document/templates/proposal/builder/ProposalBuilder.java index 4070ff45c..eff8d3249 100644 --- a/src/main/java/com/demcha/compose/document/templates/proposal/builder/ProposalBuilder.java +++ b/src/main/java/com/demcha/compose/document/templates/proposal/builder/ProposalBuilder.java @@ -8,7 +8,7 @@ import com.demcha.compose.document.style.DocumentInsets; import com.demcha.compose.document.style.DocumentTextStyle; import com.demcha.compose.document.templates.api.DocumentTemplate; -import com.demcha.compose.document.templates.components.MarkdownText; +import com.demcha.compose.document.templates.core.text.MarkdownText; import com.demcha.compose.document.templates.proposal.spec.ProposalSpec; import com.demcha.compose.document.templates.themes.Spacing; diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInlineTest.java b/src/test/java/com/demcha/compose/document/templates/core/text/MarkdownInlineTest.java similarity index 99% rename from src/test/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInlineTest.java rename to src/test/java/com/demcha/compose/document/templates/core/text/MarkdownInlineTest.java index 18011d789..3d1fd903b 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/MarkdownInlineTest.java +++ b/src/test/java/com/demcha/compose/document/templates/core/text/MarkdownInlineTest.java @@ -1,4 +1,4 @@ -package com.demcha.compose.document.templates.cv.v2.components; +package com.demcha.compose.document.templates.core.text; import com.demcha.compose.document.dsl.RichText; import com.demcha.compose.document.node.DocumentLinkOptions; diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/CvV2ComponentUtilityTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/components/CvV2ComponentUtilityTest.java index fc71856bc..74588a0d9 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/CvV2ComponentUtilityTest.java +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/components/CvV2ComponentUtilityTest.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import com.demcha.compose.document.templates.cv.v2.data.CvSection; import com.demcha.compose.document.templates.cv.v2.data.ParagraphSection; import com.demcha.compose.document.templates.cv.v2.data.RowStyle; diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabelTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabelTest.java index 3bedc48b5..2b7e2d83f 100644 --- a/src/test/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabelTest.java +++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/components/ProjectLabelTest.java @@ -1,5 +1,7 @@ package com.demcha.compose.document.templates.cv.v2.components; +import com.demcha.compose.document.templates.core.text.MarkdownInline; + import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat;