Merge pull request #771 from ChildMindInstitute/hotfix/2.0.1-to-dev-sync

Hotfix/2.0.1
ChildMindInstitute · May 16, 2024 · 36bd954 · 36bd954
2 parents a93ec5a + a80cafe
commit 36bd954
Show file tree

Hide file tree

Showing 28 changed files with 219 additions and 87 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -100,10 +100,13 @@ android {
         applicationId "lab.childmindinstitute.data"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1559
-        versionName "2.0.0"
+        versionCode 1563
+        versionName "2.0.1"
         resValue "string", "app_name", "Mindlogger"
         resValue "string", "build_config_package", "lab.childmindinstitute.data"
+        manifestPlaceholders = [
+            max_sdk_version: rootProject.ext.targetSdkVersion
+        ]
     }
     signingConfigs {
         debug {

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -1,4 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -7,7 +9,10 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />
-    <uses-permission android:minSdkVersion="34" android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission
+      android:name="android.permission.SCHEDULE_EXACT_ALARM"
+      android:maxSdkVersion="${max_sdk_version}"
+      tools:replace="android:maxSdkVersion" />
 
     <application
       android:name=".MainApplication"

diff --git a/ios/MindloggerMobile.xcodeproj/project.pbxproj b/ios/MindloggerMobile.xcodeproj/project.pbxproj
@@ -1643,7 +1643,7 @@
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -1655,7 +1655,7 @@
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1674,15 +1674,15 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				INFOPLIST_FILE = MindloggerMobileTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 12.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"-ObjC",
 					"-lc++",
@@ -1704,7 +1704,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				ENABLE_BITCODE = NO;
@@ -1715,7 +1715,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1745,7 +1745,7 @@
 				CODE_SIGN_ENTITLEMENTS = MindloggerMobile/MindloggerMobileRelease.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				INFOPLIST_FILE = MindloggerMobile/Info.plist;
@@ -1755,7 +1755,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1955,7 +1955,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				ENABLE_BITCODE = NO;
@@ -1966,7 +1966,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1995,7 +1995,7 @@
 				CODE_SIGN_ENTITLEMENTS = MindloggerMobileDevRelease.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				INFOPLIST_FILE = "MindloggerMobile dev-Info.plist";
@@ -2005,7 +2005,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2034,7 +2034,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				ENABLE_BITCODE = NO;
@@ -2045,7 +2045,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2075,7 +2075,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				INFOPLIST_FILE = "MindloggerMobile qa-Info.plist";
@@ -2085,7 +2085,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2112,7 +2112,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = MindloggerMobileStagingDebug.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				ENABLE_BITCODE = NO;
@@ -2123,7 +2123,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2152,7 +2152,7 @@
 				CODE_SIGN_ENTITLEMENTS = MindloggerMobileStagingRelease.entitlements;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				INFOPLIST_FILE = "MindloggerMobile staging-Info.plist";
@@ -2162,7 +2162,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2191,7 +2191,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				ENABLE_BITCODE = NO;
@@ -2202,7 +2202,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2232,7 +2232,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1559;
+				CURRENT_PROJECT_VERSION = 1563;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 8RHKE85KB6;
 				INFOPLIST_FILE = "MindloggerMobile uat-Info.plist";
@@ -2242,7 +2242,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.0.0;
+				MARKETING_VERSION = 2.0.1;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1263,7 +1263,7 @@ PODS:
     - ZIPFoundation
   - RNAudioRecorderPlayer (3.6.7):
     - React-Core
-  - RNBackgroundFetch (4.2.4):
+  - RNBackgroundFetch (4.2.5):
     - React-Core
   - RNCAsyncStorage (1.23.1):
     - React-Core
@@ -1639,7 +1639,7 @@ SPEC CHECKSUMS:
   boost: d3f49c53809116a5d38da093a8aa78bf551aed09
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   CocoaLumberjack: f8d89a516e7710fdb2e9b8f1560b16ec6040eef0
-  DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
+  DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
   FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7
   FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697
   Firebase: 63ce8ece0d43743dc28eacac0c6867a2d7fd5a9d
@@ -1659,7 +1659,7 @@ SPEC CHECKSUMS:
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
-  glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
+  glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
   GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
   GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
   hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2
@@ -1727,7 +1727,7 @@ SPEC CHECKSUMS:
   ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522
   ReactNativeFileAccess: 83cf2b8f9092123989feb8cb54c385670895eb3d
   RNAudioRecorderPlayer: 9b34adc281800e5b19258f1b91d889b1ef3abdd6
-  RNBackgroundFetch: 7c2d0c55e2b8924ecbdcd56b010feddff0f8463d
+  RNBackgroundFetch: 2f800a04434620db15ede2e8f21886608a2d1743
   RNCAsyncStorage: 826b603ae9c0f88b5ac4e956801f755109fa4d5c
   RNCCheckbox: a3ca9978cb0846b981d28da4e9914bd437403d77
   RNDateTimePicker: 08f00a2c341bf96e4b30da15799fbdd4c5fa48a3

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mindlogger-mobile",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": true,
   "scripts": {
     "android": "yarn android:dev",
@@ -89,7 +89,7 @@
     "react-native": "0.73.4",
     "react-native-audio-recorder-player": "^3.6.5",
     "react-native-autoheight-webview": "^1.6.5",
-    "react-native-background-fetch": "^4.2.1",
+    "react-native-background-fetch": "^4.2.5",
     "react-native-config": "^1.5.1",
     "react-native-device-info": "^10.12.0",
     "react-native-file-access": "^3.0.4",

diff --git a/src/app/model/migrations/MigrationProcessor.ts b/src/app/model/migrations/MigrationProcessor.ts
@@ -102,7 +102,7 @@ export class MigrationProcessor {
     }
 
     if (inboundVersion > currentVersion) {
-      Logger.warn('[MigrationRunner]: Downgrading version is not supported');
+      Logger.info('[MigrationRunner]: Downgrading version is not supported');
       return;
     }
 

diff --git a/src/entities/activity/lib/types/activity.ts b/src/entities/activity/lib/types/activity.ts
@@ -38,6 +38,7 @@ export type StabilityTrackerConfig = {
 type DrawingTestTestConfig = {
   imageUrl: string | null;
   backgroundImageUrl: string | null;
+  proportionEnabled: boolean;
 };
 
 type TextInputConfig = {

diff --git a/src/entities/activity/model/mappers.input.mock.ts b/src/entities/activity/model/mappers.input.mock.ts
@@ -470,7 +470,11 @@ export const drawingInput: ActivityDto = {
       question:
         "\r\n\r\n![''](https://mindlogger-applet-contents.s3.amazonaws.com/image/pbcpVTjSUKGybNARUBapMB.png =250x250)\r\n\r\ndrawing",
       responseType: 'drawing',
-      responseValues: { drawingExample: null, drawingBackground: null },
+      responseValues: {
+        drawingExample: null,
+        drawingBackground: null,
+        proportion: { enabled: false },
+      },
       config: {
         removeBackButton: false,
         skippableItem: false,

diff --git a/src/entities/activity/model/mappers.output.mock.ts b/src/entities/activity/model/mappers.output.mock.ts
@@ -561,6 +561,7 @@ export const drawingOutput: ActivityDetails = {
       config: {
         backgroundImageUrl: null,
         imageUrl: null,
+        proportionEnabled: false,
       },
       hasAlert: false,
       hasScore: false,

diff --git a/src/entities/activity/model/mappers.ts b/src/entities/activity/model/mappers.ts
@@ -87,6 +87,7 @@ function mapToDrawing(dto: DrawingItemDto): ActivityItem {
     config: {
       imageUrl: dto.responseValues.drawingExample,
       backgroundImageUrl: dto.responseValues.drawingBackground,
+      proportionEnabled: !!dto.responseValues.proportion?.enabled,
     },
     timer: mapTimerValue(dto.config.timer),
     order: dto.order,

diff --git a/src/entities/drawer/lib/utils/constants.ts b/src/entities/drawer/lib/utils/constants.ts
@@ -1,4 +1,5 @@
 export const RECT_PADDING = 15;
+export const HEIGHT_REDUCTION_FACTOR = 0.85;
 export const CANVAS_HEIGHT_FACTOR = 0.62;
 export const EXAMPLE_HEIGHT_FACTOR = 0.38;
 export const ELEMENTS_GAP = 20;
diff --git a/src/entities/drawer/lib/utils/helpers.ts b/src/entities/drawer/lib/utils/helpers.ts
@@ -1,4 +1,4 @@
-import { ImageDimensions } from '@app/shared/lib';
+import { Dimensions, ImageDimensions } from '@app/shared/lib';
 
 import {
   CANVAS_HEIGHT_FACTOR,
@@ -25,11 +25,6 @@ export const getChunkedPointsAsStrings = (lines: DrawLine[]) => {
   return results;
 };
 
-export type Dimensions = {
-  width: number;
-  height: number;
-};
-
 const getCanvasSize = (
   itemDimensions: Dimensions,
   hasExampleImage: boolean,
-Original file line number
+Diff line change
@@ Expand Up / @@ -102,7 +102,7 @@ export class MigrationProcessor { @@
         }
         if (inboundVersion > currentVersion) {
-          Logger.warn('[MigrationRunner]: Downgrading version is not supported');
+          Logger.info('[MigrationRunner]: Downgrading version is not supported');
           return;
         }
@@ Expand Down @@