From 81792f410f14da1ac6965e91f0a37ddc909761e9 Mon Sep 17 00:00:00 2001 From: "Deepak.Nair" <35517589+deepaknair-chimple@users.noreply.github.com> Date: Mon, 26 Feb 2018 02:09:28 -0800 Subject: [PATCH 1/3] correction in code --- app/components/games/TapWrongGridComponent.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/games/TapWrongGridComponent.js b/app/components/games/TapWrongGridComponent.js index 4a5ae03..214085a 100644 --- a/app/components/games/TapWrongGridComponent.js +++ b/app/components/games/TapWrongGridComponent.js @@ -30,7 +30,7 @@ export default class TapWrongGridComponent extends Component { // Randomizing array for (let w = 0; w < this.props.data.others.length; w++) { - randNum = Math.floor(Math.random() * (arr3.length+ this.props.data.others.length-1)) + 0; + randNum = Math.floor(Math.random() * (arr3.length)) + 0; console.log("random num", randNum); temp = arr3[randNum]; arr3[randNum] = this.props.data.others[w]; From 196a64b2d664874a6a51ae3bc00fde2d33a10fe9 Mon Sep 17 00:00:00 2001 From: "Deepak.Nair" <35517589+deepaknair-chimple@users.noreply.github.com> Date: Mon, 26 Feb 2018 21:54:14 -0800 Subject: [PATCH 2/3] animation --- app/components/__tests__/TapWrong-test.js | 4 ++- app/components/games/TapWrongGridComponent.js | 27 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/app/components/__tests__/TapWrong-test.js b/app/components/__tests__/TapWrong-test.js index 887f940..0959af7 100644 --- a/app/components/__tests__/TapWrong-test.js +++ b/app/components/__tests__/TapWrong-test.js @@ -18,7 +18,9 @@ it('renders correctly', () => { width: window.width, height: window.height }} - + onScore={()=>{}} + setProgress={()=>{}} + onEnd={()=>{}} /> diff --git a/app/components/games/TapWrongGridComponent.js b/app/components/games/TapWrongGridComponent.js index 214085a..0931629 100644 --- a/app/components/games/TapWrongGridComponent.js +++ b/app/components/games/TapWrongGridComponent.js @@ -63,7 +63,7 @@ export default class TapWrongGridComponent extends Component { onButtonPress = (id, view) => { - + // this.refs.view1.wobble(1000); let j = 0; let proArray = []; @@ -91,7 +91,9 @@ export default class TapWrongGridComponent extends Component { this.props.onScore(2); this.props.setProgress(this.state.num / this.props.data.others.length); if (this.state.numOFWrongElem == this.props.data.others.length) { - setTimeout( () => { this.props.onEnd();},100) + this.refs.view1.zoomIn(1000); + this.setState({statuses: this.state.statuses.map(()=>'selected')}) + setTimeout( () => { this.props.onEnd();},1500) } } else { @@ -102,25 +104,30 @@ export default class TapWrongGridComponent extends Component { render() { return ( + + + ); } From 5fa49ba82367af2e0df5072f0d39fe8c5fdb1941 Mon Sep 17 00:00:00 2001 From: "Deepak.Nair" <35517589+deepaknair-chimple@users.noreply.github.com> Date: Thu, 1 Mar 2018 02:03:36 -0800 Subject: [PATCH 3/3] modification --- app/components/games/TapWrongGridComponent.js | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/app/components/games/TapWrongGridComponent.js b/app/components/games/TapWrongGridComponent.js index ba9ba99..3f0197f 100644 --- a/app/components/games/TapWrongGridComponent.js +++ b/app/components/games/TapWrongGridComponent.js @@ -14,11 +14,11 @@ export default class TapWrongGridComponent extends Component { _initBoard = (props) => { - let arr4 = []; + let arr2 = []; let num = 0; let statuses = []; let numOFWrongElem=0; - let arr3 = this.props.data.word.map(function (element, i) { + let arr1 = this.props.data.word.map(function (element, i) { return element; }); @@ -26,30 +26,30 @@ export default class TapWrongGridComponent extends Component { var randNum = 0; var temp = 0; var temp1 = 0; - let lenOfArr3=arr3.length; + let lenOfArr1=arr1.length; // Randomizing array for (let w = 0; w < this.props.data.others.length; w++) { - randNum = Math.floor(Math.random() * (arr3.length)) + 0; + randNum = Math.floor(Math.random() * (arr1.length)) + 0; console.log("random num", randNum); - temp = arr3[randNum]; - arr3[randNum] = this.props.data.others[w]; - for (let q = randNum; q < (lenOfArr3 +( this.props.data.others.length-1)); q++) { - temp1 = arr3[q + 1]; - arr3[q + 1] = temp; + temp = arr1[randNum]; + arr1[randNum] = this.props.data.others[w]; + for (let q = randNum; q < (lenOfArr1 +( this.props.data.others.length-1)); q++) { + temp1 = arr1[q + 1]; + arr1[q + 1] = temp; temp = temp1; - console.log("arr3[q],arr2[w]", arr3[q], this.props.data.others[w]); + console.log("arr1[q],arr2[w]", arr1[q], this.props.data.others[w]); } } - for (let l = 0; l < arr3.length; l++) { + for (let l = 0; l < arr1.length; l++) { statuses[l] = 'neutral'; } return ({ - arr3, + arr1, statuses, - arr4, + arr2, num, numOFWrongElem }) @@ -67,8 +67,8 @@ export default class TapWrongGridComponent extends Component { let j = 0; let proArray = []; - for (let i = 0; i < this.state.arr3.length; i++) { - proArray[i] = this.state.arr3[i]; + for (let i = 0; i < this.state.arr1.length; i++) { + proArray[i] = this.state.arr1[i]; } proArray=proArray.filter((val,index) => index!=id) @@ -87,12 +87,13 @@ export default class TapWrongGridComponent extends Component { this.state.num++; this.state.numOFWrongElem++; - this.setState( {...this.state,arr3:this.state.arr3.filter((val,index)=> index!=id)}) + this.setState( {...this.state,arr1:this.state.arr1.filter((val,index)=> index!=id)}) this.props.onScore(2); this.props.setProgress(this.state.num / this.props.data.others.length); if (this.state.numOFWrongElem == this.props.data.others.length) { - this.refs.view1.zoomIn(1000); + this.setState({statuses: this.state.statuses.map(()=>'selected')}) + this.refs.view1.zoomIn(1000); setTimeout( () => { this.props.onEnd();},1500) } @@ -109,9 +110,9 @@ export default class TapWrongGridComponent extends Component {