diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e3610df1..f7fc902b5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,11 +17,10 @@
android:name=".splash.SplashActivity"
android:exported="true"
android:label="@string/app_name"
- android:theme="@style/Theme.WeSpot"
+ android:theme="@style/Theme.Wespot.Starting"
android:windowSoftInputMode="adjustResize">
-
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 000000000..2cd46d338
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/kotlin/com/bff/wespot/PushNotificationService.kt b/app/src/main/kotlin/com/bff/wespot/PushNotificationService.kt
index fcae71598..f2e19a140 100644
--- a/app/src/main/kotlin/com/bff/wespot/PushNotificationService.kt
+++ b/app/src/main/kotlin/com/bff/wespot/PushNotificationService.kt
@@ -65,8 +65,7 @@ class PushNotificationService : FirebaseMessagingService() {
val defaultSoundUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION)
val notificationBuilder = NotificationCompat.Builder(this, CHANNEL_ID)
- // TODO Set AppIcon
- .setSmallIcon(R.drawable.ic_launcher_background)
+ .setSmallIcon(R.mipmap.ic_launcher_round)
.setContentTitle(title)
.setContentText(content)
.setAutoCancel(true)
diff --git a/app/src/main/kotlin/com/bff/wespot/splash/SplashActivity.kt b/app/src/main/kotlin/com/bff/wespot/splash/SplashActivity.kt
index d8eed430e..a0dde2dc4 100644
--- a/app/src/main/kotlin/com/bff/wespot/splash/SplashActivity.kt
+++ b/app/src/main/kotlin/com/bff/wespot/splash/SplashActivity.kt
@@ -1,15 +1,19 @@
package com.bff.wespot.splash
-import android.animation.ObjectAnimator
+import android.os.Build
import android.os.Bundle
-import android.view.View
-import android.view.animation.DecelerateInterpolator
import androidx.activity.ComponentActivity
import androidx.activity.viewModels
-import androidx.core.animation.doOnEnd
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import com.bff.wespot.R
import com.bff.wespot.auth.AuthActivity
import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
@AndroidEntryPoint
class SplashActivity : ComponentActivity() {
@@ -17,25 +21,32 @@ class SplashActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
- installSplashScreen().apply {
- setKeepOnScreenCondition {
- return@setKeepOnScreenCondition viewModel.start.value.not()
- }
- setOnExitAnimationListener { splashScreen ->
- ObjectAnimator.ofFloat(
- splashScreen.view,
- View.TRANSLATION_Y,
- 0f, splashScreen.view.height.toFloat()
- ).apply {
- interpolator = DecelerateInterpolator()
- duration = 500L
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ installSplashScreen().apply {
+ setKeepOnScreenCondition {
+ return@setKeepOnScreenCondition viewModel.start.value.not()
+ }
+ setOnExitAnimationListener {
val intent = AuthActivity.intent(this@SplashActivity)
startActivity(intent)
- doOnEnd {
- splashScreen.remove()
- finish()
+ finish()
+ }
+ }
+ } else {
+ setContentView(R.layout.activity_splash)
+ actionBar?.hide()
+
+ lifecycleScope.launch {
+ repeatOnLifecycle(Lifecycle.State.CREATED) {
+ viewModel.start.collect {
+ if (it) {
+ delay(500)
+ val intent = AuthActivity.intent(this@SplashActivity)
+ startActivity(intent)
+ finish()
+ }
}
- start()
}
}
}
diff --git a/app/src/main/kotlin/com/bff/wespot/splash/SplashViewModel.kt b/app/src/main/kotlin/com/bff/wespot/splash/SplashViewModel.kt
index 1a2596697..0c9bdda98 100644
--- a/app/src/main/kotlin/com/bff/wespot/splash/SplashViewModel.kt
+++ b/app/src/main/kotlin/com/bff/wespot/splash/SplashViewModel.kt
@@ -3,6 +3,7 @@ package com.bff.wespot.splash
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.bff.wespot.domain.repository.RemoteConfigRepository
+import com.bff.wespot.domain.util.RemoteConfigKey
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
@@ -16,9 +17,15 @@ class SplashViewModel @Inject constructor(
private val _start = MutableStateFlow(false)
val start = _start.asStateFlow()
+ private val _minVersion = MutableStateFlow("")
+ val minVersion = _minVersion.asStateFlow()
+
init {
viewModelScope.launch {
_start.value = dataSource.startRemoteConfig()
+ if (_start.value) {
+ _minVersion.emit(dataSource.fetchFromRemoteConfig(RemoteConfigKey.MIN_VERSION))
+ }
}
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
deleted file mode 100644
index 07d5da9cb..000000000
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index 2b068d114..000000000
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-