FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

e2e(tests-app-ng): add bottom-navigation component by vchimev · Pull Request #1894 · NativeScript/nativescript-angular · GitHub

/ nativescript-angular Public

e2e(tests-app-ng): add bottom-navigation component #1894

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vchimev merged 5 commits into from
Jul 22, 2019
Conversation 0 Commits 5 Checks 0 Files changed
Merged

e2e(tests-app-ng): add bottom-navigation component #1894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
256d849
chore: update package.json file
vchimev Jul 8, 2019
4eef03c
e2e(tests-app-ng): add bottom-navigation component
vchimev Jul 8, 2019
bdd3f19
Merge branch 'master' into vchimev/bottom-navigation
Jul 10, 2019
e57e3c3
Merge branch 'master' into vchimev/bottom-navigation
vchimev Jul 17, 2019
d59f383
Merge branch 'master' into vchimev/bottom-navigation
Jul 18, 2019
File filter

Filter by extension

Filter by extension .json  (1) .ts  (3) All 2 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
7 changes: 5 additions & 2 deletions e2e/tests-app-ng/app/app.routes.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { NavigationComponent, NAVIGATION_SUBROUTES } from "./router/router-outle
import { LazyNavigationComponent } from "./router/lazy-module-navigation/lazy-navigation.component";

import { BindingComponent } from "./binding/binding-page.component";
import { BottomNavigation } from "./bottom-navigation/bottom-navigation.component"

import { ListViewComponent } from "./list-view/list-view-page.component";
import { ListViewControlComponent } from "./list-view/list-view-item-template.component";
Expand Down Expand Up @@ -61,6 +62,7 @@ export const routableComponents = [
SecondActionBarComponent,

BindingComponent,
BottomNavigation,

ListViewMainPageComponent,
ListViewComponent,
Expand Down Expand Up @@ -90,7 +92,7 @@ export const routableComponents = [
ButtonTextAlignmentComponent,
];

// Set isNavigatable: true if the page is a mian page to other sub pages
// Set `isNavigatable: true` if the page is a main page to other sub pages
export const routes = [
{ path: "", component: MainComponent, data: { title: "" } },
{ path: "", component: ModalContentComponent, data: { title: "" } },
Expand Down Expand Up @@ -119,6 +121,7 @@ export const routes = [
},

{ path: "binding", component: BindingComponent, data: { title: "Binding", isNavigatable: true } },
{ path: "bottom-navigation", component: BottomNavigation, data: { title: "BottomNavigation", isNavigatable: true } },

{
path: "ListViewExamples",
Expand Down Expand Up @@ -158,7 +161,7 @@ export const routes = [
{ path: "modal/lazy", component: LazyLoadModalComponent, data: { title: "modal(lazy)" } },

{ path: "tab-view", component: TabViewComponent, data: { title: "tab-view", isNavigatable: true } },
{ path: "tabs", component: TabsComponent, data: { title: "tabs", isNavigatable: true } },
{ path: "tabs", component: TabsComponent, data: { title: "Tabs", isNavigatable: true } },

{ path: "nav-options", component: NavigationOptionsComponent, data: { title: "nav-options", isNavigatable: true } },
{ path: "nav-info", component: NavigationInfoComponent, data: { title: "nav-info" } },
Expand Down
68 changes: 68 additions & 0 deletions e2e/tests-app-ng/app/bottom-navigation/bottom-navigation.component.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import { Component, OnInit } from "@angular/core";

@Component({
selector: "bottom-navigation-component",
template: `
<BottomNavigation #bottomNavigation>

<TabStrip>

<TabStripItem title="TabStripItem 0" iconSource="res://icon">
</TabStripItem>

<TabStripItem>
<Label text="TabStripItem 1">
</Label>
<Image src="res://icon">
</Image>
</TabStripItem>

<TabStripItem title="TabStripItem X" iconSource="res://x">
<Label text="TabStripItem 2">
</Label>
<Image src="res://icon">
</Image>
</TabStripItem>

</TabStrip>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 0">
</Label>
<Button (tap)="goTo(bottomNavigation, 1)" text="go to 1">
</Button>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 1">
</Label>
<Button (tap)="goTo(bottomNavigation, 2)" text="go to 2">
</Button>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 2">
</Label>
<Button (tap)="goTo(bottomNavigation, 0)" text="go to 0">
</Button>
</StackLayout>
</TabContentItem>

</BottomNavigation>
`,
})

export class BottomNavigation implements OnInit {

public ngOnInit(): void { }

goTo(bottomNavigation: any, index: number) {
bottomNavigation.selectedIndex = index;
}

}
30 changes: 23 additions & 7 deletions e2e/tests-app-ng/app/tabs/tabs.component.ts
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -3,43 +3,53 @@ import { Component, OnInit } from "@angular/core";
@Component({
selector: "tabs-component",
template: `
<Tabs id="tabs">
<Tabs #tabs>

<TabStrip>

<TabStripItem title="TabStripItem 1" iconSource="res://icon">
<TabStripItem title="TabStripItem 0" iconSource="res://icon">
</TabStripItem>

<TabStripItem>
<Label text="TabStripItem 2">
<Label text="TabStripItem 1">
</Label>
<Image src="res://icon">
</Image>
</TabStripItem>

<TabStripItem title="TabStripItem 3" iconSource="res://icon">
<TabStripItem title="TabStripItem X" iconSource="res://x">
<Label text="TabStripItem 2">
</Label>
<Image src="res://icon">
</Image>
</TabStripItem>

</TabStrip>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 1">
<Label text="TabContentItem 0">
</Label>
<Button (tap)="goTo(tabs, 1)" text="go to 1">
</Button>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 2">
<Label text="TabContentItem 1">
</Label>
<Button (tap)="goTo(tabs, 2)" text="go to 2">
</Button>
</StackLayout>
</TabContentItem>

<TabContentItem>
<StackLayout>
<Label text="TabContentItem 3">
<Label text="TabContentItem 2">
</Label>
<Button (tap)="goTo(tabs, 0)" text="go to 0">
</Button>
</StackLayout>
</TabContentItem>

Expand All @@ -48,5 +58,11 @@ import { Component, OnInit } from "@angular/core";
})

export class TabsComponent implements OnInit {

public ngOnInit(): void { }

goTo(tabs: any, index: number) {
tabs.selectedIndex = index;
}

}
9 changes: 1 addition & 8 deletions e2e/tests-app-ng/package.json
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,6 @@
"@ngtools/webpack": "~8.0.0"
},
"scripts": {
"tslint": "tslint --config tslint.json 'app/**/*.ts'",
"ns-bundle": "ns-bundle",
"start-android-bundle": "npm run ns-bundle --android --run-app",
"start-ios-bundle": "npm run ns-bundle --ios --run-app",
"build-android-bundle": "npm run ns-bundle --android --build-app",
"build-ios-bundle": "npm run ns-bundle --ios --build-app",
"publish-ios-bundle": "npm run ns-bundle --ios --publish-app",
"generate-android-snapshot": "generate-android-snapshot --targetArchs arm,arm64,ia32 --install"
"tslint": "tslint --config tslint.json 'app/**/*.ts'"
}
}
Back | FazBrowse Home | New Git URL