diff --git a/apps/app/ui-tests-app/font/fonts-weight/courier-new.xml b/apps/app/ui-tests-app/font/fonts-weight/courier-new.xml new file mode 100644 index 000000000..2dc656de1 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/courier-new.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/custom-fontawesome.xml b/apps/app/ui-tests-app/font/fonts-weight/custom-fontawesome.xml new file mode 100644 index 000000000..d50bd6af4 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/custom-fontawesome.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/custom-muli.xml b/apps/app/ui-tests-app/font/fonts-weight/custom-muli.xml new file mode 100644 index 000000000..12ee174fb --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/custom-muli.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/custom-sofia.xml b/apps/app/ui-tests-app/font/fonts-weight/custom-sofia.xml new file mode 100644 index 000000000..2dab7d3dd --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/custom-sofia.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/font-fallback.xml b/apps/app/ui-tests-app/font/fonts-weight/font-fallback.xml new file mode 100644 index 000000000..bc22a7c41 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/font-fallback.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/helvetica.xml b/apps/app/ui-tests-app/font/fonts-weight/helvetica.xml new file mode 100644 index 000000000..1e697e8e5 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/helvetica.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/main-page.ts b/apps/app/ui-tests-app/font/fonts-weight/main-page.ts new file mode 100644 index 000000000..155fb69bf --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/main-page.ts @@ -0,0 +1,26 @@ +import { EventData } from "tns-core-modules/data/observable"; +import { SubMainPageViewModel } from "../../sub-main-page-view-model"; +import { WrapLayout } from "tns-core-modules/ui/layouts/wrap-layout"; +import { Page } from "tns-core-modules/ui/page"; + +export function pageLoaded(args: EventData) { + const page = args.object; + const wrapLayout = page.getViewById("wrapLayoutWithExamples"); + page.bindingContext = new SubMainPageViewModel(wrapLayout, loadExamples()); +} + +export function loadExamples() { + const examples = new Map(); + examples.set("system", "font/fonts-weight/system"); + examples.set("sans-serif", "font/fonts-weight/sans-serif"); + examples.set("serif", "font/fonts-weight/serif"); + examples.set("monospace", "font/fonts-weight/monospace"); + examples.set("courier-new", "font/fonts-weight/courier-new"); + examples.set("helvetica", "font/fonts-weight/helvetica"); + examples.set("custom-fontawesome", "font/fonts-weight/custom-fontawesome"); + examples.set("custom-muli", "font/fonts-weight/custom-muli"); + examples.set("custom-sofia", "font/fonts-weight/custom-sofia"); + examples.set("font-fallback", "font/fonts-weight/font-fallback"); + + return examples; +} \ No newline at end of file diff --git a/apps/app/ui-tests-app/font/fonts-weight/main-page.xml b/apps/app/ui-tests-app/font/fonts-weight/main-page.xml new file mode 100644 index 000000000..33306f0d0 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/main-page.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/apps/app/ui-tests-app/font/fonts-weight/monospace.xml b/apps/app/ui-tests-app/font/fonts-weight/monospace.xml new file mode 100644 index 000000000..212447dfd --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/monospace.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/no-family.xml b/apps/app/ui-tests-app/font/fonts-weight/no-family.xml new file mode 100644 index 000000000..141bed1a3 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/no-family.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/sans-serif.xml b/apps/app/ui-tests-app/font/fonts-weight/sans-serif.xml new file mode 100644 index 000000000..5117a4111 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/sans-serif.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/serif.xml b/apps/app/ui-tests-app/font/fonts-weight/serif.xml new file mode 100644 index 000000000..2fffd1107 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/serif.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/fonts-weight/system.xml b/apps/app/ui-tests-app/font/fonts-weight/system.xml new file mode 100644 index 000000000..7f5989ca3 --- /dev/null +++ b/apps/app/ui-tests-app/font/fonts-weight/system.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + diff --git a/apps/app/ui-tests-app/font/main-page.ts b/apps/app/ui-tests-app/font/main-page.ts index 5c1b19e9d..d80b98a6c 100644 --- a/apps/app/ui-tests-app/font/main-page.ts +++ b/apps/app/ui-tests-app/font/main-page.ts @@ -15,10 +15,11 @@ export function loadExamples() { examples.set("fontlbl", "font/label"); examples.set("fontfield", "font/text-field"); examples.set("fontview", "font/text-view"); - examples.set("nordic", "/font/nordic/nordic"); + examples.set("nordic", "font/nordic/nordic"); examples.set("customfonts", "font/custom-fonts"); examples.set("all-fonts", "font/all-fonts"); examples.set("awesome-3654", "font/font-awesome/issue-3654"); + examples.set("fonts-weight", "font/fonts-weight/main-page"); return examples; -} \ No newline at end of file +} \ No newline at end of file diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-Black.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-Black.ttf new file mode 100755 index 000000000..76825b817 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-Black.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-BlackItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-BlackItalic.ttf new file mode 100755 index 000000000..70762c09d Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-BlackItalic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-Bold.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-Bold.ttf new file mode 100755 index 000000000..732c3ec02 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-Bold.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-BoldItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-BoldItalic.ttf new file mode 100755 index 000000000..1dac1c9cb Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-BoldItalic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBold.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBold.ttf new file mode 100755 index 000000000..a8ef44cec Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBold.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBoldItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBoldItalic.ttf new file mode 100755 index 000000000..b99e68d46 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraBoldItalic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLight.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLight.ttf new file mode 100755 index 000000000..ffe7b29de Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLight.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLightItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLightItalic.ttf new file mode 100755 index 000000000..eb8b36a0a Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-ExtraLightItalic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-Italic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-Italic.ttf new file mode 100755 index 000000000..e1599293f Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-Italic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-Light.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-Light.ttf new file mode 100755 index 000000000..4e66b6979 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-Light.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-LightItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-LightItalic.ttf new file mode 100755 index 000000000..85ac25132 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-LightItalic.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-Regular.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-Regular.ttf new file mode 100755 index 000000000..1dfd64318 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-Regular.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-SemiBold.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-SemiBold.ttf new file mode 100755 index 000000000..096a15e42 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-SemiBold.ttf differ diff --git a/apps/app/ui-tests-app/resources/fonts/Muli-SemiBoldItalic.ttf b/apps/app/ui-tests-app/resources/fonts/Muli-SemiBoldItalic.ttf new file mode 100755 index 000000000..6d7bcc856 Binary files /dev/null and b/apps/app/ui-tests-app/resources/fonts/Muli-SemiBoldItalic.ttf differ