From 5b3f2e9614a4765e25be0086a8367c0e01f47af7 Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Sat, 4 Apr 2020 16:15:27 -0400
Subject: #919 - use the right patch for statusbar, put no overlay for iOS in
 config

---
 config.xml    | 10 +++++++---
 package.json  | 14 +++++++++-----
 www/js/app.js |  9 +++------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/config.xml b/config.xml
index 9b39d38d..8e3a598e 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.096" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget android-packageName="com.pliablepixels.zmninja_pro" id="com.pliablepixels.zmninja_pro" ios-CFBundleIdentifier="com.pliablepixels.zmninja-pro" version="1.3.097" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>zmNinja</name>
     <description>
 	High performance ZoneMinder client
@@ -42,6 +42,7 @@
         <param name="ios-package" onload="true" value="CDVStatusBar" />
     </feature>
     <platform name="ios">
+        <preference name="StatusBarOverlaysWebView" value="false" />
         <preference name="WKWebViewOnly" value="true" />
         <feature name="CDVWKWebViewEngine">
             <param name="ios-package" value="CDVWKWebViewEngine" />
@@ -152,7 +153,6 @@
     <plugin name="cordova-plugin-network-information" spec="^2.0.1" />
     <plugin name="cordova-plugin-device" spec="^2.0.2" />
     <plugin name="cordova-plugin-file" spec="^6.0.1" />
-    <plugin name="cordova-plugin-statusbar" spec="^2.4.2" />
     <plugin name="cordova-library-helper-pp-fork" spec="^1.0.1" />
     <plugin name="cordova-plugin-multi-window" spec="0.0.3" />
     <plugin name="cordova-plugin-ignore-lint-translation" spec="0.0.1" />
@@ -185,8 +185,12 @@
     <plugin name="cordova-plugin-android-permissions" spec="1.0.2" />
     <plugin name="cordova-plugin-app-version" spec="0.1.9" />
     <plugin name="cordova-plugin-inappbrowser" spec="https://github.com/apache/cordova-plugin-inappbrowser.git" />
-    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
     <plugin name="cordova-plugin-certificates-pp-fork" spec="^0.9.1" />
+    <plugin name="cordova-plugin-ionic-webview" spec="https://github.com/pliablepixels/cordova-plugin-ionic-webview.git">
+        <variable name="ANDROID_SUPPORT_ANNOTATIONS_VERSION" value="27.+" />
+    </plugin>
+    <plugin name="cordova-plugin-media-pp-fork" spec="^1.0.2-dev" />
+    <plugin name="cordova-plugin-statusbar" spec="~2.4.4-dev" />
     <engine name="android" spec="8.0.0" />
     <engine name="ios" spec="5.1.1" />
 </widget>
diff --git a/package.json b/package.json
index dd8c01b0..524ebb99 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "zmninjapro",
   "description": "Home security mobile app for ZoneMinder",
-  "version":"1.3.096",
+  "version": "1.3.096",
   "displayName": "zmNinja",
   "author": "Pliable Pixels",
   "license": "custom see LICENSE.md",
@@ -27,7 +27,6 @@
       "cordova-plugin-network-information": {},
       "cordova-plugin-device": {},
       "cordova-plugin-file": {},
-      "cordova-plugin-statusbar": {},
       "cordova-library-helper-pp-fork": {},
       "cordova-plugin-multi-window": {},
       "cordova-plugin-ignore-lint-translation": {},
@@ -61,8 +60,12 @@
       "cordova-plugin-android-permissions": {},
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-app-version": {},
+      "cordova-plugin-certificates-pp-fork": {},
+      "cordova-plugin-ionic-webview": {
+        "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
+      },
       "cordova-plugin-media-pp-fork": {},
-      "cordova-plugin-certificates-pp-fork": {}
+      "cordova-plugin-statusbar-pp-fork": {}
     }
   },
   "dependencies": {
@@ -88,13 +91,14 @@
     "cordova-plugin-inappbrowser": "git+https://github.com/apache/cordova-plugin-inappbrowser.git",
     "cordova-plugin-insomnia": "^4.3.0",
     "cordova-plugin-ionic-keyboard": "2.2.0",
+    "cordova-plugin-ionic-webview": "git+https://github.com/pliablepixels/cordova-plugin-ionic-webview.git",
     "cordova-plugin-media-pp-fork": "^1.0.2-dev",
     "cordova-plugin-multi-window": "0.0.3",
     "cordova-plugin-network-information": "^2.0.2",
     "cordova-plugin-photo-library": "git+https://github.com/pliablepixels/cordova-plugin-photo-library.git",
     "cordova-plugin-pin-dialog": "^0.1.3",
     "cordova-plugin-splashscreen": "git+https://github.com/prageeth/cordova-plugin-splashscreen.git",
-    "cordova-plugin-statusbar": "^2.4.3",
+    "cordova-plugin-statusbar-pp-fork": "2.4.4-dev",
     "cordova-plugin-touch-id": "3.4.0",
     "cordova-plugin-whitelist": "^1.3.4",
     "cordova-plugin-x-socialsharing": "5.6.4",
@@ -226,4 +230,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/www/js/app.js b/www/js/app.js
index 225251e5..83937aff 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1150,9 +1150,9 @@ angular.module('zmApp', [
       $rootScope.platformOS = "desktop";
       NVR.log("Device is ready");
 
-
+      //console.log ("*************** PLATFORM IS: "+ionic.Platform.platform());
       // var ld = NVR.getLogin();
-      if ($ionicPlatform.is('ios'))
+      if ($ionicPlatform.is('ios') || ionic.Platform.platform() == 'macintel')
         $rootScope.platformOS = "ios";
       if ($ionicPlatform.is('android'))
         $rootScope.platformOS = "android";
@@ -1758,10 +1758,7 @@ angular.module('zmApp', [
           //  console.log("statusbar");
           NVR.log("Updating statusbar");
           StatusBar.styleDefault();
-          if ($rootScope.platformOS == 'ios') {
-            // console.log ("<<<<<<<<<<<<<<<< OVERLAY");
-            StatusBar.overlaysWebView(false);
-          }
+         
 
           StatusBar.backgroundColorByHexString("#2980b9");
         }
-- 
cgit v1.2.3