🔀 Merge pull request #84 from rasvanjaya21/main

✨ Implemented splash screen
lorenzovngl · Nov 6, 2023 · 1746aac · 1746aac
2 parents 83b2ec1 + 3f4b0f9
commit 1746aac
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 3 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -146,6 +146,9 @@ dependencies {
  "fullImplementation"(libs.firebase.analytics)
  "fullImplementation"(libs.firebase.crashlytics)
 
+ // Splash Screen
+ implementation(libs.splashscreen)
+
 }
 
 if (!buildFoss){

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
  <activity
  android:name=".view.activity.MainActivity"
  android:exported="true"
- android:theme="@style/Theme.FoodExpirationDates">
+ android:theme="@style/Theme.CustomSplashScreenTheme">
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />
 

diff --git a/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt b/app/src/main/java/com/lorenzovainigli/foodexpirationdates/view/activity/MainActivity.kt
@@ -12,11 +12,19 @@ import com.lorenzovainigli.foodexpirationdates.model.NotificationManager
 import com.lorenzovainigli.foodexpirationdates.view.composable.activity.MainActivityLayout
 import com.lorenzovainigli.foodexpirationdates.viewmodel.ExpirationDatesViewModel
 import dagger.hilt.android.AndroidEntryPoint
+import androidx.activity.viewModels
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
+ private val viewModel: ExpirationDatesViewModel by viewModels()
+
  override fun onCreate(savedInstanceState: Bundle?) {
+
+ val splashScreen = installSplashScreen()
+ splashScreen.setKeepOnScreenCondition { viewModel.isSplashScreenLoading.value }
+
  super.onCreate(savedInstanceState)
  DaggerAppComponent.builder()
  .appModule(AppModule())
@@ -27,7 +35,6 @@ class MainActivity : ComponentActivity() {
  override fun onResume() {
  super.onResume()
  setContent {
- val viewModel: ExpirationDatesViewModel = viewModel()
  val items by viewModel.getDates().collectAsState(emptyList())
  MainActivityLayout(
  context = this,

diff --git a/...c/main/java/com/lorenzovainigli/foodexpirationdates/viewmodel/ExpirationDatesViewModel.kt b/...c/main/java/com/lorenzovainigli/foodexpirationdates/viewmodel/ExpirationDatesViewModel.kt
@@ -8,6 +8,11 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.*
 import kotlinx.coroutines.launch
 import javax.inject.Inject
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.State
+import kotlinx.coroutines.async
+import kotlinx.coroutines.delay
 
 @HiltViewModel
 class ExpirationDatesViewModel @Inject constructor(
@@ -17,9 +22,18 @@ class ExpirationDatesViewModel @Inject constructor(
  private var expirationDates : Flow<List<ExpirationDate>> = flowOf(emptyList())
  private var expirationDate : ExpirationDate? = null
 
+ private val _isSplashScreenLoading: MutableState<Boolean> = mutableStateOf(value = true)
+ val isSplashScreenLoading: State<Boolean> = _isSplashScreenLoading
+
  fun getDates(): Flow<List<ExpirationDate>> {
  viewModelScope.launch {
- expirationDates = repository.getAll()
+ _isSplashScreenLoading.value = true
+ val deferred = async {
+ expirationDates = repository.getAll()
+ }
+ deferred.await()
+ delay(1000)
+ _isSplashScreenLoading.value = false
  }
  return expirationDates
  }

diff --git a/app/src/main/res/drawable/ic_splash.xml b/app/src/main/res/drawable/ic_splash.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item
+ android:height="100dp"
+ android:width="100dp"
+ android:drawable="@drawable/fed_icon"
+ android:gravity="center"
+ />
+</layer-list>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -2,4 +2,10 @@
 <resources>
 
  <style name="Theme.FoodExpirationDates" parent="android:Theme.Material.Light.NoActionBar" />
+
+ <style name="Theme.CustomSplashScreenTheme" parent="Theme.SplashScreen">
+ <item name="windowSplashScreenAnimatedIcon">@drawable/ic_splash</item>
+ <item name="postSplashScreenTheme">@style/Theme.FoodExpirationDates</item>
+ </style>
+
 </resources>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -24,6 +24,7 @@ test-runner = "1.5.2"
 ui-test-junit4 = "1.5.3"
 uiautomator = "2.2.0"
 work-runtime-ktx = "2.8.1"
+splashscreen = "1.0.1"
 
 [libraries]
 accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist-systemuicontroller" }
@@ -65,6 +66,7 @@ ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4", versi
 ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
 ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
+splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "splashscreen" }
 
 [plugins]
 app-cash-paparazzi = { id = "app.cash.paparazzi", version.ref = "paparazzi"}