diff --git a/apps/app/ui-tests-app/tab-view/main-page.ts b/apps/app/ui-tests-app/tab-view/main-page.ts index 69d4aa857..50f8dca5d 100644 --- a/apps/app/ui-tests-app/tab-view/main-page.ts +++ b/apps/app/ui-tests-app/tab-view/main-page.ts @@ -27,5 +27,6 @@ export function loadExamples() { examples.set("tab-view-tab-text-font-size", "tab-view/tab-view-tab-text-font-size"); examples.set("tab-view-android-swipe", "tab-view/tab-view-android-swipe"); examples.set("tab-view-icon-title-placement", "tab-view/icon-title-placement"); + examples.set("tab-text-color", "tab-view/tab-text-color"); return examples; } diff --git a/apps/app/ui-tests-app/tab-view/tab-text-color.xml b/apps/app/ui-tests-app/tab-view/tab-text-color.xml new file mode 100644 index 000000000..8f851e60d --- /dev/null +++ b/apps/app/ui-tests-app/tab-view/tab-text-color.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/e2e/modal-navigation/app/home/home-page.ts b/e2e/modal-navigation/app/home/home-page.ts index 54cb458fa..1ce7f9179 100644 --- a/e2e/modal-navigation/app/home/home-page.ts +++ b/e2e/modal-navigation/app/home/home-page.ts @@ -1,7 +1,7 @@ import * as application from "tns-core-modules/application"; import { StackLayout } from "tns-core-modules/ui/layouts/stack-layout"; import { NavigatedData, Page } from "tns-core-modules/ui/page"; -import { View, EventData } from "tns-core-modules/ui/core/view"; +import { View, EventData, ShowModalOptions } from "tns-core-modules/ui/core/view"; import { Frame } from "tns-core-modules/ui/frame"; export function onNavigatingTo(args: NavigatedData) { @@ -29,6 +29,20 @@ export function onModalNoPage(args: EventData) { false); } +export function onPopoverModal(args: EventData) { + const view = args.object as View; + let options: ShowModalOptions = { + context: "context", + closeCallback: () => console.log("home-page modal popover frame closed"), + animated: false, + ios: { + presentationStyle: UIModalPresentationStyle.Popover + } + } + + view.showModal("modal-no-page/modal-no-page", options); +} + export function onModalFrame(args: EventData) { const view = args.object as View; diff --git a/e2e/modal-navigation/app/home/home-page.xml b/e2e/modal-navigation/app/home/home-page.xml index 67a6197eb..62bfbc778 100644 --- a/e2e/modal-navigation/app/home/home-page.xml +++ b/e2e/modal-navigation/app/home/home-page.xml @@ -20,6 +20,7 @@