콘텐츠 댓글 수정 기능 추가
This commit is contained in:
parent
e9370e02be
commit
5522672195
|
@ -17,6 +17,7 @@ import kr.co.vividnext.sodalive.extensions.moneyFormat
|
||||||
|
|
||||||
class AudioContentCommentAdapter(
|
class AudioContentCommentAdapter(
|
||||||
private val creatorId: Long,
|
private val creatorId: Long,
|
||||||
|
private val modifyComment: (Long, String) -> Unit,
|
||||||
private val onClickDelete: (Long) -> Unit,
|
private val onClickDelete: (Long) -> Unit,
|
||||||
private val onItemClick: (GetAudioContentCommentListItem) -> Unit
|
private val onItemClick: (GetAudioContentCommentListItem) -> Unit
|
||||||
) : RecyclerView.Adapter<AudioContentCommentAdapter.ViewHolder>() {
|
) : RecyclerView.Adapter<AudioContentCommentAdapter.ViewHolder>() {
|
||||||
|
@ -92,6 +93,7 @@ class AudioContentCommentAdapter(
|
||||||
item.writerId == SharedPreferenceManager.userId ||
|
item.writerId == SharedPreferenceManager.userId ||
|
||||||
creatorId == SharedPreferenceManager.userId
|
creatorId == SharedPreferenceManager.userId
|
||||||
) {
|
) {
|
||||||
|
binding.etCommentModify.setText(item.comment)
|
||||||
binding.ivMenu.visibility = View.VISIBLE
|
binding.ivMenu.visibility = View.VISIBLE
|
||||||
binding.ivMenu.setOnClickListener {
|
binding.ivMenu.setOnClickListener {
|
||||||
showOptionMenu(
|
showOptionMenu(
|
||||||
|
@ -99,9 +101,19 @@ class AudioContentCommentAdapter(
|
||||||
binding.ivMenu,
|
binding.ivMenu,
|
||||||
commentId = item.id,
|
commentId = item.id,
|
||||||
writerId = item.writerId,
|
writerId = item.writerId,
|
||||||
creatorId = creatorId
|
creatorId = creatorId,
|
||||||
|
onClickModify = {
|
||||||
|
binding.rlCommentModify.visibility = View.VISIBLE
|
||||||
|
binding.tvComment.visibility = View.GONE
|
||||||
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
binding.tvModify.setOnClickListener {
|
||||||
|
binding.rlCommentModify.visibility = View.GONE
|
||||||
|
binding.tvComment.visibility = View.VISIBLE
|
||||||
|
modifyComment(item.id, binding.etCommentModify.text.toString())
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivMenu.visibility = View.GONE
|
binding.ivMenu.visibility = View.GONE
|
||||||
}
|
}
|
||||||
|
@ -131,20 +143,24 @@ class AudioContentCommentAdapter(
|
||||||
v: View,
|
v: View,
|
||||||
commentId: Long,
|
commentId: Long,
|
||||||
writerId: Long,
|
writerId: Long,
|
||||||
creatorId: Long
|
creatorId: Long,
|
||||||
|
onClickModify: () -> Unit
|
||||||
) {
|
) {
|
||||||
val popup = PopupMenu(context, v)
|
val popup = PopupMenu(context, v)
|
||||||
val inflater = popup.menuInflater
|
val inflater = popup.menuInflater
|
||||||
|
|
||||||
if (
|
if (writerId == SharedPreferenceManager.userId) {
|
||||||
writerId == SharedPreferenceManager.userId ||
|
|
||||||
creatorId == SharedPreferenceManager.userId
|
|
||||||
) {
|
|
||||||
inflater.inflate(R.menu.content_comment_option_menu, popup.menu)
|
inflater.inflate(R.menu.content_comment_option_menu, popup.menu)
|
||||||
|
} else if (creatorId == SharedPreferenceManager.userId) {
|
||||||
|
inflater.inflate(R.menu.content_comment_option_menu2, popup.menu)
|
||||||
}
|
}
|
||||||
|
|
||||||
popup.setOnMenuItemClickListener {
|
popup.setOnMenuItemClickListener {
|
||||||
when (it.itemId) {
|
when (it.itemId) {
|
||||||
|
R.id.menu_review_modify -> {
|
||||||
|
onClickModify()
|
||||||
|
}
|
||||||
|
|
||||||
R.id.menu_review_delete -> {
|
R.id.menu_review_delete -> {
|
||||||
onClickDelete(commentId)
|
onClickDelete(commentId)
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,10 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment
|
||||||
import kr.co.vividnext.sodalive.R
|
import kr.co.vividnext.sodalive.R
|
||||||
import kr.co.vividnext.sodalive.databinding.DialogAudioContentCommentBinding
|
import kr.co.vividnext.sodalive.databinding.DialogAudioContentCommentBinding
|
||||||
|
|
||||||
class AudioContentCommentFragment(private val audioContentId: Long) : BottomSheetDialogFragment() {
|
class AudioContentCommentFragment(
|
||||||
|
private val creatorId: Long,
|
||||||
|
private val audioContentId: Long
|
||||||
|
) : BottomSheetDialogFragment() {
|
||||||
|
|
||||||
private lateinit var binding: DialogAudioContentCommentBinding
|
private lateinit var binding: DialogAudioContentCommentBinding
|
||||||
|
|
||||||
|
@ -46,6 +49,7 @@ class AudioContentCommentFragment(private val audioContentId: Long) : BottomShee
|
||||||
|
|
||||||
val commentListFragmentTag = "COMMENT_LIST_FRAGMENT"
|
val commentListFragmentTag = "COMMENT_LIST_FRAGMENT"
|
||||||
val commentListFragment = AudioContentCommentListFragment.newInstance(
|
val commentListFragment = AudioContentCommentListFragment.newInstance(
|
||||||
|
creatorId = creatorId,
|
||||||
audioContentId = audioContentId
|
audioContentId = audioContentId
|
||||||
)
|
)
|
||||||
val fragmentTransaction = childFragmentManager.beginTransaction()
|
val fragmentTransaction = childFragmentManager.beginTransaction()
|
||||||
|
|
|
@ -33,6 +33,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
|
||||||
private lateinit var loadingDialog: LoadingDialog
|
private lateinit var loadingDialog: LoadingDialog
|
||||||
private lateinit var adapter: AudioContentCommentAdapter
|
private lateinit var adapter: AudioContentCommentAdapter
|
||||||
|
|
||||||
|
private var creatorId: Long = 0
|
||||||
private var audioContentId: Long = 0
|
private var audioContentId: Long = 0
|
||||||
|
|
||||||
override fun onCreateView(
|
override fun onCreateView(
|
||||||
|
@ -40,6 +41,7 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
|
||||||
container: ViewGroup?,
|
container: ViewGroup?,
|
||||||
savedInstanceState: Bundle?
|
savedInstanceState: Bundle?
|
||||||
): View? {
|
): View? {
|
||||||
|
creatorId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID) ?: 0
|
||||||
audioContentId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) ?: 0
|
audioContentId = arguments?.getLong(Constants.EXTRA_AUDIO_CONTENT_ID) ?: 0
|
||||||
return super.onCreateView(inflater, container, savedInstanceState)
|
return super.onCreateView(inflater, container, savedInstanceState)
|
||||||
}
|
}
|
||||||
|
@ -76,7 +78,15 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
|
||||||
}
|
}
|
||||||
|
|
||||||
adapter = AudioContentCommentAdapter(
|
adapter = AudioContentCommentAdapter(
|
||||||
creatorId = 0,
|
creatorId = creatorId,
|
||||||
|
modifyComment = { commentId, comment ->
|
||||||
|
hideKeyboard()
|
||||||
|
viewModel.modifyComment(
|
||||||
|
commentId = commentId,
|
||||||
|
audioContentId = audioContentId,
|
||||||
|
comment = comment
|
||||||
|
)
|
||||||
|
},
|
||||||
onClickDelete = {
|
onClickDelete = {
|
||||||
SodaDialog(
|
SodaDialog(
|
||||||
activity = requireActivity(),
|
activity = requireActivity(),
|
||||||
|
@ -192,8 +202,9 @@ class AudioContentCommentListFragment : BaseFragment<FragmentAudioContentComment
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
fun newInstance(audioContentId: Long): AudioContentCommentListFragment {
|
fun newInstance(creatorId: Long, audioContentId: Long): AudioContentCommentListFragment {
|
||||||
val args = Bundle()
|
val args = Bundle()
|
||||||
|
args.putLong(Constants.EXTRA_AUDIO_CONTENT_CREATOR_ID, creatorId)
|
||||||
args.putLong(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
|
args.putLong(Constants.EXTRA_AUDIO_CONTENT_ID, audioContentId)
|
||||||
|
|
||||||
val fragment = AudioContentCommentListFragment()
|
val fragment = AudioContentCommentListFragment()
|
||||||
|
|
|
@ -56,6 +56,8 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
||||||
private var isAlertPreview = false
|
private var isAlertPreview = false
|
||||||
private val audioContentReceiver = AudioContentReceiver()
|
private val audioContentReceiver = AudioContentReceiver()
|
||||||
|
|
||||||
|
private var creatorId: Long = 0
|
||||||
|
|
||||||
private var refresh = false
|
private var refresh = false
|
||||||
set(value) {
|
set(value) {
|
||||||
field = value
|
field = value
|
||||||
|
@ -474,7 +476,10 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun showCommentBottomSheetDialog() {
|
private fun showCommentBottomSheetDialog() {
|
||||||
val dialog = AudioContentCommentFragment(audioContentId = audioContentId)
|
val dialog = AudioContentCommentFragment(
|
||||||
|
creatorId = creatorId,
|
||||||
|
audioContentId = audioContentId
|
||||||
|
)
|
||||||
dialog.show(
|
dialog.show(
|
||||||
supportFragmentManager,
|
supportFragmentManager,
|
||||||
dialog.tag
|
dialog.tag
|
||||||
|
@ -629,6 +634,7 @@ class AudioContentDetailActivity : BaseActivity<ActivityAudioContentDetailBindin
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupCreatorArea(creator: AudioContentCreator) {
|
private fun setupCreatorArea(creator: AudioContentCreator) {
|
||||||
|
this.creatorId = creator.creatorId
|
||||||
binding.rlProfile.setOnClickListener {
|
binding.rlProfile.setOnClickListener {
|
||||||
startActivity(
|
startActivity(
|
||||||
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
Intent(applicationContext, UserProfileActivity::class.java).apply {
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:contentDescription="@null"
|
android:contentDescription="@null"
|
||||||
android:src="@drawable/ic_seemore_vertical"
|
android:src="@drawable/ic_seemore_vertical"
|
||||||
|
android:visibility="gone"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="@+id/iv_comment_profile" />
|
app:layout_constraintTop_toTopOf="@+id/iv_comment_profile" />
|
||||||
|
|
||||||
|
@ -96,6 +97,44 @@
|
||||||
android:textColor="@color/color_777777"
|
android:textColor="@color/color_777777"
|
||||||
android:textSize="12sp"
|
android:textSize="12sp"
|
||||||
tools:text="내용내용내용내용내용내용내용내용내용내용내용내용내용 내용내용내용내용내용내용내용내용내용내용 내용내용내용내용" />
|
tools:text="내용내용내용내용내용내용내용내용내용내용내용내용내용 내용내용내용내용내용내용내용내용내용내용 내용내용내용내용" />
|
||||||
|
|
||||||
|
<RelativeLayout
|
||||||
|
android:id="@+id/rl_comment_modify"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:visibility="gone">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/et_comment_modify"
|
||||||
|
android:layout_width="0dp"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_marginEnd="13.3dp"
|
||||||
|
android:layout_toStartOf="@+id/tv_modify"
|
||||||
|
android:background="@drawable/bg_round_corner_10_339970ff_9970ff"
|
||||||
|
android:importantForAutofill="no"
|
||||||
|
android:inputType="text"
|
||||||
|
android:paddingHorizontal="13.3dp"
|
||||||
|
android:paddingVertical="13dp"
|
||||||
|
android:textColor="@color/color_eeeeee"
|
||||||
|
android:textColorHint="@color/color_eeeeee"
|
||||||
|
android:textCursorDrawable="@drawable/edit_text_cursor"
|
||||||
|
android:textSize="13.3sp"
|
||||||
|
android:theme="@style/EditTextStyle"
|
||||||
|
tools:ignore="LabelFor" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/tv_modify"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:background="@drawable/bg_round_corner_6_7_9970ff"
|
||||||
|
android:fontFamily="@font/gmarket_sans_bold"
|
||||||
|
android:padding="13dp"
|
||||||
|
android:text="수정"
|
||||||
|
android:textColor="@color/white" />
|
||||||
|
</RelativeLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
|
|
@ -1,6 +1,12 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_review_modify"
|
||||||
|
android:title="수정"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
|
||||||
<item
|
<item
|
||||||
android:id="@+id/menu_review_delete"
|
android:id="@+id/menu_review_delete"
|
||||||
android:title="삭제"
|
android:title="삭제"
|
||||||
|
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||||
|
|
||||||
|
<item
|
||||||
|
android:id="@+id/menu_review_delete"
|
||||||
|
android:title="삭제"
|
||||||
|
app:showAsAction="ifRoom" />
|
||||||
|
</menu>
|
Loading…
Reference in New Issue