Improvements to bugfix/working-tests. (#739)

* #704, #705 Add third wave water profiles, and make water section like the preparation methods, to add a specific or custom one.

* We removed in lokalise all old translations to make some more cleanup.

* Preset third wave water translations

* Changed font size

* Resetting smoothedValue when attaching to the scale flow

* #709, #708, #707, #706

Added haptic engine
added text to speech for bluetooth scale connection
added sort of images
added indicator that machines are connected

* #710 - toggle hour and minutes

* #711 - Enable tare again on brew timer start when pressure or temperature threshold is hit cause of logic changes

* #712 - Unarchive a bean

* #713 - Focus seconds directly when opening the timer

* #714 - Save again the brew when the while brewing is shown

* #715 - Send EY to visualizer

* Adding Bookoo devices

* Adding translations

* Corrected identifier name, testDeviceScan corrected, aswell as searching the pressure devices to find the bookoo pressure

* Swiching to nativestorage back

* Removing splash screens

* Removing splash screen plugin, upgrading to android 13 (jdk 17 now needed). apache/cordova-android#1678

Added kotlin version etc.

Removing splash files, after they are not longer supported with android

* Making text to speech just for IOS possible, aswell as fixing android image choosing with new version update

* update text

* Removed unused function

* Made extraction chart labels translatable (#718)

Co-authored-by: Lars Saalbach <lars.saalbach@googlemail.com>

* Fix typos in Spanish translation (#716)

* update text

* Added first 7.3.0 update texts

* outcomenting the bookoo pressure

* Add new functions for starting Value Transmission

* Use Value Transmission functions depending on timer

* Commiting the pressure changes for the booko

* Fixing the meticulous API data :)

* Adding the strip android permissions, specialy for write storage aswell for:
android.permission.BODY_SENSORS

android.permission.ACTIVITY_RECOGNITION

* Fix pin formater for beans

* Set final weight for meticulous

* Updating 7.3 patchnotes

* Fixing to the next version

* Fixing iOS image selection

* #721 - Adding download button for brew by weight & retrying the call to the xenia.

* #721 - Fixing null value

* Lokalise update (#724)

* Fixings the MA_STATUS Wait, and wait 2 seconds.
Changing the notes and aromatics to the bottomline

* Lokalise update (#725)

* Lokalise update (#727)

* Enabling pressure sensor, updating to 7.3.0 version tag

* Fix tests after master merge.

* Everywhere: Add missing decalations, imports and providers.
* water-information-card: Add a water.type so Water.getIcon returns.
* app.component: Remove Platform spy because it was missing is function

* #736 - Removing the plugin cause of the core dependency

* Add missing OnDestroy to BrewAddComponent. (#738)

Original fix in b9ffb35 by AdrisGithub.
ngOnDestroy added in 5538f04.

* Remove duplicate text in README.md (#729)

Duplicate text aded in 9d05b7c

Co-authored-by: Grapehfruit <lars.saalbach@googlemail.com>

* Split beforEach calls into async and sync calls.

compileComponents is async so it needs to be in a waitForAsync block. The actual component creation should be in a sync block.
Reference: https://angular.dev/guide/testing/components-scenarios#calling-compilecomponents

* Delete unused import.

setParseTemplateAsSourceFileForTest

* Uncomment CuppingRadarComponent test.

Register chart.js components in the same way as is done in app.component.ts

* Revert changes to plotly.min.js.

This file is imported, it shouldn't have been re-formatted.

* Fix and uncomment graph-display-card.component.spec.ts.

Split beforEach in async and sync.
Clean up formatting.

* UnComment and fix BrewBrewingGraphComponent test.

* Create a MockBrew class that extends Brew and stubs out reading the Preparation from storage.
* Provide MockBrew instance as `data` input.
* In BrewBrewingGraphComponent.getPreparation, delegate to this.data.getPreparation insteda of re-implementing reading from storage. This allows for stubbing the storage read in a single palce.
* Split beforeEach in async and sync sections ref: https://angular.dev/guide/testing/components-scenarios#calling-compilecomponents

---------

Co-authored-by: Grapehfruit <lars.saalbach@googlemail.com>
Co-authored-by: randomcoffeesnob <ydietler@gmail.com>
Co-authored-by: agubelu <agubelu@users.noreply.github.com>

README.md

@@ -250,11 +250,14 @@ node -v -> v18.15.0 -> works
 
 ### iOS-Version:
 
-`ionic cordova platform add ios@7.0.1`
+`ionic cordova platform add ios@7.1.0`
 
 ### Android-Version:
 
-`ionic cordova platform add android@12.0.0`
+`ionic cordova platform add android@13.0.0`
+`jdk 17 needed`
+
+You need to remove <config>WRITE_EXTERNAL_STORAGE</config> on the x-socialshare plugin.xml
 
 ### Github Page Hosting
 

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.beanconqueror.app" version="7.2.1" xmlns="http://www.w3.org/ns/widgets">
+<widget id="com.beanconqueror.app" version="7.3.0" xmlns="http://www.w3.org/ns/widgets">
     <name>Beanconqueror</name>
     <description />
     <author email="info@beanconqueror.com" href="https://github.com/graphefruit/beanconqueror">Lars Saalbach</author>
@@ -16,8 +16,9 @@
     <allow-navigation href="*" />
     <preference name="ScrollEnabled" value="false" />
     <preference name="android-minSdkVersion" value="24" />
-    <preference name="android-targetSdkVersion" value="33" />
-    <preference name="android-compileSdkVersion" value="33" />
+    <preference name="android-targetSdkVersion" value="34" />
+    <preference name="android-compileSdkVersion" value="34" />
+    <preference name="android-buildToolsVersion" value="34.0.0" />
     <preference name="SplashMaintainAspectRatio" value="true" />
     <preference name="FadeSplashScreenDuration" value="300" />
     <preference name="SplashShowOnlyFirstTime" value="false" />
@@ -30,6 +31,11 @@
     <preference name="AndroidExtraFilesystems" value="files,files-external,documents,cache,cache-external" />
     <preference name="iosExtraFilesystems" value="library,library-nosync,documents,documents-nosync,cache,bundle,root" />
     <platform name="android">
+        <preference name="GradleVersion" value="8.7" />
+        <preference name="AndroidGradlePluginVersion" value="8.3.0" />
+        <preference name="GradlePluginKotlinVersion" value="1.9.24" />
+        <preference name="GradlePluginKotlinEnabled" value="true" />
+        <preference name="GradlePluginKotlinCodeStyle" value="official" />
         <edit-file mode="merge" parent="/resources" target="app/src/main/res/values/themes.xml">
             <style name="Theme.App.SplashScreen" parent="Theme.SplashScreen">
                 <item name="windowSplashScreenBackground">#FFFFFF</item>
@@ -92,18 +98,7 @@
         <icon density="xxxhdpi" src="resources/android/icon/drawable-xxxhdpi-icon.png" />
         <icon density="mdpi" src="resources/android/icon/drawable-mdpi-icon.png" />
         <hook src="plugins/cordova-plugin-ble-central/stripDuplicatePermissions.js" type="after_prepare" />
-        <splash density="land-ldpi" src="resources/android/splash/drawable-land-ldpi-screen.png" />
-        <splash density="land-mdpi" src="resources/android/splash/drawable-land-mdpi-screen.png" />
-        <splash density="land-hdpi" src="resources/android/splash/drawable-land-hdpi-screen.png" />
-        <splash density="land-xhdpi" src="resources/android/splash/drawable-land-xhdpi-screen.png" />
-        <splash density="land-xxhdpi" src="resources/android/splash/drawable-land-xxhdpi-screen.png" />
-        <splash density="land-xxxhdpi" src="resources/android/splash/drawable-land-xxxhdpi-screen.png" />
-        <splash density="port-ldpi" src="resources/android/splash/drawable-port-ldpi-screen.png" />
-        <splash density="port-mdpi" src="resources/android/splash/drawable-port-mdpi-screen.png" />
-        <splash density="port-hdpi" src="resources/android/splash/drawable-port-hdpi-screen.png" />
-        <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" />
+        <hook src="hooks/stripAndroidPermissions.js" type="after_prepare" />
     </platform>
     <platform name="ios">
         <privacy-manifest>

hooks/stripAndroidPermissions.js

@@ -0,0 +1,26 @@
+const FS = require('fs');
+const Path = require('path');
+
+let path = Path.resolve('platforms/android/app/src/main/AndroidManifest.xml');
+
+let manifest = FS.readFileSync(path, {
+  encoding: 'utf-8',
+});
+
+// Strips ALL occurrences of <uses-permission android:name="androoid.permission.WRITE_EXTERNAL_STORAGE" />
+// If you have several conflicts (of different maxSDKVersion, or in different formats) then the regex
+// may need to be adjusted, or repeated for each format.
+manifest = manifest.replace(
+  /^(\s)+<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" \/>$/gm,
+  ''
+);
+manifest = manifest.replace(
+  /^(\s)+<uses-permission android:name="android.permission.BODY_SENSORS" \/>$/gm,
+  ''
+);
+manifest = manifest.replace(
+  /^(\s)+<uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" \/>$/gm,
+  ''
+);
+
+FS.writeFileSync(path, manifest);