Requested changes

Author: WalcoFPV

cordova/package.json

@@ -11,21 +11,21 @@
     "cordova": "^9.0.0",
     "cordova-android": "^8.1.0",
     "cordova-clipboard": "^1.3.0",
-    "cordova-open-native-settings": "https://github.com/WalcoFPV/cordova-open-native-settings",
-    "cordova-plugin-appavailability": "https://github.com/WalcoFPV/AppAvailability.git",
+    "bf-cordova-open-native-settings": "^2.0.4",
+    "bf-cordova-plugin-appavailability": "^1.0.3",
     "cordova-plugin-chrome-apps-common": "^1.0.7",
     "cordova-plugin-chrome-apps-runtime": "^2.0.0",
     "cordova-plugin-chrome-apps-storage": "^1.0.4",
-    "cordova-plugin-chrome-apps-usb": "https://github.com/WalcoFPV/cordova-plugin-chrome-apps-usb.git",
+    "bf-cordova-plugin-chrome-apps-usb": "^2.0.1",
     "cordova-plugin-dialogs": "^2.0.2",
     "cordova-plugin-file": "^6.0.2",
     "cordova-plugin-filechooser": "^1.2.0",
-    "cordova-plugin-market": "https://github.com/xmartlabs/cordova-plugin-market.git",
+    "cordova-plugin-market": "^1.2.0",
     "cordova-plugin-permission": "^0.1.0",
     "cordova-plugin-splashscreen": "^5.0.3",
     "cordova-plugin-usb-event": "^1.0.2",
     "cordova-plugin-whitelist": "^1.3.4",
-    "cordovarduino": "https://github.com/WalcoFPV/cordovarduino.git"
+    "bf-cordovarduino": "^1.0.0"
   },
   "cordova": {
     "platforms": [
@@ -40,15 +40,15 @@
       "cordova-plugin-permission": {},
       "cordova-plugin-usb-event": {},
       "cordova-plugin-dialogs": {},
-      "cordovarduino": {},
+      "bf-cordovarduino": {},
       "cordova-plugin-file": {},
       "cordova-plugin-filechooser": {},
-      "cordova-plugin-chrome-apps-usb": {},
+      "bf-cordova-plugin-chrome-apps-usb": {},
       "cordova-clipboard": {},
       "cordova-plugin-screen-orientation": {},
       "cordova-plugin-market": {},
-      "cordova-open-native-settings": {},
-      "cordova-plugin-appavailability": {}
+      "bf-cordova-open-native-settings": {},
+      "bf-cordova-plugin-appavailability": {}
     }
   }
 }

cordova/yarn.lock

@@ -224,6 +224,16 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
+bf-cordova-open-native-settings@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bf-cordova-open-native-settings/-/bf-cordova-open-native-settings-2.0.1.tgz#645c8f06b06aa67174deee7c356f7f8e599b14bc"
+  integrity sha512-OCP0KOkYV/lG1QNezFiYB0PSkqRDyKRHdsTuKXzChDCdIIPjEwpp5+AiKpdJT0tioJjV2PK+fKRqsBsW2PuEEw==
+
+bf-cordova-plugin-appavailability@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/bf-cordova-plugin-appavailability/-/bf-cordova-plugin-appavailability-1.0.0.tgz#90560ab87b1a55d6779213b7b65b497c8932323c"
+  integrity sha512-iavnVlrmn9EIF5JuGopAG3/cThGh0t1kYLTnAjttkghFNtNWFZpcl2sRM1EzMlEaTVH7pYhB/m3NKYYLAVJ+IA==
+
 big-integer@^1.6.7:
   version "1.6.48"
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e"
@@ -610,14 +620,6 @@ cordova-lib@^9.0.0:
     shebang-command "^1.2.0"
     underscore "^1.9.1"
 
-"cordova-open-native-settings@https://github.com/WalcoFPV/cordova-open-native-settings":
-  version "1.5.2"
-  resolved "https://github.com/WalcoFPV/cordova-open-native-settings#579d7b792baf3a9342a58ed7a658d625e154a6bb"
-
-"cordova-plugin-appavailability@https://github.com/WalcoFPV/AppAvailability.git":
-  version "0.4.2"
-  resolved "https://github.com/WalcoFPV/AppAvailability.git#030a877a91a39b8260089050aaef0a94f3999ed6"
-
 cordova-plugin-chrome-apps-common@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/cordova-plugin-chrome-apps-common/-/cordova-plugin-chrome-apps-common-1.0.7.tgz#300319b59c79dc552293f83a2332cf283b10908a"

locales/en/messages.json

@@ -5760,7 +5760,7 @@
         "message": "The file will be saved in the '{{folder}}' folder in your internal storage."
     },
     "dialogFileAlreadyExistsTitle": {
-        "message": "This file already exists !"
+        "message": "This file already exists!"
     },
     "dialogFileAlreadyExistsDescription": {
         "message": "Overwrite ?"
@@ -5802,7 +5802,7 @@
         "message": "Update from the Google Play Store"
     },
     "cordovaWebviewEnable": {
-        "message": "Go in the tab of informations about your device in the settings and tap 10 times on the build version number to enable 'Developper options'. After that, search and go in the developper options and select <b>{{app}}</b> as webview provider."
+        "message": "Go into the tab of informations about your device in the settings and tap 10 times on the build version number to enable 'Developper options'. After that, search and go in the developper options and select <b>{{app}}</b> as webview provider."
     },
     "cordovaWebviewEnableBtn": {
         "message": "Open settings"

src/js/cordova_chromeapi.js

@@ -153,10 +153,10 @@ const chromeapiSerial = {
         if (typeof ConnectionOptions !== 'undefined') {
             self.setConnectionOptions(ConnectionOptions);
         }
-        const pathSplitted = path.split('/');
-        if (pathSplitted.length === 2) {
-            const vid = parseInt(pathSplitted[0]);
-            const pid = parseInt(pathSplitted[1]);
+        const pathSplit = path.split('/');
+        if (pathSplit.length === 2) {
+            const vid = parseInt(pathSplit[0]);
+            const pid = parseInt(pathSplit[1]);
             console.log(`${self.logHeader}request permission (vid=${vid} / pid=${pid})`);
             cordova_serial.requestPermission({vid: vid, pid: pid}, function() {
                 const options = self.getCordovaSerialConnectionOptions();

src/js/main.js

@@ -214,7 +214,9 @@ function startProcess() {
         );
     });
 
-    UI_PHONES.init();
+    if (GUI.isCordova()) {
+        UI_PHONES.init();
+    }
 
     const ui_tabs = $('#tabs > ul');
     $('a', ui_tabs).click(function () {

src/js/port_handler.js

@@ -162,7 +162,7 @@ PortHandler.check_usb_devices = function (callback) {
             if (dfuElement.length) {
                dfuElement.remove();
             }
-        self.dfu_available = false;
+            self.dfu_available = false;
         }
         if(callback) callback(self.dfu_available);
 

src/js/serial_backend.js

@@ -147,7 +147,9 @@ function initializeSerialBackend() {
 }
 
 function finishClose(finishedCallback) {
-    UI_PHONES.reset();
+    if (GUI.isCordova()) {
+        UI_PHONES.reset();
+    }
 
     var wasConnected = CONFIGURATOR.connectionValid;
 
@@ -459,7 +461,9 @@ function finishOpen() {
         GUI.allowedTabs.splice(GUI.allowedTabs.indexOf('led_strip'), 1);
     }
 
-    UI_PHONES.reset();
+    if (GUI.isCordova()) {
+        UI_PHONES.reset();
+    }
 
     onConnect();
 

src/js/tabs/cli.js

@@ -328,7 +328,9 @@ TABS.cli.adaptPhones = function() {
         $('.backdrop').css('height', `calc(100% - ${backdropHeight}px)`);
     }
 
-    UI_PHONES.initToolbar();
+    if (GUI.isCordova()) {
+        UI_PHONES.initToolbar();
+    }
 };
 
 TABS.cli.history = {

src/js/tabs/vtx.js

@@ -41,7 +41,9 @@ TABS.vtx.initialize = function (callback) {
         // translate to user-selected language
         i18n.localizePage();
 
-        UI_PHONES.initToolbar();
+        if (GUI.isCordova()) {
+            UI_PHONES.initToolbar();
+        }
 
         self.updating = false;
         GUI.content_ready(callback);

src/main.html

@@ -153,8 +153,10 @@
         </div>
         <div id="port-picker">
             <div id="port-override-option">
-                <label for="port-override"><span i18n="portOverrideText">Port:</span> <input id="port-override" type="text"
-                                                                                             value="/dev/rfcomm0"/></label>
+                <label for="port-override">
+                    <span i18n="portOverrideText">Port:</span>
+                    <input id="port-override" type="text" value="/dev/rfcomm0"/>
+                </label>
             </div>
             <div id="portsinput">
                 <div class="dropdown dropdown-dark">