diff --git a/app/build.gradle b/app/build.gradle index d999929..acad6fe 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateActivity.kt index 9521108..dbdc9a3 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateActivity.kt @@ -33,7 +33,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity when { isChecked -> { - viewModel.addContentId( + viewModel.addContent( AudioContentPlaylistContent( id = item.contentId, title = item.title, @@ -48,17 +48,7 @@ class AudioContentPlaylistCreateActivity : BaseActivity { - 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 } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateViewModel.kt index 1e17246..341bbbb 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/AudioContentPlaylistCreateViewModel.kt @@ -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 } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentAdapter.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentAdapter.kt index dd0f726..7558b02 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentAdapter.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/create/add_content/PlaylistAddContentAdapter.kt @@ -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)) { diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyActivity.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyActivity.kt index b8fe6de..5ef0679 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyActivity.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyActivity.kt @@ -39,7 +39,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity when { isChecked -> { - viewModel.addContentId( + viewModel.addContent( AudioContentPlaylistContent( id = item.contentId, title = item.title, @@ -54,17 +54,7 @@ class AudioContentPlaylistModifyActivity : BaseActivity { - 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 } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyViewModel.kt b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyViewModel.kt index 333abf3..406fefe 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyViewModel.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/audio_content/playlist/modify/AudioContentPlaylistModifyViewModel.kt @@ -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 }