Merge pull request #38 from ZendyLim/fearue/fukusshuAndHL4

New Seperate Flash card
ZendyLim · May 22, 2018 · 5cc84cf · 5cc84cf
2 parents cf7a0d2 + 0b32e00
commit 5cc84cf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/app/config/localization.js b/app/config/localization.js
@@ -43,6 +43,9 @@ export let strings = new LocalizedStrings({
    GOI_LIST : "VOCABULARY LIST",
    BUNPO_LIST : "GRAMMAR LIST",
    KANJI_LIST : "KANJI LIST",
+   FLASH_CARD_HIRAGANA: "FLASH CARD HIRAGANA",
+   FLASH_CARD_KATAKANA: "FLASH CARD KATAKANA",
+
  },
  ja: {
    loginGuest: "japan",
@@ -82,5 +85,8 @@ export let strings = new LocalizedStrings({
    GOI_LIST : "VOCABULARY LIST",
    BUNPO_LIST : "GRAMMAR LIST",
    KANJI_LIST : "KANJI LIST",   
-}
+   FLASH_CARD_HIRAGANA: "FLASH CARD HIRAGANA",
+   FLASH_CARD_KATAKANA: "FLASH CARD KATAKANA",
+
+  }
 });
diff --git a/app/config/router.js b/app/config/router.js
@@ -77,7 +77,7 @@ const SettingStack = StackNavigator({
 
 export const AppStack = TabNavigator({ 
     Home: {
-        screen: example, 
+        screen: HomeScreen, 
         navigationOptions: { 
             tabBarLabel: () => {
                 return <Icon name="home"  type='font-awesome' size={25} color={"white"} />;

diff --git a/app/config/studyList.js b/app/config/studyList.js
@@ -136,7 +136,11 @@ export const StudyList = [{
       type : 'HL2',
       study : '1'
     },{
-      title : 'FLASH_CARD',
+      title : 'FLASH_CARD_HIRAGANA',
+      type : 'HL3',
+      study : '1'
+    },{
+      title : 'FLASH_CARD_KATAKANA',
       type : 'HL3',
       study : '1'
     },{
@@ -177,7 +181,7 @@ export const StudyList = [{
     title : 'GOI_LIST',
     type : 'GL1',
     study : '4'
-  },,{
+  },{
     title : 'FLASH_CARD',
     type : 'GL3',
     study : '4'

diff --git a/app/screens/Learn/LearnModule.js b/app/screens/Learn/LearnModule.js
@@ -62,9 +62,16 @@ class LearnHiraganaModule extends Component {
                 <HL2Screen />        
             );        
         }else if(this.state.type == 'HL3' || this.state.type == 'GL3'  || this.state.type == 'KL3' || this.state.type == 'BL3' ){
-            return (
-                <LearningModule title={ this.state.studyType }/>     
-            );        
+            if(this.state.title == "FLASH_CARD_HIRAGANA" || this.state.title == 'FLASH_CARD_HIRAGANA'){
+                return (
+                    <LearningModule title={ this.state.title }/>     
+                );        
+                }else{
+                return (
+                    <LearningModule title={ this.state.studyType }/>     
+                );        
+
+            }
         }else if(this.state.type == 'HL4'){
             return (
                 <Text>HL4</Text>