diff --git a/presentation/build.gradle b/presentation/build.gradle index 1bef22e..addd6d1 100644 --- a/presentation/build.gradle +++ b/presentation/build.gradle @@ -75,4 +75,7 @@ dependencies { //glide implementation deps.glide.glide kapt deps.glide.compiler + + //Splash Screen Api + implementation deps.ui.splash_screen } \ No newline at end of file diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml index a41961b..c63d5c9 100644 --- a/presentation/src/main/AndroidManifest.xml +++ b/presentation/src/main/AndroidManifest.xml @@ -4,6 +4,7 @@ package="com.example.presentation"> diff --git a/presentation/src/main/java/com/example/presentation/views/CockTailsActivity.kt b/presentation/src/main/java/com/example/presentation/views/CockTailsActivity.kt index a018210..4ed9c07 100644 --- a/presentation/src/main/java/com/example/presentation/views/CockTailsActivity.kt +++ b/presentation/src/main/java/com/example/presentation/views/CockTailsActivity.kt @@ -2,13 +2,26 @@ package com.example.presentation.views import android.os.Bundle import androidx.appcompat.app.AppCompatActivity +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen +import com.bumptech.glide.load.engine.Resource +import com.example.core.Status import com.example.presentation.R +import com.example.presentation.viemodel.CockTailViewModel +import org.koin.androidx.viewmodel.ext.android.viewModel class CockTailsActivity : AppCompatActivity() { + private val viewModel: CockTailViewModel by viewModel() override fun onCreate(savedInstanceState: Bundle?) { + initSplashScreen() super.onCreate(savedInstanceState) setContentView(R.layout.activity_cocktails) // actionBar?.hide() // supportActionBar?.hide() } + private fun initSplashScreen() { + val splashScreen = installSplashScreen() + splashScreen.setKeepOnScreenCondition { + viewModel.cockTailStatus.value?.status == Status.LOADING + } + } } diff --git a/presentation/src/main/res/values-v31/styles.xml b/presentation/src/main/res/values-v31/styles.xml new file mode 100644 index 0000000..3fe4f25 --- /dev/null +++ b/presentation/src/main/res/values-v31/styles.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml similarity index 100% rename from app/src/main/res/values/colors.xml rename to presentation/src/main/res/values/colors.xml diff --git a/app/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml similarity index 68% rename from app/src/main/res/values/themes.xml rename to presentation/src/main/res/values/themes.xml index 2c0580c..86bdc10 100644 --- a/app/src/main/res/values/themes.xml +++ b/presentation/src/main/res/values/themes.xml @@ -13,4 +13,10 @@ ?attr/colorPrimaryVariant + \ No newline at end of file diff --git a/scripts/versions.gradle b/scripts/versions.gradle index 582054c..7243279 100644 --- a/scripts/versions.gradle +++ b/scripts/versions.gradle @@ -95,6 +95,7 @@ def ui = [:] ui.material = "com.google.android.material:material:$versions.material" ui.constraint_layout = "androidx.constraintlayout:constraintlayout:$versions.constraint_layout" ui.appcompat = "androidx.appcompat:appcompat:$versions.androidx_appcompat" +ui.splash_screen = "androidx.core:core-splashscreen:1.0.0-rc01" deps.ui = ui def square_up = [:]