Merge branch 'feature/qrcode-ipad' into 'master'

Added QRCode scan support for iPad

See merge request !634

config.xml

 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="106120" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.12" 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-versionCode="106130" id="fr.duniter.cesium" ios-CFBundleIdentifier="org.duniter.cesium" version="1.6.13" 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>Cesium</name>
     <description>
     An simple App for Duniter wallet

install.sh

@@ -15,7 +15,7 @@ if [ "_$CESIUM_DIR" = "_" ]; then
 fi
 
 latest_version() {
-  echo "v1.6.12" #lastest
+  echo "v1.6.13" #lastest
 }
 
 api_release_url() {

package.json

 {
   "name": "cesium",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "Cesium Wallet for G1 libre currency",
   "author": "Benoit Lavenier <benoit.lavenier@e-is.pro>",
   "license": "AGPL-3.0",

resources/web-ext/manifest.json

 {
   "name": "Cesium",
   "short_name": "Cesium",
-  "version": "1.6.12",
+  "version": "1.6.13",
   "description": "Manage your Duniter Wallet on a libre currency, like Ğ1",
   "background": {
     "scripts": ["background.js"]

scss/ionic.app.scss

@@ -2419,6 +2419,10 @@ body.demo {
   height: 204px;
 }
 
+.popover.popover-login-methods.auth.scan {
+  height: 252px;
+}
+
 @media (max-width: $screen-xs-max) {
   .popover.popover-login-methods {
     height: 256px;

www/js/config.js

@@ -70,14 +70,6 @@ angular.module("cesium.config", [])
 			"host": "g1.presles.fr",
 			"port": 443
 		},
-		{
-			"host": "g1.le-sou.org",
-			"port": 443
-		},
-		{
-			"host": "duniter.normandie-libre.fr",
-			"port": 443
-		},
 		{
 			"host": "g1.duniter.org",
 			"port": 443
@@ -101,10 +93,6 @@ angular.module("cesium.config", [])
 					"host": "g1.data.presles.fr",
 					"port": 443
 				},
-				{
-					"host": "g1.data.le-sou.org",
-					"port": 443
-				},
 				{
 					"host": "g1.data.mithril.re",
 					"port": 443
@@ -119,8 +107,8 @@ angular.module("cesium.config", [])
 			"defaultCountry": "France"
 		}
 	},
-	"version": "1.6.12",
-	"build": "2021-03-03T20:44:36.248Z",
+	"version": "1.6.13",
+	"build": "2021-04-26T22:09:07.231Z",
 	"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
 })
 

www/js/services/device-services.js

@@ -230,14 +230,14 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
         }
       };
 
-      exports.isIOS = function() {
-        return !!navigator.userAgent.match(/iPhone | iPad | iPod/i) || ionic.Platform.isIOS();
-      };
-
       exports.isOSX = function() {
         return !!navigator.userAgent.match(/Macintosh/i) || ionic.Platform.is("osx");
       };
 
+      exports.isIOS = function() {
+        return !!navigator.userAgent.match(/iPhone | iPad | iPod/i) || (!!navigator.userAgent.match(/Mobile/i) && !!navigator.userAgent.match(/Macintosh/i)) || ionic.Platform.isIOS();
+      };
+
       exports.isDesktop = function() {
         if (!angular.isDefined(cache.isDesktop)) {
           try {
@@ -269,7 +269,7 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
             if (exports.enable){
               exports.camera.enable = !!navigator.camera;
               exports.keyboard.enable = cordova && cordova.plugins && !!cordova.plugins.Keyboard;
-              exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner && !exports.isOSX();
+              exports.barcode.enable = cordova && cordova.plugins && !!cordova.plugins.barcodeScanner && (!exports.isOSX() || exports.isIOS());
               exports.clipboard.enable = cordova && cordova.plugins && !!cordova.plugins.clipboard;
               exports.intent.enable = window && !!window.plugins.launchmyapp;
 

www/manifest.json

@@ -2,7 +2,7 @@
   "short_name": "Cesium",
   "name": "Cesium",
   "manifest_version": 1,
-  "version": "1.6.12",
+  "version": "1.6.13",
   "default_locale": "fr",
   "description": "Cesium Wallet for Ğ1 libre currency",
   "icons": [

www/templates/login/popover_methods.html

 <ion-popover-view class="fit has-header popover-login-methods"
-  ng-class="{'auth': isAuth}">
+  ng-class="{'auth': isAuth, 'scan': $root.device.barcode.enable}">
   <ion-header-bar>
     <h1 class="title" translate>LOGIN.METHOD_POPOVER_TITLE</h1>
   </ion-header-bar>