Merge branch 'master' into kevin

config.xml

@@ -44,42 +44,44 @@
         <splash density="port-xhdpi" src="resources\android\splash\drawable-port-xhdpi-screen.png" />
         <splash density="port-xxhdpi" src="resources\android\splash\drawable-port-xxhdpi-screen.png" />
         <splash density="port-xxxhdpi" src="resources\android\splash\drawable-port-xxxhdpi-screen.png" />
+        <preference name="Fullscreen" value="true" />
     </platform>
     <platform name="ios">
         <allow-intent href="itms:*" />
         <allow-intent href="itms-apps:*" />
-        <icon height="57" src="resources/ios/icon/icon.png" width="57" />
-        <icon height="114" src="resources/ios/icon/[email protected]" width="114" />
-        <icon height="40" src="resources/ios/icon/icon-40.png" width="40" />
-        <icon height="80" src="resources/ios/icon/[email protected]" width="80" />
-        <icon height="120" src="resources/ios/icon/[email protected]" width="120" />
-        <icon height="50" src="resources/ios/icon/icon-50.png" width="50" />
-        <icon height="100" src="resources/ios/icon/[email protected]" width="100" />
-        <icon height="60" src="resources/ios/icon/icon-60.png" width="60" />
-        <icon height="120" src="resources/ios/icon/[email protected]" width="120" />
-        <icon height="180" src="resources/ios/icon/[email protected]" width="180" />
-        <icon height="72" src="resources/ios/icon/icon-72.png" width="72" />
-        <icon height="144" src="resources/ios/icon/[email protected]" width="144" />
-        <icon height="76" src="resources/ios/icon/icon-76.png" width="76" />
-        <icon height="152" src="resources/ios/icon/[email protected]" width="152" />
-        <icon height="167" src="resources/ios/icon/[email protected]" width="167" />
-        <icon height="29" src="resources/ios/icon/icon-small.png" width="29" />
-        <icon height="58" src="resources/ios/icon/[email protected]" width="58" />
-        <icon height="87" src="resources/ios/icon/[email protected]" width="87" />
-        <icon height="1024" src="resources/ios/icon/icon-1024.png" width="1024" />
-        <splash height="1136" src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" />
-        <splash height="1334" src="resources/ios/splash/Default-667h.png" width="750" />
-        <splash height="2208" src="resources/ios/splash/Default-736h.png" width="1242" />
-        <splash height="1242" src="resources/ios/splash/Default-Landscape-736h.png" width="2208" />
-        <splash height="1536" src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" />
-        <splash height="2048" src="resources/ios/splash/Default-Landscape@~ipadpro.png" width="2732" />
-        <splash height="768" src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" />
-        <splash height="2048" src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" />
-        <splash height="2732" src="resources/ios/splash/Default-Portrait@~ipadpro.png" width="2048" />
-        <splash height="1024" src="resources/ios/splash/Default-Portrait~ipad.png" width="768" />
-        <splash height="960" src="resources/ios/splash/Default@2x~iphone.png" width="640" />
-        <splash height="480" src="resources/ios/splash/Default~iphone.png" width="320" />
-        <splash height="2732" src="resources/ios/splash/Default@2x~universal~anyany.png" width="2732" />
+        <icon height="57" src="resources\ios\icon\icon.png" width="57" />
+        <icon height="114" src="resources\ios\icon\[email protected]" width="114" />
+        <icon height="40" src="resources\ios\icon\icon-40.png" width="40" />
+        <icon height="80" src="resources\ios\icon\[email protected]" width="80" />
+        <icon height="120" src="resources\ios\icon\[email protected]" width="120" />
+        <icon height="50" src="resources\ios\icon\icon-50.png" width="50" />
+        <icon height="100" src="resources\ios\icon\[email protected]" width="100" />
+        <icon height="60" src="resources\ios\icon\icon-60.png" width="60" />
+        <icon height="120" src="resources\ios\icon\[email protected]" width="120" />
+        <icon height="180" src="resources\ios\icon\[email protected]" width="180" />
+        <icon height="72" src="resources\ios\icon\icon-72.png" width="72" />
+        <icon height="144" src="resources\ios\icon\[email protected]" width="144" />
+        <icon height="76" src="resources\ios\icon\icon-76.png" width="76" />
+        <icon height="152" src="resources\ios\icon\[email protected]" width="152" />
+        <icon height="167" src="resources\ios\icon\[email protected]" width="167" />
+        <icon height="29" src="resources\ios\icon\icon-small.png" width="29" />
+        <icon height="58" src="resources\ios\icon\[email protected]" width="58" />
+        <icon height="87" src="resources\ios\icon\[email protected]" width="87" />
+        <icon height="1024" src="resources\ios\icon\icon-1024.png" width="1024" />
+        <splash height="1136" src="resources\ios\splash\Default-568h@2x~iphone.png" width="640" />
+        <splash height="1334" src="resources\ios\splash\Default-667h.png" width="750" />
+        <splash height="2208" src="resources\ios\splash\Default-736h.png" width="1242" />
+        <splash height="1242" src="resources\ios\splash\Default-Landscape-736h.png" width="2208" />
+        <splash height="1536" src="resources\ios\splash\Default-Landscape@2x~ipad.png" width="2048" />
+        <splash height="2048" src="resources\ios\splash\Default-Landscape@~ipadpro.png" width="2732" />
+        <splash height="768" src="resources\ios\splash\Default-Landscape~ipad.png" width="1024" />
+        <splash height="2048" src="resources\ios\splash\Default-Portrait@2x~ipad.png" width="1536" />
+        <splash height="2732" src="resources\ios\splash\Default-Portrait@~ipadpro.png" width="2048" />
+        <splash height="1024" src="resources\ios\splash\Default-Portrait~ipad.png" width="768" />
+        <splash height="960" src="resources\ios\splash\Default@2x~iphone.png" width="640" />
+        <splash height="480" src="resources\ios\splash\Default~iphone.png" width="320" />
+        <splash height="2732" src="resources\ios\splash\Default@2x~universal~anyany.png" width="2732" />
+        <preference name="StatusBarOverlaysWebView" value="false" />
     </platform>
     <plugin name="cordova-plugin-whitelist" spec="1.3.3" />
     <plugin name="cordova-plugin-statusbar" spec="2.4.2" />

package.json

@@ -27,11 +27,12 @@
     "@ionic/angular": "^4.1.0",
     "cordova": "^9.0.0",
     "cordova-android": "^7.1.4",
+    "cordova-ios": "^5.0.1",
     "cordova-plugin-device": "^2.0.2",
     "cordova-plugin-ionic-keyboard": "^2.1.3",
     "cordova-plugin-ionic-webview": "^4.1.0",
     "cordova-plugin-splashscreen": "^5.0.2",
-    "cordova-plugin-statusbar": "^2.4.2",
+    "cordova-plugin-statusbar": "git+https://github.com/apache/cordova-plugin-statusbar.git",
     "cordova-plugin-whitelist": "^1.3.3",
     "core-js": "^2.5.4",
     "ionic": "^5.0.3",
@@ -78,7 +79,8 @@
       "cordova-plugin-ionic-keyboard": {}
     },
     "platforms": [
-      "android"
+      "android",
+      "ios"
     ]
   }
 }
\ No newline at end of file

src/app/login/login.page.ts

-import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
+  import {Component,OnInit, ElementRef, NgZone, ViewChild} from '@angular/core';
 import { trigger, transition, animate, style } from '@angular/animations';
 import { Router,ActivatedRoute } from '@angular/router';
 import {Validators, FormBuilder, FormGroup, FormControl } from '@angular/forms';

src/index.html

@@ -7,7 +7,7 @@
 
   <base href="/" />
 
-  <meta name="viewport" content="viewport-fit=cover, width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+  <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width, viewport-fit=cover">
   <meta name="format-detection" content="telephone=no" />
   <meta name="msapplication-tap-highlight" content="no" />