Visual signature ported from the legacy v1 preset:
+ *The preset reuses three existing widgets ({@link Headline}, + * {@link ContactLine}, {@link SectionHeader#flatSpacedCaps}) and one + * newly introduced widget ({@link Subheadline}). The thin rules + * between sections are emitted as inline {@code pageFlow.addLine(...)} + * calls because they are part of the page-flow composition, not a + * section-scoped widget — turning them into a widget would force every + * caller to round-trip through a {@link com.demcha.compose.document.dsl.SectionBuilder}, + * which is the wrong granularity for a single-line ornament.
+ * + *Why the subline says "PROFESSIONAL TITLE" verbatim: + * the v2 {@link com.demcha.compose.document.templates.cv.v2.data.CvIdentity} + * model does not carry a {@code jobTitle} field today — the v1 preset + * hard-coded the same string for visual signature purposes and we + * preserve that exactly to keep the baseline matching. When a + * {@code jobTitle} field is introduced, swap the hard-coded string + * for {@code doc.identity().jobTitle()} (with a sensible fallback).
+ */ +public final class CenteredHeadline { + + /** Stable template identifier. */ + public static final String ID = "centered-headline"; + + /** Human-readable display name. */ + public static final String DISPLAY_NAME = "Centered Headline"; + + /** Recommended page margin (in points) — matches the legacy v1 preset. */ + public static final double RECOMMENDED_MARGIN = 28.0; + + /** + * Fixed subheadline text. Matches the v1 preset's hard-coded + * caption verbatim — see class Javadoc for rationale. + */ + private static final String SUBHEADLINE_CAPTION = "Professional Title"; + + private CenteredHeadline() { + // utility class — not instantiable + } + + /** + * Builds the preset with the classic Centered Headline theme + * ({@link CvTheme#centeredHeadline()}). + */ + public static DocumentTemplateThe {@code banner} slot is required by the record but unused + * by the Centered Headline visual signature (no banner panels); + * we reuse the classic banner colour so themes can swap the body + * style without leaving an obvious gap if a future preset reuses + * this palette with a banner-style section header.
+ */ + public static CvPalette centeredHeadline() { + return new CvPalette( + DocumentColor.rgb(54, 54, 54), // ink (#363636) + DocumentColor.rgb(105, 105, 105), // muted / soft (#696969) + DocumentColor.rgb(188, 188, 188), // rule (#BCBCBC) + DocumentColor.rgb(220, 226, 230)); // banner (inherits classic) + } } diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java index 97288def..c900d5bb 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvSpacing.java @@ -117,6 +117,32 @@ public static CvSpacing classic() { 3.0); // entrySeparation } + /** + * Spacing for the {@code CenteredHeadline} preset — designed for a + * classic single-column resume with thin full-width rules above + * and below the contact line, and small inter-module rules between + * sections. Banner-panel fields are left at sensible defaults but + * unused (the preset uses {@code flatSpacedCaps} section headers, + * not banners). + */ + public static CvSpacing centeredHeadline() { + return new CvSpacing( + 0, // pageFlowSpacing (zero — rules supply visual gaps) + 1.5, // sectionBodySpacing + DocumentInsets.zero(), // sectionBodyPadding + new DocumentInsets(8, 0, 0, 0), // headlinePadding (small top breathing room) + new DocumentInsets(7, 0, 7, 0), // contactPadding + 0.0, // bannerCornerRadius (unused) + 5.0, // bannerInnerPadding (unused) + DocumentInsets.top(0), // bannerMargin (unused) + 0.55, // accentRuleWidth (thin v1 rule) + 1.2, // paragraphMarginTop + 8.0, // entryHeaderRowSpacing + 1.0, // entryTitleWeight + 0.45, // entryDateWeight + 3.0); // entrySeparation + } + /** * Tighter spacing for the Modern Professional preset — no banner * panels, denser body, single-page-friendly proportions. diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java index a7cb88e3..4652c83e 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTheme.java @@ -87,6 +87,21 @@ public static CvTheme modernProfessional() { CvDecoration.classic()); } + /** + * The "Centered Headline" classic look ported from the v1 preset + * of the same name — Poppins headline, Lato body, soft greyscale + * palette, thin full-width rules separating headline / contact / + * each module. Pipe contact separator matches the classic + * decoration. + */ + public static CvTheme centeredHeadline() { + return new CvTheme( + CvPalette.centeredHeadline(), + CvTypography.centeredHeadline(), + CvSpacing.centeredHeadline(), + CvDecoration.classic()); + } + // -- pre-built text-style helpers ------------------------------------ // Renderers ask the theme for an already-composed DocumentTextStyle // instead of re-assembling font + size + decoration + colour every diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java index 1e4dea62..7de1427b 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/theme/CvTypography.java @@ -78,4 +78,28 @@ public static CvTypography modernProfessional() { 10.0, // body 1.35); // line spacing } + + /** + * Poppins headline + Lato body scale ported from the original + * {@code CenteredHeadline} v1 preset. The headline is the page's + * loudest element (24pt spaced caps); everything else is at + * 8-9pt for a classic-resume density. + * + *{@code sizeBanner} feeds the + * {@link com.demcha.compose.document.templates.cv.v2.widgets.SectionHeader#flatSpacedCaps} + * variant — small bold spaced-caps title in the soft palette + * tone.
+ */ + public static CvTypography centeredHeadline() { + return new CvTypography( + FontName.POPPINS, FontName.LATO, + 24.0, // headline (spaced-caps name) + 8.3, // contact + 9.5, // banner (used as small spaced-caps section title) + 8.8, // entry title + 8.6, // entry date + 8.4, // entry subtitle + 8.7, // body + 1.45); // line spacing + } } 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 260ce84f..f5239886 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 @@ -23,6 +23,11 @@ *Unlike {@link Headline} (one rendering shape, two text @@ -96,4 +101,45 @@ public static void flat(SectionBuilder host, String title, .align(TextAlign.LEFT) .margin(DocumentInsets.zero())); } + + /** + * Small left-aligned spaced-caps bold title in a given colour. No + * panel, no rule — flat like {@link #flat} but typographically + * quieter: body font, body-sized, transformed to letter-spaced + * uppercase via {@link TextOrnaments#spacedUpper(String)}. Visual + * signature of {@code CenteredHeadline}. + * + *
If the {@code titleStyle} parameter is {@code null} the widget + * derives a style from the theme's body typography + * ({@code bodyFont} at {@code sizeBanner} weight, bold, the given + * colour). Pass an explicit style when the preset needs a specific + * font / size combination that doesn't map to a theme slot.
+ * + * @param host host section + * @param title verbatim title text (transformed to spaced caps + * by the widget) + * @param color title colour — typically a soft / muted accent + * @param theme active theme (used as the style default and + * for the padding token) + * @param titleStyle explicit style override; pass {@code null} to + * fall back to the theme-derived default + */ + public static void flatSpacedCaps(SectionBuilder host, String title, + DocumentColor color, CvTheme theme, + DocumentTextStyle titleStyle) { + DocumentTextStyle resolved = titleStyle != null + ? titleStyle + : DocumentTextStyle.builder() + .fontName(theme.typography().bodyFont()) + .size(theme.typography().sizeBanner()) + .decoration(DocumentTextDecoration.BOLD) + .color(color) + .build(); + host.padding(new DocumentInsets(0, 0, 0, 0)) + .addParagraph(p -> p + .text(TextOrnaments.spacedUpper(title)) + .textStyle(resolved) + .align(TextAlign.LEFT) + .margin(DocumentInsets.zero())); + } } 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 new file mode 100644 index 00000000..60b6e59d --- /dev/null +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/Subheadline.java @@ -0,0 +1,66 @@ +package com.demcha.compose.document.templates.cv.v2.widgets; + +import com.demcha.compose.document.dsl.SectionBuilder; +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; + +/** + * Secondary headline widget — the small spaced-caps tagline rendered + * directly beneath the main {@link Headline} (e.g. + * {@code P R O F E S S I O N A L T I T L E}). + * + *Reach for {@code Subheadline} when a preset stacks a quieter + * descriptor under the subject's name — typical of classic / + * editorial layouts where the headline block reads as two centred + * lines: a loud name and a soft caption. Visual signature of + * {@code CenteredHeadline}; will likely fit + * {@code EditorialBlue} when ported.
+ * + *If a future preset wants a right-aligned or verbatim (non-spaced) + * subheadline, add a sibling factory here — keep the + * {@code (host, text, style)} signature shape so call sites stay + * uniform. Padding is supplied by the caller via {@link SectionBuilder} + * because subheadline insets are part of the headline block's vertical + * rhythm, not a per-widget concern.
+ */ +public final class Subheadline { + + private Subheadline() { + } + + /** + * Centred letter-spaced uppercase subheadline. Text is transformed + * through {@link TextOrnaments#spacedUpper(String)} — pass the raw + * caption ({@code "Professional Title"}) and the widget handles the + * spacing. + * + * @param host host section (typically the same section that + * hosts the main {@link Headline}) + * @param text caption text to render, before the spaced-caps + * transform + * @param style explicit text style — the subheadline has no + * dedicated theme slot, so the caller composes + * {@code font + size + decoration + colour} and hands + * it in. Centralise the style in the preset, not at + * each call site. + */ + public static void centeredSpacedCaps(SectionBuilder host, String text, + DocumentTextStyle style) { + host.addParagraph(p -> p + .text(TextOrnaments.spacedUpper(text)) + .textStyle(style) + .align(TextAlign.CENTER) + .margin(DocumentInsets.top(1))); + } +} diff --git a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/package-info.java b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/package-info.java index 90ce6ac5..308012f6 100644 --- a/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/package-info.java +++ b/src/main/java/com/demcha/compose/document/templates/cv/v2/widgets/package-info.java @@ -5,7 +5,7 @@ * (addParagraph / softPanel / accentBottom) and CV-specific * renderers in {@code components/}. Each widget captures one * visual idea (a headline, a contact line, a section - * header) with two or three named variants, so a preset author + * header) with a small set of named variants, so a preset author * composes a page by picking widgets instead of * writing rendering DSL by hand. * @@ -44,12 +44,16 @@ *Each widget delegates internally to the lower-level renderers
diff --git a/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java
index c2c469d8..b4fe7583 100644
--- a/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java
+++ b/src/test/java/com/demcha/compose/document/templates/cv/v2/presets/CvV2VisualParityTest.java
@@ -92,7 +92,10 @@ private static Stream