klaus
/
sodalive-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

재생 목록 수정 

- 콘텐츠가 삭제 되지 않는 버그 수정
This commit is contained in:
klaus 2024-12-18 01:26:41 +09:00
parent 057e21570b
commit 6da8846460
6 changed files with 13 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -35,8 +35,8 @@ android {
applicationId "kr.co.vividnext.sodalive" applicationId "kr.co.vividnext.sodalive"
minSdk 23 minSdk 23
targetSdk 34 targetSdk 34
versionCode 126 versionCode 128
versionName "1.24.0" versionName "1.25.0"
} }
buildTypes { buildTypes {

14
app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateActivity.kt
View File

@ -33,7 +33,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity<ActivityAudioContentPlay
PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked -> PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked ->
when { when {
isChecked -> { isChecked -> {
viewModel.addContentId( viewModel.addContent(
AudioContentPlaylistContent( AudioContentPlaylistContent(
id = item.contentId, id = item.contentId,
title = item.title, title = item.title,
@ -48,17 +48,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity<ActivityAudioContentPlay
} }
!isChecked -> { !isChecked -> {
viewModel.removeContentId( viewModel.removeContentId(item.contentId)
AudioContentPlaylistContent(
id = item.contentId,
title = item.title,
category = item.themeStr,
coverUrl = item.coverImageUrl,
duration = item.duration ?: "00:00:00",
creatorNickname = item.creatorNickname,
creatorProfileUrl = ""
)
)
return@PlaylistAddContentDialogFragment true return@PlaylistAddContentDialogFragment true
} }

7
app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateViewModel.kt
View File

@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
import io.reactivex.rxjava3.schedulers.Schedulers 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.AudioContentPlaylistRepository
import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent import kr.co.vividnext.sodalive.audio_content.playlist.detail.AudioContentPlaylistContent
import kr.co.vividnext.sodalive.base.BaseViewModel import kr.co.vividnext.sodalive.base.BaseViewModel
@ -30,13 +29,13 @@ class AudioContentPlaylistCreateViewModel(
var title: String = "" var title: String = ""
var desc: String = "" var desc: String = ""
fun addContentId(item: AudioContentPlaylistContent) { fun addContent(item: AudioContentPlaylistContent) {
contentList.add(item) contentList.add(item)
_contentListLiveData.value = contentList _contentListLiveData.value = contentList
} }
fun removeContentId(item: AudioContentPlaylistContent) { fun removeContentId(id: Long) {
contentList.remove(item) contentList.removeAll { it.id == id }
_contentListLiveData.value = contentList _contentListLiveData.value = contentList
} }

2
app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentAdapter.kt
View File

@ -52,7 +52,7 @@ class PlaylistAddContentAdapter(
binding.tvTheme.text = item.themeStr binding.tvTheme.text = item.themeStr
binding.tvDuration.text = item.duration binding.tvDuration.text = item.duration
binding.ivAdd.setOnClickListener { binding.root.setOnClickListener {
isChecked = !isChecked isChecked = !isChecked
if (onItemClick(item, isChecked)) { if (onItemClick(item, isChecked)) {

14
app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyActivity.kt
View File

@ -39,7 +39,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity<ActivityAudioContentPlay
PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked -> PlaylistAddContentDialogFragment(screenWidth, viewModel.contentList) { item, isChecked ->
when { when {
isChecked -> { isChecked -> {
viewModel.addContentId( viewModel.addContent(
AudioContentPlaylistContent( AudioContentPlaylistContent(
id = item.contentId, id = item.contentId,
title = item.title, title = item.title,
@ -54,17 +54,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity<ActivityAudioContentPlay
} }
!isChecked -> { !isChecked -> {
viewModel.removeContentId( viewModel.removeContentId(item.contentId)
AudioContentPlaylistContent(
id = item.contentId,
title = item.title,
category = item.themeStr,
coverUrl = item.coverImageUrl,
duration = item.duration ?: "00:00:00",
creatorNickname = item.creatorNickname,
creatorProfileUrl = ""
)
)
return@PlaylistAddContentDialogFragment true return@PlaylistAddContentDialogFragment true
} }

6
app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyViewModel.kt
View File

@ -37,13 +37,13 @@ class AudioContentPlaylistModifyViewModel(
var desc: String = "" var desc: String = ""
private var playlistId: Long = 0 private var playlistId: Long = 0
fun addContentId(item: AudioContentPlaylistContent) { fun addContent(item: AudioContentPlaylistContent) {
contentList.add(item) contentList.add(item)
_contentListLiveData.value = contentList _contentListLiveData.value = contentList
} }
fun removeContentId(item: AudioContentPlaylistContent) { fun removeContentId(id: Long) {
contentList.remove(item) contentList.removeAll { it.id == id }
_contentListLiveData.value = contentList _contentListLiveData.value = contentList
} }