[둘리] 3, 4 단계 영화 티켓 예매 제출합니다. #47
refactor: sealed class view holder, view type enum class 생성, item들 xm…
…l 수정
- Loading branch information
commit bb03b6a3a08078a2fa418a3686bcfd53fb711be9
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package woowacourse.movie.activity.movielist | ||
|
|
||
| import android.view.View | ||
| import android.widget.Button | ||
| import android.widget.ImageView | ||
| import android.widget.TextView | ||
| import androidx.annotation.DrawableRes | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import woowacourse.movie.R | ||
| import woowacourse.movie.model.MovieModel | ||
| import java.time.format.DateTimeFormatter | ||
|
|
||
| sealed class CustomViewHolder(view: View) : RecyclerView.ViewHolder(view) { | ||
| class MovieItemViewHolder(view: View) : CustomViewHolder(view) { | ||
| private val image: ImageView = view.findViewById(R.id.img_movie) | ||
| private val title: TextView = view.findViewById(R.id.text_title) | ||
| private val playingDate: TextView = view.findViewById(R.id.text_playing_date) | ||
| private val runningTime: TextView = view.findViewById(R.id.text_running_time) | ||
| private val reserveButton: Button = view.findViewById(R.id.btn_reserve) | ||
|
|
||
| fun set(movie: MovieModel, clickListener: View.OnClickListener) { | ||
| val context = title.context | ||
| image.setImageResource(movie.image) | ||
| title.text = movie.title | ||
| playingDate.text = context.getString( | ||
| R.string.playing_date_range, | ||
| DateTimeFormatter.ofPattern(context.getString(R.string.date_format)) | ||
| .format(movie.startDate), | ||
| DateTimeFormatter.ofPattern(context.getString(R.string.date_format)) | ||
| .format(movie.endDate), | ||
| ) | ||
| runningTime.text = context.getString(R.string.running_time, movie.runningTime) | ||
| reserveButton.setOnClickListener(clickListener) | ||
| } | ||
| } | ||
|
|
||
| class AdItemViewHolder(view: View) : CustomViewHolder(view) { | ||
| private val image: ImageView = view.findViewById(R.id.img_ad) | ||
| fun set(@DrawableRes resId: Int) { | ||
| image.setImageResource(resId) | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,81 +1,53 @@ | ||
| package woowacourse.movie.activity.movielist | ||
|
|
||
| import android.util.Log | ||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import woowacourse.movie.R | ||
| import woowacourse.movie.model.ListViewType | ||
| import woowacourse.movie.model.MovieModel | ||
|
|
||
| class MovieListAdapter( | ||
| private val adInterval: Int, | ||
| private val movies: List<MovieModel>, | ||
| private val onClick: (MovieModel) -> Unit, | ||
| ) : | ||
| RecyclerView.Adapter<CustomViewHolder>() { | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): CustomViewHolder { | ||
| return when (ListViewType.values()[viewType]) { | ||
| ListViewType.AD_VIEWTYPE -> { | ||
| Log.d("Type", "AD") | ||
| val view = LayoutInflater.from(parent.context).inflate(R.layout.ad_item, parent, false) | ||
| CustomViewHolder.AdItemViewHolder(view) | ||
| } | ||
| else -> { | ||
| Log.d("Type", "MOVIE") | ||
| val view = LayoutInflater.from(parent.context).inflate(R.layout.movie_item, parent, false) | ||
| CustomViewHolder.MovieItemViewHolder(view) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: CustomViewHolder, position: Int) { | ||
| when (holder) { | ||
| is CustomViewHolder.AdItemViewHolder -> { // ad item | ||
| holder.set(R.drawable.ad) | ||
| } | ||
| is CustomViewHolder.MovieItemViewHolder -> { // movie item | ||
| holder.set(movies[position - ((position + 1) / (adInterval + 1))]) { | ||
| onClick(movies[position - ((position + 1) / (adInterval + 1))]) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| override fun getItemViewType(position: Int): Int { | ||
| return ListViewType.getViewType(adInterval, position).ordinal | ||
| } | ||
|
|
||
| override fun getItemId(position: Int): Long = position.toLong() | ||
|
|
||
| override fun getItemCount(): Int = movies.size | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package woowacourse.movie.model | ||
|
|
||
| enum class ListViewType { | ||
| AD_VIEWTYPE, NORMAL_VIEWTYPE; | ||
|
|
||
| companion object { | ||
| fun getViewType(adInterval: Int, position: Int): ListViewType { | ||
| if ((position + 1) % (adInterval + 1) == 0) return AD_VIEWTYPE | ||
| return NORMAL_VIEWTYPE | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,5 +12,4 @@ | |
| android:adjustViewBounds="true" | ||
| android:src="@drawable/ad" | ||
| /> | ||
| </LinearLayout> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ViewHolder에 sealed class를 활용하셨네요 👍
CustomViewHolder란 이름은 좀 더 고민해보면 좋겠네요 :)