#971 Fixing keyboard resize for API 35.

Ignoring first 6 seconds on a shot run for the baristamode for sanremo

Author: graphefruit

android/app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.beanconqueror.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 80400
-        versionName "8.4.0"
+        versionCode 80401
+        versionName "8.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

capacitor.config.ts

@@ -1,5 +1,6 @@
 import type { CapacitorConfig } from '@capacitor/cli';
 import { argv, env } from 'process';
+import { KeyboardResize } from '@capacitor/keyboard';
 
 type Platform = 'android' | 'ios';
 const PlatformOverrideEnvVariable = 'CAPACITOR_PLATFORM_OVERRIDE';
@@ -99,6 +100,10 @@ const createConfig = () => {
       // to the __baristaDB on Android when updating from Cordova builds
       config.server.hostname = 'beanconqueror.com';
       config.server.androidScheme = 'https';
+      config.plugins.Keyboard = {
+        resize: KeyboardResize.Native,
+        resizeOnFullScreen: true,
+      };
       break;
     case 'ios':
       // Using this hostname and scheme is required to retain access

ios/App/App.xcodeproj/project.pbxproj

@@ -348,6 +348,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 3;
 				DEVELOPMENT_TEAM = W8B7XY7WGY;
@@ -356,10 +357,11 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 8.4.0;
+				MARKETING_VERSION = 8.4.1;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = com.beanconqueror.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -372,6 +374,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W8B7XY7WGY;
@@ -380,9 +383,10 @@
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.food-and-drink";
 				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 8.4.0;
+				MARKETING_VERSION = 8.4.1;
 				PRODUCT_BUNDLE_IDENTIFIER = com.beanconqueror.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

src/components/brews/brew-brewing-graph/brew-brewing-graph.component.ts

@@ -2623,6 +2623,19 @@ export class BrewBrewingGraphComponent implements OnInit {
       _scaleChange.notMutatedWeight,
       1,
     );
+
+    if (this.baristamode && this.brewComponent.timer.getSeconds() <= 6) {
+      /**Maybe the barista put on a new cup, which means the weight was before -XXX grams, and it may jump to like 5 grams then
+       * this means we would regarding the rising factor never work correctly, so we ignore the first 6 seconds in barista mode and then we start**/
+
+      return {
+        actual: weight,
+        old: oldWeight,
+        smoothed: smoothedWeight,
+        oldSmoothed: oldSmoothedWeight,
+        notMutatedWeight: notMutatedWeight,
+      };
+    }
     const isEspresso = _styleType === PREPARATION_STYLE_TYPE.ESPRESSO;
     const scaleType = this.bleManager.getScale()?.getScaleType();
     //Yeay yeay yeay, sometimes the lunar scale is reporting wrongly cause of closed api, therefore try to tackle this issues down with the lunar