diff --git a/projects/common/classes/buttonElement.ts b/projects/common/classes/buttonElement.ts index a9681aa2c352b7a15a6589f8e508dd8ca53f51a9..906d10c3e72c35346d6a482c1fc894df95171ca8 100644 --- a/projects/common/classes/buttonElement.ts +++ b/projects/common/classes/buttonElement.ts @@ -1,5 +1,6 @@ import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; -import { initSurfaceElement, initFontElement, UIElement } from './uIElement'; +import { UIElement } from './uIElement'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class ButtonElement extends UIElement implements FontElement, SurfaceUIElement { label: string = 'Knopf'; diff --git a/projects/common/classes/checkboxElement.ts b/projects/common/classes/checkboxElement.ts index 3be20cdf368731a1d96d5dc9004bc398321b8db4..7385d35c3f1bc79c7033b3031a9b7ec3e9ed07e5 100644 --- a/projects/common/classes/checkboxElement.ts +++ b/projects/common/classes/checkboxElement.ts @@ -1,5 +1,6 @@ -import { initSurfaceElement, initFontElement, InputElement, UIElement } from './uIElement'; +import { InputElement, UIElement } from './uIElement'; import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class CheckboxElement extends InputElement implements FontElement, SurfaceUIElement { fontColor: string = 'black'; diff --git a/projects/common/classes/dropdownElement.ts b/projects/common/classes/dropdownElement.ts index 368e5cbd3f4b55eb151daea5f670508922c2f5b2..9373cba59582e64175f4bb4ca78f8305ef81a385 100644 --- a/projects/common/classes/dropdownElement.ts +++ b/projects/common/classes/dropdownElement.ts @@ -1,5 +1,6 @@ -import { initSurfaceElement, initFontElement, InputElement, UIElement } from './uIElement'; +import { InputElement, UIElement } from './uIElement'; import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class DropdownElement extends InputElement implements FontElement, SurfaceUIElement { options: string[] = []; diff --git a/projects/common/classes/radioButtonGroupElement.ts b/projects/common/classes/radioButtonGroupElement.ts index 8fa4ae4ce580bd09ecea41c463b27d2dde22a628..e66b31a04c36b58a5e7b05292cd2e3d259118beb 100644 --- a/projects/common/classes/radioButtonGroupElement.ts +++ b/projects/common/classes/radioButtonGroupElement.ts @@ -1,5 +1,6 @@ -import { initSurfaceElement, initFontElement, InputElement, UIElement } from './uIElement'; +import { InputElement, UIElement } from './uIElement'; import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class RadioButtonGroupElement extends InputElement implements FontElement, SurfaceUIElement { options: string[] = []; diff --git a/projects/common/classes/textAreaElement.ts b/projects/common/classes/textAreaElement.ts index a3694c7f73d34fbc9e5513e373c01a3e8c8df048..b063d384f47bc0455ebe70eafae41b394788bc63 100644 --- a/projects/common/classes/textAreaElement.ts +++ b/projects/common/classes/textAreaElement.ts @@ -1,5 +1,6 @@ import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; -import { initSurfaceElement, initFontElement, InputElement, UIElement } from './uIElement'; +import { InputElement, UIElement } from './uIElement'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class TextAreaElement extends InputElement implements FontElement, SurfaceUIElement { appearance: 'standard' | 'legacy' | 'fill' | 'outline' = 'outline'; diff --git a/projects/common/classes/textElement.ts b/projects/common/classes/textElement.ts index 2e2f789b8537a9497835aa7f15e6e3f098fd6fa6..8ccab10c724e831b44301d57f96073ce62dc1604 100644 --- a/projects/common/classes/textElement.ts +++ b/projects/common/classes/textElement.ts @@ -1,5 +1,6 @@ -import { initSurfaceElement, UIElement } from './uIElement'; +import { UIElement } from './uIElement'; import { SurfaceUIElement } from '../interfaces/UIElementInterfaces'; +import { initSurfaceElement } from '../util/unit-interface-initializer'; export class TextElement extends UIElement implements SurfaceUIElement { text: string = '<p>Lorem ipsum dolor sit amet</p>'; diff --git a/projects/common/classes/textFieldElement.ts b/projects/common/classes/textFieldElement.ts index 8ae22001ebaaba705fa3e5970819063b2e47e42c..23ea3548dd51277b7a137a4ba4544b296319f200 100644 --- a/projects/common/classes/textFieldElement.ts +++ b/projects/common/classes/textFieldElement.ts @@ -1,5 +1,6 @@ -import { initSurfaceElement, initFontElement, InputElement, UIElement } from './uIElement'; +import { InputElement, UIElement } from './uIElement'; import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; +import { initFontElement, initSurfaceElement } from '../util/unit-interface-initializer'; export class TextFieldElement extends InputElement implements FontElement, SurfaceUIElement { appearance: 'standard' | 'legacy' | 'fill' | 'outline' = 'outline'; diff --git a/projects/common/classes/uIElement.ts b/projects/common/classes/uIElement.ts index dd74dba43d9194ad56360cc889fd4b65b3a163c1..0ca1101e2b3fc4ebb3a7af848b56a7079cf783b2 100644 --- a/projects/common/classes/uIElement.ts +++ b/projects/common/classes/uIElement.ts @@ -1,5 +1,4 @@ // eslint-disable-next-line max-classes-per-file -import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; import { IdService } from '../id.service'; export abstract class UIElement { @@ -54,20 +53,3 @@ export abstract class InputElement extends UIElement { this.requiredWarnMessage = serializedElement.requiredWarnMessage as string || 'Eingabe erforderlich'; } } - -// ================================================ - -export function initFontElement(): FontElement { - return { - fontColor: 'black', - font: 'Roboto', - fontSize: 18, - bold: false, - italic: false, - underline: false - }; -} - -export function initSurfaceElement(): SurfaceUIElement { - return { backgroundColor: 'lightgrey' }; -} diff --git a/projects/common/util/unit-interface-initializer.ts b/projects/common/util/unit-interface-initializer.ts new file mode 100644 index 0000000000000000000000000000000000000000..24e3f4241ffdf09a5b8a19ff948d6175c4e43a7e --- /dev/null +++ b/projects/common/util/unit-interface-initializer.ts @@ -0,0 +1,16 @@ +import { FontElement, SurfaceUIElement } from '../interfaces/UIElementInterfaces'; + +export function initFontElement(): FontElement { + return { + fontColor: 'black', + font: 'Roboto', + fontSize: 18, + bold: false, + italic: false, + underline: false + }; +} + +export function initSurfaceElement(): SurfaceUIElement { + return { backgroundColor: 'lightgrey' }; +}