parent
057e21570b
commit
6da8846460
|
@ -35,8 +35,8 @@ android {
|
|||
applicationId "kr.co.vividnext.sodalive"
|
||||
minSdk 23
|
||||
targetSdk 34
|
||||
versionCode 126
|
||||
versionName "1.24.0"
|
||||
versionCode 128
|
||||
versionName "1.25.0"
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
|
|
|
@ -33,7 +33,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity<ActivityAudioContentPlay
|
|||
PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked ->
|
||||
when {
|
||||
isChecked -> {
|
||||
viewModel.addContentId(
|
||||
viewModel.addContent(
|
||||
AudioContentPlaylistContent(
|
||||
id = item.contentId,
|
||||
title = item.title,
|
||||
|
@ -48,17 +48,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity<ActivityAudioContentPlay
|
|||
}
|
||||
|
||||
!isChecked -> {
|
||||
viewModel.removeContentId(
|
||||
AudioContentPlaylistContent(
|
||||
id = item.contentId,
|
||||
title = item.title,
|
||||
category = item.themeStr,
|
||||
coverUrl = item.coverImageUrl,
|
||||
duration = item.duration ?: "00:00:00",
|
||||
creatorNickname = item.creatorNickname,
|
||||
creatorProfileUrl = ""
|
||||
)
|
||||
)
|
||||
viewModel.removeContentId(item.contentId)
|
||||
return@PlaylistAddContentDialogFragment true
|
||||
}
|
||||
|
||||
|
|
|
@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
|
|||
import androidx.lifecycle.MutableLiveData
|
||||
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
|
||||
import io.reactivex.rxjava3.schedulers.Schedulers
|
||||
import kr.co.vividnext.sodalive.audio_content.order.GetAudioContentOrderListItem
|
||||
import kr.co.vividnext.sodalive.audio_content.playlist.AudioContentPlaylistRepository
|
||||
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
|
||||
import kr.co.vividnext.sodalive.base.BaseViewModel
|
||||
|
@ -30,13 +29,13 @@ class AudioContentPlaylistCreateViewModel(
|
|||
var title: String = ""
|
||||
var desc: String = ""
|
||||
|
||||
fun addContentId(item: AudioContentPlaylistContent) {
|
||||
fun addContent(item: AudioContentPlaylistContent) {
|
||||
contentList.add(item)
|
||||
_contentListLiveData.value = contentList
|
||||
}
|
||||
|
||||
fun removeContentId(item: AudioContentPlaylistContent) {
|
||||
contentList.remove(item)
|
||||
fun removeContentId(id: Long) {
|
||||
contentList.removeAll { it.id == id }
|
||||
_contentListLiveData.value = contentList
|
||||
}
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ class PlaylistAddContentAdapter(
|
|||
binding.tvTheme.text = item.themeStr
|
||||
binding.tvDuration.text = item.duration
|
||||
|
||||
binding.ivAdd.setOnClickListener {
|
||||
binding.root.setOnClickListener {
|
||||
isChecked = !isChecked
|
||||
|
||||
if (onItemClick(item, isChecked)) {
|
||||
|
|
|
@ -39,7 +39,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity<ActivityAudioContentPlay
|
|||
PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked ->
|
||||
when {
|
||||
isChecked -> {
|
||||
viewModel.addContentId(
|
||||
viewModel.addContent(
|
||||
AudioContentPlaylistContent(
|
||||
id = item.contentId,
|
||||
title = item.title,
|
||||
|
@ -54,17 +54,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity<ActivityAudioContentPlay
|
|||
}
|
||||
|
||||
!isChecked -> {
|
||||
viewModel.removeContentId(
|
||||
AudioContentPlaylistContent(
|
||||
id = item.contentId,
|
||||
title = item.title,
|
||||
category = item.themeStr,
|
||||
coverUrl = item.coverImageUrl,
|
||||
duration = item.duration ?: "00:00:00",
|
||||
creatorNickname = item.creatorNickname,
|
||||
creatorProfileUrl = ""
|
||||
)
|
||||
)
|
||||
viewModel.removeContentId(item.contentId)
|
||||
return@PlaylistAddContentDialogFragment true
|
||||
}
|
||||
|
||||
|
|
|
@ -37,13 +37,13 @@ class AudioContentPlaylistModifyViewModel(
|
|||
var desc: String = ""
|
||||
private var playlistId: Long = 0
|
||||
|
||||
fun addContentId(item: AudioContentPlaylistContent) {
|
||||
fun addContent(item: AudioContentPlaylistContent) {
|
||||
contentList.add(item)
|
||||
_contentListLiveData.value = contentList
|
||||
}
|
||||
|
||||
fun removeContentId(item: AudioContentPlaylistContent) {
|
||||
contentList.remove(item)
|
||||
fun removeContentId(id: Long) {
|
||||
contentList.removeAll { it.id == id }
|
||||
_contentListLiveData.value = contentList
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue