Skip to content

Commit 6c448a1

Browse files
sohyun127sohyun127
authored
Merge pull request #244 from TeamDon-tBe/fix/#233-bnv-qa
[Fix/#233] 1.0.0 업뎃 전 버전 코드 변경, 슬랙 디자인 qa 반영
2 parents 3b5f648 + 13e03ee commit 6c448a1

File tree

15 files changed

+55
-39
lines changed

15 files changed

+55
-39
lines changed

‎domain/src/main/java/com/teamdontbe/domain/entity/CommentEntity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ data class CommentEntity(
66
val memberNickname: String,
77
val isGhost: Boolean,
88
val memberGhost: Int,
9-
val isLiked: Boolean,
10-
val commentLikedNumber: Int,
9+
var isLiked: Boolean,
10+
var commentLikedNumber: Int,
1111
val contentText: String,
1212
val time: String,
1313
val commentId: Int,

‎domain/src/main/java/com/teamdontbe/domain/entity/FeedEntity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ data class FeedEntity(
44
val memberId: Int,
55
val memberProfileUrl: String,
66
val memberNickname: String,
7-
val isLiked: Boolean,
7+
var isLiked: Boolean,
88
val isGhost: Boolean,
99
val memberGhost: Int,
10-
val contentLikedNumber: Int,
10+
var contentLikedNumber: Int,
1111
val commentNumber: Int,
1212
val contentText: String,
1313
val time: String,

‎feature/src/main/java/com/teamdontbe/feature/home/HomeFragment.kt‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@ import com.teamdontbe.feature.util.pagingSubmitData
2929
import dagger.hilt.android.AndroidEntryPoint
3030
import kotlinx.coroutines.flow.launchIn
3131
import kotlinx.coroutines.flow.onEach
32-
import timber.log.Timber
3332

3433
@AndroidEntryPoint
3534
class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home) {
3635
private val homeViewModel by activityViewModels<HomeViewModel>()
3736

3837
private lateinit var homeFeedAdapter: HomePagingFeedAdapter
39-
private var deleteFeedPosition: Int = -1
4038

4139
override fun initView() {
4240
statusBarColorOf(R.color.gray_1)
@@ -81,7 +79,6 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
8179
feedData.memberId == homeViewModel.getMemberId(),
8280
it,
8381
)
84-
deleteFeedPosition = position
8582
}
8683
}
8784

@@ -179,10 +176,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
179176
}
180177

181178
private fun handleDeleteFeedSuccess() {
182-
if (deleteFeedPosition != -1) {
183-
homeFeedAdapter.deleteItem(deleteFeedPosition)
184-
deleteFeedPosition = -1
185-
}
179+
homeFeedAdapter.refresh()
186180
val dialog = DeleteCompleteDialogFragment()
187181
dialog.show(childFragmentManager, DELETE_POSTING)
188182
}
@@ -217,7 +211,7 @@ class HomeFragment : BindingFragment<FragmentHomeBinding>(R.layout.fragment_home
217211
homeFeedAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
218212
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
219213
super.onItemRangeInserted(positionStart, itemCount)
220-
binding.rvHome.smoothScrollToPosition(0)
214+
if (positionStart == 0) scrollRecyclerViewToTop()
221215
homeFeedAdapter.unregisterAdapterDataObserver(this)
222216
}
223217
})

‎feature/src/main/java/com/teamdontbe/feature/home/viewholder/HomeFeedViewHolder.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,10 @@ class HomeFeedViewHolder(
6969
onClickLikedBtn(contentId, btnHomeHeart.isSelected)
7070
}
7171
val likeNumber = tvHomeHeartNum.text.toString()
72-
tvHomeHeartNum.text =
73-
if (btnHomeHeart.isSelected) (likeNumber.toInt() - 1).toString() else (likeNumber.toInt() + 1).toString()
72+
val likeNumberChanged = if (btnHomeHeart.isSelected) (likeNumber.toInt() - 1) else (likeNumber.toInt() + 1)
73+
tvHomeHeartNum.text = likeNumberChanged.toString()
74+
data.isLiked = !btnHomeHeart.isSelected
75+
data.contentLikedNumber = likeNumberChanged
7476
btnHomeHeart.isSelected = !btnHomeHeart.isSelected
7577
}
7678
}

‎feature/src/main/java/com/teamdontbe/feature/homedetail/HomeDetailFragment.kt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ class HomeDetailFragment :
295295

296296
private fun handleCommentPostingSuccess() {
297297
homeDetailCommentAdapter.refresh()
298+
binding.rvHomeDetail.post {
299+
binding.rvHomeDetail.smoothScrollToPosition(homeDetailCommentAdapter.itemCount + 1)
300+
}
298301
requireContext().hideKeyboard(binding.root)
299302
(requireActivity() as MainActivity).findViewById<View>(R.id.bnv_main).visibility =
300303
View.VISIBLE

‎feature/src/main/java/com/teamdontbe/feature/homedetail/viewholder/HomeDetailCommentViewHolder.kt‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@ class HomeDetailCommentViewHolder(
3131
ivCommentGhostFillGreen.isVisible = data.memberId !== userId
3232
dividerComment.isVisible = data.memberId !== userId
3333
btnCommentHeart.isSelected = data.isLiked
34-
35-
dividerCommentDivideBottom.isVisible = (lastPosition !== position)
34+
dividerCommentDivideBottom.isVisible = (lastPosition !== absoluteAdapterPosition)
3635
if (data.isGhost) {
3736
setFeedTransparent(-85)
3837
binding.tvCommentTransparency.text = context.getString(
@@ -63,8 +62,11 @@ class HomeDetailCommentViewHolder(
6362
btnCommentHeart.setOnDuplicateBlockClick {
6463
onClickLikedBtn(data.commentId, btnCommentHeart.isSelected)
6564
val likeNumber = tvCommentLikeNum.text.toString()
66-
tvCommentLikeNum.text =
67-
if (btnCommentHeart.isSelected) (likeNumber.toInt() - 1).toString() else (likeNumber.toInt() + 1).toString()
65+
val likeNumberChanged =
66+
if (btnCommentHeart.isSelected) (likeNumber.toInt() - 1) else (likeNumber.toInt() + 1)
67+
tvCommentLikeNum.text = likeNumberChanged.toString()
68+
data.isLiked = !btnCommentHeart.isSelected
69+
data.commentLikedNumber = likeNumberChanged
6870
btnCommentHeart.isSelected = !btnCommentHeart.isSelected
6971
}
7072
}

‎feature/src/main/java/com/teamdontbe/feature/mypage/comment/MyPageCommentFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class MyPageCommentFragment :
5555
initDeleteObserve()
5656
initTransparentObserve()
5757
stateCommentItemNull()
58-
scrollRecyclerViewToTop()
58+
//scrollRecyclerViewToTop()
5959
}
6060

6161
private fun initMemberProfile() {

‎feature/src/main/java/com/teamdontbe/feature/mypage/comment/MyPageCommentViewHolder.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ class MyPageCommentViewHolder(
5656
btnCommentHeart.setOnClickListener {
5757
onClickLikedBtn(data.commentId, btnCommentHeart.isSelected)
5858
val likeNumber = tvCommentLikeNum.text.toString()
59-
tvCommentLikeNum.text =
60-
if (btnCommentHeart.isSelected) (likeNumber.toInt() - 1).toString() else (likeNumber.toInt() + 1).toString()
59+
val likeNumberChanged =
60+
if (btnCommentHeart.isSelected) (likeNumber.toInt() - 1) else (likeNumber.toInt() + 1)
61+
tvCommentLikeNum.text = likeNumberChanged.toString()
62+
data.isLiked = !btnCommentHeart.isSelected
63+
data.commentLikedNumber = likeNumberChanged
6164
btnCommentHeart.isSelected = !btnCommentHeart.isSelected
6265
}
6366
}

‎feature/src/main/java/com/teamdontbe/feature/mypage/feed/MyPageFeedFragment.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class MyPageFeedFragment :
5656
initDeleteObserve()
5757
initTransparentObserve()
5858
stateFeedItemNull()
59-
scrollRecyclerViewToTop()
59+
//scrollRecyclerViewToTop()
6060
}
6161

6262
private fun initMemberProfile() {

‎feature/src/main/java/com/teamdontbe/feature/mypage/feed/MyPageFeedViewHolder.kt‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,11 @@ class MyPageFeedViewHolder(
5959
onClickLikedBtn(contentId, btnHomeHeart.isSelected)
6060
}
6161
val likeNumber = tvHomeHeartNum.text.toString()
62-
tvHomeHeartNum.text =
63-
if (btnHomeHeart.isSelected) (likeNumber.toInt() - 1).toString() else (likeNumber.toInt() + 1).toString()
62+
val likeNumberChanged =
63+
if (btnHomeHeart.isSelected) (likeNumber.toInt() - 1) else (likeNumber.toInt() + 1)
64+
tvHomeHeartNum.text = likeNumberChanged.toString()
65+
data.isLiked = !btnHomeHeart.isSelected
66+
data.contentLikedNumber = likeNumberChanged
6467
btnHomeHeart.isSelected = !btnHomeHeart.isSelected
6568
}
6669
}

0 commit comments

Comments
 (0)