feat(TheaterBottomSheetFragment): 극장 선택 구현

app/src/main/java/woowacourse/movie/data/MovieMockRepository.kt

@@ -18,7 +18,13 @@ object MovieMockRepository : MovieRepository {
  "그의 뒤를 쫓아 산속 폐허에서 발견한 낡은 문. ‘스즈메’가 무언가에 이끌리듯 문을 열자 마을에 재난의 위기가 닥쳐오고 가문 대대로 문 너머의 재난을 봉인하는 ‘소타’를 도와 간신히 문을 닫는다. " +
  "“닫아야만 하잖아요, 여기를!” 재난을 막았다는 안도감도 잠시, 수수께끼의 고양이 ‘다이진’이 나타나 ‘소타’를 의자로 바꿔 버리고 일본 각지의 폐허에 재난을 부르는 문이 열리기 시작하자 ‘스즈메’는 의자가 된 ‘소타’와 함께 재난을 막기 위한 여정에 나선다." +
  "“꿈이 아니었어” 규슈, 시코쿠, 고베, 도쿄 재난을 막기 위해 일본 전역을 돌며 필사적으로 문을 닫아가던 중 어릴 적 고향에 닿은 ‘스즈메’는 잊고 있던 진실과 마주하게 되는데…",
- Schedule(mapOf("잠실 극장" to listOf(LocalTime.of(9, 0)))),
+ Schedule(
+ mapOf(
+ "선릉 극장" to listOf(LocalTime.of(13, 0), LocalTime.of(15, 0), LocalTime.of(17, 0), LocalTime.of(19, 0)),
+ "잠실 극장" to listOf(LocalTime.of(9, 0)),
+ "강남 극장" to listOf(LocalTime.of(12, 0), LocalTime.of(14, 0), LocalTime.of(16, 0))
+ )
+ ),
  ),
  Movie(
  "해리 포터와 마법사의 돌",
@@ -42,6 +48,7 @@ object MovieMockRepository : MovieRepository {
  Schedule(
  mapOf(
  "선릉 극장" to listOf(LocalTime.of(9, 0), LocalTime.of(11, 0), LocalTime.of(15, 0)),
+ "강남 극장" to listOf(LocalTime.of(12, 0), LocalTime.of(14, 0), LocalTime.of(16, 0))
  ),
  ),
  ),
@@ -53,6 +60,7 @@ object MovieMockRepository : MovieRepository {
  "어벤져스 실사영화 시리즈의 4번째 작품이자, 마블 시네마틱 유니버스의 스물두번째 작품이며, 페이즈 3의 10번째 작품이자 지난 2008년, 아이언맨을 시작으로 장장 11년 동안 이어져 왔던 인피니티 사가의 최종편.",
  Schedule(
  mapOf(
+ "선릉 극장" to listOf(LocalTime.of(9, 0), LocalTime.of(11, 0), LocalTime.of(15, 0)),
  "잠실 극장" to listOf(LocalTime.of(11, 0), LocalTime.of(14, 0)),
  ),
  ),

app/src/main/java/woowacourse/movie/data/MoviePosterMockRepository.kt

@@ -2,8 +2,8 @@ package woowacourse.movie.data
 
 import woowacourse.movie.R
 
-class MoviePosterMockRepository : MoviePosterRepository {
- val posters = mapOf(
+object MoviePosterMockRepository : MoviePosterRepository {
+ private val posters = mapOf(
  "스즈메의 문단속" to R.drawable.suzume_poster,
  "해리 포터와 마법사의 돌" to R.drawable.harry_potter1_poster,
  "스타워즈" to R.drawable.starwars_poster,

app/src/main/java/woowacourse/movie/data/MoviePosterRepository.kt

@@ -0,0 +1,5 @@
+package woowacourse.movie.data
+
+interface MoviePosterRepository {
+ fun findPoster(title: String): Int
+}

app/src/main/java/woowacourse/movie/util/MapExtension.kt

@@ -0,0 +1,9 @@
+package woowacourse.movie.util
+
+fun <T, K> Map<T, List<K>>.getOrEmptyList(key: T): List<K> {
+ return this[key] ?: emptyList<K>()
+}
+
+fun <T, K> Map<T, K>.getKeyFromIndex(index: Int): T {
+ return keys.toList()[index]
+}

app/src/main/java/woowacourse/movie/view/mapper/MovieMapper.kt

@@ -4,27 +4,12 @@ import androidx.annotation.DrawableRes
 import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.view.model.MovieUiModel
 
-fun Movie.toUiModel(@DrawableRes posterResourceId: Int): MovieUiModel {
- val convertSchedule = buildMap {
- schedule.schedule.forEach { (name, screeningDateTimes) ->
- put(name, screeningDateTimes.dateTimes)
- }
- }
-
- return MovieUiModel(
- title,
- startDate,
- endDate,
- runningTime.value,
- posterResourceId,
- summary,
- convertSchedule,
- )
-}
-
-// fun MovieUiModel.toDomainModel(): Movie = Movie(
-// title,
-// ScreeningDateTimes(screeningDateTimes),
-// Minute(runningTime),
-// summary
-// )
+fun Movie.toUiModel(@DrawableRes posterResourceId: Int): MovieUiModel = MovieUiModel(
+ title,
+ startDate,
+ endDate,
+ runningTime.value,
+ posterResourceId,
+ summary,
+ schedule.schedule,
+)

app/src/main/java/woowacourse/movie/view/model/MovieUiModel.kt

@@ -13,5 +13,5 @@ data class MovieUiModel(
  val runningTime: Int,
  val posterResourceId: Int,
  val summary: String,
- val schedule: Map<String, Map<LocalDate, List<LocalTime>>>,
+ val schedule: Map<String, List<LocalTime>>,
 ) : Parcelable

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

@@ -0,0 +1,14 @@
+package woowacourse.movie.view.moviemain.movielist
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentFactory
+import woowacourse.movie.view.model.MovieUiModel
+
+class BottomSheetFragmentFactoryImpl(private val movie: MovieUiModel) : FragmentFactory() {
+ override fun instantiate(classLoader: ClassLoader, className: String): Fragment {
+ return when (className) {
+ TheaterBottomSheetFragment::class.java.name -> TheaterBottomSheetFragment(movie)
+ else -> super.instantiate(classLoader, className)
+ }
+ }
+}

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

@@ -17,8 +17,8 @@ sealed class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  binding.movieTitle.text = movie.title
  binding.movieScreeningDate.text =
  context.getString(R.string.screening_date_format).format(
- movie.screeningDateTimes.keys.min().format(DATE_FORMATTER),
- movie.screeningDateTimes.keys.max().format(DATE_FORMATTER),
+ movie.startDate.format(DATE_FORMATTER),
+ movie.endDate.format(DATE_FORMATTER),
  )
 
  binding.movieRunningTime.text =

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

@@ -1,5 +1,6 @@
 package woowacourse.movie.view.moviemain.movielist
 
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
@@ -31,10 +32,11 @@ class MovieListAdapter(
  }
  }
 
- override fun getItemCount(): Int = movies.size
+ override fun getItemCount(): Int = movies.size + movies.size / adInterval
 
  override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
  val item = movies[position - ((position + 1) / (adInterval + 1))]
+ Log.d("index", (position - ((position + 1) / (adInterval + 1))).toString())
  when (holder) {
  is ItemViewHolder.MovieItemViewHolder -> {
  holder.set(item) {

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

@@ -6,7 +6,6 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.R
 import woowacourse.movie.view.model.MovieUiModel
-import woowacourse.movie.view.reservation.ReservationActivity
 
 class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -20,8 +19,9 @@ class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
  }
 
  private fun onClick(item: MovieUiModel) {
- val intent = ReservationActivity.newIntent(requireContext(), item)
- startActivity(intent)
+ val bottomSheet = TheaterBottomSheetFragment(item)
+ childFragmentManager.fragmentFactory = BottomSheetFragmentFactoryImpl(item)
+ bottomSheet.show(childFragmentManager, TheaterBottomSheetFragment.TAG_THEATER)
  }
 
  companion object {

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

@@ -1,19 +1,17 @@
 package woowacourse.movie.view.moviemain.movielist
 
-import woowacourse.movie.R
 import woowacourse.movie.data.MovieMockRepository
+import woowacourse.movie.data.MoviePosterMockRepository
+import woowacourse.movie.data.MoviePosterRepository
 import woowacourse.movie.domain.repository.MovieRepository
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.MovieUiModel
 
 class MovieListPresenter : MovieListContract.Presenter {
  override fun getMovieListData(): List<MovieUiModel> {
  val movieRepository: MovieRepository = MovieMockRepository
- val movies = movieRepository.findAll().map { it.toUiModel(R.drawable.harry_potter1_poster) }
- return movies
- }
-
- companion object {
- private const val AD_POST_INTERVAL = 3
+ val moviePosterRepository: MoviePosterRepository = MoviePosterMockRepository
+ return movieRepository.findAll()
+ .map { it.toUiModel(moviePosterRepository.findPoster(it.title)) }
  }
 }

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

@@ -0,0 +1,23 @@
+package woowacourse.movie.view.moviemain.movielist
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import woowacourse.movie.R
+import woowacourse.movie.view.model.MovieUiModel
+import woowacourse.movie.view.reservation.ReservationActivity
+
+class TheaterBottomSheetFragment(private val movie: MovieUiModel) : BottomSheetDialogFragment(R.layout.theater_select_bottom_sheet) {
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
+ val theatersView = view.findViewById<RecyclerView>(R.id.recycler_theaters)
+ theatersView.adapter = TheaterListAdapter(movie.schedule) {
+ val intent = ReservationActivity.newIntent(requireContext(), movie, it)
+ startActivity(intent)
+ }
+ }
+ companion object {
+ const val TAG_THEATER = "THEATER"
+ }
+}

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

@@ -0,0 +1,21 @@
+package woowacourse.movie.view.moviemain.movielist
+
+import androidx.recyclerview.widget.RecyclerView
+import woowacourse.movie.R
+import woowacourse.movie.databinding.TheaterItemBinding
+import java.time.LocalTime
+
+class TheaterItemViewHolder(
+ private val binding: TheaterItemBinding,
+ private val onItemClick: TheaterListAdapter.OnItemClick,
+) : RecyclerView.ViewHolder(binding.root) {
+
+ fun bind(name: String, times: List<LocalTime>) {
+ val context = binding.root.context
+ with(binding) {
+ textTheaterName.text = name
+ textScreeningTimeCount.text = context.getString(R.string.screening_times_count, times.size)
+ layoutTheaterItem.setOnClickListener { onItemClick.onClick(name) }
+ }
+ }
+}

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

@@ -0,0 +1,33 @@
+package woowacourse.movie.view.moviemain.movielist
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import woowacourse.movie.R
+import woowacourse.movie.databinding.TheaterItemBinding
+import woowacourse.movie.util.getKeyFromIndex
+import woowacourse.movie.util.getOrEmptyList
+import java.time.LocalTime
+
+class TheaterListAdapter(
+ private val schedule: Map<String, List<LocalTime>>,
+ private val onItemClick: OnItemClick,
+) : RecyclerView.Adapter<TheaterItemViewHolder>() {
+ fun interface OnItemClick {
+ fun onClick(name: String)
+ }
+
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TheaterItemViewHolder {
+ val view = LayoutInflater.from(parent.context).inflate(R.layout.theater_item, parent, false)
+ return TheaterItemViewHolder(TheaterItemBinding.bind(view), onItemClick)
+ }
+
+ override fun getItemCount(): Int {
+ return schedule.size
+ }
+
+ override fun onBindViewHolder(holder: TheaterItemViewHolder, position: Int) {
+ val key = schedule.getKeyFromIndex(position)
+ holder.bind(key, schedule.getOrEmptyList(key))
+ }
+}

app/src/main/java/woowacourse/movie/view/reservation/ReservationActivity.kt

@@ -11,7 +11,6 @@ import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import woowacourse.movie.R
 import woowacourse.movie.databinding.ActivityReservationBinding
-import woowacourse.movie.util.DATE_FORMATTER
 import woowacourse.movie.util.getParcelableCompat
 import woowacourse.movie.view.model.MovieUiModel
 import woowacourse.movie.view.model.ReservationOptions
@@ -38,7 +37,7 @@ class ReservationActivity : AppCompatActivity(), ReservationContract.View {
  presenter = ReservationPresenter(this)
 
  setViewData(movie)
- setDateSpinner(movie.screeningDateTimes)
+ // setDateSpinner(movie.screeningDateTimes)
  setPeopleCountAdjustButtonClickListener()
  setReserveButtonClickListener(movie)
  supportActionBar?.setDisplayHomeAsUpEnabled(true)
@@ -52,10 +51,10 @@ class ReservationActivity : AppCompatActivity(), ReservationContract.View {
  binding.apply {
  moviePoster.setImageResource(movie.posterResourceId)
  movieTitle.text = movie.title
- movieScreeningDate.text = getString(R.string.screening_date_format).format(
- movie.screeningDateTimes.keys.min().format(DATE_FORMATTER),
- movie.screeningDateTimes.keys.max().format(DATE_FORMATTER),
- )
+ // movieScreeningDate.text = getString(R.string.screening_date_format).format(
+ //  movie.screeningDateTimes.keys.min().format(DATE_FORMATTER),
+ //  movie.screeningDateTimes.keys.max().format(DATE_FORMATTER),
+ // )
  movieRunningTime.text =
  getString(R.string.running_time_format).format(movie.runningTime)
  movieSummary.text = movie.summary
@@ -152,10 +151,12 @@ class ReservationActivity : AppCompatActivity(), ReservationContract.View {
  private const val SELECTED_DATE_POSITION = "SELECTED_DATE_POSITION"
  private const val SELECTED_TIME_POSITION = "SELECTED_TIME_POSITION"
  private const val MOVIE = "MOVIE"
+ private const val THEATER = "THEATER"
 
- fun newIntent(context: Context, movie: MovieUiModel): Intent {
+ fun newIntent(context: Context, movie: MovieUiModel, theaterName: String): Intent {
  val intent = Intent(context, ReservationActivity::class.java)
  intent.putExtra(MOVIE, movie)
+ intent.putExtra(THEATER, theaterName)
  return intent
  }
  }

app/src/main/res/drawable/ic_right_arrow.xml

@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+ android:tint="#000000" android:viewportHeight="24"
+ android:viewportWidth="24" android:width="24dp" xmlns:android="https://schemas.android.com/apk/res/android">
+ <path android:fillColor="@android:color/white" android:pathData="M6.23,20.23l1.77,1.77l10,-10l-10,-10l-1.77,1.77l8.23,8.23z"/>
+</vector>

app/src/main/res/layout/theater_item.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="https://schemas.android.com/apk/res/android"
+ android:id="@+id/layout_theater_item"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ xmlns:app="https://schemas.android.com/apk/res-auto"
+ xmlns:tools="https://schemas.android.com/tools"
+ android:background="?attr/selectableItemBackground"
+ android:padding="24dp">
+
+ <TextView
+ android:id="@+id/text_theater_name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ tools:text="선릉 극장"
+ android:textColor="@color/black"
+ android:textSize="16sp" />
+ <TextView
+ android:id="@+id/text_screening_time_count"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ tools:text="3개의 상영 시간"
+ android:textSize="12sp"
+ android:layout_marginTop="2dp"
+ app:layout_constraintTop_toBottomOf="@id/text_theater_name"
+ app:layout_constraintStart_toStartOf="parent" />
+ <ImageView
+ android:layout_width="18dp"
+ android:layout_height="18dp"
+ android:background="@drawable/ic_right_arrow"
+ android:backgroundTint="@color/theater_arrow"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/theater_select_bottom_sheet.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="https://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ xmlns:tools="https://schemas.android.com/tools"
+ xmlns:app="https://schemas.android.com/apk/res-auto">
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/recycler_theaters"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ tools:listitem="@layout/theater_item"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"/>
+
+</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/values/colors.xml

@@ -18,6 +18,7 @@
  <color name="seat_rank_a">#1B48E9</color>
  <color name="price">#727272</color>
  <color name="disabled_click">#B7B7B7</color>
+ <color name="theater_arrow">#5F5F5F</color>
  <drawable name="select_seat">#FAFF00</drawable>
  <drawable name="deselect_seat">#FFFFFF</drawable>
 </resources>

app/src/main/res/values/strings.xml

@@ -33,4 +33,5 @@
  <string name="push_notification_title">푸시 알림 수신</string>
  <string name="notification_description">해제하면 푸시 알림을 수신할 수 없습니다.</string>
  <string name="submit">확인</string>
+ <string name="screening_times_count">%d개의 상영 시간</string>
 </resources>