diff --git a/app/build.gradle b/app/build.gradle index 1717061..7376036 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,13 +7,12 @@ plugins { } android { - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId "org.fnives.test.showcase" minSdkVersion 21 - //noinspection OldTargetApi // todo - targetSdkVersion 30 + targetSdkVersion 31 versionCode 1 versionName "1.0" buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"' @@ -31,11 +30,13 @@ android { productFlavors { hilt { dimension 'di' + resValue "string", "app_name", "Hilt Test-ShowCase" applicationId "org.fnives.test.showcase.hilt" testInstrumentationRunner "org.fnives.test.showcase.testutils.configuration.HiltTestRunner" } koin { dimension 'di' + resValue "string", "app_name", "Koin Test-ShowCase" applicationId "org.fnives.test.showcase.koin" } } diff --git a/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt b/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt index c3af781..d6b6f2b 100644 --- a/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt +++ b/app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt @@ -1,6 +1,8 @@ package org.fnives.test.showcase.ui.splash +import android.annotation.SuppressLint import dagger.hilt.android.AndroidEntryPoint +@SuppressLint("CustomSplashScreen") @AndroidEntryPoint class HiltSplashActivity : SplashActivity() diff --git a/app/src/main/java/org/fnives/test/showcase/ui/splash/SplashActivity.kt b/app/src/main/java/org/fnives/test/showcase/ui/splash/SplashActivity.kt index 48e1ce1..cb08d69 100644 --- a/app/src/main/java/org/fnives/test/showcase/ui/splash/SplashActivity.kt +++ b/app/src/main/java/org/fnives/test/showcase/ui/splash/SplashActivity.kt @@ -1,11 +1,13 @@ package org.fnives.test.showcase.ui.splash +import android.annotation.SuppressLint import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import org.fnives.test.showcase.R import org.fnives.test.showcase.ui.IntentCoordinator import org.fnives.test.showcase.ui.viewModels +@SuppressLint("CustomSplashScreen") open class SplashActivity : AppCompatActivity() { private val viewModel by viewModels() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f84909a..40bb924 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,4 @@ - Test ShowCase Login Username Password diff --git a/gradlescripts/versions.gradle b/gradlescripts/versions.gradle index 0d5a246..8505e17 100644 --- a/gradlescripts/versions.gradle +++ b/gradlescripts/versions.gradle @@ -1,12 +1,12 @@ project.ext { - androidx_core_version = "1.6.0" + androidx_core_version = "1.7.0" androidx_appcompat_version = "1.3.1" androidx_material_version = "1.4.0" - androidx_constraintlayout_version = "2.1.0" - androidx_livedata_version = "2.3.1" + androidx_constraintlayout_version = "2.1.1" + androidx_livedata_version = "2.4.0" androidx_swiperefreshlayout_version = "1.1.0" androidx_room_version = "2.3.0" - activity_ktx_version = "1.3.1" + activity_ktx_version = "1.4.0" coroutines_version = "1.4.3" koin_version = "3.1.2"