The narrow sidebar suits a list of short labels. A CV whose projects + * carry a paragraph each fills it long before the wide column fills, so the + * projects run onto a page of their own while the main column ends half + * empty. Which column they belong in is a property of the CV rather than of + * the design, so it is the caller's to choose — and the default stays what it + * has always been.
+ * + *Placement is read off the node names the preset gives its + * blocks, not off reading order. Order would only be a proxy: the preset emits + * one body row per page, so once the document paginates a later page's sidebar + * follows an earlier page's main column and the proxy inverts. The names say + * which column drew the block whatever the pagination does.
+ */ +class TimelineMinimalProjectsColumnTest { + + /** How the preset names a block: the column, then its normalised title. */ + private static final String SIDEBAR_PROJECTS = "CvV2TimelineMinimalSidebarprojects"; + private static final String MAIN_PROJECTS = "CvV2TimelineMinimalMainprojects"; + + @Test + void byDefaultTheProjectsAreDrawnInTheSidebar() { + ListEvery lookup builds a fresh template with the preset's own default - * theme; a caller wanting a variant calls that preset's - * {@code create(BrandTheme)} directly. {@code CvTemplatesCoverageTest} holds + * theme and default layout; a caller wanting a variant calls that preset's + * own factory directly — {@code create(BrandTheme)}, or {@code create(Options)} + * where the preset offers one, as {@code NordicClean} and + * {@code TimelineMinimal} do. {@code CvTemplatesCoverageTest} holds * this catalogue to the presets package, so a preset added and not * registered fails the build rather than staying invisible to every runtime * caller.
diff --git a/templates/src/main/java/com/demcha/compose/document/templates/cv/presets/TimelineMinimal.java b/templates/src/main/java/com/demcha/compose/document/templates/cv/presets/TimelineMinimal.java index 4a9da2a0..b4e00866 100644 --- a/templates/src/main/java/com/demcha/compose/document/templates/cv/presets/TimelineMinimal.java +++ b/templates/src/main/java/com/demcha/compose/document/templates/cv/presets/TimelineMinimal.java @@ -34,7 +34,8 @@ *Minimal two-column CV with a vertical timeline axis between the * sidebar (Education / Skills / Expertise / Languages / Interests / * References) and the main column (Professional Profile / Work - * Experience). Visual signature ported from the v1 + * Experience) — the default arrangement, which {@link Options} lets a + * caller change for the projects. Visual signature ported from the v1 * {@code TimelineMinimalCvTemplateComposer}: spaced caps name in * Barlow Condensed, contact stack with PNG icons, all-grey palette, * three timeline dots between four axis segments.
@@ -63,6 +64,21 @@ * and emits one row per page, letting each finished row overflow naturally. * What it holds back for the masthead is measured from the identity, because * the contact stack grows a row per link. + * + *The sidebar suits a list of short project labels. A CV whose projects + * carry a paragraph each fills it long before the wide column fills, so the + * default draws them onto a second page while the main column ends half + * empty. Which column they belong in is a property of the CV rather than of + * the design:
+ * + *{@code
+ * TimelineMinimal.create(
+ * TimelineMinimal.Options.builder()
+ * .projectsColumn(TimelineMinimal.Column.MAIN)
+ * .build());
+ * }
*/
public final class TimelineMinimal {
@@ -184,7 +200,7 @@ private TimelineMinimal() {
* @return ready-to-use template
*/
public static DocumentTemplateAmbiguous against {@link #create(BrandTheme)} for a bare + * {@code null} literal; pass {@link Options#defaults()} rather than + * {@code null} to ask for the stock layout.
+ * + * @param options placement options + * @return ready-to-use template + * @throws NullPointerException if {@code options} is null + * @since 2.3.0 + */ + public static DocumentTemplateNot to be confused with + * {@link com.demcha.compose.document.templates.cv.data.Slot}, which shares + * two of these names: a slot is where the author of the CV put a + * section, and every preset here reads {@code Slot.MAIN}. This is where + * this preset then draws one of them.
+ * + * @since 2.3.0 + */ + public enum Column { + /** The narrow left column, beside Education and Skills. */ + SIDEBAR, + /** The wide right column, under the profile and the work history. */ + MAIN } - private record Template(BrandTheme theme) implements DocumentTemplateThe narrow column suits a list of short labels. A CV whose projects + * carry a paragraph each fills it faster than the wide column fills, so + * the projects run onto a page of their own while the main column ends + * half empty and every technical line wraps three times. Moving them is a + * property of the CV, not of the design, which is why it is a caller's + * choice rather than a second preset.
+ * + * @param projectsColumn where the projects section is drawn; + * {@code null} means {@link Column#SIDEBAR} + * @since 2.3.0 + */ + public record Options(Column projectsColumn) { + + /** Normalises a null column to the default. */ + public Options { + projectsColumn = projectsColumn == null ? Column.SIDEBAR : projectsColumn; + } + + /** + * The layout this preset has always drawn: projects in the sidebar. + * + * @return the default options + */ + public static Options defaults() { + return new Options(Column.SIDEBAR); + } + + /** + * Starts a mutable builder. + * + * @return new builder + */ + public static Builder builder() { + return new Builder(); + } + + /** + * Builder for {@link Options}. + */ + public static final class Builder { + private Column projectsColumn = Column.SIDEBAR; + + private Builder() { + } + + /** + * Sets the column the projects section is drawn in. + * + * @param value target column + * @return this builder + */ + public Builder projectsColumn(Column value) { + this.projectsColumn = value; + return this; + } + + /** + * Builds the configured options. + * + * @return a new {@link Options} + */ + public Options build() { + return new Options(projectsColumn); + } + } + } + + private record Template(BrandTheme theme, Options options) + implements DocumentTemplate