Skip to content
This repository was archived by the owner on Oct 22, 2018. It is now read-only.

Commit d88e1d9

Browse files
jdnichollscjdnichollsc
committed
Remove Page component to fix the navigation
1 parent 3e4f373 commit d88e1d9

File tree

3 files changed

+42
-47
lines changed

3 files changed

+42
-47
lines changed

‎src/app/about/components/about/about.component.tns.html

+13-14
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
<Page xmlns:Card="nativescript-cardview">
2-
<ActionBar title="About">
3-
<ActionItem ios.position="left" (tap)="goBack()">
4-
<Button class="ion-icon" text="{{ '\uF30C' }}"></Button>
5-
</ActionItem>
6-
</ActionBar>
7-
<ScrollView>
8-
<Card:CardView row="0" class="cardStyle" radius="10" elevation="50" margin="20">
9-
<GridLayout rows="*, *, *" columns="*, *, *">
10-
<Image src="https://avatars3.githubusercontent.com/u/2154886?v=3" margin="20" stretch="aspectFill" colSpan="3" row="0"></Image>
11-
</GridLayout>
12-
</Card:CardView>
13-
</ScrollView>
14-
</Page>
1+
<ActionBar title="About">
2+
<NavigationButton visibility="collapsed"></NavigationButton>
3+
<ActionItem ios.position="left" (tap)="goBack()">
4+
<Button class="ion-icon" text="{{ '\uF30C' }}"></Button>
5+
</ActionItem>
6+
</ActionBar>
7+
<ScrollView>
8+
<Card:CardView row="0" class="cardStyle" radius="10" elevation="50" margin="20">
9+
<GridLayout rows="*, *, *" columns="*, *, *">
10+
<Image src="https://avatars3.githubusercontent.com/u/2154886?v=3" margin="20" stretch="aspectFill" colSpan="3" row="0"></Image>
11+
</GridLayout>
12+
</Card:CardView>
13+
</ScrollView>

‎src/app/app.component.tns.html

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
<StackLayout class="container" row="1">
2-
<router-outlet></router-outlet>
3-
</StackLayout>
1+
<page-router-outlet></page-router-outlet>

‎src/app/home/components/home/home.component.tns.html

+28-30
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,28 @@
1-
<Page xmlns:Card="nativescript-cardview" class="homePage">
2-
<ActionBar title="NativeScript Mobile App, yay!">
3-
<ActionItem ios.position="right" [nsRouterLink]="['/about']" pageTransition="flip">
4-
<Button class="ion-icon" text="{{ '\uf41a' }}"></Button>
5-
</ActionItem>
6-
</ActionBar>
7-
<ScrollView>
8-
<StackLayout>
9-
<SearchBar hint="Search hint"></SearchBar>
10-
<Card:CardView class="cardStyle" radius="10" elevation="50" margin="20">
11-
<GridLayout rows="*, *, *" columns="*, *, *">
12-
<Image src="http://ionicframework.com/img/home/cta-iphone-2.png" margin="20" stretch="aspectFill" colSpan="3" row="0"></Image>
13-
<TextView class="description" editable="false" text="The most popular template to create web (Ionic) and native (NativeScript) mobile apps!" textWrap="true" row="1" colSpan="3"></TextView>
14-
<Button (tap)="showAlert('Favorite')" text="Favorite" tap="goAway" row="3" col="0"></Button>
15-
<Button (tap)="showAlert('Listen')" text="Listen" row="3" col="1"></Button>
16-
<Button (tap)="showAlert('Share')" text="Share" row="3" col="2"></Button>
17-
</GridLayout>
18-
</Card:CardView>
19-
<Card:CardView class="cardStyle" margin="20" elevation="40" radius="5">
20-
<GridLayout rows="*, *, *" columns="*, *, *">
21-
<Image src="https://upload.wikimedia.org/wikipedia/en/1/17/Batman-BenAffleck.jpg" stretch="aspectFill" colSpan="3" row="0" />
22-
<Label class="description" text="I'm batman!" textWrap="true" row="1" colSpan="3"></Label>
23-
<Button text="Favorite" tap="goAway" row="2" col="0" />
24-
<Button text="Listen" row="2" col="1" />
25-
<Button text="Share" row="2" col="2" />
26-
</GridLayout>
27-
</Card:CardView>
28-
</StackLayout>
29-
</ScrollView>
30-
</Page>
1+
<ActionBar title="NativeScript Mobile App, yay!">
2+
<ActionItem ios.position="right" [nsRouterLink]="['/about']" pageTransition="flip">
3+
<Button class="ion-icon" text="{{ '\uf41a' }}"></Button>
4+
</ActionItem>
5+
</ActionBar>
6+
<ScrollView class="homePage">
7+
<StackLayout>
8+
<SearchBar hint="Search hint"></SearchBar>
9+
<Card:CardView class="cardStyle" radius="10" elevation="50" margin="20">
10+
<GridLayout rows="*, *, *" columns="*, *, *">
11+
<Image src="http://ionicframework.com/img/home/cta-iphone-2.png" margin="20" stretch="aspectFill" colSpan="3" row="0"></Image>
12+
<TextView class="description" editable="false" text="The most popular template to create web (Ionic) and native (NativeScript) mobile apps!" textWrap="true" row="1" colSpan="3"></TextView>
13+
<Button (tap)="showAlert('Favorite')" text="Favorite" tap="goAway" row="3" col="0"></Button>
14+
<Button (tap)="showAlert('Listen')" text="Listen" row="3" col="1"></Button>
15+
<Button (tap)="showAlert('Share')" text="Share" row="3" col="2"></Button>
16+
</GridLayout>
17+
</Card:CardView>
18+
<Card:CardView class="cardStyle" margin="20" elevation="40" radius="5">
19+
<GridLayout rows="*, *, *" columns="*, *, *">
20+
<Image src="https://upload.wikimedia.org/wikipedia/en/1/17/Batman-BenAffleck.jpg" stretch="aspectFill" colSpan="3" row="0" />
21+
<Label class="description" text="I'm batman!" textWrap="true" row="1" colSpan="3"></Label>
22+
<Button text="Favorite" tap="goAway" row="2" col="0" />
23+
<Button text="Listen" row="2" col="1" />
24+
<Button text="Share" row="2" col="2" />
25+
</GridLayout>
26+
</Card:CardView>
27+
</StackLayout>
28+
</ScrollView>

0 commit comments

Comments
 (0)