Skip to content

[FIX/#1557] 콕지르기 QA 사항 반영 #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
seungjunGong wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

[FIX/#1557] 콕지르기 QA 사항 반영 #1559

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33fec10
[FIX/#1557] OnboardingPokeUserViewModel 내 비어있는 유저 리스트 처리 로직 수정
seungjunGong Apr 14, 2026
4787106
[FEAT/#1557] PokeNotificationScreen 내 뒤로가기 동작 추가
seungjunGong Apr 14, 2026
b26429a
[MERGE/#1557] pulled develop
seungjunGong Apr 14, 2026
78e99fa
[REFACTOR/#1557] 익명 프로필 이미지 고정 리소스 적용 및 UI 로직 수정
seungjunGong Apr 14, 2026
b5c3ccc
[FIX] 콕 찌르기 후 UI 업데이트 로직 수정 및 바텀시트 처리 개선
seungjunGong Apr 14, 2026
020bca2
[FIX/#1557] Poke UI 상태 초기화 및 BottomSheet 처리 로직 최적화
seungjunGong Apr 14, 2026
7f7ee1a
[REFACTOR/#1557] Poke 관련 ApiError 발생 시 노출되는 토스트 메시지 리소스 변경
seungjunGong Apr 14, 2026
7414f9b
[REFACTOR/#1557] PokeMainViewModel 내 콕 찌르기 상태 업데이트 로직 수정
seungjunGong Apr 15, 2026
6f76049
[FIX/#1557] 콕 찌르기 메인 내 친구 목록 노출 및 예외 처리 로직 수정
seungjunGong Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../java/org/sopt/official/feature/poke/friend/detail/FriendListDetailBottomSheetFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ class FriendListDetailBottomSheetFragment : BottomSheetDialogFragment() {

is UiState.ApiError -> {
messageListBottomSheet?.dismiss()
showPokeToast(getString(R.string.poke_user_alert_exceeded))
showPokeToast(getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/sopt/official/feature/poke/friend/summary/FriendListSummaryActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ class FriendListSummaryActivity : AppCompatActivity() {

is UiState.ApiError -> {
messageListBottomSheet?.dismiss()
showPokeToast(getString(R.string.poke_user_alert_exceeded))
showPokeToast(getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand Down
2 changes: 1 addition & 1 deletion ...ke/src/main/java/org/sopt/official/feature/poke/friend/summary/FriendListSummaryScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ fun FriendListSummaryScreen(

is UiState.ApiError -> {
dismissBottomSheet(fragmentManager, bottomSheetTag)
fragmentActivity?.showPokeToast(context.getString(R.string.poke_user_alert_exceeded))
fragmentActivity?.showPokeToast(context.getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand Down
2 changes: 1 addition & 1 deletion feature/poke/src/main/java/org/sopt/official/feature/poke/main/PokeMainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class PokeMainActivity : AppCompatActivity() {

is UiState.ApiError -> {
messageListBottomSheet?.dismiss()
showPokeToast(getString(R.string.poke_user_alert_exceeded))
showPokeToast(getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand Down
14 changes: 11 additions & 3 deletions feature/poke/src/main/java/org/sopt/official/feature/poke/main/PokeMainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,15 +163,23 @@ class PokeMainViewModel @Inject constructor(
}
if (_pokeSimilarFriendUiState.value is UiState.Success<List<PokeRandomUserList.PokeRandomUsers>>) {
val oldData = (_pokeSimilarFriendUiState.value as UiState.Success<List<PokeRandomUserList.PokeRandomUsers>>).data
for (friend in oldData) {
friend.userInfoList.find { it.userId == userId }?.isAlreadyPoke = true
val updatedSimilarFriends = oldData.map { randomUsers ->
randomUsers.copy(
userInfoList = randomUsers.userInfoList.map { pokeUser ->
pokeUser.copy(isAlreadyPoke = pokeUser.isAlreadyPoke || pokeUser.userId == userId)
}
Copy link
Copy Markdown
Member

@sonms sonms Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

현재 코드는 리스트에 있는 모든 유저에 해대 copy 함수를 실행하는 방식인거 같은데

Suggested change
pokeUser.copy(isAlreadyPoke = pokeUser.isAlreadyPoke || pokeUser.userId == userId)
}
if (pokeUser.userId == userId) {
pokeUser.copy(isAlreadyPoke = true)
} else {
pokeUser
}

이런식으로 userId가 일치할 때만 새로운 객체로 copy하고 일치하지 않으면 기존 객체를 그대로 반환해서 불필요한 복사를 막아 메모리 낭비를 막는 방식은 어떨까요? (제가 이해한게 맞다면..)

Copy link
Copy Markdown
Member Author

@seungjunGong seungjunGong Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

오 말씀해주신 방식이 불필요한 copy 를 줄여서 더 나을것 같습니다 ! 수정해둘게요 :)

)
}
_pokeSimilarFriendUiState.emit(UiState.Loading)
_pokeSimilarFriendUiState.emit(UiState.Success(oldData))
_pokeSimilarFriendUiState.emit(UiState.Success(updatedSimilarFriends))
}
}
}

fun resetPokeUserUiState() {
_pokeUserUiState.value = UiState.Loading
}

fun setAnonymousFriend(pokeUser: PokeUser?) {
_anonymousFriend.value = pokeUser
}
Expand Down
33 changes: 25 additions & 8 deletions feature/poke/src/main/java/org/sopt/official/feature/poke/main/PokeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,15 @@ import org.sopt.official.feature.poke.friend.summary.FriendListSummaryActivity
import org.sopt.official.feature.poke.message.MessageListBottomSheetFragment
import org.sopt.official.feature.poke.user.PokeUserListClickListener
import org.sopt.official.feature.poke.util.addOnAnimationEndListener
import org.sopt.official.feature.poke.util.dismissBottomSheet
import org.sopt.official.feature.poke.util.isBestFriend
import org.sopt.official.feature.poke.util.isSoulMate
import org.sopt.official.feature.poke.util.setRelationStrokeColor
import org.sopt.official.feature.poke.util.showPokeToast
import org.sopt.official.model.UserStatus

private const val MESSAGE_LIST_BOTTOM_SHEET_TAG = "MessageListBottomSheet"

@Composable
fun PokeScreen(
paddingValues: PaddingValues,
Expand All @@ -88,6 +91,8 @@ fun PokeScreen(
context.findActivity<FragmentActivity>()
}

val fragmentManager = fragmentActivity?.supportFragmentManager

val pokeMeUiState by viewModel.pokeMeUiState.collectAsStateWithLifecycle()
val pokeFriendUiState by viewModel.pokeFriendUiState.collectAsStateWithLifecycle()
val pokeSimilarFriendUiState by viewModel.pokeSimilarFriendUiState.collectAsStateWithLifecycle()
Expand Down Expand Up @@ -151,10 +156,12 @@ fun PokeScreen(
pokeMainListAdapter.submitList(state.data)
currentBinding.refreshLayoutPokeMain.isRefreshing = false
}

is UiState.ApiError, is UiState.Failure -> {
activity?.showPokeToast(context.getString(R.string.toast_poke_error))
currentBinding.refreshLayoutPokeMain.isRefreshing = false
}

is UiState.Loading -> {}
}
}
Expand All @@ -168,9 +175,11 @@ fun PokeScreen(
initPokeMeView(currentBinding, state.data, tracker, userStatus, activity, viewModel)
}
}

is UiState.ApiError, is UiState.Failure -> {
currentBinding.layoutSomeonePokeMe.setVisible(false)
}

else -> {}
}
}
Expand All @@ -184,6 +193,7 @@ fun PokeScreen(
initPokeFriendView(currentBinding, state.data, tracker, userStatus, activity, viewModel)
}
}

is UiState.ApiError -> activity?.showPokeToast(context.getString(R.string.toast_poke_error))
is UiState.Failure -> activity?.showPokeToast(state.throwable.message ?: context.getString(R.string.toast_poke_error))
else -> {}
Expand Down Expand Up @@ -231,10 +241,19 @@ fun PokeScreen(
}
}
}
is UiState.ApiError -> activity?.showPokeToast(context.getString(R.string.poke_user_alert_exceeded))
is UiState.Failure -> activity?.showPokeToast(state.throwable.message ?: context.getString(R.string.toast_poke_error))

is UiState.ApiError -> {
activity?.showPokeToast(context.getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
activity?.showPokeToast(state.throwable.message ?: context.getString(R.string.toast_poke_error))
}

else -> {}
}
dismissBottomSheet(fragmentManager, MESSAGE_LIST_BOTTOM_SHEET_TAG)
viewModel.resetPokeUserUiState()
}
}

Expand Down Expand Up @@ -335,9 +354,7 @@ private fun initPokeMeView(
}

if (pokeMeItem.isAnonymous) {
pokeMeItem.anonymousImage.takeIf { it.isNotEmpty() }?.let {
imgUserProfileSomeonePokeMe.load(it) { transformations(CircleCropTransformation()) }
} ?: imgUserProfileSomeonePokeMe.setImageResource(R.drawable.ic_empty_profile)
imgUserProfileSomeonePokeMe.load(R.drawable.image_anonymous_profile) { transformations(CircleCropTransformation()) }
tvUserNameSomeonePokeMe.text = pokeMeItem.anonymousName
tvFriendsStatusSomeonePokeMe.visibility = View.GONE
tvUserGenerationSomeonePokeMe.visibility = View.GONE
Expand Down Expand Up @@ -414,7 +431,7 @@ private fun initPokeFriendView(
}

if (pokeFriendItem.isAnonymous) {
imgUserProfilePokeMyFriend.load(pokeFriendItem.anonymousImage) { transformations(CircleCropTransformation()) }
imgUserProfilePokeMyFriend.load(R.drawable.image_anonymous_profile) { transformations(CircleCropTransformation()) }
tvUserNamePokeMyFriend.text = pokeFriendItem.anonymousName
} else {
pokeFriendItem.profileImage.takeIf { it.isNotEmpty() }?.let {
Expand Down Expand Up @@ -447,7 +464,7 @@ private fun showMessageListBottomSheet(
viewModel: PokeMainViewModel,
userId: Int,
pokeMessageType: PokeMessageType,
isFirstMeet: Boolean = false
isFirstMeet: Boolean = false,
) {
val messageListBottomSheet =
MessageListBottomSheetFragment.Builder()
Expand All @@ -462,5 +479,5 @@ private fun showMessageListBottomSheet(
}
.create()

messageListBottomSheet.show(activity.supportFragmentManager, messageListBottomSheet.tag)
messageListBottomSheet.show(activity.supportFragmentManager, MESSAGE_LIST_BOTTOM_SHEET_TAG)
}
1 change: 1 addition & 0 deletions feature/poke/src/main/java/org/sopt/official/feature/poke/navigation/PokeNavGraph.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ fun NavGraphBuilder.pokeNavGraph(
PokeNotificationScreen(
paddingValues = paddingValues,
userStatus = userStatus,
navigateUp = navController::navigateUp,
)
}

Expand Down
2 changes: 1 addition & 1 deletion ...oke/src/main/java/org/sopt/official/feature/poke/notification/PokeNotificationActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class PokeNotificationActivity : AppCompatActivity() {

is UiState.ApiError -> {
messageListBottomSheet?.dismiss()
showPokeToast(getString(R.string.poke_user_alert_exceeded))
showPokeToast(getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand Down
4 changes: 1 addition & 3 deletions ...poke/src/main/java/org/sopt/official/feature/poke/notification/PokeNotificationAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,7 @@ class PokeNotificationAdapter(
fun onBind(item: PokeUser) {
with(viewBinding) {
if (item.isAnonymous) {
item.anonymousImage.takeIf { it.isNotEmpty() }?.let {
imgUserProfile.load(it) { transformations(CircleCropTransformation()) }
} ?: imgUserProfile.setImageResource(R.drawable.ic_empty_profile)
imgUserProfile.load(R.drawable.image_anonymous_profile) { transformations(CircleCropTransformation()) }
tvUserName.text = item.anonymousName
tvUserGeneration.visibility = View.GONE
tvUserFriendsStatus.visibility = View.GONE
Expand Down
16 changes: 11 additions & 5 deletions .../poke/src/main/java/org/sopt/official/feature/poke/notification/PokeNotificationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import kotlinx.coroutines.launch
import org.sopt.official.analytics.EventType
import org.sopt.official.analytics.compose.LocalTracker
import org.sopt.official.common.context.findActivity
import org.sopt.official.common.util.setOnSingleClickListener
import org.sopt.official.domain.poke.entity.PokeUser
import org.sopt.official.domain.poke.type.PokeMessageType
import org.sopt.official.feature.poke.R
Expand All @@ -74,6 +75,7 @@ import org.sopt.official.model.UserStatus
fun PokeNotificationScreen(
paddingValues: PaddingValues,
userStatus: UserStatus,
navigateUp: () -> Unit,
viewModel: PokeNotificationViewModel = hiltViewModel()
) {
val context = LocalContext.current
Expand Down Expand Up @@ -189,14 +191,17 @@ fun PokeNotificationScreen(
if (!currentBinding.animationFriendViewLottie.isAnimating) {
if (isBestFriend) {
currentBinding.layoutAnonymousFriendLottie.visibility = View.VISIBLE
currentBinding.tvFreindLottie.text = context.getString(R.string.anonymous_to_friend, user.anonymousName, "단짝친구가")
currentBinding.tvFreindLottieHint.text = context.getString(R.string.anonymous_user_info_part, user.generation, user.part)
currentBinding.tvFreindLottie.text =
context.getString(R.string.anonymous_to_friend, user.anonymousName, "단짝친구가")
currentBinding.tvFreindLottieHint.text =
context.getString(R.string.anonymous_user_info_part, user.generation, user.part)
currentBinding.animationFriendViewLottie.setAnimation(R.raw.friendtobestfriend)
currentBinding.animationFriendViewLottie.playAnimation()
} else if (isSoulMate) {
viewModel.setAnonymousFriend(user)
currentBinding.layoutAnonymousFriendLottie.visibility = View.VISIBLE
currentBinding.tvFreindLottie.text = context.getString(R.string.anonymous_to_friend, user.anonymousName, "천생연분이")
currentBinding.tvFreindLottie.text =
context.getString(R.string.anonymous_to_friend, user.anonymousName, "천생연분이")
currentBinding.animationFriendViewLottie.setAnimation(R.raw.bestfriendtosoulmate)
currentBinding.animationFriendViewLottie.playAnimation()
}
Expand All @@ -207,7 +212,7 @@ fun PokeNotificationScreen(

is UiState.ApiError -> {
dismissBottomSheet(fragmentManager, bottomSheetTag)
fragmentActivity?.showPokeToast(context.getString(R.string.poke_user_alert_exceeded))
fragmentActivity?.showPokeToast(context.getString(R.string.toast_poke_error))
}

is UiState.Failure -> {
Expand All @@ -225,7 +230,7 @@ fun PokeNotificationScreen(
properties = mapOf("view_type" to userStatus.name),
)

onPauseOrDispose { }
onPauseOrDispose { }
}

AndroidViewBinding(
Expand All @@ -237,6 +242,7 @@ fun PokeNotificationScreen(
binding = this
if (recyclerviewPokeNotification.adapter == null) {
includeAppBar.textViewTitle.text = root.context.getString(R.string.poke_title)
includeAppBar.toolbar.setOnSingleClickListener { navigateUp() }

recyclerviewPokeNotification.adapter = adapter

Expand Down
8 changes: 7 additions & 1 deletion ...ke/src/main/java/org/sopt/official/feature/poke/onboarding/OnboardingPokeUserViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,13 @@ class OnboardingPokeUserViewModel @Inject constructor(
_onboardingPokeUserListUiState.emit(UiState.Loading)
getOnboardingPokeUserListUseCase.invoke(randomType = randomType.value, size = 6)
.onSuccess { response ->
_onboardingPokeUserListUiState.emit(UiState.Success(response.randomInfoList[0]))
val nextRandomUsers = response.randomInfoList.firstOrNull()
?: PokeRandomUserList.PokeRandomUsers(
randomType = randomType.value,
randomTitle = "",
userInfoList = emptyList(),
)
_onboardingPokeUserListUiState.emit(UiState.Success(nextRandomUsers))
Comment on lines +60 to +66
Copy link
Copy Markdown
Member

@sonms sonms Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

혹시 이 코드는 어떤 의미일까요?
온보딩 기준으로 유저가 없을 경우를 대비 하신 걸까요?

Copy link
Copy Markdown
Member Author

@seungjunGong seungjunGong Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

네 맞습니다. 기존에 콕지르기를 다한경우, 리스트에 값이 안들어와서 앱이 크래시되는 현상을 수정했습니다

}
.onApiError { statusCode, responseMessage ->
_onboardingPokeUserListUiState.emit(UiState.ApiError(statusCode, responseMessage))
Expand Down
17 changes: 12 additions & 5 deletions feature/poke/src/main/java/org/sopt/official/feature/poke/user/PokeUserViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ sealed class PokeUserViewHolder(
binding.apply {
imageViewFriendRelationOutline.setRelationStrokeColor(pokeUser.relationName)
if (pokeUser.isAnonymous) {
imageViewProfile.load(pokeUser.anonymousImage) {
imageViewProfile.load(R.drawable.image_anonymous_profile) {
crossfade(true)
transformations(CircleCropTransformation())
}
Expand All @@ -74,20 +74,27 @@ sealed class PokeUserViewHolder(
) : PokeUserViewHolder(binding) {
override fun onBind(pokeUser: PokeUser) {
binding.apply {
when (pokeUser.profileImage.isBlank()) {
true ->
when {
pokeUser.isAnonymous ->
imageViewProfile.load(R.drawable.image_anonymous_profile) {
crossfade(true)
transformations(CircleCropTransformation())
}

pokeUser.profileImage.isBlank() ->
imageViewProfile.load(null) {
crossfade(true)
transformations(CircleCropTransformation())
}

false ->
else ->
imageViewProfile.load(pokeUser.profileImage) {
crossfade(true)
transformations(CircleCropTransformation())
}
}
textViewUserName.text = pokeUser.name
textViewUserName.text = if (pokeUser.isAnonymous) pokeUser.anonymousName else pokeUser.name
textViewUserInfo.isVisible = !pokeUser.isAnonymous
textViewUserInfo.text = binding.root.context.getString(R.string.poke_user_info, pokeUser.generation, pokeUser.part)
imageButtonPoke.isEnabled = !pokeUser.isAlreadyPoke
}
Expand Down
Binary file added feature/poke/src/main/res/drawable/image_anonymous_profile.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading