From ab413f8cfc03a18bb2c2bc0c5439e0f415722510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Wed, 18 Mar 2015 10:43:34 +0100
Subject: [PATCH] #19 Open main menu on application pause event
---
android/build.gradle | 4 ++++
core/src/cz/nic/tablexia/Tablexia.java | 10 +++++++++-
core/src/cz/nic/tablexia/menu/MainMenuContainer.java | 4 ++++
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/android/build.gradle b/android/build.gradle
index 96b30896c..637b07657 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -59,6 +59,10 @@ android {
}
}
}
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_6
+ targetCompatibility JavaVersion.VERSION_1_6
+ }
}
def getVersionCodeFromGit() {
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index c3e58e67f..cdfd4543c 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -1,5 +1,6 @@
package cz.nic.tablexia;
+import com.badlogic.gdx.Application;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import com.badlogic.gdx.utils.reflect.ReflectionException;
@@ -115,7 +116,14 @@ public class Tablexia extends TablexiaApplication {
startLoading(TablexiaSettings.getInstance().getLocale());
}
- @Override
+ @Override
+ public void pause() {
+ super.pause();
+ // don't use menu open animation for android pause event (animation is run after resume on android)
+ mainMenuContainer.openMainMenu(!Gdx.app.getType().equals(Application.ApplicationType.Android));
+ }
+
+ @Override
public void render () {
// render other screens
super.render();
diff --git a/core/src/cz/nic/tablexia/menu/MainMenuContainer.java b/core/src/cz/nic/tablexia/menu/MainMenuContainer.java
index fec29a27f..b2b6b0b31 100644
--- a/core/src/cz/nic/tablexia/menu/MainMenuContainer.java
+++ b/core/src/cz/nic/tablexia/menu/MainMenuContainer.java
@@ -53,4 +53,8 @@ public class MainMenuContainer extends Group {
screenDimmer.setColor(screenDimmer.getColor().r, screenDimmer.getColor().g, screenDimmer.getColor().b, mainMenu.getMenuOpenPercentage());
}
}
+
+ public void openMainMenu(boolean animated) {
+ mainMenu.openMenu(animated);
+ }
}
--
GitLab