[Chore] Change delete/modify/report modal #248
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package com.eatssu.android.presentation.common | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.appcompat.app.AlertDialog | ||
| import androidx.fragment.app.activityViewModels | ||
| import androidx.lifecycle.lifecycleScope | ||
| import com.eatssu.android.App | ||
| import com.eatssu.android.R | ||
| import com.eatssu.android.databinding.FragmentBottomsheetMyReviewBinding | ||
| import com.eatssu.android.presentation.mypage.myreview.MyReviewViewModel | ||
| import com.eatssu.android.presentation.review.modify.ModifyReviewActivity | ||
| import com.eatssu.android.presentation.util.showToast | ||
| import com.google.android.material.bottomsheet.BottomSheetDialogFragment | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import kotlinx.coroutines.flow.collectLatest | ||
| import kotlinx.coroutines.launch | ||
| import timber.log.Timber | ||
|
|
||
| @AndroidEntryPoint | ||
| class MyReviewBottomSheetFragment : BottomSheetDialogFragment() { | ||
| private var _binding: FragmentBottomsheetMyReviewBinding? = null | ||
| private val binding get() = _binding!! | ||
|
|
||
| interface OnReviewDeletedListener { | ||
| fun onReviewDeleted() | ||
| } | ||
|
|
||
| var onReviewDeletedListener: OnReviewDeletedListener? = null | ||
|
|
||
| private val viewModel: MyReviewViewModel by activityViewModels() | ||
|
|
||
| var reviewId = -1L | ||
| var menu = "" | ||
| var content = "" | ||
| var mainGrade = -1 | ||
| var amountGrade = -1 | ||
| var tasteGrade = -1 | ||
|
Comment on lines
+36
to
+41
Member
There was a problem hiding this comment. 이런 정보는 이렇게 변수로 선언하는 것보다는 뷰모델에서 uiState로 가지고 있는게 좋지 않나요??
Member
Author
There was a problem hiding this comment. 읆 그러면 activityViewModels인 MyReviewViewModel을 MyReviewBottomSheetFragment에서도 쓰고 ModifyReviewActivity에서도 쓰자는 말인거죵!? ModifyReviewActivity에서는 ModifyViewModel이랑 MyReviewBottomSheetFragment 둘다 쓰고?
Member
Author
There was a problem hiding this comment. 엄... 이건 다른 PR에서 작업해도 될까요? 해당 PR이 장기화 되는 것 같아서요..! |
||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| _binding = FragmentBottomsheetMyReviewBinding.inflate(inflater, container, false) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| arguments?.let { | ||
| reviewId = it.getLong("reviewId") | ||
| menu = it.getString("menu").toString() | ||
| content = it.getString("content").toString() | ||
| mainGrade = it.getInt("mainGrade") | ||
| amountGrade = it.getInt("amountGrade") | ||
| tasteGrade = it.getInt("tasteGrade") | ||
| } | ||
|
|
||
| Timber.d("넘겨받은 리뷰 정보: $reviewId $menu $content $reviewId") | ||
|
|
||
| binding.llModify.setOnClickListener { | ||
| val intent = Intent(requireContext(), ModifyReviewActivity::class.java) | ||
|
|
||
| intent.let { | ||
| it.putExtra("reviewId", reviewId) | ||
| it.putExtra("menu", menu) | ||
| it.putExtra("content", content) | ||
| it.putExtra("mainGrade", mainGrade) | ||
| it.putExtra("amountGrade", amountGrade) | ||
| it.putExtra("tasteGrade", tasteGrade) | ||
| } | ||
|
|
||
| startActivity(intent) | ||
| dismiss() | ||
| } | ||
|
|
||
| binding.llDelete.setOnClickListener { | ||
| AlertDialog.Builder(requireContext()).apply { | ||
| setTitle(R.string.delete) | ||
| setMessage(R.string.delete_description) | ||
| setNegativeButton("취소") { _, _ -> | ||
| activity?.showToast(App.appContext.getString(R.string.delete_undo)) | ||
| } | ||
| setPositiveButton("삭제") { _, _ -> | ||
| viewModel.deleteReview(reviewId) | ||
| lifecycleScope.launch { | ||
| viewModel.uiState.collectLatest { | ||
| if (it.isDeleted) { | ||
| onReviewDeletedListener?.onReviewDeleted() // 콜백 호출 | ||
| dismiss() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }.create().show() | ||
| } | ||
|
Comment on lines
+82
to
+101
There was a problem hiding this comment. 삭제 로직 개선 필요 다음 사항들을 개선하면 좋을 것 같습니다:
- setNegativeButton("취소") { _, _ ->
- activity?.showToast(App.appContext.getString(R.string.delete_undo))
- }
- setPositiveButton("삭제") { _, _ ->
+ setNegativeButton(R.string.cancel) { _, _ ->
+ activity?.showToast(getString(R.string.delete_undo))
+ }
+ setPositiveButton(R.string.delete) { _, _ ->
viewModel.deleteReview(reviewId)
lifecycleScope.launch {
+ try {
viewModel.uiState.collectLatest {
if (it.isDeleted) {
onReviewDeletedListener?.onReviewDeleted() // 콜백 호출
dismiss()
+ } else if (it.error != null) {
+ activity?.showToast(getString(R.string.delete_error))
}
}
+ } catch (e: Exception) {
+ activity?.showToast(getString(R.string.unknown_error))
+ }
}
}
|
||
|
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| package com.eatssu.android.presentation.common | ||
|
|
||
| import android.content.Intent | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import com.eatssu.android.databinding.FragmentBottomsheetOthersBinding | ||
| import com.eatssu.android.presentation.review.report.ReportActivity | ||
| import com.google.android.material.bottomsheet.BottomSheetDialogFragment | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import timber.log.Timber | ||
|
|
||
| @AndroidEntryPoint | ||
| class OthersBottomSheetFragment : BottomSheetDialogFragment() { | ||
| private var _binding: FragmentBottomsheetOthersBinding? = null | ||
| private val binding get() = _binding!! | ||
|
|
||
| var reviewId = -1L | ||
| var menu = "" | ||
|
|
||
|
Comment on lines
+16
to
+21
There was a problem hiding this comment. 메모리 누수 방지를 위한 바인딩 정리 필요 바인딩 객체가 프래그먼트 수명주기 이후에도 유지될 수 있어 메모리 누수가 발생할 수 있습니다. 다음과 같이 수정해주세요: + override fun onDestroyView() {
+ super.onDestroyView()
+ _binding = null
+ }또한 reviewId와 menu를 데이터 클래스로 캡슐화하는 것을 고려해보세요.
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| _binding = FragmentBottomsheetOthersBinding.inflate(inflater, container, false) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| super.onViewCreated(view, savedInstanceState) | ||
|
|
||
| arguments?.let { | ||
| reviewId = it.getLong("reviewId") | ||
| menu = it.getString("menu").toString() | ||
| } | ||
|
Comment on lines
+34
to
+37
There was a problem hiding this comment. 💡 Codebase verification 인자 검증 로직 개선 필요 arguments에서 reviewId와 menu를 가져올 때 다음과 같은 문제점들이 발견되었습니다:
수정이 필요한 부분:
🔗 Analysis chain인자 유효성 검사 추가 필요 reviewId가 유효하지 않은 경우(-1)에 대한 처리가 필요합니다. 또한 menu가 null이나 빈 문자열일 경우의 처리도 필요합니다. Let me check how these reviewId values are handled in the related files. Let me check how these fragments handle their lifecycle and any error cases. 🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Check if there are any null checks for these arguments in other files
rg "reviewId.*-1|menu.*isEmpty" app/src/main/java/
Length of output: 786 Script: #!/bin/bash
# Check the implementation of these bottom sheet fragments and activities
ast-grep --pattern 'class $_ : BottomSheetDialogFragment {
$$$
reviewId $$$
$$$
}'
# Also check for menu parameter handling
rg "menu.*toString|getString.*menu" app/src/main/java/
Length of output: 1924 Script: #!/bin/bash
# Check implementation of these bottom sheet fragments
cat app/src/main/java/com/eatssu/android/presentation/common/OthersBottomSheetFragment.kt
cat app/src/main/java/com/eatssu/android/presentation/common/MyReviewBottomSheetFragment.kt
# Check if there's any error handling in parent classes
rg "class.*BottomSheetDialogFragment" app/src/main/java/
Length of output: 5925 |
||
|
|
||
| Timber.d("넘겨받은 리뷰 정보: $reviewId $menu") | ||
|
|
||
| binding.llReport.setOnClickListener { | ||
|
|
||
| val intent = Intent(requireContext(), ReportActivity::class.java) | ||
| intent.putExtra("reviewId", reviewId) | ||
| Timber.d("reviewId $reviewId") | ||
| startActivity(intent) | ||
| dismiss() | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This comment was marked as outdated.
Sorry, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.