Merge branch 'develop'

.github/workflows/node.js.yml

@@ -0,0 +1,26 @@
+# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
+
+name: npm test CI
+
+on:
+  push:
+    branches: [ "master", "develop" ]
+  pull_request:
+    branches: [ "master", "develop" ]
+  workflow_dispatch:
+
+jobs:
+  build-and-test:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - uses: actions/setup-node@v4
+      with:
+        node-version: 22.x
+        cache: 'npm'
+    - run: npm ci
+    - run: npm run build --if-present
+    - run: npm test -- --browsers=ChromeHeadless --watch=false

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.beanconqueror.app" version="7.4.0" xmlns="http://www.w3.org/ns/widgets">
+<widget id="com.beanconqueror.app" version="7.5.0" xmlns="http://www.w3.org/ns/widgets">
     <name>Beanconqueror</name>
     <description />
     <author email="[email protected]" href="https://github.com/graphefruit/beanconqueror">Lars Saalbach</author>

package.json

@@ -47,6 +47,8 @@
     "@ionic/cordova-builders": "^8.0.0",
     "@ionic/storage": "^4.0.0",
     "@ionic/storage-angular": "^4.0.0",
+    "@meticulous-home/espresso-api": "^0.3.1",
+    "@meticulous-home/espresso-profile": "^0.4.0",
     "@ngx-translate/core": "^15.0.0",
     "@ngx-translate/http-loader": "^4.0.0",
     "@zip.js/zip.js": "^2.7.14",
@@ -68,7 +70,6 @@
     "lodash": "^4.17.21",
     "long": "^5.2.0",
     "luxon": "^2.3.0",
-    "meticulous-api": "github:FFFuego/meticulous-typescript-api#dist",
     "moment": "^2.29.4",
     "ngx-stars": "^1.6.4",
     "postcss": "^8.3.5",
@@ -98,7 +99,7 @@
     "@wisdomgarden/cordova-plugin-filepath": "git+https://github.com/wisdom-garden/cordova-plugin-filepath.git",
     "cordova-android": "^13.0.0",
     "cordova-clipboard": "^1.3.0",
-    "cordova-ios": "^7.1.0",
+    "cordova-ios": "^7.1.1",
     "cordova-plugin-add-swift-support": "^2.0.2",
     "cordova-plugin-advanced-http": "^3.3.1",
     "cordova-plugin-android-permissions": "^1.1.5",
@@ -210,22 +211,22 @@
       "cordova-plugin-nativestorage": {},
       "cordova-plugin-androidx": {},
       "cordova-plugin-androidx-adapter": {},
-      "cordova-plugin-ble-central": {
-        "BLUETOOTH_USAGE_DESCRIPTION": "Bluetooth access needed to connect smartscales",
-        "IOS_INIT_ON_LOAD": "false",
-        "ACCESS_BACKGROUND_LOCATION": "false",
-        "BLUETOOTH_RESTORE_STATE": "false"
-      },
       "cordova-plugin-inappbrowser": {},
       "skwas-cordova-plugin-datetimepicker": {},
       "cordova-plugin-statusbar": {},
       "cordova-plugin-file": {
         "ANDROIDX_WEBKIT_VERSION": "1.4.0"
+      },
+      "cordova-plugin-ble-central": {
+        "BLUETOOTH_USAGE_DESCRIPTION": "Bluetooth access needed to connect smartscales",
+        "IOS_INIT_ON_LOAD": "false",
+        "ACCESS_BACKGROUND_LOCATION": "false",
+        "BLUETOOTH_RESTORE_STATE": "false"
       }
     },
     "platforms": [
-      "ios",
-      "android"
+      "android",
+      "ios"
     ]
   },
   "platforms": [
@@ -240,4 +241,4 @@
     "*.css": "stylelint --fix",
     "*.{ts,js,css,md}": "prettier --write"
   }
-}
+}

src/app/app.component.html

@@ -54,27 +54,9 @@
               <ion-item [class.active]="pages.settings.active" [routerLink]="[pages.settings.url]" replaceUrl="true">
                 <ion-label>{{pages.settings.title | translate}}</ion-label>
               </ion-item>
-              <ion-item *ngIf="isAndroid()">
-
-                <ion-label><hr style="width:50%;max-width:50%" /><br/>{{"SUPPORT_ME" | translate}}</ion-label>
-              </ion-item>
-            </ion-list>
-            <ion-list *ngIf="isAndroid()" class="no-label-margin" lines="none">
-              <ion-item>
-                <ion-label>
-                  <ion-button (click)="openPaypal()" tappable color="accent" fill="clear" >
-                    <ion-icon name="logo-paypal" slot="icon-only"></ion-icon>
-                  </ion-button>
-                  <ion-button (click)="openGithubSponsor()" tappable color="accent" fill="clear" >
-                    <ion-icon name="logo-github" slot="icon-only"></ion-icon>
-                  </ion-button>
-                  <ion-button (click)="openDonatePage()" tappable color="accent" fill="clear" >
-                    <ion-icon style="position:relative;top:-2px;" name="beanconqueror-love" slot="icon-only"></ion-icon>
-                  </ion-button>
-                </ion-label>
-              </ion-item>
             </ion-list>
 
+
           </ion-menu-toggle>
         </ion-list>
       </ion-content>
@@ -99,10 +81,6 @@
               <ion-button (click)="openDiscord()" color="accent" fill="clear" tappable >
                 <ion-icon name="logo-discord" slot="icon-only"></ion-icon>
               </ion-button>
-
-              <ion-button (click)="openPaypal()" *ngIf="!isAndroid()" color="accent" fill="clear" tappable >
-                <ion-icon name="beanconqueror-love" slot="icon-only" style="position:relative;top:-4px;"></ion-icon>
-              </ion-button>
             </ion-label>
           </ion-item>
           <ion-item (click)="dismiss()" tappable [class.active]="pages.info.active" [routerLink]="[pages.info.url]"

src/app/app.component.ts

@@ -329,6 +329,11 @@ export class AppComponent implements AfterViewInit {
       // #7
       this.statusBar.show();
       this.statusBar.styleDefault();
+      if (this.platform.is('android')) {
+        try {
+          this.statusBar.styleLightContent();
+        } catch (ex) {}
+      }
 
       this.keyboard.hideFormAccessoryBar(false);
       if (environment.production === true) {
@@ -506,6 +511,8 @@ export class AppComponent implements AfterViewInit {
                   settingLanguage = 'fr';
                 } else if (systemLanguage === 'id') {
                   settingLanguage = 'id';
+                } else if (systemLanguage === 'nl') {
+                  settingLanguage = 'nl';
                 } else {
                   settingLanguage = 'en';
                 }
@@ -1024,31 +1031,9 @@ export class AppComponent implements AfterViewInit {
     );
   }
 
-  public openPaypal() {
-    this.uiAnalytics.trackEvent(
-      LINK_TRACKING.TITLE,
-      LINK_TRACKING.ACTIONS.PAYPAL
-    );
-    this.uiHelper.openExternalWebpage(
-      'https://www.paypal.com/paypalme/LarsSaalbach'
-    );
-  }
+  public openPaypal() {}
 
-  public openGithubSponsor() {
-    this.uiAnalytics.trackEvent(
-      LINK_TRACKING.TITLE,
-      LINK_TRACKING.ACTIONS.GITHUB_SPONSOR
-    );
-    this.uiHelper.openExternalWebpage(
-      'https://github.com/sponsors/graphefruit'
-    );
-  }
+  public openGithubSponsor() {}
 
-  public openDonatePage() {
-    this.uiAnalytics.trackEvent(
-      LINK_TRACKING.TITLE,
-      LINK_TRACKING.ACTIONS.BUY_ME_A_COFFEE
-    );
-    this.uiHelper.openExternalWebpage('https://ko-fi.com/beanconqueror');
-  }
+  public openDonatePage() {}
 }

src/app/app.scss

@@ -739,6 +739,7 @@ ion-menu:host .menu-inner {
     font-weight: bold;
   }
 
+
   .button-top-absolute {
     position: absolute;
     top: -20px;
@@ -943,24 +944,27 @@ swiper-container {
   --swiper-scrollbar-drag-bg-color: rgba(var(--ion-text-color-rgb, 0, 0, 0), 0.5);
 }
 
-swiper-slide {
-  display: flex;
-  position: relative;
+swiper-container.swiper {
+  swiper-slide {
+    display: flex;
+    position: relative;
 
-  flex-direction: column;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
+    flex-direction: column;
+    flex-shrink: 0;
+    align-items: center;
+    justify-content: center;
 
-  width: 100%;
-  height: 100%;
+    width: 100%;
+    height: 100%;
 
-  font-size: 18px;
+    font-size: 18px;
 
-  text-align: center;
-  box-sizing: border-box;
+    text-align: center;
+    box-sizing: border-box;
+  }
 }
 
+
 swiper-slide img {
   width: auto;
   max-width: 100%;