tutorials/Android-Tutorial-Test-ShowCase
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update dependencies, targetSDK add differnet App Names for the different versions

Browse source
This commit is contained in:
Gergely Hegedus 2021-11-04 18:17:42 +02:00
parent 1f3c98ad91
commit 8707aedd75
5 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/build.gradle
View file

@ -7,13 +7,12 @@ plugins {
} }
android { android {
compileSdkVersion 30 compileSdkVersion 31
defaultConfig { defaultConfig {
applicationId "org.fnives.test.showcase" applicationId "org.fnives.test.showcase"
minSdkVersion 21 minSdkVersion 21
//noinspection OldTargetApi // todo targetSdkVersion 31
targetSdkVersion 30
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"' buildConfigField "String", "BASE_URL", '"https://606844a10add49001733fe6b.mockapi.io/"'
@ -31,11 +30,13 @@ android {
productFlavors { productFlavors {
hilt { hilt {
dimension 'di' dimension 'di'
resValue "string", "app_name", "Hilt Test-ShowCase"
applicationId "org.fnives.test.showcase.hilt" applicationId "org.fnives.test.showcase.hilt"
testInstrumentationRunner "org.fnives.test.showcase.testutils.configuration.HiltTestRunner" testInstrumentationRunner "org.fnives.test.showcase.testutils.configuration.HiltTestRunner"
} }
koin { koin {
dimension 'di' dimension 'di'
resValue "string", "app_name", "Koin Test-ShowCase"
applicationId "org.fnives.test.showcase.koin" applicationId "org.fnives.test.showcase.koin"
} }
} }

2
app/src/hilt/java/org/fnives/test/showcase/ui/splash/HiltSplashActivity.kt
View file

@ -1,6 +1,8 @@
package org.fnives.test.showcase.ui.splash package org.fnives.test.showcase.ui.splash
import android.annotation.SuppressLint
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
@SuppressLint("CustomSplashScreen")
@AndroidEntryPoint @AndroidEntryPoint
class HiltSplashActivity : SplashActivity() class HiltSplashActivity : SplashActivity()

2
app/src/main/java/org/fnives/test/showcase/ui/splash/SplashActivity.kt
View file

@ -1,11 +1,13 @@
package org.fnives.test.showcase.ui.splash package org.fnives.test.showcase.ui.splash
import android.annotation.SuppressLint
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import org.fnives.test.showcase.R import org.fnives.test.showcase.R
import org.fnives.test.showcase.ui.IntentCoordinator import org.fnives.test.showcase.ui.IntentCoordinator
import org.fnives.test.showcase.ui.viewModels import org.fnives.test.showcase.ui.viewModels
@SuppressLint("CustomSplashScreen")
open class SplashActivity : AppCompatActivity() { open class SplashActivity : AppCompatActivity() {
private val viewModel by viewModels<SplashViewModel>() private val viewModel by viewModels<SplashViewModel>()

1
app/src/main/res/values/strings.xml
View file

@ -1,5 +1,4 @@
<resources> <resources>
<string name="app_name">Test ShowCase</string>
<string name="login">Login</string> <string name="login">Login</string>
<string name="username">Username</string> <string name="username">Username</string>
<string name="password">Password</string> <string name="password">Password</string>

8
gradlescripts/versions.gradle
View file

@ -1,12 +1,12 @@
project.ext { project.ext {
androidx_core_version = "1.6.0" androidx_core_version = "1.7.0"
androidx_appcompat_version = "1.3.1" androidx_appcompat_version = "1.3.1"
androidx_material_version = "1.4.0" androidx_material_version = "1.4.0"
androidx_constraintlayout_version = "2.1.0" androidx_constraintlayout_version = "2.1.1"
androidx_livedata_version = "2.3.1" androidx_livedata_version = "2.4.0"
androidx_swiperefreshlayout_version = "1.1.0" androidx_swiperefreshlayout_version = "1.1.0"
androidx_room_version = "2.3.0" androidx_room_version = "2.3.0"
activity_ktx_version = "1.3.1" activity_ktx_version = "1.4.0"
coroutines_version = "1.4.3" coroutines_version = "1.4.3"
koin_version = "3.1.2" koin_version = "3.1.2"