From 060c999e8b45d06443cdea0eab30ea818fe5d0f7 Mon Sep 17 00:00:00 2001 From: Marcella Souza Date: Tue, 1 Sep 2020 17:12:27 -0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20[DSY-1423]=20fixing?= =?UTF-8?q?=20lint=20issues?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/SplashScreenFunctionalTests.kt | 5 ++--- .../natura/android/sample/SplashActivity.kt | 18 +++++++----------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/sample/src/androidTest/kotlin/com/natura/android/sample/SplashScreenFunctionalTests.kt b/sample/src/androidTest/kotlin/com/natura/android/sample/SplashScreenFunctionalTests.kt index ff1630acf..f6c3ee236 100644 --- a/sample/src/androidTest/kotlin/com/natura/android/sample/SplashScreenFunctionalTests.kt +++ b/sample/src/androidTest/kotlin/com/natura/android/sample/SplashScreenFunctionalTests.kt @@ -12,7 +12,7 @@ import org.junit.Test import org.junit.runner.RunWith @RunWith(AndroidJUnit4::class) -class SplashScreenFunctionalTestsTests { +class SplashScreenFunctionalTests { @Before fun setup() { ActivityScenario.launch(SplashActivity::class.java) @@ -29,5 +29,4 @@ class SplashScreenFunctionalTestsTests { onView(withId(R.id.naturaCoLogo)) .check(matches(isDisplayed())) } - -} \ No newline at end of file +} diff --git a/sample/src/main/java/com/natura/android/sample/SplashActivity.kt b/sample/src/main/java/com/natura/android/sample/SplashActivity.kt index b328b1680..6930f66d2 100644 --- a/sample/src/main/java/com/natura/android/sample/SplashActivity.kt +++ b/sample/src/main/java/com/natura/android/sample/SplashActivity.kt @@ -1,19 +1,17 @@ package com.natura.android.sample import android.content.Intent -import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.os.Handler -import android.view.View +import android.view.animation.AccelerateInterpolator import android.view.animation.AlphaAnimation -import android.view.animation.DecelerateInterpolator -import kotlinx.android.synthetic.main.activity_logo.* +import androidx.appcompat.app.AppCompatActivity import kotlinx.android.synthetic.main.activity_splash.* class SplashActivity : AppCompatActivity() { lateinit var mDelayHandler: Handler - private val mRunnable: Runnable = Runnable { + private val mRunnable: Runnable = Runnable { if (!isFinishing) { val intent = Intent(applicationContext, BrandSelectorActivity::class.java) startActivity(intent) @@ -26,8 +24,8 @@ class SplashActivity : AppCompatActivity() { setContentView(R.layout.activity_splash) val fadeIn = AlphaAnimation(0f, 1f) - fadeIn.interpolator = DecelerateInterpolator() - fadeIn.duration = 1500 + fadeIn.interpolator = AccelerateInterpolator() + fadeIn.duration = 2000 splashContainer.apply { animation = fadeIn @@ -36,7 +34,6 @@ class SplashActivity : AppCompatActivity() { mDelayHandler = Handler() mDelayHandler?.postDelayed(mRunnable, SPLASH_DELAY) - } public override fun onDestroy() { @@ -45,7 +42,6 @@ class SplashActivity : AppCompatActivity() { } companion object { - private const val SPLASH_DELAY: Long = 2000 + private const val SPLASH_DELAY: Long = 3000 } - -} \ No newline at end of file +}