diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 843b0a8fd6..947d8342ac 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index bec96cb7bf..f3bb3d51b2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,26 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +//ext { +// git = org.ajoberstar.grgit.Grgit.open() +// gitVersionCode = git.tag.list().size() +// gitVersionName = "${git.describe()}" +//} + +def getVersionCode = { -> + try { + def code = new ByteArrayOutputStream() + exec { + commandLine 'git', 'tag', '--list' + standardOutput = code + } + return code.toString().split("\n").size() + } + catch (ignored) { + return -1; + } +} + android { compileSdkVersion 27 defaultConfig { @@ -9,7 +29,7 @@ android { minSdkVersion 21 targetSdkVersion 27 versionCode 26 - versionName "0.85.5.831" + versionName "0.85.5.831 " + getVersionCode testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java index 02bd68b64a..c5422bfcd9 100644 --- a/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/LogoActivity.java @@ -17,12 +17,10 @@ import com.tangem.wallet.R; public class LogoActivity extends AppCompatActivity { public static final String TAG = LogoActivity.class.getSimpleName(); - private final Runnable mHideRunnable = new Runnable() { - @Override - public void run() { - hide(); - } - }; + public static final String EXTRA_AUTO_HIDE = "extra_auto_hide"; + public static final int MILLIS_AUTO_HIDE = 1000; + + private final Runnable mHideRunnable = this::hide; private ImageView imgLogo; @@ -50,9 +48,9 @@ public class LogoActivity extends AppCompatActivity { else AppVersion.setText("BETA v." + BuildConfig.VERSION_NAME); - if (!getIntent().getBooleanExtra("skipAutoHide", false)) { - delayedHide(1000); - } + + if (getIntent().getBooleanExtra(EXTRA_AUTO_HIDE, true)) + delayedHide(); } private void hide() { @@ -61,12 +59,9 @@ public class LogoActivity extends AppCompatActivity { finish(); } - /** - * Schedules a call to hide() in [delay] milliseconds, canceling any - * previously scheduled calls. - */ - private void delayedHide(int delayMillis) { - //imgLogo.removeCallbacks(mHideRunnable); - imgLogo.postDelayed(mHideRunnable, delayMillis); + private void delayedHide() { +// imgLogo.removeCallbacks(mHideRunnable); + imgLogo.postDelayed(mHideRunnable, MILLIS_AUTO_HIDE); } -} + +} \ No newline at end of file diff --git a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java index fa493db2f9..6f55632e70 100644 --- a/app/src/main/java/com/tangem/presentation/activity/MainActivity.java +++ b/app/src/main/java/com/tangem/presentation/activity/MainActivity.java @@ -332,6 +332,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI private void showLogoActivity() { Intent intent = new Intent(getBaseContext(), LogoActivity.class); intent.putExtra(LogoActivity.TAG, true); + intent.putExtra(LogoActivity.EXTRA_AUTO_HIDE, false); startActivity(intent); } diff --git a/build.gradle b/build.gradle index 90096d9c40..8aa32e9b86 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ buildscript { + ext.kotlin_version = '1.2.41' repositories { google()