fix #725: lifecycleScope 수정

sopt-makers · Jun 9, 2024 · d2a0421 · d2a0421
1 parent dcf93fb
commit d2a0421
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 48 deletions.
diff --git a/.../java/org/sopt/official/feature/poke/friend/detail/FriendListDetailBottomSheetFragment.kt b/.../java/org/sopt/official/feature/poke/friend/detail/FriendListDetailBottomSheetFragment.kt
@@ -27,8 +27,6 @@ package org.sopt.official.feature.poke.friend.detail
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -42,8 +40,10 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import org.sopt.official.analytics.AmplitudeTracker
 import org.sopt.official.analytics.EventType
 import org.sopt.official.common.util.colorOf
@@ -127,25 +127,26 @@ class FriendListDetailBottomSheetFragment : BottomSheetDialogFragment() {
         with(binding) {
             animationFriendViewLottie.addOnAnimationEndListener {
                 if (viewModel.anonymousFriend.value != null) { // 천생연분 -> 정체 공개
-                    // 로티
-                    layoutAnonymousFriendLottie.visibility = View.GONE
-                    layoutAnonymousFriendOpen.visibility = View.VISIBLE
-
-                    val anonymousFriend = viewModel.anonymousFriend.value
-                    anonymousFriend?.let {
-                        tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
-                        tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
-                        imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
-                            transformations(CircleCropTransformation())
+                    lifecycleScope.launch {
+                        // 로티
+                        layoutAnonymousFriendLottie.visibility = View.GONE
+                        layoutAnonymousFriendOpen.visibility = View.VISIBLE
+
+                        val anonymousFriend = viewModel.anonymousFriend.value
+                        anonymousFriend?.let {
+                            tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
+                            tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
+                            imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
+                                transformations(CircleCropTransformation())
+                            }
+
+                            imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
                         }
 
-                        imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
-                    }
-
-                    Handler(Looper.getMainLooper()).postDelayed({
+                        delay(2000)
                         layoutAnonymousFriendOpen.visibility = View.GONE
                         viewModel.setAnonymousFriend(null)
-                    }, 2000)
+                    }
                 } else {
                     layoutAnonymousFriendLottie.visibility = View.GONE
                 }

diff --git a/.../src/main/java/org/sopt/official/feature/poke/friend/summary/FriendListSummaryActivity.kt b/.../src/main/java/org/sopt/official/feature/poke/friend/summary/FriendListSummaryActivity.kt
@@ -37,8 +37,10 @@ import androidx.lifecycle.lifecycleScope
 import coil.load
 import coil.transform.CircleCropTransformation
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import org.sopt.official.analytics.AmplitudeTracker
 import org.sopt.official.analytics.EventType
 import org.sopt.official.auth.model.UserStatus
@@ -118,25 +120,26 @@ class FriendListSummaryActivity : AppCompatActivity() {
         with(binding) {
             animationFriendViewLottie.addOnAnimationEndListener {
                 if (viewModel.anonymousFriend.value != null) { // 천생연분 -> 정체 공개
-                    // 로티
-                    layoutAnonymousFriendLottie.visibility = View.GONE
-                    layoutAnonymousFriendOpen.visibility = View.VISIBLE
-
-                    val anonymousFriend = viewModel.anonymousFriend.value
-                    anonymousFriend?.let {
-                        tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
-                        tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
-                        imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
-                            transformations(CircleCropTransformation())
-                        }
+                    lifecycleScope.launch {
+                        // 로티
+                        layoutAnonymousFriendLottie.visibility = View.GONE
+                        layoutAnonymousFriendOpen.visibility = View.VISIBLE
+
+                        val anonymousFriend = viewModel.anonymousFriend.value
+                        anonymousFriend?.let {
+                            tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
+                            tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
+                            imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
+                                transformations(CircleCropTransformation())
+                            }
 
-                        imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
-                    }
+                            imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
+                        }
 
-                    Handler(Looper.getMainLooper()).postDelayed({
+                        delay(2000)
                         layoutAnonymousFriendOpen.visibility = View.GONE
                         viewModel.setAnonymousFriend(null)
-                    }, 2000)
+                    }
                 } else {
                     layoutAnonymousFriendLottie.visibility = View.GONE
                 }

diff --git a/...oke/src/main/java/org/sopt/official/feature/poke/notification/PokeNotificationActivity.kt b/...oke/src/main/java/org/sopt/official/feature/poke/notification/PokeNotificationActivity.kt
@@ -28,8 +28,6 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.os.Handler
-import android.os.Looper
 import android.view.View
 import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
@@ -40,8 +38,10 @@ import androidx.recyclerview.widget.RecyclerView
 import coil.load
 import coil.transform.CircleCropTransformation
 import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import org.sopt.official.analytics.AmplitudeTracker
 import org.sopt.official.analytics.EventType
 import org.sopt.official.common.util.serializableExtra
@@ -110,25 +110,26 @@ class PokeNotificationActivity : AppCompatActivity() {
 
             animationFriendViewLottie.addOnAnimationEndListener {
                 if (viewModel.anonymousFriend.value != null) { // 천생연분 -> 정체 공개
-                    // 로티
-                    layoutAnonymousFriendLottie.visibility = View.GONE
-                    layoutAnonymousFriendOpen.visibility = View.VISIBLE
+                    lifecycleScope.launch {
+                        // 로티
+                        layoutAnonymousFriendLottie.visibility = View.GONE
+                        layoutAnonymousFriendOpen.visibility = View.VISIBLE
 
-                    val anonymousFriend = viewModel.anonymousFriend.value
-                    anonymousFriend?.let {
-                        tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
-                        tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
-                        imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
-                            transformations(CircleCropTransformation())
-                        }
+                        val anonymousFriend = viewModel.anonymousFriend.value
+                        anonymousFriend?.let {
+                            tvAnonymousFreindName.text = getString(R.string.anonymous_user_identity, it.anonymousName)
+                            tvAnonymousFreindInfo.text = getString(R.string.anonymous_user_info, it.generation, it.part, it.name)
+                            imgAnonymousFriendOpen.load(it.profileImage.ifEmpty { R.drawable.ic_empty_profile }) {
+                                transformations(CircleCropTransformation())
+                            }
 
-                        imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
-                    }
+                            imgAnonymousFriendOpenOutline.setRelationStrokeColor(it.mutualRelationMessage)
+                        }
 
-                    Handler(Looper.getMainLooper()).postDelayed({
+                        delay(2000)
                         layoutAnonymousFriendOpen.visibility = View.GONE
                         viewModel.setAnonymousFriend(null)
-                    }, 2000)
+                    }
                 } else {
                     layoutAnonymousFriendLottie.visibility = View.GONE
                 }