0.3.0 release prepare

CHANGELOG.md

@@ -1,10 +1,15 @@
 # Changelog
 
-## 0.3.0 (unreleased, 2019-09-20?)
-- UI rework (WIP)
+## 0.3.1 (unreleased, planned 2019-12-25)
 - New localisations: Polish (WIP), French (WIP)
 - Online mode preview (not yet started)
 
+## 0.3.0 (2019-12-15)
+- Bug fixes
+- New portrait orientation layout (useful for phones)
+- Some UI reworks (changed main font)
+- Localisation fixes
+
 ## 0.2.9 (2019-08-17)
 - New deck
 - New localisations: German

android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="ru.hyst329.openfool"
-    android:versionCode="29"
-    android:versionName="0.2.9" >
+    android:versionCode="30"
+    android:versionName="0.3.0" >
 
     <application
         android:allowBackup="true"

android/assets/i18n/OpenFool.properties

@@ -46,8 +46,9 @@ DefeatHeader=Defeat :(
 DefeatText=You lost the game.
 DrawHeader=It's a draw.
 DrawText=Friendship won!
-PlayerPlace={0} took place {1}
+PlayerPlace={0} took {1,choice,1#1st|2#2nd|3#3rd|3<{1,number,integer}th} place
 DeckCardsCount=Number of cards:
 PassingGame=Allow passing
 LanguageGerman=German
 CardsPeoples=Peoples of the USSR
+PortraitOrientation=Portrait screen orientation

android/assets/i18n/OpenFool_cs.properties

@@ -50,4 +50,5 @@ PlayerPlace={0} obsadil(a) {1}. místo
 DeckCardsCount=Počet karet:
 PassingGame=Přenosná hrá
 LanguageGerman=Německý
-CardsPeoples=Národy SSSR
+CardsPeoples=Národy SSSR
+PortraitOrientation=Orientace obrazovky na výšku

android/assets/i18n/OpenFool_de.properties

@@ -46,8 +46,9 @@ DefeatHeader=Niederlage :(
 DefeatText=Sie haben die Partie verloren.
 DrawHeader=Remis.
 DrawText=Die Freundschaft hat gewonnen!
-PlayerPlace={0}
+PlayerPlace={0} hat den {1}. Platz genommen
 PassingGame=Schieben
 DeckCardsCount=Anzahl der Karten:
 LanguageGerman=Deutsch
-CardsPeoples=Völker der UdSSR
+CardsPeoples=Völker der UdSSR
+PortraitOrientation=Bildschirm-Hochformat

android/assets/i18n/OpenFool_en.properties

@@ -46,8 +46,9 @@ DrawHeader=It's a draw.
 VictoryText=You won the game!
 DefeatText=You lost the game.
 DrawText=Friendship won!
-PlayerPlace={0} took place {1}
+PlayerPlace={0} took {1,choice,1#1st|2#2nd|3#3rd|3<{1,number,integer}th} place
 DeckCardsCount=Number of cards:
 PassingGame=Allow passing
 LanguageGerman=German
-CardsPeoples=Peoples of the USSR
+CardsPeoples=Peoples of the USSR
+PortraitOrientation=Portrait screen orientation

android/assets/i18n/OpenFool_ru.properties

@@ -50,4 +50,5 @@ PlayerPlace={0} занял(а) {1}-е место
 DeckCardsCount=Количество карт:
 PassingGame=Переводной
 LanguageGerman=Немецкий
-CardsPeoples=Народности СССР
+CardsPeoples=Народности СССР
+PortraitOrientation=Вертикальная ориентация экрана

android/build.gradle

@@ -21,6 +21,7 @@ android {
         applicationId "ru.hyst329.openfool"
         minSdkVersion 14
         targetSdkVersion 28
+        multiDexEnabled true
     }
     productFlavors {
     }
@@ -43,29 +44,34 @@ android {
 
         }
     }
+    packagingOptions {
+        exclude 'META-INF/android_debug.kotlin_module'
+    }
 }
 // called every time gradle gets executed, takes the native dependencies of
 // the natives configuration, and extracts them to the proper libs/ folders
 // so they get packed with the APK.
 task copyAndroidNatives() {
-    file("libs/armeabi/").mkdirs();
-    file("libs/armeabi-v7a/").mkdirs();
-    file("libs/arm64-v8a/").mkdirs();
-    file("libs/x86_64/").mkdirs();
-    file("libs/x86/").mkdirs();
+    doFirst {
+        file("libs/armeabi/").mkdirs();
+        file("libs/armeabi-v7a/").mkdirs();
+        file("libs/arm64-v8a/").mkdirs();
+        file("libs/x86_64/").mkdirs();
+        file("libs/x86/").mkdirs();
 
-    configurations.natives.files.each { jar ->
-        def outputDir = null
-        if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
-        if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
-        if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
-        if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
-        if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
-        if (outputDir != null) {
-            copy {
-                from zipTree(jar)
-                into outputDir
-                include "*.so"
+        configurations.natives.files.each { jar ->
+            def outputDir = null
+            if (jar.name.endsWith("natives-arm64-v8a.jar")) outputDir = file("libs/arm64-v8a")
+            if (jar.name.endsWith("natives-armeabi-v7a.jar")) outputDir = file("libs/armeabi-v7a")
+            if (jar.name.endsWith("natives-armeabi.jar")) outputDir = file("libs/armeabi")
+            if (jar.name.endsWith("natives-x86_64.jar")) outputDir = file("libs/x86_64")
+            if (jar.name.endsWith("natives-x86.jar")) outputDir = file("libs/x86")
+            if (outputDir != null) {
+                copy {
+                    from zipTree(jar)
+                    into outputDir
+                    include "*.so"
+                }
             }
         }
     }

android/src/ru/hyst329/openfool/AndroidLauncher.kt

@@ -0,0 +1,15 @@
+package ru.hyst329.openfool
+
+import android.os.Bundle
+import com.badlogic.gdx.backends.android.AndroidApplication
+import com.badlogic.gdx.backends.android.AndroidApplicationConfiguration
+
+class AndroidLauncher : AndroidApplication() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val config = AndroidApplicationConfiguration()
+        config.useAccelerometer = false
+        config.useCompass = false
+        initialize(OpenFoolGame(AndroidOrientationHelper(this)), config)
+    }
+}

android/src/ru/hyst329/openfool/AndroidOrientationHelper.kt

@@ -0,0 +1,26 @@
+package ru.hyst329.openfool
+
+import OrientationHelper
+import android.app.Activity
+import android.content.pm.ActivityInfo
+
+class AndroidOrientationHelper(val activity: Activity) : OrientationHelper {
+    override fun requestOrientation(orientation: OrientationHelper.Orientation?): Boolean {
+        this.orientation = orientation
+        //return when (orientation) {
+            if (orientation == OrientationHelper.Orientation.LANDSCAPE) {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
+                return true
+            }
+            if (orientation == OrientationHelper.Orientation.PORTRAIT)  {
+                activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+                return true
+            }
+            else {
+                return false
+            }
+        //}
+    }
+
+    override var orientation: OrientationHelper.Orientation? = OrientationHelper.Orientation.LANDSCAPE
+}

build.gradle

@@ -1,5 +1,5 @@
 buildscript {
-    ext.kotlinVersion = '1.3.41'
+    ext.kotlinVersion = '1.3.61'
 
     repositories {
         mavenLocal()
@@ -13,17 +13,17 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:3.4.2'
+        classpath 'com.android.tools.build:gradle:3.5.3'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.3'
-        classpath "gradle.plugin.com.palantir.graal:gradle-graal:0.4.0"
+        classpath "gradle.plugin.com.palantir.graal:gradle-graal:0.6.0"
     }
 }
 
 allprojects {
     apply plugin: "eclipse"
     apply plugin: "idea"
 
-    version = '0.2.9'
+    version = '0.3.0'
     ext {
         appName = "OpenFool"
         gdxVersion = '1.9.10'
@@ -64,7 +64,7 @@ project(":desktop") {
 
 project(":android") {
     apply plugin: "android"
-    //apply plugin: "kotlin-android"
+    apply plugin: "kotlin-android"
 
     configurations { natives }