Merge pull request #2882 from ChildMindInstitute/bugfixes_alekseyn_4_1

Bugfixes alekseyn 4 1
ChildMindInstitute · Nov 9, 2022 · 459f1fe · 459f1fe
2 parents ab74ea7 + 4036cf9
commit 459f1fe
Show file tree

Hide file tree

Showing 15 changed files with 156 additions and 101 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.21.59] - 2022-10-31
+- Bugfixes: 2842 (fix for iOS), 2834, 1064 
+
 ## [0.21.52] - 2022-09-15
 - Bugfixes: 2842, 2822, 2867
 

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# MindLogger 0.21.57
+# MindLogger 0.21.59
 
 _Note: v0.1 is deprecated as of June 12, 2019._
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -130,8 +130,8 @@ android {
         applicationId "lab.childmindinstitute.data"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 610
-        versionName "0.21.57"
+        versionCode 614
+        versionName "0.21.59"
         missingDimensionStrategy 'react-native-camera', 'general'
         multiDexEnabled true
     }

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,4 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+def REACT_NATIVE_VERSION = new File(['node', '--print',"JSON.parse(require('fs').readFileSync(require.resolve('react-native/package.json'), 'utf-8')).version"].execute(null, rootDir).text.trim())
+
 
 buildscript {
     ext {
@@ -22,6 +24,12 @@ buildscript {
 }
 
 allprojects {
+    configurations.all {
+          resolutionStrategy {
+              // Remove this override in 0.65+, as a proper fix is included in react-native itself.
+              force "com.facebook.react:react-native:" + REACT_NATIVE_VERSION
+          }
+    }
     repositories {
         mavenLocal()
         maven {

diff --git a/app/components/ActivityScreens.js b/app/components/ActivityScreens.js
@@ -26,22 +26,49 @@ class ActivityScreens extends React.PureComponent {
     const activity = this.props.activity;
 
     for (let i = 0; i < activity.items.length; i++) {
-      if (activity.items[i].inputType == 'visual-stimulus-response' && !activeScreens.includes(i)) {
+      if (
+        activity.items[i].inputType == "visual-stimulus-response" &&
+        !activeScreens.includes(i)
+      ) {
         activeScreens.unshift(i);
       }
     }
-
     return activeScreens;
   }
 
+  defineFlankerPosition() {
+    const activity = this.props.activity;
+    const currentScreen = this.props.currentScreen;
+
+    const flankerIndexes = [];
+
+    for (let i = 0; i < activity.items.length; i++) {
+      if (activity.items[i].inputType == "visual-stimulus-response") {
+        flankerIndexes.push(i);
+      }
+    }
+
+    if (!flankerIndexes.length) {
+      return null;
+    }
+
+    return {
+      isFirst: currentScreen === flankerIndexes[0],
+      isLast: currentScreen === flankerIndexes.pop(),
+    };
+  }
+
   componentDidUpdate(oldProps) {
     if (oldProps.currentScreen !== this.props.currentScreen) {
       // eslint-disable-next-line
       const activeScreens = [oldProps.currentScreen, this.props.currentScreen];
 
       this.setState({
         activeScreens: this.preLoadFlanker(activeScreens),
-        direction: calcPosition(oldProps.currentScreen, this.props.currentScreen),
+        direction: calcPosition(
+          oldProps.currentScreen,
+          this.props.currentScreen
+        ),
       });
     }
   }
@@ -58,15 +85,20 @@ class ActivityScreens extends React.PureComponent {
     } = this.props;
     const { activeScreens, direction } = this.state;
 
+    const flankerPosition = this.defineFlankerPosition()
+
     return (
-      <View onTouchStart={this.props.onAnyTouch} style={{ flex: 1, width: '100%', position: 'relative' }}>
-        {activeScreens.map(index => (
+      <View
+        onTouchStart={this.props.onAnyTouch}
+        style={{ flex: 1, width: "100%", position: "relative" }}
+      >
+        {activeScreens.map((index) => (
           <SlideInView
             key={`${activity.id}-screen-${index}`}
             style={{
-              position: 'absolute',
-              height: '100%',
-              width: '100%',
+              position: "absolute",
+              height: "100%",
+              width: "100%",
             }}
             position={calcPosition(currentScreen, index)}
             slideInFrom={direction}
@@ -82,6 +114,7 @@ class ActivityScreens extends React.PureComponent {
               currentScreen={currentScreen}
               isCurrent={index === currentScreen}
               onContentError={onContentError}
+              flankerPosition={flankerPosition}
             />
           </SlideInView>
         ))}

diff --git a/app/components/screen/Widget.js b/app/components/screen/Widget.js
@@ -55,6 +55,7 @@ const Widget = ({
   onContentError,
   appletTokenBalance,
   handleReplaceBehaviourResponse,
+  flankerPosition
 }) => {
   const valueType = R.path(['valueConstraints', 'valueType'], screen);
 
@@ -273,6 +274,7 @@ const Widget = ({
         config={screen.inputs}
         appletId={applet.id}
         isCurrent={isCurrent}
+        flankerPosition={flankerPosition}
       />
     );
   }

diff --git a/app/components/screen/index.js b/app/components/screen/index.js
@@ -338,8 +338,24 @@ class ActivityScreen extends Component {
   }
 
   render() {
-    const { activity, screen, answer, isCurrent, onContentError, currentScreen, lastResponseTime, profiles, answers } = this.props;
-    const { orientation, scrollEnabled, inputDelayed, timerActive } = this.state;
+    const {
+      activity,
+      screen,
+      answer,
+      isCurrent,
+      onContentError,
+      currentScreen,
+      lastResponseTime,
+      profiles,
+      answers,
+      flankerPosition,
+    } = this.props;
+    const {
+      orientation,
+      scrollEnabled,
+      inputDelayed,
+      timerActive,
+    } = this.state;
 
     return (
       <View
@@ -399,6 +415,7 @@ class ActivityScreen extends Component {
                       this.setState({ scrollEnabled: true });
                     }}
                     handleReplaceBehaviourResponse={this.handleReplaceBehaviourResponse.bind(this)}
+                    flankerPosition={flankerPosition}
                   />
                 </View>
               </View>
@@ -417,6 +434,7 @@ class ActivityScreen extends Component {
                 }}
                 onContentError={onContentError}
                 handleReplaceBehaviourResponse={this.handleReplaceBehaviourResponse.bind(this)}
+                flankerPosition={flankerPosition}
               />
             )}
           </ScrollView>

diff --git a/app/services/scoring.js b/app/services/scoring.js
@@ -153,6 +153,8 @@ export const getScoreFromLookupTable = (
   for (let i = 0; i < responses.length; i++) {
     if (responses[i]) {
       scores.push(getScoreFromResponse(items[i], responses[i].value));
+    } else {
+      scores.push(0);
     }
   }
 

diff --git a/app/widgets/VisualStimulusResponse/index.js b/app/widgets/VisualStimulusResponse/index.js
@@ -61,7 +61,7 @@ const getTrials = (stimulusScreens, blocks, buttons, samplingMethod) => {
   return trials;
 }
 
-export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId }) => {
+export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId, flankerPosition }) => {
   const [loading, setLoading] = useState(true);
   const [scriptInjected, setScriptInjected] = useState(false);
   const [responses, setResponses] = useState([]);
@@ -71,8 +71,9 @@ export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId }
     const dataString = result.nativeEvent.data;
     const dataObject = JSON.parse(dataString);
     const dataType = result.nativeEvent.type;
-    if (dataObject.trial_index > configObj.trials.length) return ;
-    console.log(parseResponse(dataObject))
+
+    if (dataObject.trial_index > configObj.trials.length) return
+
     if (dataType == 'response') {
       setResponses(responses.concat([dataObject]));
 
@@ -139,12 +140,24 @@ export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId }
     if(!isCurrent || Platform.OS !== 'ios') {
       return;
     }
-    NativeModules.FlankerViewManager.parameterGameType(config.blockType == "test" ? 1 : 0, JSON.stringify(configObj));
-    NativeModules.FlankerViewManager.parameterGame(true, configObj.trials.length, 0);
+
+    // todo - review how to avoid setTimeout. Currently it's needed because of
+    // race condition: FlankerView.swift may be created later than startGame
+    setTimeout(() => {
+      NativeModules.FlankerViewManager.setGameParameters(JSON.stringify(configObj))
+      NativeModules.FlankerViewManager.startGame(flankerPosition.isFirst, flankerPosition.isLast)
+    }, 600)
   }, [isCurrent])
 
   useEffect(() => {
-    if(!isCurrent || Platform.OS !== 'android') {
+    if(Platform.OS !== 'ios') {
+      return;
+    }
+    NativeModules.FlankerViewManager.preloadGameImages(JSON.stringify(configObj))
+  })
+
+  useEffect(() => {
+    if(!isCurrent || Platform.OS !== 'android') { 
       return;
     }
     if(!loading && !scriptInjected) {
@@ -166,6 +179,18 @@ export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId }
     response_touch_timestamp: Platform.OS === 'ios' ? record.response_touch_timestamp : (record.rt ? record.start_timestamp + record.rt : null)
   })
 
+  if (!isCurrent) {
+    return (
+      <View
+        style={{
+          height: '100%',
+          position: 'relative',
+        }}
+      >
+        <Text>DEBUG: Is not current</Text>
+      </View>)
+  }
+
   if (Platform.OS === 'ios') {
     return (
       <View
@@ -194,8 +219,8 @@ export const VisualStimulusResponse = ({ onChange, config, isCurrent, appletId }
             position: 'absolute',
             alignItems: 'center',
             justifyContent: 'center' }}
-            onEndGame={onEndGame}
-            dataJson ={JSON.stringify(configObj)}
+
+        onEndGame = { onEndGame }
       />
       </View>
       </View>

diff --git a/ios/MDCApp.xcodeproj/project.pbxproj b/ios/MDCApp.xcodeproj/project.pbxproj
@@ -830,14 +830,14 @@
 				CODE_SIGN_ENTITLEMENTS = MDCApp/MDCApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 610;
+				CURRENT_PROJECT_VERSION = 614;
 				DEAD_CODE_STRIPPING = NO;
 				DEVELOPMENT_TEAM = 8RHKE85KB6;
 				ENABLE_TESTABILITY = YES;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = MDCApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.21.57;
+				MARKETING_VERSION = 0.21.59;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -863,12 +863,12 @@
 				CODE_SIGN_ENTITLEMENTS = MDCApp/MDCApp.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 610;
+				CURRENT_PROJECT_VERSION = 614;
 				DEVELOPMENT_TEAM = 8RHKE85KB6;
 				GCC_NO_COMMON_BLOCKS = YES;
 				INFOPLIST_FILE = MDCApp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 0.21.57;
+				MARKETING_VERSION = 0.21.59;
 				ONLY_ACTIVE_ARCH = NO;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

diff --git a/ios/MDCApp/Flanker/FlankerView.swift b/ios/MDCApp/Flanker/FlankerView.swift
@@ -175,6 +175,12 @@ class FlankerView: UIView {
     super.init(coder: coder)
   }
 
+
+  override func removeFromSuperview() {
+    self.gameManager.clearData()
+    super.removeFromSuperview()
+  }
+
   func parameterGame() {
     DispatchQueue.main.async {
       self.finishView.isHidden = true

diff --git a/ios/MDCApp/Flanker/FlankerViewManager.m b/ios/MDCApp/Flanker/FlankerViewManager.m
@@ -9,8 +9,9 @@
 #import "React/RCTViewManager.h"
 
 @interface RCT_EXTERN_MODULE(RCTFlankerViewManager, RCTViewManager)
-RCT_EXTERN_METHOD(parameterGameType:(int *)blockType json:(NSString *)json)
-RCT_EXTERN_METHOD(parameterGame:(BOOL *)isShowAnswers countGame:(int *)countGame index:(int*)index)
+RCT_EXTERN_METHOD(setGameParameters:(NSString *)json)
+RCT_EXTERN_METHOD(preloadGameImages:(NSString *)json)
+RCT_EXTERN_METHOD(startGame:(BOOL *)isFirst isLast:(BOOL *)isLast)
 RCT_EXPORT_VIEW_PROPERTY(onEndGame, RCTBubblingEventBlock)
 RCT_EXPORT_VIEW_PROPERTY(dataJson, NSString)
 RCT_EXPORT_VIEW_PROPERTY(onUpdate, RCTDirectEventBlock)