Commit abe93df0 authored by Anton Danilov's avatar Anton Danilov

#760 newspapers are opened right after spin

parent a3cbf591
......@@ -21,7 +21,7 @@ final BUILD_CONFIG_DIR = "${buildDir}/generated/source/buildConfig/"
final BUILD_CONFIG_ENCODING = 'UTF-8'
android {
buildToolsVersion "24.0.3"
buildToolsVersion '25.0.0'
compileSdkVersion 21
packagingOptions {
......
......@@ -25,7 +25,7 @@ buildscript {
jcenter { url "http://jcenter.bintray.com/" }
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
classpath 'com.novoda:gradle-android-command-plugin:1.3.0'
......@@ -412,7 +412,6 @@ project(":desktop") {
}
project(":android") {
apply plugin: 'android-sdk-manager'
apply plugin: 'com.android.application'
apply plugin: 'android-command'
......
......@@ -304,6 +304,11 @@ public class PanoramaScreen extends AbstractTablexiaScreen<int[][]> {
hideHintsAndOpenNewspaper();
}
}, TIMER_OPEN_NEWSPAPER);
if(TablexiaSettings.getInstance().getPlatform() == TablexiaSettings.Platform.DESKTOP) {
hideHintsAndOpenNewspaper();
openNewspaperTimer.cancel();
}
}
}))));
getStage().addActor(spin);
......
#Fri Nov 25 11:07:23 CET 2016
#Tue Oct 31 12:02:14 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
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