From e8a5a49d4dae810d6b0cc57311d72fcd10c7248f Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Fri, 1 Mar 2024 19:43:19 +0900 Subject: [PATCH] =?UTF-8?q?[ADD/#219]=20=EC=97=AC=ED=96=89=20=EC=B4=88?= =?UTF-8?q?=EB=8C=80=206=EB=AA=85=20=EC=A0=9C=ED=95=9C=20=EC=95=88?= =?UTF-8?q?=EB=82=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../presentation/todo/ourtodo/OurTodoFragment.kt | 12 ++++++++---- presentation/src/main/res/values/strings.xml | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt index 49c886fb..995f7558 100644 --- a/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt +++ b/presentation/src/main/java/com/going/presentation/todo/ourtodo/OurTodoFragment.kt @@ -105,20 +105,24 @@ class OurTodoFragment() : BaseFragment(R.layout.fragment private fun initInviteBtnListener() { binding.btnOurTodoAddFriend.setOnSingleClickListener { - friendInviteDialog = FriendInviteDialog() - friendInviteDialog?.show(parentFragmentManager, INVITE_DIALOG) + if (participantList.size > 5) { + toast(getString(R.string.our_todo_participant_over_six)) + } else { + friendInviteDialog = FriendInviteDialog() + friendInviteDialog?.show(parentFragmentManager, INVITE_DIALOG) + } } } private fun initBackBtnClickListener() { binding.btnOurTodoBack.setOnSingleClickListener { - activity?.finish() + requireActivity().finish() } } private fun initTripFriendBtnClickListener() { binding.btnOurTripFriend.setOnSingleClickListener { - Intent(activity, CheckFriendsActivity::class.java).apply { + Intent(requireActivity(), CheckFriendsActivity::class.java).apply { putExtra(EXTRA_TRIP_ID, viewModel.tripId) startActivity(this) } diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 948d7101..9b93c5cf 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -83,6 +83,7 @@ %s - %s %s월 %s일 앗! 누가하지? + 여행은 최대 6명까지 함께할 수 있어요 혼자 할일