From 29bf9f818a24f1901ceee1d0ba1eb6a95d9440f1 Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Tue, 22 Aug 2023 14:28:28 +0900 Subject: [PATCH 1/5] =?UTF-8?q?[feat]=20#141=20=EC=9E=90=EC=8B=A0=EC=9D=98?= =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=EC=9D=80=20=EB=B3=B4=EC=9D=B4=EC=A7=80?= =?UTF-8?q?=EC=95=8A=EA=B2=8C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/notification/NotificationActivity.kt | 2 +- .../main/notification/NotificationAdapter.kt | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt index 5f359681..28780bc7 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt @@ -46,7 +46,7 @@ class NotificationActivity : } is UiState.Success -> { - notificationAdapter.submitList(state.data) + notificationAdapter.setData(state.data) } is UiState.Failure -> { diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt index 0ad64d6b..34429ad5 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationAdapter.kt @@ -15,6 +15,17 @@ class NotificationAdapter( ) : ListAdapter(DiffUtil) { + fun setData(dataList: List?) { + val filteredDataList = filterData(dataList) + submitList(filteredDataList) + } + + private fun filterData(dataList: List?): List? { + return dataList?.filterNot { data -> + data.notiReceiver.length <= data.notiMessage.length && + data.notiReceiver == data.notiMessage.substring(0, data.notiReceiver.length) + } + } class NotificationViewHolder( private val binding: ItemNotificationPostBinding, private val navigateFeedDetail: (feedId: Int?) -> Unit, From 8445a8ee640964999175ff23941e4fb592708ecd Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Tue, 22 Aug 2023 14:28:49 +0900 Subject: [PATCH 2/5] =?UTF-8?q?[chore]=20#141=20=EC=A1=B4=EC=9E=AC?= =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EA=B2=8C=EC=8B=9C?= =?UTF-8?q?=EB=AC=BC=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/winey/presentation/main/feed/detail/DetailActivity.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt index acd50c40..38eea311 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt @@ -18,6 +18,7 @@ import com.android.go.sopt.winey.presentation.main.MainActivity import com.android.go.sopt.winey.util.binding.BindingActivity import com.android.go.sopt.winey.util.context.snackBar import com.android.go.sopt.winey.util.context.stringOf +import com.android.go.sopt.winey.util.context.toast import com.android.go.sopt.winey.util.context.wineySnackbar import com.android.go.sopt.winey.util.fragment.WineyDialogFragment import com.android.go.sopt.winey.util.view.UiState @@ -248,6 +249,7 @@ class DetailActivity : BindingActivity(R.layout.activity_ is UiState.Failure -> { snackBar(binding.root) { state.msg } + finish() } else -> Timber.tag("failure").e(MSG_DETAIL_ERROR) From f7430c0e7d903af3704d1250285cf2ca922c9b7c Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Tue, 22 Aug 2023 14:30:53 +0900 Subject: [PATCH 3/5] =?UTF-8?q?[chore]=20#141=20import=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/winey/presentation/main/feed/detail/DetailActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt index 38eea311..33308954 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/detail/DetailActivity.kt @@ -18,7 +18,6 @@ import com.android.go.sopt.winey.presentation.main.MainActivity import com.android.go.sopt.winey.util.binding.BindingActivity import com.android.go.sopt.winey.util.context.snackBar import com.android.go.sopt.winey.util.context.stringOf -import com.android.go.sopt.winey.util.context.toast import com.android.go.sopt.winey.util.context.wineySnackbar import com.android.go.sopt.winey.util.fragment.WineyDialogFragment import com.android.go.sopt.winey.util.view.UiState From a3dcf015e3df7270c8bfdb1dca5627eeca3310a5 Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Wed, 23 Aug 2023 15:44:17 +0900 Subject: [PATCH 4/5] =?UTF-8?q?[feat]=20#141=20=EC=95=8C=EB=A6=BC=20->=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4?= =?UTF-8?q?=ED=9B=84=20=EB=92=A4=EB=A1=9C=EA=B0=80=EA=B8=B0=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EB=88=84=EB=A5=B4=EB=A9=B4=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EB=A1=9C=20=EB=8F=8C=EC=95=84?= =?UTF-8?q?=EC=98=A4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winey/presentation/main/MainActivity.kt | 8 +++++++- .../presentation/main/mypage/MyPageFragment.kt | 18 +++++++++++++++++- .../main/notification/NotificationActivity.kt | 1 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt index cbcd0ec8..14f84385 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/MainActivity.kt @@ -45,7 +45,13 @@ class MainActivity : BindingActivity(R.layout.activity_main private fun initFragment() { if (intent.getBooleanExtra("navigateMypage", false)) { - navigateTo() + val bundle = Bundle() + bundle.putString("fromNoti", "true") + val myPageFragment = MyPageFragment() + myPageFragment.arguments = bundle + val transaction = supportFragmentManager.beginTransaction() + transaction.replace(R.id.fcv_main, myPageFragment) + transaction.commit() binding.bnvMain.selectedItemId = R.id.menu_mypage } else { navigateTo() diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt index ab8bc46b..2374b5b9 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt @@ -4,6 +4,7 @@ import android.content.Intent import android.net.Uri import android.os.Bundle import android.view.View +import androidx.activity.OnBackPressedCallback import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.fragment.app.commit @@ -17,6 +18,7 @@ import com.android.go.sopt.winey.domain.entity.User import com.android.go.sopt.winey.domain.repository.DataStoreRepository import com.android.go.sopt.winey.presentation.main.MainViewModel import com.android.go.sopt.winey.presentation.main.mypage.myfeed.MyFeedFragment +import com.android.go.sopt.winey.presentation.main.notification.NotificationActivity import com.android.go.sopt.winey.presentation.nickname.NicknameActivity import com.android.go.sopt.winey.presentation.onboarding.guide.GuideActivity import com.android.go.sopt.winey.util.binding.BindingFragment @@ -51,10 +53,24 @@ class MyPageFragment : BindingFragment(R.layout.fragment_ initLogoutButtonClickListener() initWithdrawButtonClickListener() initNicknameButtonClickListener() - + requireActivity().onBackPressedDispatcher.addCallback(viewLifecycleOwner, callback) setupGetUserState() setupDeleteUserState() } + private val callback = object : OnBackPressedCallback(true) { + override fun handleOnBackPressed() { + val receivedBundle = arguments + if (receivedBundle != null) { + val value = receivedBundle.getString("fromNoti") + if (value == "true") { + val intent = Intent(requireContext(), NotificationActivity::class.java) + startActivity(intent) + requireActivity().finish() + } + } + requireActivity().finish() + } + } // 닉네임 액티비티 갔다가 다시 돌아왔을 때 유저 데이터 갱신하도록 override fun onStart() { diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt index 28780bc7..3e9f5034 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/notification/NotificationActivity.kt @@ -73,7 +73,6 @@ class NotificationActivity : private fun navigateToMypage() { val intent = Intent(this, MainActivity::class.java) - intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP intent.putExtra("navigateMypage", true) startActivity(intent) this.finish() From 27e59d06d3eef4327edaedd7653fcf9171c01827 Mon Sep 17 00:00:00 2001 From: Sangwook123 Date: Wed, 23 Aug 2023 15:44:56 +0900 Subject: [PATCH 5/5] =?UTF-8?q?[feat]=20#141=20=EB=AA=A9=ED=91=9C=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EB=B6=88=EA=B0=80=20=EB=8B=A4=EC=9D=B4=EC=96=BC?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EB=9D=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winey/presentation/main/mypage/MyPageFragment.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt index 2374b5b9..599be978 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/MyPageFragment.kt @@ -198,10 +198,7 @@ class MyPageFragment : BindingFragment(R.layout.fragment_ private fun initBottomSheetClickListener(data: User?) { binding.btnMypageTargetModify.setOnSingleClickListener { - val bottomSheet = TargetAmountBottomSheetFragment() - bottomSheet.show(this.childFragmentManager, bottomSheet.tag) - - /*when (data.isOver) { + when (data?.isOver) { true -> { val bottomSheet = TargetAmountBottomSheetFragment() bottomSheet.show(this.childFragmentManager, bottomSheet.tag) @@ -211,7 +208,10 @@ class MyPageFragment : BindingFragment(R.layout.fragment_ val dialog = MyPageDialogFragment() dialog.show(this.childFragmentManager, dialog.tag) } - }*/ + + null -> { + } + } } }