diff --git a/app/config/localization.js b/app/config/localization.js
index 0245b29..d3d1e01 100644
--- a/app/config/localization.js
+++ b/app/config/localization.js
@@ -14,6 +14,8 @@ export let strings = new LocalizedStrings({
next_topic : "Next Topic",
TOPIC_LIST : "Topic List",
HIRAGANA_TITLE: "Hiragana & Katakana",
+ HIRAGANA_LIST_TITLE: 'Hiragana',
+ KATAKANA_LIST_TITLE: 'Katakana',
NUMBER_TITLE : "Number",
GREETING_TITLE : "Greeting",
TOPIC1_TITLE : "Myself",
@@ -94,6 +96,8 @@ export let strings = new LocalizedStrings({
next_topic : "次のトピック",
TOPIC_LIST : "トピック一覧",
HIRAGANA_TITLE: "ひらがなとカタカナ",
+ HIRAGANA_LIST_TITLE: 'ひらがな',
+ KATAKANA_LIST_TITLE: 'カタカナ',
NUMBER_TITLE : "数字",
GREETING_TITLE : "あいさつ",
TOPIC1_TITLE : "自分",
diff --git a/app/config/router.js b/app/config/router.js
index 64fd20a..447223b 100644
--- a/app/config/router.js
+++ b/app/config/router.js
@@ -180,13 +180,13 @@ export const HiraganaLearnStack = TabNavigator({
Hiragana: {
screen: HiraganaLearnScreen,
navigationOptions: {
- tabBarLabel: 'Hiragana',
+ // tabBarLabel: 'Hiragana',
}
},
Katakana: {
screen: KatakanaLearnScreen,
navigationOptions: {
- tabBarLabel: 'Katakana',
+ // tabBarLabel: 'Katakana',
}
},
},
diff --git a/app/screens/Learn/LearnModule.js b/app/screens/Learn/LearnModule.js
index c5bc41a..9a35db4 100644
--- a/app/screens/Learn/LearnModule.js
+++ b/app/screens/Learn/LearnModule.js
@@ -33,8 +33,12 @@ class LearnHiraganaModule extends Component {
constructor(props) {
super(props);
}
- static navigationOptions = {
- title: 'Learn',
+ static navigationOptions = ({ navigation }) => {
+ // title: 'Learn',
+ const {state} = navigation;
+ return {
+ title: `${strings[state.params.studyType]}`,
+ };
swipeEnabled: false
};
state = {
@@ -86,7 +90,7 @@ class LearnHiraganaModule extends Component {
if(this.state.type == 'HL1'){
if(this.state.studyType == 'HIRAGANA_TITLE'){
return (
-
+
);
}else if(this.state.studyType == 'NUMBER_TITLE'){
return (
diff --git a/app/screens/learn/hiraganalearn.js b/app/screens/learn/hiraganalearn.js
index 680572f..a358f51 100644
--- a/app/screens/learn/hiraganalearn.js
+++ b/app/screens/learn/hiraganalearn.js
@@ -13,12 +13,11 @@ import {
Platform,
} from 'react-native';
import { List, ListItem, Icon } from 'react-native-elements';
-
+ import { strings } from '../../config/localization';
import { TabNavigator, StackNavigator } from 'react-navigation';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
import { HiraganaLearnStack } from '../../config/router';
- // import { hiraganalearn } from '../../config/hiraganalearn'
import { hiraganaList, katakanaList } from '../../config/data'
import * as Actions from '../../actions/user'; //Import your actions
@@ -79,11 +78,13 @@ function playSound(testInfo, component) {
export class HiraganaLearnScreen extends Component {
- static navigationOptions = {
- // header: null,
- // title: 'LearnHL1',
- tabBarLabel: 'Hiragana',
+ static navigationOptions = ({ navigation }) => {
+ const {state} = navigation;
+ return {
+ title: `${strings['HIRAGANA_LIST_TITLE']}`,
};
+ swipeEnabled: false
+ };
constructor(props) {
super(props);
diff --git a/app/screens/learn/katakanalearn.js b/app/screens/learn/katakanalearn.js
index c8167cd..23b8b94 100644
--- a/app/screens/learn/katakanalearn.js
+++ b/app/screens/learn/katakanalearn.js
@@ -21,6 +21,7 @@ import {
import { connect } from 'react-redux';
import { HiraganaLearnStack } from '../../config/router';
import { katakanaList } from '../../config/data'
+ import { strings } from '../../config/localization';
import * as Actions from '../../actions/user'; //Import your actions
var Sound = require('react-native-sound');
@@ -80,10 +81,12 @@ function playSound(testInfo, component) {
export class KatakanaLearnScreen extends Component {
- static navigationOptions = {
- // header: null,
- // title: 'LearnHL1',
- tabBarLabel: 'Hiragana',
+ static navigationOptions = ({ navigation }) => {
+ const {state} = navigation;
+ return {
+ title: `${strings['KATAKANA_LIST_TITLE']}`,
+ };
+ swipeEnabled: false
};
constructor(props) {
diff --git a/app/screens/learn/learnhl1.js b/app/screens/learn/learnhl1.js
index efe81ad..0cabc8d 100644
--- a/app/screens/learn/learnhl1.js
+++ b/app/screens/learn/learnhl1.js
@@ -26,6 +26,7 @@ import {
headerTitleStyle: {
fontSize: 20,
},
+ title: 'Test',
};