Commit 3582f90c authored by Luboš Horáček's avatar Luboš Horáček

#9 Fixed lint tests - same android version as libgdx

parent d98a37a3
android {
buildToolsVersion "21.1.2"
compileSdkVersion 21
buildToolsVersion "20.0.0"
compileSdkVersion 20
defaultConfig {
targetSdkVersion 21
targetSdkVersion 20
versionName tablexiaVersionName
versionCode tablexiaVersionCode
applicationId rootProject.applicationIdRelease
......
......@@ -5,11 +5,9 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:1.1.0'
classpath 'org.robovm:robovm-gradle-plugin:1.0.0'
classpath 'com.android.tools.build:gradle:1.2.3'
classpath 'org.robovm:robovm-gradle-plugin:1.2.0'
classpath 'de.felixschulze.gradle:gradle-spoon-plugin:2.1'
classpath 'commons-io:commons-io:2.4'
classpath 'com.google.guava:guava:17.0'
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
classpath 'com.novoda:gradle-android-command-plugin:1.3.0'
}
......@@ -31,10 +29,10 @@ allprojects {
applicationIdDevelSuffix = '.devel'
applicationIdDevel = applicationIdRelease + applicationIdDevelSuffix
gdxVersion = '1.5.5'
gdxVersion = '1.6.1'
gdxUtilsVersion = '0.9.1'
mbassadorVersion = '1.2.0'
roboVMVersion = '1.0.0'
roboVMVersion = '1.2.0'
box2DLightsVersion = '1.3'
ashleyVersion = '1.3.1'
aiVersion = '1.4.0'
......
package cz.nic.tablexia.game.games.robbery;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.moveTo;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.parallel;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.scaleTo;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
import java.util.List;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
......@@ -21,15 +10,26 @@ import com.badlogic.gdx.scenes.scene2d.Actor;
import com.badlogic.gdx.scenes.scene2d.Group;
import com.badlogic.gdx.scenes.scene2d.InputEvent;
import com.badlogic.gdx.scenes.scene2d.InputListener;
import com.badlogic.gdx.scenes.scene2d.utils.Align;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.reflect.ClassReflection;
import com.badlogic.gdx.utils.reflect.ReflectionException;
import java.util.List;
import cz.nic.tablexia.game.games.robbery.assets.RobberyAssets;
import cz.nic.tablexia.game.games.robbery.creature.CreatureRoot;
import cz.nic.tablexia.screen.AbstractTablexiaScreen;
import cz.nic.tablexia.util.Log;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.alpha;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeIn;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.fadeOut;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.moveTo;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.parallel;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.run;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.scaleTo;
import static com.badlogic.gdx.scenes.scene2d.actions.Actions.sequence;
public class GameScreen extends AbstractTablexiaScreen<Void> {
private static class GameBackground extends Actor {
......
......@@ -14,9 +14,9 @@ import com.badlogic.gdx.scenes.scene2d.ui.Stack;
import com.badlogic.gdx.scenes.scene2d.ui.Table;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import com.badlogic.gdx.scenes.scene2d.ui.TextButton.TextButtonStyle;
import com.badlogic.gdx.scenes.scene2d.utils.Align;
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable;
import com.badlogic.gdx.utils.Align;
import cz.nic.tablexia.TablexiaSettings;
import cz.nic.tablexia.bus.ApplicationBus;
......
......@@ -121,7 +121,7 @@ public class GameMenuPage extends MenuPage implements ViewPager.ScrollListener {
// Labels for diffuculty slider
BitmapFont font = screen.getDefaultBoldFont();
font.setScale(0.5f);
//font.setScale(0.5f); // TODO make text smaller
Label.LabelStyle labelStyle = new Label.LabelStyle(font, Color.BLACK);
Label easy = new Label(GameDifficulty.EASY.getTextDescription(), labelStyle);
......
......@@ -22,14 +22,16 @@ public class TextDialog extends TablexiaDialog {
@Override
protected void prepareContent() {
Label.LabelStyle titleLabelStyle = new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(ApplicationFontManager.APPLICATION_DEFAULT_FONT_BOLD), Color.BLACK);
titleLabelStyle.font.setScale(TITLE_FONT_SCALE);
// TODO fix scaling
//titleLabelStyle.font.setScale(TITLE_FONT_SCALE);
if(dialogTextContent.getTitle() != null && !dialogTextContent.getTitle().equals("")){
Label titleLabel = new Label(dialogTextContent.getTitle(),titleLabelStyle);
getContentTable().add(titleLabel).center() ;
getContentTable().row();
}
Label.LabelStyle contentLabelStyle = new Label.LabelStyle(ApplicationFontManager.getInstance().getFont(ApplicationFontManager.APPLICATION_DEFAULT_FONT_REGULAR), Color.BLACK);
contentLabelStyle.font.setScale(CONTENT_FONT_SCALE);
// TODO fix scaling
//contentLabelStyle.font.setScale(CONTENT_FONT_SCALE);
Label label = new Label(dialogTextContent.getContent(),contentLabelStyle);
label.setWrap(true);
getContentTable().add(label).left().top().expand().fillX();
......
......@@ -32,11 +32,7 @@
<pattern>org.apache.harmony.security.provider.cert.DRLCertFactory</pattern>
<pattern>org.apache.harmony.security.provider.crypto.CryptoProvider</pattern>
</forceLinkClasses>
<libs>
<lib>build/libs/ios/libgdx.a</lib>
<lib>build/libs/ios/libgdx-freetype.a</lib>
<lib>build/libs/ios/libObjectAL.a</lib>
</libs>
<libs/>
<frameworks>
<framework>UIKit</framework>
<framework>OpenGLES</framework>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment