refactor(Adapter, ViewHolder): click listener 파라미터 고차함수 -> OnItemClic…

…k으로 변경 및 수정

app/src/main/java/woowacourse/movie/view/moviemain/movielist/MovieAdViewHolder.kt

@@ -6,16 +6,13 @@ import woowacourse.movie.view.model.MovieListModel
 
 class MovieAdViewHolder(
  private val binding: MovieAdItemBinding,
- private val onViewClick: (Int) -> Unit
+ private val onViewClick: MovieListAdapter.OnItemClick
 ) : RecyclerView.ViewHolder(binding.root) {
 
- init {
- binding.adImageview.setOnClickListener {
- onViewClick(adapterPosition)
- }
- }
-
  fun bind(ad: MovieListModel.MovieAdModel) {
  binding.adImageview.setImageResource(ad.banner)
+ binding.adImageview.setOnClickListener {
+ onViewClick.onClick(ad)
+ }
  }
 }

app/src/main/java/woowacourse/movie/view/moviemain/movielist/MovieItemViewHolder.kt

@@ -8,14 +8,8 @@ import woowacourse.movie.view.model.MovieListModel.MovieUiModel
 
 class MovieItemViewHolder(
  private val binding: MovieItemBinding,
- private val onViewClick: (Int) -> Unit
+ private val onViewClick: MovieListAdapter.OnItemClick
 ) : RecyclerView.ViewHolder(binding.root) {
- init {
- binding.reserveNowButton.setOnClickListener {
- onViewClick(adapterPosition)
- }
- }
-
  fun bind(movie: MovieUiModel) {
  binding.apply {
  val context = binding.root.context
@@ -29,5 +23,8 @@ class MovieItemViewHolder(
  movieRunningTime.text = context.resources.getString(R.string.running_time_format)
  .format(movie.runningTime)
  }
+ binding.reserveNowButton.setOnClickListener {
+ onViewClick.onClick(movie)
+ }
  }
 }

app/src/main/java/woowacourse/movie/view/moviemain/movielist/MovieListAdapter.kt

@@ -18,27 +18,15 @@ class MovieListAdapter(
  fun onClick(item: MovieListModel)
  }
 
- private val onItemViewClick: (Int) -> Unit = {
- onItemClick.onClick(dataList[it])
- }
-
  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
  return when (MovieListViewType.values()[viewType]) {
  MovieListViewType.MOVIE_ITEM -> {
- val view = LayoutInflater.from(parent.context).inflate(
- MovieListViewType.MOVIE_ITEM.id, parent, false
- )
- MovieItemViewHolder(MovieItemBinding.bind(view)) {
- onItemViewClick(it)
- }
+ val view = LayoutInflater.from(parent.context).inflate(MovieListViewType.MOVIE_ITEM.id, parent, false)
+ MovieItemViewHolder(MovieItemBinding.bind(view), onItemClick)
  }
  MovieListViewType.AD_ITEM -> {
- val view = LayoutInflater.from(parent.context).inflate(
- MovieListViewType.AD_ITEM.id, parent, false
- )
- MovieAdViewHolder(MovieAdItemBinding.bind(view)) {
- onItemViewClick(it)
- }
+ val view = LayoutInflater.from(parent.context).inflate(MovieListViewType.AD_ITEM.id, parent, false)
+ MovieAdViewHolder(MovieAdItemBinding.bind(view), onItemClick)
  }
  }
  }

app/src/main/java/woowacourse/movie/view/moviemain/reservationlist/ReservationItemViewHolder.kt

@@ -9,16 +9,9 @@ import woowacourse.movie.view.model.ReservationUiModel
 
 class ReservationItemViewHolder(
  private val binding: ReservationItemBinding,
- private val onItemClick: (Int) -> Unit
+ private val onItemClick: ReservationListAdapter.OnItemClick
 ) :
  RecyclerView.ViewHolder(binding.root) {
-
- init {
- binding.reservationLayout.setOnClickListener {
- onItemClick(adapterPosition)
- }
- }
-
  fun bind(reservation: ReservationUiModel) {
  val context = binding.root.context
  with(binding) {
@@ -29,5 +22,8 @@ class ReservationItemViewHolder(
  )
  movieTitle.text = reservation.title
  }
+ binding.reservationLayout.setOnClickListener {
+ onItemClick.onClick(reservation)
+ }
  }
 }

app/src/main/java/woowacourse/movie/view/moviemain/reservationlist/ReservationListAdapter.kt

@@ -16,14 +16,9 @@ class ReservationListAdapter(
  fun onClick(reservation: ReservationUiModel)
  }
 
- private val onReservationViewClick: (Int) -> Unit = {
- onItemClick.onClick(reservations[it])
- }
-
  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ReservationItemViewHolder {
- val view =
- LayoutInflater.from(parent.context).inflate(R.layout.reservation_item, parent, false)
- return ReservationItemViewHolder(ReservationItemBinding.bind(view), onReservationViewClick)
+ val view = LayoutInflater.from(parent.context).inflate(R.layout.reservation_item, parent, false)
+ return ReservationItemViewHolder(ReservationItemBinding.bind(view), onItemClick)
  }
 
  override fun getItemCount(): Int {