Merge branch 'develop' for version 0.1.3

DATA_PRIVACY_STATEMENT

@@ -0,0 +1,9 @@
+# Data Privacy Statement (English)
+
+This app does not collect any user data.
+Nor does it share any user information with any third party.
+
+# Datenschutzerklärung (Deutsch)
+
+Diese App sammelt keinerlei Nutzerdaten.
+Außerdem werden keine Informationen über Benutzer an Dritte weitergegeben.

README.md

@@ -0,0 +1,32 @@
+# X Party Game App
+This is a react native app for the x-party-game
+The android app is currently in closed alpha, get in touch if you are interested to try it.
+
+# License
+ - The source code of this app is available under [MIT License](LICENSE).
+ - Third party libraries are included via yarn (or npm) and have their own licenses.
+ - The [included font file](android/app/src/main/assets/font/FontAwesome.otf) from [fontawesome](http://fontawesome.io) 4.7.0 is available under
+[SIL OFL 1.1](http://scripts.sil.org/OFL)
+
+# Data privacy statement (Datenschutzerklärung)
+Please see the [DATA_PRIVACY_STATEMENT file](DATA_PRIVACY_STATEMENT).
+This file has not been checked by a lawyer.
+
+# Changes
+## 0.1.3 <2017-04-28>
+ - Fix skip game bug (#2)
+ - Add icons (fontawesome)
+ - More preliminary games
+## 0.1.2 <2017-04-27>
+ - Add games
+ - Improve layout (incl color scheme)
+ - Enhance game properties
+## 0.1.1 <2017-04-27>
+ - Remove LAN games
+## 0.1.0 <2017-04-27>
+ - Initial release
+ - Two play styles (classic, club mode)
+ - Match Settings (number of rounds, score counting, games)
+ - Player and Teamselection screens
+ - Read games from json
+ - I18n (German, English)

android/app/BUCK

@@ -46,13 +46,13 @@ android_library(
 
 android_build_config(
   name = 'build_config',
-  package = 'com.xmobile',
+  package = 'org.iimog.xmobile',
 )
 
 android_resource(
   name = 'res',
   res = 'src/main/res',
-  package = 'com.xmobile',
+  package = 'org.iimog.xmobile',
 )
 
 android_binary(

android/app/build.gradle

@@ -87,15 +87,25 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.xmobile"
+        applicationId "org.iimog.xmobile"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        versionCode 4
+        versionName "0.1.3"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }
     }
+    signingConfigs {
+        release {
+            if (project.hasProperty('X_RELEASE_STORE_FILE')) {
+                storeFile file(X_RELEASE_STORE_FILE)
+                storePassword X_RELEASE_STORE_PASSWORD
+                keyAlias X_RELEASE_KEY_ALIAS
+                keyPassword X_RELEASE_KEY_PASSWORD
+            }
+        }
+    }
     splits {
         abi {
             reset()
@@ -108,6 +118,7 @@ android {
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
+            signingConfig signingConfigs.release
         }
     }
     // applicationVariants are e.g. debug, release

android/app/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.xmobile"
+    package="org.iimog.xmobile"
     android:versionCode="1"
     android:versionName="1.0">
 

android/app/src/main/java/com/xmobile/MainActivity.java → android/app/src/main/java/org/iimog/xmobile/MainActivity.java

@@ -1,4 +1,4 @@
-package com.xmobile;
+package org.iimog.xmobile;
 
 import com.facebook.react.ReactActivity;
 

android/app/src/main/java/com/xmobile/MainApplication.java → android/app/src/main/java/org/iimog/xmobile/MainApplication.java

@@ -1,4 +1,4 @@
-package com.xmobile;
+package org.iimog.xmobile;
 
 import android.app.Application;
 

app/components/Button/Button.js

@@ -6,12 +6,17 @@ import {
   Text
 } from 'react-native';
 import styles from './styles';
+import FontAwesome, { Icons } from 'react-native-fontawesome'
 
 export default class Button extends Component {
   render() {
+    let icon: ?FontAwesome = null
+    if(this.props.icon !== null){
+      icon = <FontAwesome>{Icons[this.props.icon]}</FontAwesome>
+    }
     return (
       <TouchableHighlight onPress={this.props.onPress} style={styles.button}>
-        <Text style={styles.text}>{this.props.text}</Text>
+        <Text style={styles.text}>{icon}{this.props.text}</Text>
       </TouchableHighlight>
     );
   }

app/components/ProgressBoard/ProgressBoard.js

@@ -7,11 +7,12 @@ import {
   StyleSheet,
 } from 'react-native';
 import styles from './styles'
+import globalStyle from '../../config/styles'
 
 function Tile(props: {num: number, winner: ?number}){
   let backgroundColor: string = 'transparent'
   if(typeof props.winner === 'number'){
-    backgroundColor = ['skyblue', 'red'][props.winner]
+    backgroundColor = globalStyle.teamColors[props.winner]
   }
   return(
     <View style={StyleSheet.flatten([styles.scoreBoardNumberContainer,{backgroundColor: backgroundColor}])}>

app/config/styles.js

@@ -0,0 +1,5 @@
+const style = {
+  teamColors: ['#447684', '#734C8F']
+}
+
+export default style

app/games/gameTemplate.json

@@ -0,0 +1,16 @@
+{
+  "iimog/TODO": {
+    "name": "TODO",
+    "instructions": "TODO",
+    "bestOf": 5,
+    "activePlayers": 1,
+    "tiePossible": false,
+    "randomStarter": false,
+    "translations": {
+      "de": {
+        "name": "TODO",
+        "instructions": "TODO"
+      }
+    }
+  }
+}