Merge branch 'develop' into release/v6.4.x

graphefruit · Jun 2, 2023 · 1508a07 · 1508a07
2 parents 41ecadd + 62a4d16
commit 1508a07
Show file tree

Hide file tree

Showing 27 changed files with 234 additions and 73 deletions.
diff --git a/README.md b/README.md
@@ -255,16 +255,29 @@ After SDK Target 31 needs to be supported, and older plugins doesn't have the an
 Cordova-plugin-x-socialsharing
 `<receiver android:name="nl.xservices.plugins.ShareChooserPendingIntent" android:exported="false" android:enabled="true">`
 
+Fixing SocialSharing.java
+` int flag = PendingIntent.FLAG_MUTABLE;
+if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.S) {
+flag = PendingIntent.FLAG_UPDATE_CURRENT;
+}
+final PendingIntent pendingIntent = PendingIntent.getBroadcast(cordova.getActivity().getApplicationContext(), 0, receiverIntent, flag);`
+-> https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin/pull/1202/commits
+
 cordova-plugin-telerik-imagepicker
-`<activity android:exported="false" android:label="@string/multi_app_name" android:name="com.synconset.MultiImageChooserActivity" android:theme="@style/Theme.AppCompat.Light">`
 
-fttx-phonegap-plugin-barcodescanner
-`<activity android:name="com.google.zxing.client.android.encode.EncodeActivity" android:exported="false" android:label="Share"/>`
+1. `<activity android:exported="false" android:label="@string/multi_app_name" android:name="com.synconset.MultiImageChooserActivity" android:theme="@style/Theme.AppCompat.Light">`
+2. `  <config-file file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application">
+<application android:requestLegacyExternalStorage="true" />
+</config-file>` -> change edit-config to config-file
+   fttx-phonegap-plugin-barcodescanner
+   `<activity android:name="com.google.zxing.client.android.encode.EncodeActivity" android:exported="false" android:label="Share"/>`
 
 cordova-plugin-file/src/android
 ContentFileSystem.java
 -> Temp fix for import
-` String encodedPath = inputURL.uri.getEncodedPath(); String authorityAndPath = encodedPath.substring(encodedPath.indexOf(this.name) + 1 + this.name.length() + 2);`
+`        String encodedPath = inputURL.uri.getEncodedPath();
+String authorityAndPath = encodedPath.substring(encodedPath.indexOf(this.name) + 1 + this.name.length() + 2);`
 
-Fixing SocialSharing.java
--> https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin/pull/1202/commits
+Compile deson't work on android?
+Try:
+`cordova build android -- --jvmargs='-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M" --add-exports=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED'`
diff --git a/config.xml b/config.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.beanconqueror.app" version="6.4.0" xmlns="http://www.w3.org/ns/widgets">
+<widget id="com.beanconqueror.app" version="6.4.10" xmlns="http://www.w3.org/ns/widgets">
     <name>Beanconqueror</name>
     <description />
     <author email="[email protected]" href="https://github.com/graphefruit/beanconqueror">Lars Saalbach</author>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -107,12 +107,13 @@
     "cordova-plugin-androidx-adapter": "^1.1.3",
     "cordova-plugin-app-version": "^0.1.12",
     "cordova-plugin-apprate": "^1.7.2",
-    "cordova-plugin-ble-central": "^1.6.3",
+    "cordova-plugin-ble-central": "^1.7.0",
     "cordova-plugin-camera": "^6.0.0",
     "cordova-plugin-customurlscheme-ng": "^10.0.0",
     "cordova-plugin-dialogs": "^2.0.2",
     "cordova-plugin-file": "^7.0.0",
     "cordova-plugin-file-transfer": "github:dpa99c/cordova-plugin-file-transfer",
+    "cordova-plugin-filepath": "^1.6.0",
     "cordova-plugin-geolocation": "^4.1.0",
     "cordova-plugin-health": "^2.0.0",
     "cordova-plugin-inappbrowser": "^5.0.0",
@@ -235,8 +236,8 @@
       }
     },
     "platforms": [
-      "android",
-      "ios"
+      "ios",
+      "android"
     ]
   },
   "platforms": [
@@ -251,4 +252,4 @@
     "*.css": "stylelint --fix",
     "*.{ts,js,css,md}": "prettier --write"
   }
-}
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -713,13 +713,13 @@ export class AppComponent implements AfterViewInit {
     if (pressure_id && isAndroidAndPressureDevice === false) {
       searchIds.push(pressure_id);
     }
-    if (temperature_id) {
+    if (temperature_id && !this.platform.is('android')) {
       searchIds.push(temperature_id);
     }
     try {
       if (searchIds.length > 0) {
-        //Just search if we raly got id's
-        this.bleManager.findDeviceWithDirectIds(searchIds, 60000);
+        // Just search if we raly got id's
+        await this.bleManager.findDeviceWithDirectIds(searchIds, 8000);
       }
     } catch (ex) {}
   }

diff --git a/src/app/app.scss b/src/app/app.scss
@@ -861,11 +861,21 @@ ion-segment.tabs {
   padding-top:0px;
 
   ion-segment-button{
-    width: 100%; 
+    width: 100%;
 
     .value{
       font-size: 14px;
       opacity: 0.8;
     }
   }
-}
+}
+
+.xenia-script-chooser {
+  max-width:100%;
+  width:100%;
+  .alert-wrapper {
+    max-width:100%;
+    width:90%;
+
+  }
+}
diff --git a/src/app/brew/brew-detail/brew-detail.component.html b/src/app/brew/brew-detail/brew-detail.component.html
@@ -362,7 +362,7 @@ <h3>{{data.coffee_concentration}}</h3>
                       data.getPreparation().use_custom_parameters)">
       <ion-label>
         <h2>{{"BREW_DATA_RATING" | translate }}:</h2>
-        <h3>{{data.rating}}</h3>
+        <h3>{{data.rating | number : '.0-2'}}</h3>
       </ion-label>
 
     </ion-item>

diff --git a/src/app/brew/brew-detail/brew-detail.component.ts b/src/app/brew/brew-detail/brew-detail.component.ts
@@ -96,7 +96,7 @@ export class BrewDetailComponent implements OnInit {
       // Set timeout else element wont be visible
       setTimeout(() => {
         this.__loadCuppingChart();
-      }, 150);
+      }, 1000);
     }
 
     await this.readFlowProfile();
@@ -464,15 +464,34 @@ export class BrewDetailComponent implements OnInit {
       'image/jpeg',
       1
     );*/
-    Plotly.Snapshot.toImage(document.getElementById('flowProfileChart'), {
-      format: 'jpeg',
-    }).once('success', async (url) => {
-      try {
-        this.socialSharing.share(null, null, url, null);
-      } catch (err) {
-        this.uiLog.error('Cant share profilechart ' + err.message);
-      }
-    });
+    if (this.platform.is('ios')) {
+      //#544 - we need to do it twice... don't know why, ios issue
+      Plotly.Snapshot.toImage(document.getElementById('flowProfileChart'), {
+        format: 'jpeg',
+      }).once('success', async (url) => {
+        setTimeout(() => {
+          Plotly.Snapshot.toImage(document.getElementById('flowProfileChart'), {
+            format: 'jpeg',
+          }).once('success', async (urlNew) => {
+            try {
+              this.socialSharing.share(null, null, urlNew, null);
+            } catch (err) {
+              this.uiLog.error('Cant share profilechart ' + err.message);
+            }
+          });
+        }, 750);
+      });
+    } else {
+      Plotly.Snapshot.toImage(document.getElementById('flowProfileChart'), {
+        format: 'jpeg',
+      }).once('success', async (url) => {
+        try {
+          this.socialSharing.share(null, null, url, null);
+        } catch (err) {
+          this.uiLog.error('Cant share profilechart ' + err.message);
+        }
+      });
+    }
   }
 
   private getChartLayout() {

diff --git a/src/app/settings/settings.page.html b/src/app/settings/settings.page.html
@@ -404,6 +404,20 @@ <h2>{{"SMART_SCALE_COMMAND_DELAY" | translate}}</h2>
                 <ion-label slot="end">{{settings.bluetooth_command_delay}} ms</ion-label>
               </ion-range>
             </ion-item>
+
+            <ion-item lines="none">
+              <ion-label>
+                <h2>{{"SMART_SCALE_ACAIA_HEARTBEAT_TIMER" | translate}}</h2>
+              </ion-label>
+              <ion-icon name="information-outline" slot="end"
+                        tooltip='{{"SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP" | translate}}'></ion-icon>
+            </ion-item>
+            <ion-item style="top:-15px;">
+              <ion-range style="padding-top:0;padding-bottom:0px;padding-right:0px;" min="200" snaps="true" max="1000"
+                         step="1" (ionBlur)="saveSettings()" [(ngModel)]="settings.acaia_heartbeat_command_delay">
+                <ion-label slot="end">{{settings.acaia_heartbeat_command_delay}} ms</ion-label>
+              </ion-range>
+            </ion-item>
             <ion-item>
               <ion-label class="ion-margin-end" style="white-space: normal;">
                 <h2>{{"SMART_SCALE_LOG" | translate}}</h2>

diff --git a/src/app/settings/settings.page.ts b/src/app/settings/settings.page.ts
@@ -790,8 +790,9 @@ export class SettingsPage implements OnInit {
 
     this.uiStorage.export().then(
       (_data) => {
+        const isIOS = this.platform.is('ios');
         this.uiHelper
-          .exportJSON('Beanconqueror.json', JSON.stringify(_data))
+          .exportJSON('Beanconqueror.json', JSON.stringify(_data), isIOS)
           .then(
             async (_fileEntry: FileEntry) => {
               if (this.platform.is('cordova')) {

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -862,6 +862,13 @@
         "<b>Sonstiges:</b>",
         "Kleinere Fehlerbehebungen"
       ]
+    },
+    "6.4.10": {
+      "TITLE": "Version 6.4.1: Das ist neu",
+      "DESCRIPTION": [
+        "<b>Sonstiges:</b>",
+        "Kleinere Fehlerbehebungen"
+      ]
     }
   },
   "CUSTOM_PARAMETERS": "Parameter individualisieren",
@@ -1460,5 +1467,7 @@
   "BREW_TEMPERATURE_REALTIME": "Temperatur",
   "PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "Temperaturgerät",
   "PRESSURE_DEVICE_JUST_VISIBLE_ON_ESPRESSO": "Druckgerät ist nur Verwendbar bei Zubereitungsmethoden der Zubereitungsart 'Espresso'",
-  "PRESSURE_MESSAGE_AFTER_CONNECTION": "Bekanntes Verhalten (in Analyse): Bitte beachte, dass der Verbindungsaufbau nach dem Neustart deines Telefons oder nach längerer Zeit, ohne, dass die App verwendet worden ist, auch länger dauern kann (30 Sekunden bis 1 Minute) danach sollte das Problem nicht mehr auftreten. "
+  "PRESSURE_MESSAGE_AFTER_CONNECTION": "Bekanntes Verhalten (in Analyse): Bitte beachte, dass der Verbindungsaufbau nach dem Neustart deines Telefons oder nach längerer Zeit, ohne, dass die App verwendet worden ist, auch länger dauern kann (30 Sekunden bis 1 Minute) danach sollte das Problem nicht mehr auftreten. ",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER": "Heartbeat timer - Nur Acaia Waagen!",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP": "Wird nur für Acaia Waagen verwendet!!! Alte Acaia Wagen benötigen ein Heartbeat timer, falls du Probleme mit der Waage hast, versuch die Zeit zu minimieren "
 }
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -862,6 +862,13 @@
         "<b>Others:</b>",
         "Small bug fixes"
       ]
+    },
+    "6.4.10": {
+      "TITLE": "Version 6.4.1: What's new?",
+      "DESCRIPTION": [
+        "<b>Others:</b>",
+        "Small bug fixes"
+      ]
     }
   },
   "CUSTOM_PARAMETERS": "Customize parameters",
@@ -1460,5 +1467,7 @@
   },
   "POPOVER_BLUETOOTH_ACTION_RECONNECT_TEMPERATURE_DEVICE": "Reconnect temperature device",
   "PRESSURE_DEVICE_JUST_VISIBLE_ON_ESPRESSO": "Pressure device is only usable with the preparation style 'Espresso'",
-  "PRESSURE_MESSAGE_AFTER_CONNECTION": "Known Behavior (in analyse): Note, that after restarting your phone or when not using the app for a long time, the connection can take longer (30 seconds to 1 minute), after that time elapses the connection issue should be resolved."
-}
+  "PRESSURE_MESSAGE_AFTER_CONNECTION": "Known Behavior (in analyse): Note, that after restarting your phone or when not using the app for a long time, the connection can take longer (30 seconds to 1 minute), after that time elapses the connection issue should be resolved.",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER": "Heartbeat timer - Just for Acaia Scales",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP": "Just used for Acaia scales!!! - Older Acaia scales need an heartbeat, if you encounter issues, try to minimize the heartbeat to a faster frequence"
+}
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -862,6 +862,13 @@
         "<b>Otros</b>",
         "Corrección de errores menores"
       ]
+    },
+    "6.4.10": {
+      "TITLE": "Versión 6.4.1: Novedades",
+      "DESCRIPTION": [
+        "<b>Otros</b>",
+        "Corrección de errores menores"
+      ]
     }
   },
   "CUSTOM_PARAMETERS": "Personalizar parámetros",
@@ -1460,5 +1467,7 @@
   "PRESSURE_DEVICE_JUST_VISIBLE_ON_ESPRESSO": "El sensor de presión solo se puede usar en espresso",
   "PRESSURE_MESSAGE_AFTER_CONNECTION": "Comportamiento conocido (en estudio): tenga en cuenta que tras reiniciar su teléfono o tras no usar la aplicación durante un tiempo, la conexión puede llevar más tiempo del habitual (de 30 segundos a 1 minutos). Tras eso, el comportamiento debería el habitual.",
   "BREW_TEMPERATURE_REALTIME": "Temperatura",
-  "PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "Sensor de temperatura"
+  "PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "Sensor de temperatura",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER": "Heartbeat timer - Just for Acaia Scales",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP": "Just used for Acaia scales!!! - Older Acaia scales need an heartbeat, if you encounter issues, try to minimize the heartbeat to a faster frequence"
 }
diff --git a/src/assets/i18n/tr.json b/src/assets/i18n/tr.json
@@ -862,6 +862,13 @@
         "<b>Diğerleri:</b>",
         "Daha küçük hata düzeltmeleri"
       ]
+    },
+    "6.4.10": {
+      "TITLE": "Version 6.4.1: Neler yeni?",
+      "DESCRIPTION": [
+        "<b>Diğerleri:</b>",
+        "Daha küçük hata düzeltmeleri"
+      ]
     }
   },
   "CUSTOM_PARAMETERS": "Parametreyi özelleştir",
@@ -1460,5 +1467,7 @@
   "PRESSURE_DEVICE_JUST_VISIBLE_ON_ESPRESSO": "Basınç cihazı sadece 'espresso' hazırlama stilinde kullanılabilir",
   "PRESSURE_MESSAGE_AFTER_CONNECTION": "Bilinen davranış (analizde): Lütfen dikkat edin, telefonunuzu yeniden başlattıktan veya uygulamayı uzun süre kullanmadıysanız, bağlantı daha uzun sürebilir (30 saniye ila 1 dakika), sonra sorun çözülmelidir.",
   "BREW_TEMPERATURE_REALTIME": "Sıcaklık",
-  "PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "Termometre"
+  "PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "Termometre",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER": "Heartbeat timer - Just for Acaia Scales",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP": "Just used for Acaia scales!!! - Older Acaia scales need an heartbeat, if you encounter issues, try to minimize the heartbeat to a faster frequence"
 }
diff --git a/src/assets/i18n/zh.json b/src/assets/i18n/zh.json
@@ -861,6 +861,13 @@
 		"<b>其他：</b>",
 		"修复了一些小错误"
       ]
+    },
+    "6.4.10": {
+      "TITLE": "版本 6.4.1: 更新内容",
+      "DESCRIPTION": [
+        "<b>其他：</b>",
+        "修复了一些小错误"
+      ]
     }
 	},
 	"CUSTOM_PARAMETERS": "自定义参数",
@@ -1459,5 +1466,7 @@
 	"PRESSURE_DEVICE_JUST_VISIBLE_ON_ESPRESSO": "压力设备仅在 'espresso' 模式中可用",
 	"PRESSURE_MESSAGE_AFTER_CONNECTION": "已知行为 (在分析中): 请注意, 如果您重启手机或长时间未使用应用程序, 则连接可能需要更长时间 (30 秒至 1 分钟) ",
 	"BREW_TEMPERATURE_REALTIME": "温度",
-	"PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "温度设备"
+	"PAGE_SETTINGS_TAB_BLUETOOTH_TEMPERATURE": "温度设备",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER": "Heartbeat timer - Just for Acaia Scales",
+  "SMART_SCALE_ACAIA_HEARTBEAT_TIMER_TOOLTIP": "Just used for Acaia scales!!! - Older Acaia scales need an heartbeat, if you encounter issues, try to minimize the heartbeat to a faster frequence"
 	}