javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-26 03:01:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:NativeScript/NativeScript

Browse Source 
# Conflicts:
#	.gitignore
#	apps/ui/src/tabs/frame-in-tabs-inner-page-1.xml
#	apps/ui/src/tabs/main-page.ts
#	apps/ui/src/tabs/swipe-disabled-page.xml
#	apps/ui/src/tabs/tabs-position-page.xml
#	package.json
#	packages/core/package.json
#	packages/core/ui/core/view-base/index.d.ts
#	packages/core/ui/core/view-base/index.ts
#	packages/core/ui/core/view/index.android.ts
#	packages/core/ui/tabs/index.android.ts
#	packages/core/ui/tabs/index.ios.ts
#	packages/core/ui/tabs/tabs-common.ts
This commit is contained in:
Martin Guillon
2021-01-19 13:44:42 +01:00
parent 8570d4396c 376f3ebdd7
commit 37c8a846c7
142 changed files with 16103 additions and 1253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/ui/package.json
View File

@ -11,7 +11,8 @@
"@nativescript/core": "file:../../packages/core"
},
"devDependencies": {
"@nativescript/ios": "7.0.0",
"@nativescript/android": "7.0.1",
"@nativescript/ios": "7.1.0",
"@nativescript/webpack": "file:../../dist/packages/nativescript-webpack.tgz",
"typescript": "file:../../node_modules/typescript"
},

7
apps/ui/src/progress-bar/activity-indicator-page.xml
View File

@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<Page>
<ActivityIndicator busy="true" verticalAlignment="center" horizontalAlignment="center"/>
<StackLayout>
<ActivityIndicator busy="true" color="red" verticalAlignment="center" horizontalAlignment="center"/>
<ActivityIndicator busy="true" color="green" verticalAlignment="center" horizontalAlignment="center"/>
<ActivityIndicator busy="true" color="blue" verticalAlignment="center" horizontalAlignment="center"/>
<ActivityIndicator busy="true" color="" verticalAlignment="center" horizontalAlignment="center"/>
</StackLayout>
</Page>

24
apps/ui/src/tabs/frame-in-tabs-overflow.xml Normal file
View File

@ -0,0 +1,24 @@
<Page class="page">
<StackLayout>
<Tabs iosOverflowSafeArea="true" highlightColor="red" offscreenTabLimit="1" automationText="tabNavigation">
<TabStrip highlightColor="green" itemTap="onItemTap">
<TabStripItem title="1"></TabStripItem>
<TabStripItem title="2"></TabStripItem>
<TabStripItem title="3"></TabStripItem>
<TabStripItem title="4"></TabStripItem>
</TabStrip>
<TabContentItem>
<Frame defaultPage="tabs/frame-in-tabs-inner-page-1"></Frame>
</TabContentItem>
<TabContentItem>
<Frame defaultPage="tabs/frame-in-tabs-inner-page-2"></Frame>
</TabContentItem>
<TabContentItem>
<Frame defaultPage="tabs/frame-in-tabs-inner-page-3"></Frame>
</TabContentItem>
<TabContentItem>
<Frame defaultPage="tabs/frame-in-tabs-inner-page-4"></Frame>
</TabContentItem>
</Tabs>
</StackLayout>
</Page>

15
apps/ui/src/tabs/swipe-disabled-page.ts Normal file
View File

@ -0,0 +1,15 @@
import { EventData, Page, Tabs } from '@nativescript/core';
export function goToFirst(args: EventData) {
console.log('---> goToFirst');
const page = <Page>(<any>args.object).page;
const tabsNav = <Tabs>page.getViewById('tabs');
tabsNav.selectedIndex = 0;
}
export function goToSecond(args: EventData) {
console.log('---> goToSecond');
const page = <Page>(<any>args.object).page;
const tabsNav = <Tabs>page.getViewById('tabs');
tabsNav.selectedIndex = 1;
}