Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class DiscoverPickActivity :
binding.ivDiscoverPickFinish.setOnClickListener {
if (it.isActivated) {
Intent(this, DiscoverUploadActivity::class.java).apply {
putExtra(EXTRA_UPLOAD_COURSE, viewModel.currentSelectedCourse)
putExtra(EXTRA_UPLOAD_COURSE, viewModel.selectedCourse)
startActivity(this)
}
applyScreenEnterAnimation()
Expand Down Expand Up @@ -146,7 +146,7 @@ class DiscoverPickActivity :
onCourseItemClick = { isSelected, course ->
viewModel.apply {
updateCourseSelectState(isSelected)
if (isSelected) saveCurrentSelectedCourse(course)
if (isSelected) saveSelectedCourse(course)
}
}
).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ class DiscoverPickViewModel @Inject constructor(
val courseGetState: LiveData<UiStateV2<List<DiscoverUploadCourse>?>>
get() = _courseGetState

private val _courseSelectState = MutableLiveData<Boolean>()
private val _courseSelectState = MutableLiveData(false)
val courseSelectState: LiveData<Boolean>
get() = _courseSelectState

private var _currentSelectedCourse = DiscoverUploadCourse(-1, "", "", "")
val currentSelectedCourse get() = _currentSelectedCourse
private var _selectedCourse = DiscoverUploadCourse(-1, "", "", "")
val selectedCourse get() = _selectedCourse

init {
getMyCourseLoad()
Expand Down Expand Up @@ -59,7 +59,7 @@ class DiscoverPickViewModel @Inject constructor(
_courseSelectState.value = isSelected
}

fun saveCurrentSelectedCourse(course: DiscoverUploadCourse) {
_currentSelectedCourse = course
fun saveSelectedCourse(course: DiscoverUploadCourse) {
_selectedCourse = course
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.runnect.runnect.presentation.discover.pick.adapter

import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.recyclerview.widget.ListAdapter
import androidx.recyclerview.widget.RecyclerView
Expand All @@ -12,33 +11,38 @@ import com.runnect.runnect.util.callback.diff.ItemDiffCallback
class DiscoverPickAdapter(
private val onCourseItemClick: (Boolean, DiscoverUploadCourse) -> Unit
) : ListAdapter<DiscoverUploadCourse, DiscoverPickAdapter.DiscoverPickViewHolder>(diffUtil) {
private var selectedPosition = -1

override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): DiscoverPickViewHolder {
return DiscoverPickViewHolder(
binding = ItemDiscoverPickBinding.inflate(
ItemDiscoverPickBinding.inflate(
LayoutInflater.from(parent.context),
parent,
false
),
onCourseItemClick = onCourseItemClick
)
)
}

override fun onBindViewHolder(holder: DiscoverPickViewHolder, position: Int) {
holder.bind(currentList[position])
holder.bind(currentList[position], position)
}

class DiscoverPickViewHolder(
private val binding: ItemDiscoverPickBinding,
private val onCourseItemClick: (Boolean, DiscoverUploadCourse) -> Unit
inner class DiscoverPickViewHolder(
private val binding: ItemDiscoverPickBinding
) : RecyclerView.ViewHolder(binding.root) {
fun bind(course: DiscoverUploadCourse) {
fun bind(course: DiscoverUploadCourse, position: Int) {
binding.course = course
binding.ivItemDiscoverPickBackground.isSelected = false

binding.ivItemDiscoverPickBackground.setOnClickListener { view ->
view.isSelected = !view.isSelected
onCourseItemClick.invoke(view.isSelected, course)
binding.ivItemDiscoverPickBackground.setOnClickListener {
notifyItemChanged(selectedPosition) // 이전에 선택한 것은 해제
selectedPosition = absoluteAdapterPosition
notifyItemChanged(selectedPosition) // 새로 선택된 것은 활성화

onCourseItemClick.invoke(selectedPosition == position, course)
}

// 단일 선택된 항목의 배경 활성화
binding.ivItemDiscoverPickBackground.isSelected = (selectedPosition == position)
}
}

Expand Down