javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2998 from NativeScript/vchimev-flex

Browse Source 
Update flexbox test page
This commit is contained in:
Vasil Chimev
2016-10-31 15:59:47 +02:00
committed by GitHub
parent ef1d0b0d42 9f9b9c7d92
commit 6c077da786
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/app/ui-tests-app/flexbox/flexbox.xml
View File

@ -1,4 +1,4 @@
<Page xmlns="http://schemas.nativescript.org/tns.xsd" actionBarHidden="true"> <Page xmlns="http://schemas.nativescript.org/tns.xsd" android:actionBarHidden="true">
<GridLayout rows="auto, *"> <GridLayout rows="auto, *">
<GridLayout class="control" columns="auto, *" rows="25, 15, 25, 15, 25, 15, 15, 15, 15, 25, 15"> <GridLayout class="control" columns="auto, *" rows="25, 15, 25, 15, 25, 15, 15, 15, 15, 25, 15">
@ -37,12 +37,12 @@
<Label row="4" text="alignContent" verticalAlignment="center" /> <Label row="4" text="alignContent" verticalAlignment="center" />
<FlexboxLayout row="4" col="1"> <FlexboxLayout row="4" col="1">
<Button text="flex-start" tap="alignContent" flexGrow="1" automationText="alignItems-flex-start" /> <Button text="flex-start" tap="alignContent" flexGrow="1" automationText="alignContent-flex-start" />
<Button text="flex-end" tap="alignContent" flexGrow="1" automationText="alignItems-flex-end" /> <Button text="flex-end" tap="alignContent" flexGrow="1" automationText="alignContent-flex-end" />
<Button text="center" tap="alignContent" flexGrow="1" automationText="alignItems-center" /> <Button text="center" tap="alignContent" flexGrow="1" automationText="alignContent-center" />
<Button text="space-between" tap="alignContent" flexGrow="1" automationText="alignItems-space-between" /> <Button text="space-between" tap="alignContent" flexGrow="1" automationText="alignContent-space-between" />
<Button text="space-around" tap="alignContent" flexGrow="1" automationText="alignItems-space-around" /> <Button text="space-around" tap="alignContent" flexGrow="1" automationText="alignContent-space-around" />
<Button text="stretch" tap="alignContent" flexGrow="1" automationText="alignItems-stretch" /> <Button text="stretch" tap="alignContent" flexGrow="1" automationText="alignContent-stretch" />
</FlexboxLayout> </FlexboxLayout>
<Label row="5" colSpan="2" text="--- selected item properties ---" /> <Label row="5" colSpan="2" text="--- selected item properties ---" />

2
apps/app/ui-tests-app/mainPage.ts
View File

@ -35,7 +35,7 @@ export function pageLoaded(args: EventData) {
examples.set("animeBG", "animations/background"); examples.set("animeBG", "animations/background");
examples.set("transitions", "transitions/page0"); examples.set("transitions", "transitions/page0");
examples.set("segStyle", "segmented-bar/all"); examples.set("segStyle", "segmented-bar/all");
examples.set("flexBox", "flexbox/flexbox"); examples.set("flexbox", "flexbox/flexbox");
examples.set("list-view", "list-view/list-view"); examples.set("list-view", "list-view/list-view");
examples.set("issues", "issues/main-page"); examples.set("issues", "issues/main-page");