Merge branch 'master' into stable-1.0

Author: anntr

App.js

@@ -1,16 +1,17 @@
-import React from 'react';
+import React from 'react'
 import Game from "./app/containers/Game"
-import {StackNavigator} from "react-navigation";
-import {Text, View} from "react-native";
-import _ from "lodash";
+import {StackNavigator} from "react-navigation"
+import {Text, View, PermissionsAndroid} from "react-native"
+import _ from "lodash"
 import {AdamConfig, defaultConfig, FrycekConfig, FrycekTestConfig, KacperConfig} from "./TEMP_CONFIGS"
-import MainScreen from "./app/containers/MainScreen";
-import {readActiveConfig, readConfigs} from "./app/services/db/configs";
-import {ModeTypes} from "./app/services/db/format";
-import ConfigProvider from "./app/containers/ConfigProvider";
-import ConfigConsumer from "./app/containers/ConfigConsumer";
+import MainScreen from "./app/containers/MainScreen"
+import {readActiveConfig, readConfigs} from "./app/services/db/configs"
+import {ModeTypes} from "./app/services/db/format"
+import ConfigProvider from "./app/containers/ConfigProvider"
+import ConfigConsumer from "./app/containers/ConfigConsumer"
 import Analytics from "appcenter-analytics"
-import SplashScreen from "./app/containers/SplashScreen";
+import SplashScreen from "./app/containers/SplashScreen"
+import ErrorScreen from "./app/containers/ErrorScreen"
 
 const configFromDbToGameScreen = (config) => ({
     ...config,
@@ -21,7 +22,7 @@ const configFromDbToGameScreen = (config) => ({
         isInTestMode: material.isInTestMode,
         isInLearningMode: material.isInLearningMode,
     })),
-});
+})
 
 function prepareLevels(materials, repetitions, optionsNumber) {
     let levels = _.shuffle(_.flatMap(materials, material =>
@@ -30,10 +31,10 @@ function prepareLevels(materials, repetitions, optionsNumber) {
                 name: material.name,
                 images: material.images,
                 isCorrectAnswer: true
-            })))));
+            })))))
 
-    levels = _.map(levels, level => _.map(level, material => ({...material, image: _.sample(material.images)})));
-    return _(levels);
+    levels = _.map(levels, level => _.map(level, material => ({...material, image: _.sample(material.images)})))
+    return _(levels)
 }
 
 const GameScreen = ({navigation}) => {
@@ -43,7 +44,7 @@ const GameScreen = ({navigation}) => {
                 const isTestMode = mode === ModeTypes.test
 
                 const materials = isTestMode ? _.filter(config.materials, 'isInTestMode') : config.materials,
-                    repetitions = isTestMode ? config.testConfig.numberOfRepetitions : config.numberOfRepetitions;
+                    repetitions = isTestMode ? config.testConfig.numberOfRepetitions : config.numberOfRepetitions
 
                 return <Game
                     levels={prepareLevels(materials, repetitions, config.picturesNumber)}
@@ -61,7 +62,7 @@ const GameScreen = ({navigation}) => {
             }
         </ConfigConsumer>
     )
-};
+}
 
 
 const AppNavigator = StackNavigator(
@@ -73,21 +74,21 @@ const AppNavigator = StackNavigator(
     {
         headerMode: "none",
         initialRouteName: "Splash"
-    });
+    })
 
 
 export default class App extends React.Component {
     state = {
         fontLoaded: false,
-    };
+    }
 
     async loadConfig() {
         const {id, mode = ModeTypes.learning} = await readActiveConfig()
         console.log("Active config id: ", id, "in mode:", mode === ModeTypes.learning ? "learning" : "test")
 
         const configs = await readConfigs()
 
-        const activeConfig = configs.find(config => config.id === id) || defaultConfig;
+        const activeConfig = configs.find(config => config.id === id) || defaultConfig
 
         console.log("Active config:", activeConfig)
         return {
@@ -103,23 +104,54 @@ export default class App extends React.Component {
         console.log("Loaded all assets")
     }
 
+    async requestExternalStoragePermission() {
+        try {
+            const granted = await PermissionsAndroid.request(
+                PermissionsAndroid.PERMISSIONS.WRITE_EXTERNAL_STORAGE,
+                {
+                    'title': 'Przyjazne Słowa - uprawnienia do zapisu',
+                    'message': "Aplikacja Przyjazne Słowa wymaga uprawnień do zapisu danych w pamięci urządzenia, aby móc komunikować się z aplikacją Przyjazne Słowa - Menadżer"
+                }
+            )
+            if (granted === PermissionsAndroid.RESULTS.GRANTED) {
+                console.log("You can use the camera")
+                return true;
+            } else {
+                console.log("Camera permission denied")
+                return false;
+            }
+        } catch (err) {
+            console.warn(err)
+            return false;
+        }
+    }
+
     async componentDidMount() {
-        Analytics.trackEvent("App loaded");
+        Analytics.trackEvent("App loaded")
+        const hasPermissions = await this.requestExternalStoragePermission();
+
+        if(!hasPermissions) {
+            this.setState({noPermissions: true})
+            return;
+        }
 
-        await this.loadAssets();
-        const {config, mode} = await this.loadConfig();
+        await this.loadAssets()
+        const {config, mode} = await this.loadConfig()
         this.setState({
             assetsLoaded: true,
             config: configFromDbToGameScreen(config),
             mode
-        });
+        })
     }
 
     render() {
+        if(this.state.noPermissions) {
+            return <ErrorScreen/>
+        }
         return !this.state.assetsLoaded ? <Text>Loading</Text> : (
             <ConfigProvider config={this.state.config} mode={this.state.mode}>
                 <AppNavigator/>
             </ConfigProvider>
-        );
+        )
     }
 }

app/containers/ErrorScreen.js

@@ -0,0 +1,19 @@
+import React from 'react'
+import {Button, StatusBar, TouchableOpacity, Linking} from 'react-native'
+import {Layout} from "./Game"
+import {View} from "glamorous-native"
+import CapriolaText from "../components/ui/CapriolaText"
+
+export default ErrorScreen = () =>
+    <Layout>
+        <View flex={1} alignItems={"center"} justifyContent={"space-around"}>
+            <CapriolaText>Nie można wczytać pliku z konfiguracją - brak uprawnień do zapisu pliku.</CapriolaText>
+            <CapriolaText>Uruchom ponownie aplikację i zaakceptuj prośbę o uzyskanie uprawnień.</CapriolaText>
+            <CapriolaText>W razie problemów skontaktuj się z nami:</CapriolaText>
+            <TouchableOpacity
+                onPress={() => Linking.openURL('mailto:autyzmpg@gmail.com?subject=Uprawnienia+do+zapisu')}>
+                <CapriolaText>autyzmpg@gmail.com</CapriolaText>
+            </TouchableOpacity>
+
+        </View>
+    </Layout>