Upgrade to NativeScript 4.1, Angular 6, all plugins to latest #16

EddyVerbruggen · Jun 8, 2018 · b1ca7a7 · b1ca7a7
1 parent 5086a24
commit b1ca7a7
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/app/appicon/appicon.component.html b/app/appicon/appicon.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="App icon" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 
@@ -30,6 +30,7 @@
 
       <GridLayout rows="auto, auto, auto" columns="auto, *" class="icon-container">
         <Label text="Default icon" class="m-t-15"></Label>
+        <!-- TODO change icon -->
         <Image col="1" src="res://icon-default" width="50" height="50" borderRadius="5" (tap)="changeAppIcon(null)" horizontalAlignment="left"></Image>
 
         <Label row="1" text="Alternatives" class="m-t-15 p-t-20" verticalAlignment="top"></Label>

diff --git a/app/ar/ar.component.html b/app/ar/ar.component.html
@@ -3,9 +3,10 @@
     <Label class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon"></Label>
   </ActionItem>
   <Label horizontalAlignment="center" class="semibold" text="Augmented Reality" *ngIf="isIOS"></Label>
-  <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
-  </ActionItem>
+  <!-- currently, loading this would crash the app when closed (need to fix the pause/resume in AR plugin) -->
+  <!--<ActionItem ios.position="right" (tap)="showPluginInfo()">-->
+    <!--<Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>-->
+  <!--</ActionItem>-->
 </ActionBar>
 
 <StackLayout class="page-wrapper p-20">

diff --git a/app/feedback/feedback.component.html b/app/feedback/feedback.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="Feedback" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/firebase/firebase.component.html b/app/firebase/firebase.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="Firebase" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/home/home.component.html b/app/home/home.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="left" class="semibold" text="Hi!  👋🏻" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/info-modal/info-modal.html b/app/info-modal/info-modal.html
@@ -2,7 +2,7 @@
   <NavigationButton visibility="collapse"></NavigationButton>
   <Label horizontalAlignment="center" class="semibold" text="Plugins on this page"></Label>
   <ActionItem ios.position="right" (tap)="back()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-close-circle-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-close-circle-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/input/input.component.html b/app/input/input.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="Input" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon" style="padding-bottom: 4"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon" style="padding-bottom: 4"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/mapping/mapping.component.html b/app/mapping/mapping.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="Mapping" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>
 

diff --git a/app/speech/speech.component.html b/app/speech/speech.component.html
@@ -5,7 +5,7 @@
   <Label horizontalAlignment="left" class="mdi-actionitem mdi-menu" [text]="'mdi-hamburger' | fonticon" (tap)="toggleTheMenu()" *ngIf="!isIOS"></Label>
   <Label horizontalAlignment="center" class="semibold" text="Speech" *ngIf="isIOS"></Label>
   <ActionItem ios.position="right" (tap)="showPluginInfo()">
-    <Label class="mdi-actionitem mdi-actionitem-right mdi-menu" [text]="'mdi-information-outline' | fonticon"></Label>
+    <Label class="mdi-actionitem mdi-actionitem-right m-r-0" [text]="'mdi-information-outline' | fonticon"></Label>
   </ActionItem>
 </ActionBar>