From d8262a624e8b171114fbb7e744e6699d5977b7be Mon Sep 17 00:00:00 2001 From: Martin Yankov Date: Wed, 10 Jul 2019 21:05:45 +0300 Subject: [PATCH] feat: add font icons to image actionbar and tab navigation (#7498) --- .../app/action-bar/font-icons-page.css | 11 ++++ .../app/action-bar/font-icons-page.ts | 17 +++++++ .../app/action-bar/font-icons-page.xml | 19 +++++++ e2e/ui-tests-app/app/action-bar/main-page.ts | 1 + .../app/bottom-navigation/font-icons-page.css | 11 ++++ .../app/bottom-navigation/font-icons-page.xml | 34 +++++++++++++ .../app/bottom-navigation/main-page.ts | 1 + .../app/image-view/font-icons-page.css | 11 ++++ .../app/image-view/font-icons-page.xml | 16 ++++++ e2e/ui-tests-app/app/image-view/main-page.ts | 1 + e2e/ui-tests-app/app/tabs/font-icons-page.css | 11 ++++ e2e/ui-tests-app/app/tabs/font-icons-page.xml | 34 +++++++++++++ e2e/ui-tests-app/app/tabs/main-page.ts | 1 + tests/app/font/FontAwesome.ttf | Bin 0 -> 138204 bytes tests/app/image-source/image-source-tests.ts | 11 ++++ tests/app/ui/image/image-tests.ts | 8 +++ .../image-source/image-source.android.ts | 47 +++++++++++++++++- .../image-source/image-source.d.ts | 18 +++++++ .../image-source/image-source.ios.ts | 41 ++++++++++++++- .../ui/action-bar/action-bar.android.ts | 22 ++++++-- .../ui/action-bar/action-bar.ios.ts | 22 ++++++-- .../bottom-navigation.android.ts | 15 ++++-- .../bottom-navigation.ios.ts | 26 +++++++--- tns-core-modules/ui/image/image-common.ts | 15 ++++-- tns-core-modules/ui/image/image.android.ts | 4 +- tns-core-modules/ui/tabs/tabs.android.ts | 15 ++++-- tns-core-modules/ui/tabs/tabs.ios.ts | 24 ++++++--- tns-core-modules/utils/utils-common.ts | 10 ++++ tns-core-modules/utils/utils.d.ts | 6 +++ 29 files changed, 416 insertions(+), 36 deletions(-) create mode 100644 e2e/ui-tests-app/app/action-bar/font-icons-page.css create mode 100644 e2e/ui-tests-app/app/action-bar/font-icons-page.ts create mode 100644 e2e/ui-tests-app/app/action-bar/font-icons-page.xml create mode 100644 e2e/ui-tests-app/app/bottom-navigation/font-icons-page.css create mode 100644 e2e/ui-tests-app/app/bottom-navigation/font-icons-page.xml create mode 100644 e2e/ui-tests-app/app/image-view/font-icons-page.css create mode 100644 e2e/ui-tests-app/app/image-view/font-icons-page.xml create mode 100644 e2e/ui-tests-app/app/tabs/font-icons-page.css create mode 100644 e2e/ui-tests-app/app/tabs/font-icons-page.xml create mode 100644 tests/app/font/FontAwesome.ttf diff --git a/e2e/ui-tests-app/app/action-bar/font-icons-page.css b/e2e/ui-tests-app/app/action-bar/font-icons-page.css new file mode 100644 index 000000000..edbdd2d7b --- /dev/null +++ b/e2e/ui-tests-app/app/action-bar/font-icons-page.css @@ -0,0 +1,11 @@ +.font-awesome { + font-family: "FontAwesome"; +} + +.font-size { + font-size: 48; +} + +.color { + color: blue; +} \ No newline at end of file diff --git a/e2e/ui-tests-app/app/action-bar/font-icons-page.ts b/e2e/ui-tests-app/app/action-bar/font-icons-page.ts new file mode 100644 index 000000000..92b243d5a --- /dev/null +++ b/e2e/ui-tests-app/app/action-bar/font-icons-page.ts @@ -0,0 +1,17 @@ +import * as frame from "tns-core-modules/ui/frame"; +import { EventData } from "tns-core-modules/ui/frame"; +import { Button } from "tns-core-modules/ui/button"; +import { ActionBar } from "tns-core-modules/ui/action-bar"; + +const iconModes = ["automatic", "alwaysOriginal", "alwaysTemplate", undefined]; + +export function navigate(args) { + frame.topmost().navigate("ui-tests-app/action-bar/clean"); +} + +export function onChangeRenderingMode(args: EventData) { + const button =