Merge branch 'feature-dialog_devel' into 'feature-dialog'

Feature dialog devel

See merge request !27

.gitignore

@@ -64,3 +64,6 @@ build/
 
 ## OS Specific
 .DS_Store
+
+## iOS
+ios/robovm.properties

android/AndroidManifest.xml

@@ -16,7 +16,7 @@
         <activity
             android:name="cz.nic.tablexia.android.AndroidLauncher"
             android:label="@string/app_name" 
-            android:screenOrientation="landscape"
+            android:screenOrientation="sensorLandscape"
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

android/assets/text/application/application_cs.properties

@@ -9,10 +9,18 @@ mainmenu_encyclopedia=Encyklopedie
 mainmenu_preferences=Nastavení
 mainmenu_about=O aplikaci
 mainmenu_logout=Odhlásit
+mainmenu_screendebug=Debug Screen
+
+gamedifficulty_easy=Lehká
+gamedifficulty_medium=Střední
+gamedifficulty_hard=Těžká
+
+victoryscreen_button_replay=Hrát znovu
+victoryscreen_button_changegame=Jinou hru
 
 game_robbery_title=Lupiči
 game_kidnapping_title=Únos
 game_pursuit_title=Pronásledování
 game_night_watch_title=Hlídka
 game_shooting_range_title=Střelnice
-game_in_the_darkness_title=Potmě
\ No newline at end of file
+game_in_the_darkness_title=Potmě

android/assets/text/application/application_sk.properties

@@ -9,6 +9,14 @@ mainmenu_encyclopedia=Encyklopédia
 mainmenu_preferences=Nastavenie
 mainmenu_about=O aplikácií
 mainmenu_logout=Odhlásiť
+mainmenu_screendebug=Debug Screen
+
+gamedifficulty_easy=Ľahká
+gamedifficulty_medium=Stredná
+gamedifficulty_hard=Ťažká
+
+victoryscreen_button_replay=Hráť znovu
+victoryscreen_button_changegame=Inú hru
 
 game_robbery_title=Lupiči
 game_kidnapping_title=Únos

android/build.gradle

 android {
     buildToolsVersion "21.1.2"
     compileSdkVersion 21
+
+    buildTypes {
+        debug {
+            applicationIdSuffix rootProject.applicationIdDebugSuffix
+        }
+        release {
+            debuggable false
+        }
+        devel.initWith(buildTypes.debug)
+        devel {
+            applicationIdSuffix rootProject.applicationIdDevelSuffix
+        }
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
@@ -16,29 +30,27 @@ android {
         debug {
             res.srcDirs = ['res/debug']
         }
+        devel {
+            res.srcDirs = ['res/devel']
+        }
 
         instrumentTest.setRoot('tests')
     }
 
     defaultConfig {
-        versionName version
-        versionCode getVersionCodeFromGit()
+        versionName tablexiaVersionName
+        versionCode tablexiaVersionCode
         applicationId rootProject.applicationIdRelease
     }
 
-    buildTypes {
-        debug {
-            applicationIdSuffix rootProject.applicationIdDebugSuffix
-        }
-        release {
-            debuggable false
-        }
-    }
+    assemble.dependsOn = ['assembleRelease', 'assembleDebug']
 
     applicationVariants.all { variant ->
-        variant.outputs.each { output ->
-            def file = output.outputFile
-            output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + defaultConfig.versionName + ".apk").replace("android", appName))
+        if (!variant.buildType.name.equals("devel")) {
+            variant.outputs.each { output ->
+                def file = output.outputFile
+                output.outputFile = new File(file.parent, file.name.replace(".apk", "-" + tablexiaVersionName + ".apk").replace("android", appName))
+            }
         }
     }
 
@@ -59,15 +71,10 @@ android {
             }
         }
     }
-}
-
-def getVersionCodeFromGit() {
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine 'git', 'log', '-1', '--format=%at'
-        standardOutput = stdout
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_6
+        targetCompatibility JavaVersion.VERSION_1_6
     }
-    return stdout.toString().trim().toInteger()
 }
 
 // needed to add JNI shared libraries to APK when compiling on CLI

android/src/cz/nic/tablexia/android/AndroidLauncher.java

@@ -13,6 +13,6 @@ public class AndroidLauncher extends AndroidApplication {
 	protected void onCreate (Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
-		initialize(new Tablexia(BuildConfig.DEBUG, getResources().getConfiguration().locale, BuildConfig.VERSION_NAME, BuildConfig.APPLICATION_ID), config);
+        initialize(new Tablexia(BuildConfig.BUILD_TYPE, getResources().getConfiguration().locale, BuildConfig.VERSION_NAME, savedInstanceState == null), config);
 	}
 }

build.gradle

@@ -6,7 +6,7 @@ buildscript {
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
         classpath 'com.android.tools.build:gradle:1.0.0'
-        classpath 'org.robovm:robovm-gradle-plugin:1.0.0-beta-01'
+        classpath 'org.robovm:robovm-gradle-plugin:1.0.0'
     }
 }
 
@@ -15,16 +15,21 @@ allprojects {
     apply plugin: "idea"
 
     version = getVersionNameFromGit()
-    project.extensions.add("applicationIdRelease", "cz.nic.tablexia")
-    project.extensions.add("applicationIdDebugSuffix", ".debug")
-    project.extensions.add("applicationIdDebug", applicationIdRelease + applicationIdDebugSuffix)
 
     ext {
         appName = 'Tablexia'
-        gdxVersion = '1.5.2'
+        tablexiaVersionName = getVersionNameFromGit()
+        tablexiaVersionCode = getVersionCodeFromGit()
+        applicationIdRelease = 'cz.nic.tablexia'
+        applicationIdDebugSuffix = '.debug'
+        applicationIdDebug = applicationIdRelease + applicationIdDebugSuffix
+        applicationIdDevelSuffix = '.devel'
+        applicationIdDevel = applicationIdRelease + applicationIdDevelSuffix
+
+        gdxVersion = '1.5.5'
 		gdxUtilsVersion = '0.9.1'
 	    mbassadorVersion = '1.2.0'
-        roboVMVersion = '1.0.0-beta-01'
+        roboVMVersion = '1.0.0'
         box2DLightsVersion = '1.3'
         ashleyVersion = '1.3.1'
         aiVersion = '1.4.0'
@@ -46,6 +51,15 @@ def getVersionNameFromGit() {
     return stdout.toString().trim()
 }
 
+def getVersionCodeFromGit() {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'log', '-1', '--format=%at'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim().toInteger()
+}
+
 task zipAssets(type:Zip) {
 
 	new File(project(":core").projectDir.absolutePath + "/assets").eachDir() { dir ->