@media-quest/builder 0.0.39 → 0.0.41

package/src/theme/Default-theme.ts

@@ -1,188 +1,173 @@
-import { DCss, DStyle, PStyle } from "@media-quest/engine";
-import { IconUrls } from "./icon-urls";
-import { BuilderOptionTheme, IDefaultTheme } from "./IDefault-theme";
-import { CssTheme } from "./css-theme";
-
-namespace BuilderOptionTheme {
-  const GREEN = "#70AD47";
-  const YELLOW = "#FFC000";
-  const ORANGE = "#F4902C";
-  const RED = "#FF0000";
-  const LIGHT_BLUE = "#42719C";
-  const WHITE = "#ffffff";
-  const BLUE = "#2F5597";
-  const BTN_BORDER_WIDTH = 3;
-  const BTN_BORDER_RADIUS = 10;
-  const BTN_HEIGHT = 130;
-  const BTN_WIDTH_LONG: DCss.Percent = { _unit: "percent", value: 19 };
-  const BTN_WIDTH_SHORT: DCss.Percent = { _unit: "percent", value: 15 };
-  const BTN_BORDER_STYLE: DStyle["borderStyle"] = "solid";
-  const FONT_WEIGHT: DStyle["fontWeight"] = 500;
-  const FONT_SIZE: DCss.Px["value"] = 36;
-
-  const BTN_PADDING_LEFT = 10;
-  const BTN_PADDING_TOP = 10;
-
-  const buttonBaseCss = (): CssTheme => ({
-    css: {
-      fontWeight: FONT_WEIGHT,
-
-      fontSize: { _unit: "px", value: FONT_SIZE },
-      letterSpacing: { _unit: "px", value: 2 },
-      paddingLeft: { _unit: "px", value: BTN_PADDING_LEFT },
-      paddingTop: { _unit: "px", value: BTN_PADDING_TOP },
-      paddingBottom: { _unit: "px", value: BTN_PADDING_TOP },
-      paddingRight: { _unit: "px", value: BTN_PADDING_LEFT },
-      borderRadius: { _unit: "px", value: BTN_BORDER_RADIUS },
-      borderWidth: { _unit: "px", value: BTN_BORDER_WIDTH },
-      width: BTN_WIDTH_LONG,
-      height: { _unit: "px", value: BTN_HEIGHT },
-      borderStyle: BTN_BORDER_STYLE,
-      // boxShadow: "3px 3px gray",
-      position: "relative",
-      display: "block",
-    },
-    cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
-    cssEnabled: { opacity: 1, cursor: "pointer" },
-  });
-
-  export const blueButton = (): BuilderOptionTheme => {
-    const base = buttonBaseCss();
-    const { css, cssEnabled, cssDisabled } = base;
-    const optionTheme: BuilderOptionTheme = {
-      name: "blue-button-theme",
-      normal: {
-        btn: {
-          css: {
-            ...css,
-            backgroundColor: BLUE,
-            borderColor: BLUE,
-            textColor: WHITE,
-          },
-          cssDisabled,
-          cssEnabled,
-        },
-        divider: {},
-        text1: {},
-        text2: {},
-      },
-
-      dontKnow: {
-        btn: {
-          css: {
-            ...css,
-            backgroundColor: WHITE,
-            borderColor: LIGHT_BLUE,
-            textColor: BLUE,
-            width: BTN_WIDTH_SHORT,
-          },
-          cssDisabled,
-          cssEnabled,
-        },
-        text1: {},
-        text2: {},
-        divider: {},
-      },
-    };
-
-    return optionTheme;
-  };
-}
-
-const MAIN_TEXT_FONT_SIZE: DCss.Px = { _unit: "px", value: 40 };
-const MAIN_TEXT_WIDTH: DCss.Percent = { _unit: "percent", value: 76 };
-const textHighTop = 30;
-const textLowTop = 72;
-const audioHighTop = 30;
-const audioLowTop = 72;
-
-const textBase: PStyle = {
-  width: MAIN_TEXT_WIDTH,
-  // backgroundColor: "red",
-  top: textHighTop,
-  left: 14,
-  lineHeight: 1.2,
-  textAlign: "left",
-  textColor: "black",
-  transform: "translate(0, -50%)",
-  fontSize: MAIN_TEXT_FONT_SIZE,
-};
-
-const textHigh: PStyle = { ...textBase, top: textHighTop };
-const textLow: PStyle = { ...textHigh, top: textLowTop };
-
-const audioBase: PStyle = {
-  height: 6,
-  width: 6,
-  left: 4,
-  top: audioHighTop,
-  cursor: "pointer",
-  opacity: 0.8,
-  transform: "translate(0, -50%)",
-  visibility: "visible",
-};
-const audioHigh: PStyle = { ...audioBase, top: audioHighTop };
-const audioLow: PStyle = { ...audioBase, top: audioLowTop };
-
-export const DefaultTheme: IDefaultTheme = {
-  name: "default-theme",
-  schemaBackgroundColor: "white",
-  dimensions: { baseHeight: 1300, baseWidth: 1024 },
-  videoPlayer: {
-    playButton: {
-      iconUrl: IconUrls.playCircleRegular,
-      css: { w: 5, h: 5, y: 48, x: 4 },
-      cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
-      cssEnabled: { opacity: 0.8, cursor: "pointer" },
-    },
-    pauseButton: {
-      iconUrl: IconUrls.pauseSvg,
-      css: { w: 5, h: 5, y: 48, x: 4 },
-      cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
-      cssEnabled: { opacity: 0.8, cursor: "pointer" },
-    },
-    videoElement: { css: { height: 41, top: 3, x: 0 } },
-  },
-  image: { style: { h: 50, w: 100, x: 0 } },
-  mainText: {
-    base: {
-      text: { ...textBase },
-      audio: {
-        iconUrl: IconUrls.volumeUpSvg,
-        css: { ...audioBase },
-        cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
-        cssEnabled: { opacity: 0.8, cursor: "pointer" },
-      },
-    },
-    notMediaHasAudio: {
-      text: { ...textHigh },
-      audio: { ...audioHigh },
-    },
-    hasMediaNotAudio: {
-      text: { ...textHigh },
-    },
-    notMediaNotAudio: { text: { ...textHigh } },
-    hasMediaHasAudio: { text: { ...textLow }, audio: { ...audioLow } },
-  },
-
-  buttonBar: {
-    vibrateMs: false,
-    container: {
-      base: {
-        display: "flex",
-        justifyContent: "space-evenly",
-        position: "absolute",
-        width: 100,
-        height: 15,
-        bottom: 0,
-        left: 0, // h: 10,
-        alignItems: "center",
-        // backgroundColor: "yellow",
-      },
-      whenSingle: { justifyContent: "space-evenly" },
-      whenMany: { justifyContent: "space-evenly" },
-    },
-    nextButtonTheme: BuilderOptionTheme.blueButton(),
-    responseButtons: BuilderOptionTheme.blueButton(),
-  },
-};
+import { DCss, DStyle, PStyle } from "@media-quest/engine";
+import { IconUrls } from "./icon-urls";
+import { BuilderOptionTheme, IDefaultTheme } from "./IDefault-theme";
+import { CssTheme } from "./css-theme";
+
+namespace BuilderOptionTheme {
+  const GREEN = "#70AD47";
+  const YELLOW = "#FFC000";
+  const ORANGE = "#F4902C";
+  const RED = "#FF0000";
+  const LIGHT_BLUE = "#42719C";
+  const WHITE = "#ffffff";
+  const BLUE = "#2F5597";
+  const BTN_BORDER_WIDTH = 3;
+  const BTN_BORDER_RADIUS = 10;
+  const BTN_BORDER_STYLE: DStyle["borderStyle"] = "solid";
+  const FONT_WEIGHT: DStyle["fontWeight"] = 600;
+  const FONT_SIZE: DCss.Px["value"] = 50;
+  const BTN_PADDING_LEFT = 40;
+  const BTN_PADDING_TOP = 40;
+
+  const buttonBaseCss = (): CssTheme => ({
+    css: {
+      fontWeight: FONT_WEIGHT,
+      fontSize: { _unit: "px", value: FONT_SIZE },
+      letterSpacing: { _unit: "px", value: 2 },
+      paddingLeft: { _unit: "px", value: BTN_PADDING_LEFT },
+      paddingTop: { _unit: "px", value: BTN_PADDING_TOP },
+      paddingBottom: { _unit: "px", value: BTN_PADDING_TOP },
+      paddingRight: { _unit: "px", value: BTN_PADDING_LEFT },
+      borderRadius: { _unit: "px", value: BTN_BORDER_RADIUS },
+      borderWidth: { _unit: "px", value: BTN_BORDER_WIDTH },
+      borderStyle: BTN_BORDER_STYLE,
+      // boxShadow: "3px 3px gray",
+      position: "relative",
+      display: "block",
+    },
+    cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
+    cssEnabled: { opacity: 1, cursor: "pointer" },
+  });
+
+  export const blueButton = (): BuilderOptionTheme => {
+    const base = buttonBaseCss();
+    const { css, cssEnabled, cssDisabled } = base;
+    const optionTheme: BuilderOptionTheme = {
+      name: "blue-button-theme",
+      normal: {
+        btn: {
+          css: {
+            ...css,
+            backgroundColor: BLUE,
+            borderColor: BLUE,
+            textColor: WHITE,
+          },
+          cssDisabled,
+          cssEnabled,
+        },
+        divider: {},
+        text1: {},
+        text2: {},
+      },
+
+      dontKnow: {
+        btn: {
+          css: {
+            ...css,
+            backgroundColor: WHITE,
+            borderColor: LIGHT_BLUE,
+            textColor: BLUE,
+          },
+          cssDisabled,
+          cssEnabled,
+        },
+        text1: {},
+        text2: {},
+        divider: {},
+      },
+    };
+
+    return optionTheme;
+  };
+}
+
+const textHighTop = 25;
+const textLowTop = 55;
+const audioHighTop = 20;
+const audioLowTop = 55;
+
+const textBase: PStyle = {
+  width: 80,
+  top: textHighTop,
+  left: 10,
+  textAlign: "center",
+  textColor: "black",
+  fontSize: { _unit: "px", value: 40 },
+};
+const textHigh: PStyle = { ...textBase, top: textHighTop };
+const textLow: PStyle = { ...textHigh, top: textLowTop };
+
+const audioBase: PStyle = {
+  height: 6,
+  width: 6,
+  left: 4,
+  top: audioHighTop,
+  cursor: "pointer",
+  opacity: 0.8,
+  visibility: "visible",
+};
+const audioHigh: PStyle = { ...audioBase, top: audioHighTop };
+const audioLow: PStyle = { ...audioBase, top: audioLowTop };
+
+export const DefaultTheme: IDefaultTheme = {
+  name: "default-theme",
+  schemaBackgroundColor: "white",
+  dimensions: { baseHeight: 1300, baseWidth: 1024 },
+  videoPlayer: {
+    playButton: {
+      iconUrl: IconUrls.playCircleRegular,
+      css: { w: 5, h: 5, y: 48, x: 4 },
+      cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
+      cssEnabled: { opacity: 0.8, cursor: "pointer" },
+    },
+    pauseButton: {
+      iconUrl: IconUrls.pauseSvg,
+      css: { w: 5, h: 5, y: 48, x: 4 },
+      cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
+      cssEnabled: { opacity: 0.8, cursor: "pointer" },
+    },
+    videoElement: { css: { height: 41, top: 3, x: 0 } },
+  },
+  image: { style: { h: 50, w: 100, x: 0 } },
+  mainText: {
+    base: {
+      text: { ...textBase },
+      audio: {
+        iconUrl: IconUrls.volumeUpSvg,
+        css: { ...audioBase },
+        cssDisabled: { opacity: 0.3, cursor: "not-allowed" },
+        cssEnabled: { opacity: 0.8, cursor: "pointer" },
+      },
+    },
+    notMediaHasAudio: {
+      text: { ...textHigh },
+      audio: { ...audioHigh },
+    },
+    hasMediaNotAudio: {
+      text: { ...textHigh },
+    },
+    notMediaNotAudio: { text: { ...textHigh } },
+    hasMediaHasAudio: { text: { ...textLow }, audio: { ...audioLow } },
+  },
+
+  buttonBar: {
+    vibrateMs: false,
+    container: {
+      base: {
+        display: "flex",
+        justifyContent: "space-evenly",
+        position: "absolute",
+        width: 100,
+        height: 15,
+        bottom: 0,
+        left: 0, // h: 10,
+        alignItems: "center",
+        backgroundColor: "yellow",
+      },
+      whenSingle: { justifyContent: "space-evenly" },
+      whenMany: { justifyContent: "space-evenly" },
+    },
+    nextButtonTheme: BuilderOptionTheme.blueButton(),
+    responseButtons: BuilderOptionTheme.blueButton(),
+  },
+};

package/src/theme/IDefault-theme.ts

@@ -1,125 +1,124 @@
-import { DStyle } from "@media-quest/engine";
-import type { CssTheme } from "./css-theme";
-
-type PStyle = Partial<DStyle>;
-export interface IDefaultTheme {
-  name: string;
-  schemaBackgroundColor: string;
-  dimensions: {
-    baseHeight: number;
-    baseWidth: number;
-  };
-
-  pageBackGroundImage?: { url: string; style: PStyle };
-
-  pageBackGround?: { style: PStyle };
-
-  backGroundArea1?: { style: PStyle };
-
-  backGroundArea2?: { style: PStyle };
-
-  backGroundArea3?: { style: PStyle };
-
-  progressBar?: {
-    width: number;
-    height: number;
-    bottom: number;
-    left: number;
-    backgroundStyles: PStyle;
-    progressStyles: PStyle;
-    text?: {
-      style: PStyle;
-      textType: "percent" | "page-progress";
-    };
-  };
-
-  image: { style: PStyle };
-  videoPlayer: {
-    playButton: {
-      iconUrl: string;
-      css: PStyle;
-      cssDisabled: PStyle;
-      cssEnabled: PStyle;
-      text?: { text: string; css: PStyle };
-    };
-
-    buttonBar?: PStyle;
-
-    pauseButton: {
-      iconUrl: string;
-      css: PStyle;
-      cssDisabled: PStyle;
-      cssEnabled: PStyle;
-      text?: { text: string; css: PStyle };
-    };
-
-    replayButton?: {
-      iconUrl: string;
-      css: PStyle;
-      cssDisabled: PStyle;
-      cssEnabled: PStyle;
-      text?: { text: string; css: PStyle };
-    };
-
-    muteButton?: {
-      iconUrl: string;
-      css: PStyle;
-      text?: { text: string; css: PStyle };
-    };
-
-    unMuteButton?: {
-      iconUrl: string;
-      css: PStyle;
-      text?: { text: string; css: PStyle };
-    };
-
-    videoElement: {
-      css: PStyle;
-    };
-  };
-  mainText: {
-    base: {
-      text: PStyle;
-      audio: { css: PStyle; cssDisabled: PStyle; cssEnabled: PStyle; iconUrl: string };
-    };
-
-    notMediaNotAudio: {
-      text: PStyle;
-    };
-
-    hasMediaNotAudio: {
-      text: PStyle;
-    };
-
-    hasMediaHasAudio: {
-      text: PStyle;
-      audio: PStyle;
-    };
-
-    notMediaHasAudio: {
-      text: PStyle;
-      audio: PStyle;
-    };
-  };
-
-  buttonBar: {
-    vibrateMs: number | false;
-    container: { base: PStyle; whenSingle: PStyle; whenMany: PStyle };
-    responseButtons: BuilderOptionTheme;
-    nextButtonTheme: BuilderOptionTheme;
-  };
-  // buttonThemes?: Array<BuilderOptionTheme>;
-}
-
-interface ButtonTheme {
-  btn: CssTheme;
-  divider: PStyle;
-  text1: PStyle;
-  text2: PStyle;
-}
-
-export interface BuilderOptionTheme {
-  name: string;
-  normal: ButtonTheme;
-  dontKnow: ButtonTheme;
-}
+import { PStyle } from "@media-quest/engine";
+import type { CssTheme } from "./css-theme";
+
+export interface IDefaultTheme {
+  name: string;
+  schemaBackgroundColor: string;
+  dimensions: {
+    baseHeight: number;
+    baseWidth: number;
+  };
+
+  pageBackGroundImage?: { url: string; style: PStyle };
+
+  pageBackGround?: { style: PStyle };
+
+  backGroundArea1?: { style: PStyle };
+
+  backGroundArea2?: { style: PStyle };
+
+  backGroundArea3?: { style: PStyle };
+
+  progressBar?: {
+    width: number;
+    height: number;
+    bottom: number;
+    left: number;
+    backgroundStyles: PStyle;
+    progressStyles: PStyle;
+    text?: {
+      style: PStyle;
+      textType: "percent" | "page-progress";
+    };
+  };
+
+  image: { style: PStyle };
+  videoPlayer: {
+    playButton: {
+      iconUrl: string;
+      css: PStyle;
+      cssDisabled: PStyle;
+      cssEnabled: PStyle;
+      text?: { text: string; css: PStyle };
+    };
+
+    buttonBar?: PStyle;
+
+    pauseButton: {
+      iconUrl: string;
+      css: PStyle;
+      cssDisabled: PStyle;
+      cssEnabled: PStyle;
+      text?: { text: string; css: PStyle };
+    };
+
+    replayButton?: {
+      iconUrl: string;
+      css: PStyle;
+      cssDisabled: PStyle;
+      cssEnabled: PStyle;
+      text?: { text: string; css: PStyle };
+    };
+
+    muteButton?: {
+      iconUrl: string;
+      css: PStyle;
+      text?: { text: string; css: PStyle };
+    };
+
+    unMuteButton?: {
+      iconUrl: string;
+      css: PStyle;
+      text?: { text: string; css: PStyle };
+    };
+
+    videoElement: {
+      css: PStyle;
+    };
+  };
+  mainText: {
+    base: {
+      text: PStyle;
+      audio: { css: PStyle; cssDisabled: PStyle; cssEnabled: PStyle; iconUrl: string };
+    };
+
+    notMediaNotAudio: {
+      text: PStyle;
+    };
+
+    hasMediaNotAudio: {
+      text: PStyle;
+    };
+
+    hasMediaHasAudio: {
+      text: PStyle;
+      audio: PStyle;
+    };
+
+    notMediaHasAudio: {
+      text: PStyle;
+      audio: PStyle;
+    };
+  };
+
+  buttonBar: {
+    vibrateMs: number | false;
+    container: { base: PStyle; whenSingle: PStyle; whenMany: PStyle };
+    responseButtons: BuilderOptionTheme;
+    nextButtonTheme: BuilderOptionTheme;
+  };
+  // buttonThemes?: Array<BuilderOptionTheme>;
+}
+
+interface ButtonTheme {
+  btn: CssTheme;
+  divider: PStyle;
+  text1: PStyle;
+  text2: PStyle;
+}
+
+export interface BuilderOptionTheme {
+  name: string;
+  normal: ButtonTheme;
+  dontKnow: ButtonTheme;
+}

package/src/theme/ThemeCompiler.ts

@@ -1,11 +1,10 @@
-import { SchemaDto } from "@media-quest/engine";
-import { CompilerOption } from "../builder-compiler";
-import { BuilderSchemaDto } from "../Builder-schema-dto";
-
-export interface ThemeCompiler<ThemeSchema> {
-  currentTheme: ThemeSchema;
-  allThemes: ThemeSchema[];
-  setTheme(theme: ThemeSchema): void;
-  // protected constructor(protected readonly theme: ThemeSchema) {}
-  compile(schema: BuilderSchemaDto): SchemaDto;
-}
+import type { BuilderSchemaDto } from "../Builder-schema";
+import { SchemaDto } from "@media-quest/engine";
+
+export interface ThemeCompiler<ThemeSchema> {
+  currentTheme: ThemeSchema;
+  allThemes: ThemeSchema[];
+  setTheme(theme: ThemeSchema): void;
+  // protected constructor(protected readonly theme: ThemeSchema) {}
+  compile(schema: BuilderSchemaDto): SchemaDto;
+}