From 22333472ca2c59a0856e4985cb691e101a8ad0ee Mon Sep 17 00:00:00 2001 From: Ericwyn Date: Mon, 23 Oct 2017 17:44:25 +0800 Subject: [PATCH] add support Android Studio 2.3.3 , replace the icon of the startup page, reduced waiting time for homepage startup. --- app/build.gradle | 16 ++++++++-------- .../org/houxg/leamonax/ui/LaunchActivity.java | 11 ++++++----- app/src/main/res/drawable/ic_launcher.png | Bin 0 -> 7860 bytes app/src/main/res/layout/activity_launch.xml | 6 +++--- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 6 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 app/src/main/res/drawable/ic_launcher.png diff --git a/app/build.gradle b/app/build.gradle index 6b19894..31ba3ae 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,8 +32,8 @@ android { storePassword System.getenv('KEYSTORE_PWD') } } - compileSdkVersion 24 - buildToolsVersion "25.0.1" + compileSdkVersion 25 + buildToolsVersion "25.0.2" defaultConfig { applicationId "com.leanote.android" minSdkVersion 19 @@ -69,11 +69,11 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:24.1.0' - compile 'com.android.support:support-v4:24.1.0' - compile 'com.android.support:design:24.1.0' - compile 'com.android.support:recyclerview-v7:24.1.0' - compile 'com.android.support:cardview-v7:24.1.0' + compile 'com.android.support:appcompat-v7:25.3.0' + compile 'com.android.support:support-v4:25.3.0' + compile 'com.android.support:design:25.3.0' + compile 'com.android.support:recyclerview-v7:25.3.0' + compile 'com.android.support:cardview-v7:25.3.0' compile 'com.jakewharton:butterknife:8.4.0' apt 'com.jakewharton:butterknife-compiler:8.4.0' @@ -94,7 +94,7 @@ dependencies { compile 'com.github.bumptech.glide:glide:3.7.0' compile 'jp.wasabeef:glide-transformations:2.0.1' - compile 'com.android.support:support-v13:24.1.0' + compile 'com.android.support:support-v13:25.3.0' compile 'com.yuyh.imgsel:library:1.3.2' compile 'com.facebook.stetho:stetho:1.4.2' compile 'com.facebook.stetho:stetho-okhttp3:1.4.2' diff --git a/app/src/main/java/org/houxg/leamonax/ui/LaunchActivity.java b/app/src/main/java/org/houxg/leamonax/ui/LaunchActivity.java index e604cc0..e00d1c3 100644 --- a/app/src/main/java/org/houxg/leamonax/ui/LaunchActivity.java +++ b/app/src/main/java/org/houxg/leamonax/ui/LaunchActivity.java @@ -4,8 +4,6 @@ import android.animation.Animator; import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.os.Handler; -import android.view.Window; import android.view.WindowManager; import org.houxg.leamonax.R; @@ -32,9 +30,7 @@ public class LaunchActivity extends Activity { intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK); findViewById(R.id.iv_logo) .animate() - .scaleX(1.5f) - .scaleY(1.5f) - .setDuration(3000) + .setDuration(1000) .setListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator animator) { @@ -58,4 +54,9 @@ public class LaunchActivity extends Activity { } }).start(); } + + @Override + public void onBackPressed() { + + } } diff --git a/app/src/main/res/drawable/ic_launcher.png b/app/src/main/res/drawable/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..5d413d38256c9535d9ee05141b4b59e54cc815c1 GIT binary patch literal 7860 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 M%Bsqg155+|2jVO?6951J literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_launch.xml b/app/src/main/res/layout/activity_launch.xml index 3af7cdf..134e4ae 100644 --- a/app/src/main/res/layout/activity_launch.xml +++ b/app/src/main/res/layout/activity_launch.xml @@ -7,9 +7,9 @@ + android:src="@drawable/ic_launcher" /> \ No newline at end of file diff --git a/build.gradle b/build.gradle index 74b2ab0..c2eea8e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.3' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..6a435c5 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Thu Oct 19 16:56:00 CST 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 \ No newline at end of file