[refactor] #92 스플래쉬, 로딩 화면에서 코루틴 delay 함수 사용하도록 변경

team-winey · Aug 6, 2023 · 7f2b9ba · 7f2b9ba
1 parent e674ce2
commit 7f2b9ba
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 41 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,11 @@
             android:screenOrientation="portrait"
             android:theme="@style/Theme.Winey.SplashScreen">
 
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
 
         </activity>
 
@@ -34,15 +39,7 @@
             android:name=".presentation.main.feed.upload.UploadActivity"
             android:exported="true"
             android:screenOrientation="portrait"
-            android:windowSoftInputMode="adjustResize" >
-
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
+            android:windowSoftInputMode="adjustResize" />
 
         <activity
             android:name=".presentation.main.feed.upload.loading.LoadingActivity"

diff --git a/...n/java/com/android/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt b/...n/java/com/android/go/sopt/winey/presentation/main/feed/upload/loading/LoadingActivity.kt
@@ -2,12 +2,13 @@ package com.android.go.sopt.winey.presentation.main.feed.upload.loading
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
+import androidx.lifecycle.lifecycleScope
 import com.android.go.sopt.winey.R
 import com.android.go.sopt.winey.databinding.ActivityLoadingBinding
 import com.android.go.sopt.winey.presentation.main.MainActivity
 import com.android.go.sopt.winey.util.binding.BindingActivity
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 class LoadingActivity : BindingActivity<ActivityLoadingBinding>(R.layout.activity_loading) {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -20,7 +21,6 @@ class LoadingActivity : BindingActivity<ActivityLoadingBinding>(R.layout.activit
     private fun classifySaveItemCategory() {
         val amountString = intent.extras?.getString(EXTRA_AMOUNT_KEY, "") ?: return
         val amount = amountString.toLong()
-
         val amountRange = resources.getIntArray(R.array.save_amount_range)
         val itemCategories = resources.getStringArray(R.array.save_item_categories)
 
@@ -38,12 +38,13 @@ class LoadingActivity : BindingActivity<ActivityLoadingBinding>(R.layout.activit
     }
 
     private fun delayMillis() {
-        Handler(Looper.getMainLooper()).postDelayed({
-            navigateMainScreen()
-        }, DELAY_TIME)
+        lifecycleScope.launch {
+            delay(DELAY_TIME)
+            navigateToMainScreen()
+        }
     }
 
-    private fun navigateMainScreen() {
+    private fun navigateToMainScreen() {
         Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
             startActivity(this)

diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/splash/SplashActivity.kt
@@ -2,22 +2,24 @@ package com.android.go.sopt.winey.presentation.splash
 
 import android.content.Intent
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
-import androidx.appcompat.app.AppCompatActivity
+import androidx.lifecycle.lifecycleScope
 import com.android.go.sopt.winey.R
+import com.android.go.sopt.winey.databinding.ActivitySplashBinding
 import com.android.go.sopt.winey.presentation.main.MainActivity
+import com.android.go.sopt.winey.util.binding.BindingActivity
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 
 @AndroidEntryPoint
-class SplashActivity : AppCompatActivity() {
+class SplashActivity : BindingActivity<ActivitySplashBinding>(R.layout.activity_splash) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_splash)
 
-        Handler(Looper.getMainLooper()).postDelayed({
+        lifecycleScope.launch {
+            delay(DELAY_TIME)
             navigateToMainScreen()
-        }, DELAY_TIME)
+        }
     }
 
     private fun navigateToMainScreen() {

diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
@@ -1,19 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black">
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <com.airbnb.lottie.LottieAnimationView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:layout_marginBottom="50dp"
-        app:lottie_autoPlay="true"
-        app:lottie_rawRes="@raw/lottie_splash" />
+    <data>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </data>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/black">
+
+        <com.airbnb.lottie.LottieAnimationView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            android:layout_marginBottom="50dp"
+            app:lottie_autoPlay="true"
+            app:lottie_rawRes="@raw/lottie_splash" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -31,8 +31,7 @@
             @android:color/transparent
         </item>
         <item name="postSplashScreenTheme">@style/Theme.Winey</item>
-
         <item name="android:statusBarColor">@color/black</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
-</resources>
+</resources>