@magmamath/students-features 0.5.0-rc.5 → 0.5.0

package/src/features/celebrations/config.ts

@@ -1,10 +1,10 @@
-import StarIcon from '../../shared/icons/Star';
-import HalloweenIcon from '../../shared/icons/Halloween';
-import PiIcon from '../../shared/icons/Pi';
-import WinterIcon from '../../shared/icons/Winter';
-import ValentineIcon from '../../shared/icons/Valentine';
-import { COLORS } from '@magmamath/react-native-ui';
-import { CelebrationVariant } from './types';
+import StarIcon from '../../shared/icons/Star'
+import HalloweenIcon from '../../shared/icons/Halloween'
+import PiIcon from '../../shared/icons/Pi'
+import WinterIcon from '../../shared/icons/Winter'
+import ValentineIcon from '../../shared/icons/Valentine'
+import { COLORS } from '@magmamath/react-native-ui'
+import { CelebrationVariant } from './types'
 
 export const CELEBRATION_ICON_CONFIG = [
   {
@@ -43,7 +43,7 @@ export const CELEBRATION_ICON_CONFIG = [
       end: '07-01',
     },
   },
-];
+]
 
 export const CELEBRATION_VARIANTS = {
   [CelebrationVariant.FIRST_ATTEMPT]: {
@@ -74,7 +74,12 @@ export const CELEBRATION_VARIANTS = {
       from: -0.05,
       to: 0.05,
     },
+    speedRange: {
+      spark: [4, 18],
+      main: [4, 18],
+    },
     life: 65,
+    gravity: 0,
   },
   [CelebrationVariant.CORRECT]: {
     color: COLORS.PRIMARY_YELLOW,
@@ -104,7 +109,12 @@ export const CELEBRATION_VARIANTS = {
       from: -0.05,
       to: 0.05,
     },
+    speedRange: {
+      spark: [4, 18],
+      main: [4, 18],
+    },
     life: 65,
+    gravity: 0,
   },
   [CelebrationVariant.GBD]: {
     color: COLORS.PRIMARY_ORANGE,
@@ -134,7 +144,12 @@ export const CELEBRATION_VARIANTS = {
       from: -0.03,
       to: 0.03,
     },
+    speedRange: {
+      spark: [4, 18],
+      main: [4, 18],
+    },
     life: 120,
+    gravity: 0,
   },
   [CelebrationVariant.GBD_FINISH_ASSIGNMENT]: {
     color: COLORS.PRIMARY_ORANGE,
@@ -151,20 +166,25 @@ export const CELEBRATION_VARIANTS = {
       to: 32,
     },
     angle: {
-      from: 180,
-      to: 360,
+      from: 220,
+      to: 320,
     },
-    velocityMultiplier: 1.8,
+    velocityMultiplier: 2,
     rotation: {
       from: 0,
       to: 10,
     },
     friction: 0.95,
     angularAcceleration: {
-      from: -0.05,
-      to: 0.05,
+      from: -0.02,
+      to: 0.02,
+    },
+    speedRange: {
+      spark: [14, 28],
+      main: [6, 18],
     },
     life: 100,
+    gravity: 0.1,
   },
   [CelebrationVariant.CORRECT_FINISH_ASSIGNMENT]: {
     color: COLORS.PRIMARY_GREEN,
@@ -181,19 +201,24 @@ export const CELEBRATION_VARIANTS = {
       to: 32,
     },
     angle: {
-      from: 180,
-      to: 360,
+      from: 220,
+      to: 320,
     },
-    velocityMultiplier: 1.8,
+    velocityMultiplier: 2,
     rotation: {
       from: 0,
       to: 10,
     },
     friction: 0.95,
     angularAcceleration: {
-      from: -0.05,
-      to: 0.05,
+      from: -0.02,
+      to: 0.02,
+    },
+    speedRange: {
+      spark: [14, 28],
+      main: [6, 18],
     },
     life: 100,
+    gravity: 0.1,
   },
-};
+}

package/src/features/celebrations/helpers.ts

@@ -32,7 +32,8 @@ export const getIconForCurrentDate = () => {
 };
 
 const MainIcon = getIconForCurrentDate();
-export const generateParticle = (variant: CelebrationVariant) => {
+export const generateParticle = (variant: CelebrationVariant
+) => {
   const {
     elementsCount,
     angle,
@@ -43,13 +44,19 @@ export const generateParticle = (variant: CelebrationVariant) => {
     friction,
     life,
     angularAcceleration,
+    speedRange
   } = CELEBRATION_VARIANTS[variant];
 
+  const sparkSpeedMin = speedRange?.spark?.[0]
+  const sparkSpeedMax = speedRange?.spark?.[1]
+  const mainSpeedMin = speedRange?.main?.[0]
+  const mainSpeedMax = speedRange?.main?.[1]
+
   const particles: ParticlesBatch[] = [];
 
   for (let i = 0; i < elementsCount.spark; i++) {
     const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180);
-    const randomSpeed = randomRange(4, 18);
+    const randomSpeed = randomRange(sparkSpeedMin, sparkSpeedMax);
     const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to);
 
     particles.push({
@@ -71,7 +78,7 @@ export const generateParticle = (variant: CelebrationVariant) => {
   }
   for (let i = 0; i < elementsCount.star; i++) {
     const randomAngle = randomRange((angle.from * Math.PI) / 180, (angle.to * Math.PI) / 180);
-    const randomSpeed = randomRange(4, 18);
+    const randomSpeed = randomRange(mainSpeedMin, mainSpeedMax);
     const randomAngularAcceleration = randomRange(angularAcceleration.from, angularAcceleration.to);
 
     particles.push({

package/src/features/chatbot/model/ChatbotApi.ts

@@ -13,19 +13,6 @@ export class ChatbotAPI {
   public readonly spotErrorFx
 
   constructor(api: ChatbotApiRequests) {
-    // this.spotErrorFx = createControllerEffect(
-    //   (props: SpotErrorPayload): Promise<SpotErrorResponse> => {
-    //     return new Promise<SpotErrorResponse>((res) => {
-    //       if (props.strokes.length <= 3) return res({ strokesIds: [] })
-    //       setTimeout(() => {
-    //         const randomStrokes = getRandomElements(props.strokes, 4)
-    //         res({
-    //           strokesIds: randomStrokes.map((stroke) => stroke.id ?? ''),
-    //         })
-    //       }, 1000)
-    //     })
-    //   },
-    // )
     this.spotErrorFx = createControllerEffect(api.spotError)
     this.postMessageFx = createControllerEffect(api.postMessage)
     this.getAlternativesFx = createEffect(api.getAlternatives)

package/src/features/endOfAssignment/components/CorrectAnswer/AnimatedCard.tsx

@@ -64,6 +64,8 @@ export const AnimatedCard = memo(
     const statsOpacity = useSharedValue(OPACITY.initial)
     const delaySv = useSharedValue(0)
 
+    const starOffsetLeft = gbdAmount > 9 ? 70 : 55
+
     const animatedCardStyle = useAnimatedStyle(() => {
       const progress = interpolate(
         statsOpacity.value,
@@ -192,7 +194,7 @@ export const AnimatedCard = memo(
 
             <Animated.View style={[styles.statsWrapper, animatedStatsStyle]}>
               {variant === AnimatedCardVariant.GOOD_DRAWING && (
-                <View style={styles.starContainer}>
+                <View style={[styles.starContainer, { left: starOffsetLeft }]}>
                   <SparkIcon size={20} color={VARIANT_COLORS[variant].initial} />
                   <View style={styles.starCircle} />
                   <SparkIcon size={12} color={VARIANT_COLORS[variant].initial} />
@@ -281,7 +283,6 @@ const styles = StyleSheet.create({
   },
   starContainer: {
     position: 'absolute',
-    left: 55,
     top: 10,
   },
   starCircle: {

package/src/features/endOfAssignment/ui/PracticeButtonGroup.tsx

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react'
 import { StyleSheet } from 'react-native'
-
 import Animated, {
   useSharedValue,
   withDelay,

package/dist/commonjs/lib/helpers/randomElements.js

@@ -1,24 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getRandomElements = getRandomElements;
-function getRandomElements(array, limit = array.length) {
-  if (array.length === 0) {
-    return [];
-  }
-  const randomCount = Math.min(Math.floor(Math.random() * array.length) + 1, limit);
-  const arrayCopy = [...array];
-  const result = [];
-  for (let i = 0; i < randomCount; i++) {
-    if (arrayCopy.length === 0) {
-      break;
-    }
-    const randomIndex = Math.floor(Math.random() * arrayCopy.length);
-    result.push(arrayCopy[randomIndex]);
-    arrayCopy.splice(randomIndex, 1);
-  }
-  return result;
-}
-//# sourceMappingURL=randomElements.js.map

package/dist/commonjs/lib/helpers/randomElements.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["getRandomElements","array","limit","length","randomCount","Math","min","floor","random","arrayCopy","result","i","randomIndex","push","splice"],"sourceRoot":"../../../../src","sources":["lib/helpers/randomElements.ts"],"mappings":";;;;;;AAAO,SAASA,iBAAiBA,CAAIC,KAAU,EAAEC,KAAK,GAAGD,KAAK,CAACE,MAAM,EAAO;EAC1E,IAAIF,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;IACtB,OAAO,EAAE;EACX;EAEA,MAAMC,WAAW,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,KAAK,CAACF,IAAI,CAACG,MAAM,CAAC,CAAC,GAAGP,KAAK,CAACE,MAAM,CAAC,GAAG,CAAC,EAAED,KAAK,CAAC;EAEjF,MAAMO,SAAS,GAAG,CAAC,GAAGR,KAAK,CAAC;EAC5B,MAAMS,MAAW,GAAG,EAAE;EAEtB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,WAAW,EAAEO,CAAC,EAAE,EAAE;IACpC,IAAIF,SAAS,CAACN,MAAM,KAAK,CAAC,EAAE;MAC1B;IACF;IAEA,MAAMS,WAAW,GAAGP,IAAI,CAACE,KAAK,CAACF,IAAI,CAACG,MAAM,CAAC,CAAC,GAAGC,SAAS,CAACN,MAAM,CAAC;IAChEO,MAAM,CAACG,IAAI,CAACJ,SAAS,CAACG,WAAW,CAAC,CAAC;IACnCH,SAAS,CAACK,MAAM,CAACF,WAAW,EAAE,CAAC,CAAC;EAClC;EAEA,OAAOF,MAAM;AACf","ignoreList":[]}

package/dist/module/lib/helpers/randomElements.js

@@ -1,20 +0,0 @@
-"use strict";
-
-export function getRandomElements(array, limit = array.length) {
-  if (array.length === 0) {
-    return [];
-  }
-  const randomCount = Math.min(Math.floor(Math.random() * array.length) + 1, limit);
-  const arrayCopy = [...array];
-  const result = [];
-  for (let i = 0; i < randomCount; i++) {
-    if (arrayCopy.length === 0) {
-      break;
-    }
-    const randomIndex = Math.floor(Math.random() * arrayCopy.length);
-    result.push(arrayCopy[randomIndex]);
-    arrayCopy.splice(randomIndex, 1);
-  }
-  return result;
-}
-//# sourceMappingURL=randomElements.js.map

package/dist/module/lib/helpers/randomElements.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["getRandomElements","array","limit","length","randomCount","Math","min","floor","random","arrayCopy","result","i","randomIndex","push","splice"],"sourceRoot":"../../../../src","sources":["lib/helpers/randomElements.ts"],"mappings":";;AAAA,OAAO,SAASA,iBAAiBA,CAAIC,KAAU,EAAEC,KAAK,GAAGD,KAAK,CAACE,MAAM,EAAO;EAC1E,IAAIF,KAAK,CAACE,MAAM,KAAK,CAAC,EAAE;IACtB,OAAO,EAAE;EACX;EAEA,MAAMC,WAAW,GAAGC,IAAI,CAACC,GAAG,CAACD,IAAI,CAACE,KAAK,CAACF,IAAI,CAACG,MAAM,CAAC,CAAC,GAAGP,KAAK,CAACE,MAAM,CAAC,GAAG,CAAC,EAAED,KAAK,CAAC;EAEjF,MAAMO,SAAS,GAAG,CAAC,GAAGR,KAAK,CAAC;EAC5B,MAAMS,MAAW,GAAG,EAAE;EAEtB,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGP,WAAW,EAAEO,CAAC,EAAE,EAAE;IACpC,IAAIF,SAAS,CAACN,MAAM,KAAK,CAAC,EAAE;MAC1B;IACF;IAEA,MAAMS,WAAW,GAAGP,IAAI,CAACE,KAAK,CAACF,IAAI,CAACG,MAAM,CAAC,CAAC,GAAGC,SAAS,CAACN,MAAM,CAAC;IAChEO,MAAM,CAACG,IAAI,CAACJ,SAAS,CAACG,WAAW,CAAC,CAAC;IACnCH,SAAS,CAACK,MAAM,CAACF,WAAW,EAAE,CAAC,CAAC;EAClC;EAEA,OAAOF,MAAM;AACf","ignoreList":[]}

package/dist/typescript/commonjs/lib/helpers/randomElements.d.ts

@@ -1,2 +0,0 @@
-export declare function getRandomElements<T>(array: T[], limit?: number): T[];
-//# sourceMappingURL=randomElements.d.ts.map

package/dist/typescript/commonjs/lib/helpers/randomElements.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"randomElements.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/randomElements.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,SAAe,GAAG,CAAC,EAAE,CAqB1E"}

package/dist/typescript/module/lib/helpers/randomElements.d.ts

@@ -1,2 +0,0 @@
-export declare function getRandomElements<T>(array: T[], limit?: number): T[];
-//# sourceMappingURL=randomElements.d.ts.map

package/dist/typescript/module/lib/helpers/randomElements.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"randomElements.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/randomElements.ts"],"names":[],"mappings":"AAAA,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,KAAK,SAAe,GAAG,CAAC,EAAE,CAqB1E"}

package/src/lib/helpers/randomElements.ts

@@ -1,22 +0,0 @@
-export function getRandomElements<T>(array: T[], limit = array.length): T[] {
-  if (array.length === 0) {
-    return []
-  }
-
-  const randomCount = Math.min(Math.floor(Math.random() * array.length) + 1, limit)
-
-  const arrayCopy = [...array]
-  const result: T[] = []
-
-  for (let i = 0; i < randomCount; i++) {
-    if (arrayCopy.length === 0) {
-      break
-    }
-
-    const randomIndex = Math.floor(Math.random() * arrayCopy.length)
-    result.push(arrayCopy[randomIndex])
-    arrayCopy.splice(randomIndex, 1)
-  }
-
-  return result
-}