Merge branch 'master' into stable-1.0

Author: anntr

App.js

@@ -91,7 +91,7 @@ export default class App extends React.Component {
 
         console.log("Active config:", activeConfig)
         return {
-            config: activeConfig.config,
+            config: {...activeConfig.config, name: activeConfig.name},
             mode: mode,
         }
     }

TEMP_CONFIGS.js

@@ -22,13 +22,14 @@ const CONFIG2 = {
 
     hintType: ["fade"],
     picturesNumber: 3,
-    isTextForPicture: false,
+    isTextForPicture: false, //nie ma, jest showPicturesLabels
     isReadingCommands: true,
     showHintAfter: 10,
     commandText: "Where is {slowo}?",
     numberOfRepetitions: 2,
     textRewards: ["Good", "Keep going!", "Yes"],
     isReadingRewards: false,
+    name:"config2"
 };
 
 let TTStest = {
@@ -60,6 +61,7 @@ let TTStest = {
     numberOfRepetitions: 3,
     textRewards: ["Good", "Super", "Keep going"],
     isReadingRewards: true,
+    name:"TTStest"
 };
 
 let TextUnderCardsTest = {
@@ -87,6 +89,7 @@ let TextUnderCardsTest = {
     numberOfRepetitions: 3,
     textRewards: ["Good!"],
     isReadingRewards: false,
+    name:"TextUnderCardsTest"
 };
 
 let ManyRepetitionsTest = {
@@ -114,6 +117,7 @@ let ManyRepetitionsTest = {
     numberOfRepetitions: 10,
     textRewards: ["Good job!"],
     isReadingRewards: false,
+    name:"ManyRepetitionsTest"
 };
 
 let CheckWordLearningTest = {
@@ -141,6 +145,7 @@ let CheckWordLearningTest = {
     numberOfRepetitions: 3,
     textRewards: ["Good"],
     isReadingRewards: true,
+    name:"CheckWordLearningTest"
 };
 
 const defaultConfig = {
@@ -258,6 +263,7 @@ const defaultConfig = {
         "showPicturesLabels": true,
         "isReadingCommands": false,
         "showHintAfter": 5,
+        "name":"defaultConfig",
         "numberOfRepetitions": 3,
         "textRewards": [
             "ŚWIETNIE",

app/components/ui/Header.js

@@ -7,5 +7,5 @@ export const Subheader = glamorous(CapriolaText)({fontSize: moderateScale(20)});
 
 export const Header = glamorous(CapriolaText)({fontSize: moderateScale(26)});
 Header.propsAreTextOverrides = true;
-
 export const JumboHeader = glamorous(CapriolaText)({fontSize: moderateScale(30)});
+export const Configurationheader = glamorous(CapriolaText)({fontSize: moderateScale(11), opacity: 0.5});

app/containers/MainScreen.js

@@ -2,13 +2,18 @@ import React from 'react';
 import {Button, StatusBar} from 'react-native';
 import {Layout} from "./Game";
 import {PlayButton} from '../components/ui/borderedButton/BorderedButton';
-import {JumboHeader} from "../components/ui/Header";
+import {JumboHeader, Configurationheader} from "../components/ui/Header";
 import {View} from "glamorous-native";
+import ConfigConsumer from "./ConfigConsumer";
+import Game from "./Game";
 
 export default MainScreen = ({navigation}) =>
 	<Layout>
 		<View flex={1} alignItems={"center"} justifyContent={"space-around"}>
         	<JumboHeader>Przyjazne Słowa</JumboHeader>
+            <ConfigConsumer>
+                {(config) =>  <Configurationheader>{`Aktywna konfiguracja: ${config.name}`}</Configurationheader>}
+            </ConfigConsumer>
 			<PlayButton onPress={() => navigation.navigate("Game")}/>
 		</View>
 	</Layout>