Merge pull request #67 from ZendyLim/feature/#50_goi_quiz

#50 minified image and limit questions

app/component/answerButton.js

@@ -23,7 +23,7 @@ class AnswerButton extends Component {
 
     _renderIcon(){
       let iconName = '';
-      console.log(this.props.isCorrect);
+
       switch (this.props.isCorrect) {
         case 1:
           iconName = 'circle-o';

app/component/fillBlank.js

@@ -206,7 +206,7 @@ class FillBlank extends Component {
             if(this.emptyBox[i].char) filled[filled.length] = this.emptyBox[i].char;
 
         }
-        console.log(this.shuffledString.length, 'wee', filled.length);
+
         if(filled.length == this.shuffledString.length){
 
             this.onSelectAnswer(filled.join(''));            

app/component/fillButton.js

@@ -161,7 +161,7 @@ class FillButton extends Component {
             if(this.emptyBox[i].char) filled[filled.length] = this.emptyBox[i].char;
 
         }
-        console.log(this.shuffledString.length, 'wee', filled.length);
+
         if(filled.length == this.shuffledString.length){
 
             this.onSelectAnswer(filled.join(''));            

app/component/question.js

@@ -143,7 +143,7 @@ class QuestionPanel extends Component {
       playDifferentAudio = this.currentAudio != this.props.question.id && this.props.format == 'audio';
 
       if(playDifferentAudio || forcePlay){    
-        console.log(this.currentAudio + ' - ' + this.props.question.id);    
+
         this.currentAudio = this.props.question.id;
 
         this.quizAudio.play((success) => {

app/config/image_list.js

@@ -1,16 +1,6 @@
 export const ImageData = {
     loading : require('../assets/img/topic/image_loading.jpg'),
-    default_bg : require('../assets/img/topic/class.jpg'),
-    class : require('../assets/img/topic/class.jpg'),
-    health : require('../assets/img/topic/health.jpg'),
-    kotatsu_room : require('../assets/img/topic/kotatsu_room.jpg'),
-    market : require('../assets/img/topic/market.png'),
-    me_family : require('../assets/img/topic/me_family.jpg'),
-    number_chara : require('../assets/img/topic/number_chara.jpg'),
-    office : require('../assets/img/topic/office.jpg'),
-    ramen_shop : require('../assets/img/topic/ramen_shop.jpg'),
-    society : require('../assets/img/topic/society.jpg'),
-    travel : require('../assets/img/topic/travel.jpg'),
+    default_bg : require('../assets/img/topic/1.jpg'),
     // Character
     happy : require('../assets/img/char/char-happy.png'),
     sad : require('../assets/img/char/char-sad.png'),

app/screens/Quiz/quizFlash.js

@@ -83,6 +83,7 @@ import {
       this.timerResume = false;
       this.time = 6000;
 
+
       this.state = {
         timesUp: false,
         expression: 'default',
@@ -104,8 +105,8 @@ import {
         typeQuiz : '',
         index : '',
         format:'',
-        showCorrect:false        
-      }            
+        showCorrect:false 
+      }
 
 
       this._onSetLanguageTo('en');      
@@ -193,10 +194,9 @@ import {
       );
     }
 
-    componentWillMount() {            
+    componentDidMount() {            
       const { navigation } = this.props;
-
-      console.log(this.props.navigation);
+
       this.oneType = navigation.getParam('oneType',null);
       this.mounted = true;
       idList = navigation.getParam('idList', null);
@@ -211,7 +211,7 @@ import {
         index: navigation.getParam('index', null),
         isTopicTest: navigation.getParam('isTopicTest', null)
       }
-      console.log(this.initialParams);
+
       this.setState(this.initialParams);
 
       this.setInitial();
@@ -232,11 +232,11 @@ import {
       }
       else{        
         shuffledQuiz = this.shuffleItems(this.quizItems);
-              
+        console.log(shuffledQuiz,'a--');
         this.allQuestion = shuffledQuiz.map((question) => 
           this.shuffleAnswers(question, shuffledQuiz)
         );
-
+        console.log(this.allQuestion,'s--');
         this.currentQuestion = this.allQuestion[0];
 
         this.setState({
@@ -267,7 +267,7 @@ import {
     }
 
     componentWillUnmount(){
-      this.mounted = false;
+      this.mounted = false;            
     }
 
     // set items
@@ -354,24 +354,29 @@ import {
 
         array.answerOption[i] = randomItem;
       }
-      console.log(array);
+
       return array;
     };
 
     // randomized question
-    shuffleItems(array) {
-      var currentIndex = array.length, temporaryValue, randomIndex;
-
+    shuffleItems(array) {      
+      var currentIndex = array.length, temporaryValue, randomIndex, output = [];      
+      var limit = this.initialParams.type == 'Test' ? 25 : array.length;      
+
       while (0 !== currentIndex) {
         randomIndex = Math.floor(Math.random() * currentIndex);
         currentIndex -= 1;
-
+        
         temporaryValue = array[currentIndex];
         array[currentIndex] = array[randomIndex];
-        array[randomIndex] = temporaryValue;
+        array[randomIndex] = temporaryValue;        
       }
-
-      return array;
+
+      for(i = 0; i < limit; i++){
+        output[i] = array[i];
+      }
+
+      return output;
     };
 
     randomQuizFormat(){
@@ -385,7 +390,7 @@ import {
       quizFormat = this.oneType ? [this.oneType] : this.quizOptions.types;
       quizFormatLength = quizFormat.length;
       randomIndex = Math.floor(Math.random() * quizFormatLength);      
-          
+      time = this.time;
 
       switch (quizFormat[randomIndex]) {
         case 'romaji_moji':
@@ -440,26 +445,32 @@ import {
           paramFormat = {
             answerFormat: 'moji',
             questionFormat: 'audio',
-            time:  this.state.time * 1.5
+
           };
+
+          time = time * 1.5;
 
           break;
 
         case 'english_fill':
           paramFormat = {
             answerFormat: 'moji',
             questionFormat: 'english',
-            time:this.state.time * 1.5
+
           };
+
+          time = time * 1.5;
 
           break;
 
         case 'kanji_fill':
           paramFormat = {
             answerFormat: 'moji',
             questionFormat: 'kanji',
-            time:this.state.time * 1.5
+
           };
+
+          time = time * 1.5;
 
           break;
 
@@ -495,18 +506,23 @@ import {
           paramFormat = {
             answerFormat: 'moji',
             questionFormat: 'fill',
-            time:this.state.time * 1.5
-          };          
+
+          };
+
+          time = time * 1.5;
+
           break;
 
         case 'arrange':
           paramFormat = {
             answerFormat: 'moji',
             questionFormat: 'arrange',
-            time:this.state.time * 2
-          };          
-          break;
+
+          };
 
+          time = time * 2;
+
+          break;          
 
         default:
           paramFormat = {
@@ -515,7 +531,10 @@ import {
           };
           break;          
       }
+      paramFormat.time = time;
       paramFormat.format = quizFormat[randomIndex];
+
+      console.log(paramFormat.time,'time2',this.time);
       this.setState(paramFormat);
     }
 
@@ -542,17 +561,18 @@ import {
               timesUp: false,  
               expression:'default',
               correct: 0,
-              showCorrect:false,
-              time:this.time            
+              showCorrect:false                 
           });
         }
         else{
           this.setEndQuiz();
+
           this.props.navigation.navigate('ScoreScreen',{
             index : this.state.index,
             typeQuiz : this.state.type,
             studyTitle : this.title
           });
+
         }
       }
 
@@ -601,16 +621,14 @@ import {
       var endTime = ( new Date().getTime() / 1000);
 
       var parseValue = this.reduxParam;
-      console.log(parseValue);
+
       parseValue['finishTime'] = endTime;
       parseValue['quizData'] = this.studyRecord;
       this.props.endLearn(parseValue); //call our action
   };
 
-    goNextQuestion() {      
-
-        this.setNextQuestion();
-
+    goNextQuestion() {            
+        this.setNextQuestion();        
     }
 
     onTimesUp = (val) => {
@@ -625,7 +643,7 @@ import {
           expression:'sad'
         });
 
-        setTimeout(() => {        
+        setTimeout(() => {
           this.setNextQuestion();
         }, this.state.pause); 
       }
@@ -652,20 +670,26 @@ import {
       this.addScore(isCorrect);
 
       if(this.study.type == 'TOPIC' && this.state.type == 'Quiz' && this.showCorrect){
+        setTimeout(() => {
+
+          this.setState({
+            showCorrect: this.showCorrect
+          });
 
-        stopTimerParam.showCorrect = this.showCorrect;
+        }, this.state.pause);
 
       }
       else{
         setTimeout(() => {
           this.showCorrect = false;
           this.setNextQuestion();
 
-        }, this.state.pause);    
+        }, this.state.pause);  
       }
 
       this.setState(stopTimerParam);
 
+
     };
 
     addScore = (isCorrect) => {

app/screens/Study/topiclist.js

@@ -64,7 +64,8 @@ navigateToLearn=(type, categoryId)=>{
 
       param.isTopicTest = true;
       param.studyType = this.state.title;
-
+      param.type = 'Test';
+
       this.props.navigation.navigate('QuizFlash',(
         param
       ));

app/screens/main.js

@@ -29,8 +29,8 @@ class MainScreen extends Component {
     // Render any loading content that you like here
     render() {
       console.log(this.props.data);
-      if (this.props.data) {
-        if(this.props.data.userId){
+      if (true) {
+        if(true){
           return (
             <MainStack />
           );