diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt index 904ac6d5..fc8d2346 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/feed/WineyFeedAdapter.kt @@ -15,7 +15,7 @@ import com.android.go.sopt.winey.util.view.setOnSingleClickListener class WineyFeedAdapter( private val likeButtonClick: (feedId: Int, isLiked: Boolean) -> Unit, private val showPopupMenu: (View, WineyFeed) -> Unit, - private val toFeedDetail: (feedId: Int, writerLevel: Int) -> Unit + private val toFeedDetail: (feedId: Int, writerId: Int) -> Unit ) : PagingDataAdapter(diffUtil) { private val currentData: ItemSnapshotList get() = snapshot() diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt index 7a86698d..df599c69 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedAdapter.kt @@ -15,7 +15,7 @@ import com.android.go.sopt.winey.util.view.setOnSingleClickListener class MyFeedAdapter( private val likeButtonClick: (feedId: Int, isLiked: Boolean) -> Unit, private val showPopupMenu: (View, WineyFeed) -> Unit, - private val toFeedDetail: (feedId: Int, writerLevel: Int) -> Unit + private val toFeedDetail: (feedId: Int, writerId: Int) -> Unit ) : PagingDataAdapter(diffUtil) { private val currentData: ItemSnapshotList get() = snapshot() @@ -24,7 +24,7 @@ class MyFeedAdapter( private val binding: ItemMyfeedPostBinding, private val onLikeButtonClick: (feedId: Int, isLiked: Boolean) -> Unit, private val showPopupMenu: (View, WineyFeed) -> Unit, - private val toFeedDetail: (feedId: Int, writerLevel: Int) -> Unit + private val toFeedDetail: (feedId: Int, writerId: Int) -> Unit ) : RecyclerView.ViewHolder(binding.root) { fun onBind(data: WineyFeed?) { binding.apply { @@ -40,7 +40,7 @@ class MyFeedAdapter( showPopupMenu(view, data) } lMyfeedPost.setOnSingleClickListener { - toFeedDetail(data.feedId, data.writerLevel) + toFeedDetail(data.feedId, data.userId) } } } diff --git a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt index b52c93ca..a9aec58b 100644 --- a/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt +++ b/app/src/main/java/com/android/go/sopt/winey/presentation/main/mypage/myfeed/MyFeedFragment.kt @@ -59,7 +59,7 @@ class MyFeedFragment : BindingFragment(R.layout.fragment_ showPopupMenu = { view, wineyFeed -> showPopupMenu(view, wineyFeed) }, - toFeedDetail = { feedId, writerLevel -> navigateToDetail(feedId, writerLevel) } + toFeedDetail = { feedId, writerId -> navigateToDetail(feedId, writerId) } ) binding.rvMyfeedPost.adapter = myFeedAdapter.withLoadStateFooter(wineyFeedLoadAdapter) } @@ -182,10 +182,10 @@ class MyFeedFragment : BindingFragment(R.layout.fragment_ } } - private fun navigateToDetail(feedId: Int, writerLevel: Int) { + private fun navigateToDetail(feedId: Int, writerId: Int) { val intent = Intent(requireContext(), DetailActivity::class.java) - intent.putExtra("feedId", feedId) - intent.putExtra("writerLevel", writerLevel) + intent.putExtra(KEY_FEED_ID, feedId) + intent.putExtra(KEY_FEED_WRITER_ID, writerId) startActivity(intent) } @@ -198,7 +198,9 @@ class MyFeedFragment : BindingFragment(R.layout.fragment_ } companion object { - private const val LV_KNIGHT = 2 + private const val KEY_FEED_ID = "feedId" + private const val KEY_FEED_WRITER_ID = "feedWriterId" + private const val MSG_MYFEED_ERROR = "ERROR" private const val TAG_DELETE_DIALOG = "DELETE_DIALOG" }