로띠 스플래시 액티비티 추가

app/build.gradle.kts

@@ -86,7 +86,6 @@ dependencies {
     implementation(libs.core.ktx)
     implementation(libs.kotlin.android)
     implementation(libs.kotlin.core)
-    implementation(libs.androidx.splash)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.test.ext.junit)
     androidTestImplementation(libs.espresso.core)

app/src/main/AndroidManifest.xml

@@ -19,12 +19,17 @@
         tools:targetApi="31">
 
         <activity
-            android:name=".MainActivity"
+            android:name=".splash.SplashActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+        </activity>
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

app/src/main/java/com/mashup/dorabangs/MainActivity.kt

@@ -11,19 +11,14 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.viewModels
-import androidx.compose.runtime.collectAsState
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.mashup.dorabangs.core.designsystem.theme.DorabangsTheme
 import com.mashup.dorabangs.navigation.DoraApp
 import com.mashup.dorabangs.splash.FirstEntryScreen
-import com.mashup.dorabangs.splash.SplashViewModel
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class MainActivity : ComponentActivity() {
 
-    private val splashViewModel: SplashViewModel by viewModels()
     private val overlayPermissionLauncher =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
             if (!Settings.canDrawOverlays(this)) {
@@ -36,32 +31,24 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         checkPermission()
 
-        val userId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
-        splashViewModel.checkUserToken(userId)
-
+        val firstEntryScreen = intent.getStringExtra("firstEntry")
         val url = intent.data?.path?.substring(1).orEmpty()
 
-        installSplashScreen().apply {
-            setKeepOnScreenCondition {
-                (splashViewModel.isSplashShow.value || splashViewModel.firstEntryScreen.value == FirstEntryScreen.Splash) &&
-                    url.isBlank()
-            }
-        }
-
         setContent {
-            val firstEntryScreen = splashViewModel.firstEntryScreen.collectAsState()
-            if (firstEntryScreen.value != FirstEntryScreen.Splash) {
-                val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
+            firstEntryScreen?.let {
+                if (firstEntryScreen != FirstEntryScreen.Splash.name) {
+                    val imm = getSystemService(Context.INPUT_METHOD_SERVICE) as? InputMethodManager
 
-                DorabangsTheme {
-                    DoraApp(
-                        isFirstEntry = firstEntryScreen.value == FirstEntryScreen.Onboarding,
-                        hideKeyboardAction = {
-                            currentFocus?.let {
-                                imm?.hideSoftInputFromWindow(it.windowToken, 0)
-                            }
-                        },
-                    )
+                    DorabangsTheme {
+                        DoraApp(
+                            isFirstEntry = firstEntryScreen == FirstEntryScreen.Onboarding.name,
+                            hideKeyboardAction = {
+                                currentFocus?.let {
+                                    imm?.hideSoftInputFromWindow(it.windowToken, 0)
+                                }
+                            },
+                        )
+                    }
                 }
             }
         }

app/src/main/java/com/mashup/dorabangs/splash/SplashActivity.kt

@@ -0,0 +1,39 @@
+package com.mashup.dorabangs.splash
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.provider.Settings
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.viewModels
+import androidx.compose.runtime.collectAsState
+import com.mashup.dorabangs.MainActivity
+import dagger.hilt.android.AndroidEntryPoint
+
+@SuppressLint("CustomSplashScreen")
+@AndroidEntryPoint
+class SplashActivity : ComponentActivity() {
+    private val splashViewModel: SplashViewModel by viewModels()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val userId = Settings.Secure.getString(contentResolver, Settings.Secure.ANDROID_ID)
+        splashViewModel.checkUserToken(userId)
+
+        val url = intent.data?.path?.substring(1).orEmpty()
+
+        setContent {
+            SplashScreen()
+
+            val firstEntryScreen = splashViewModel.firstEntryScreen.collectAsState()
+            if (firstEntryScreen.value != FirstEntryScreen.Splash) {
+                val intent = Intent(this, MainActivity::class.java)
+                intent.putExtra("firstEntry", firstEntryScreen.value.name)
+                startActivity(intent)
+                finish()
+            }
+        }
+    }
+}

app/src/main/java/com/mashup/dorabangs/splash/SplashScreen.kt

@@ -0,0 +1,21 @@
+package com.mashup.dorabangs.splash
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.mashup.dorabangs.core.designsystem.component.util.LottieLoader
+import com.mashup.dorabangs.core.designsystem.R as coreR
+
+@Composable
+fun SplashScreen() {
+    Box(modifier = Modifier.fillMaxSize()) {
+        LottieLoader(
+            lottieRes = coreR.raw.splash,
+            modifier = Modifier.align(Alignment.Center).size(126.dp),
+        )
+    }
+}

app/src/main/java/com/mashup/dorabangs/splash/SplashViewModel.kt

@@ -10,11 +10,11 @@ import com.mashup.dorabangs.domain.usecase.user.GetUserAccessTokenUseCase
 import com.mashup.dorabangs.domain.usecase.user.RegisterUserUseCase
 import com.mashup.dorabangs.domain.usecase.user.SetUserAccessTokenUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.withTimeout
 import javax.inject.Inject
 
 @HiltViewModel
@@ -40,19 +40,18 @@ class SplashViewModel @Inject constructor(
                     token
                 }.orEmpty()
 
-            withTimeout(SPLASH_SCREEN_TIME) {
-                if (userAccessToken.isNotEmpty()) {
-                    splashShowFlow.value = false
-                    _firstEntryScreen.value = if (getIsFirstEntryUseCase().firstOrNull() != false) FirstEntryScreen.Onboarding else FirstEntryScreen.Home
-                } else {
-                    // Todo :: 유저 토큰 가져오기 실패에 대한 처리 해줘야함 (Like 토스트 메시지)
-                }
+            if (userAccessToken.isNotEmpty()) {
+                delay(SPLASH_SCREEN_TIME)
+                splashShowFlow.value = false
+                _firstEntryScreen.value = if (getIsFirstEntryUseCase().firstOrNull() != false) FirstEntryScreen.Onboarding else FirstEntryScreen.Home
+            } else {
+                // Todo :: 유저 토큰 가져오기 실패에 대한 처리 해줘야함 (Like 토스트 메시지)
             }
         }
     }
 
     companion object {
-        private const val SPLASH_SCREEN_TIME = 1000L
+        private const val SPLASH_SCREEN_TIME = 3000L
     }
 }
 

feature/home/src/main/java/com/mashup/dorabangs/feature/home/HomeContract.kt

@@ -7,7 +7,7 @@ import com.mashup.dorabangs.domain.model.Folder
 import com.mashup.dorabangs.domain.utils.isValidUrl
 
 data class HomeState(
-    val isLoading: Boolean = false,
+    val isLoading: Boolean = true,
     val isScrollLoading: Boolean = false,
     val clipBoardState: ClipBoardState = ClipBoardState(),
     val tapElements: List<FeedUiModel.DoraChipUiModel> = emptyList(),