Skip to content

Commit b1ca7a7

Browse files
EddyVerbruggenEddyVerbruggen
committed
Upgrade to NativeScript 4.1, Angular 6, all plugins to latest #16 
1 parent 5086a24 commit b1ca7a7

File tree

9 files changed

+13
-11
lines changed

9 files changed

+13
-11
lines changed

‎app/appicon/appicon.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="App icon" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

@@ -30,6 +30,7 @@
3030

3131
<GridLayout rows="auto, auto, auto" columns="auto, *" class="icon-container">
3232
<Label text="Default icon" class="m-t-15"></Label>
33+
<!-- TODO change icon -->
3334
<Image col="1" src="res://icon-default" width="50" height="50" borderRadius="5" (tap)="changeAppIcon(null)" horizontalAlignment="left"></Image>
3435

3536
<Label row="1" text="Alternatives" class="m-t-15 p-t-20" verticalAlignment="top"></Label>

‎app/ar/ar.component.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
<Label class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon"></Label>
44
</ActionItem>
55
<Label horizontalAlignment="center" class="semibold" text="Augmented Reality" *ngIf="isIOS"></Label>
6-
<ActionItem ios.position="right" (tap)="showPluginInfo()">
7-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8-
</ActionItem>
6+
<!-- currently, loading this would crash the app when closed (need to fix the pause/resume in AR plugin) -->
7+
<!--<ActionItem ios.position="right" (tap)="showPluginInfo()">-->
8+
<!--<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>-->
9+
<!--</ActionItem>-->
910
</ActionBar>
1011

1112
<StackLayout class="page-wrapper p-20">

‎app/feedback/feedback.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="Feedback" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

‎app/firebase/firebase.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="Firebase" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

‎app/home/home.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="left" class="semibold" text="Hi! 👋🏻" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

‎app/info-modal/info-modal.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<NavigationButton visibility="collapse"></NavigationButton>
33
<Label horizontalAlignment="center" class="semibold" text="Plugins on this page"></Label>
44
<ActionItem ios.position="right" (tap)="back()">
5-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-close-circle-outline' | fonticon"></Label>
5+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-close-circle-outline' | fonticon"></Label>
66
</ActionItem>
77
</ActionBar>
88

‎app/input/input.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="Input" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon" style="padding-bottom: 4"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon" style="padding-bottom: 4"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

‎app/mapping/mapping.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="Mapping" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

‎app/speech/speech.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
66
<Label horizontalAlignment="center" class="semibold" text="Speech" *ngIf="isIOS"></Label>
77
<ActionItem ios.position="right" (tap)="showPluginInfo()">
8-
<Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
8+
<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
99
</ActionItem>
1010
</ActionBar>
1111

0 commit comments

Comments
 (0)