[둘리] 3, 4단계 영화 극장 선택 제출합니다.

app/src/main/java/woowacourse/movie/data/setting/SettingPreferencesManager.kt → app/src/main/java/woowacourse/movie/data/setting/SettingPreferencesRepository.kt

@@ -2,8 +2,9 @@ package woowacourse.movie.data.setting
 
 import android.content.Context
 import androidx.preference.PreferenceManager
+import woowacourse.movie.domain.repository.SettingRepository
 
-class SettingPreferencesManager(context: Context) : SettingDataManager {
+class SettingPreferencesRepository(context: Context) : SettingRepository {
  private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
  override fun getIsAlarmSetting(): Boolean = sharedPreferences.getBoolean(IS_ALARM_ON, false)
  override fun setIsAlarmSetting(isOn: Boolean) {

app/src/main/java/woowacourse/movie/data/theater/TheaterMockRepository.kt

@@ -1,6 +1,5 @@
 package woowacourse.movie.data.theater
 
-import woowacourse.movie.R
 import woowacourse.movie.domain.policy.MorningPolicy
 import woowacourse.movie.domain.policy.MovieDayPolicy
 import woowacourse.movie.domain.policy.NightPolicy
@@ -25,24 +24,20 @@ object TheaterMockRepository : TheaterRepository {
  NightPolicy(),
  )
 
- val theaters: List<Theater> = listOf(
+ private val theaters: List<Theater> = listOf(
  Theater("정말아주아주아주아주아주아주아주긴극장이름", seatInfo, policies),
  Theater("선릉 극장", seatInfo, policies),
  Theater("잠실 극장", seatInfo, policies),
  Theater("강남 극장", seatInfo, policies),
  )
 
- val gradeColor = mapOf(
- Grade.B to R.color.seat_rank_b,
- Grade.S to R.color.seat_rank_s,
- Grade.A to R.color.seat_rank_a,
- )
-
  override fun findAll(): List<Theater> {
  return theaters
  }
 
  override fun findTheater(name: String): Theater {
- return theaters.find { it.name == name } ?: throw java.lang.IllegalArgumentException("존재하지 않는 상영관입니다.")
+ val theater = theaters.find { it.name == name }
+ requireNotNull(theater) { "존재하지 않는 상영관입니다." }
+ return theater
  }
 }

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

@@ -0,0 +1,5 @@
+package woowacourse.movie.util
+
+import java.text.DecimalFormat
+
+val DECIMAL_FORMAT = DecimalFormat("#,###")

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

@@ -3,7 +3,3 @@ 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/AlarmController.kt

@@ -39,7 +39,7 @@ class AlarmController(private val context: Context) {
  alarmManager.cancel(pendingIntent)
  }
 
- fun createChannel() {
+ private fun createChannel() {
  val channel = NotificationChannel(AlarmReceiver.CHANNEL_ID, CHANNER_NAME, NotificationManager.IMPORTANCE_DEFAULT)
  val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
  if (!notificationManager.notificationChannels.contains(channel)) notificationManager.createNotificationChannel(channel)

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

@@ -1,15 +1,22 @@
 package woowacourse.movie.view.mapper
 
-import androidx.annotation.DrawableRes
+import woowacourse.movie.R
 import woowacourse.movie.domain.movie.Movie
 import woowacourse.movie.view.model.MovieUiModel
 
-fun Movie.toUiModel(@DrawableRes posterResourceId: Int): MovieUiModel = MovieUiModel(
+val posters = mapOf(
+ "스즈메의 문단속" to R.drawable.suzume_poster,
+ "해리 포터와 마법사의 돌" to R.drawable.harry_potter1_poster,
+ "스타워즈" to R.drawable.starwars_poster,
+ "어벤져스: 엔드게임" to R.drawable.avengers_endgame_poster,
+)
+
+fun Movie.toUiModel(): MovieUiModel = MovieUiModel(
  title,
  startDate,
  endDate,
  runningTime.value,
- posterResourceId,
+ posters[title] ?: 0,
  summary,
  schedule.schedule,
 )

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

@@ -1,8 +1,7 @@
 package woowacourse.movie.view.mapper
 
 import woowacourse.movie.domain.price.Price
-import java.text.DecimalFormat
 
-fun Price.toUiModel(): String {
- return DecimalFormat("#,###").format(price)
+fun Price.toUiModel(): Int {
+ return price
 }

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

@@ -1,7 +1,8 @@
 package woowacourse.movie.view.mapper
 
+import androidx.annotation.ColorInt
 import woowacourse.movie.domain.system.Seat
 import woowacourse.movie.view.model.SeatUiModel
 
-fun Seat.toUiModel(): SeatUiModel = SeatUiModel(row, col)
+fun Seat.toUiModel(@ColorInt color: Int = 0): SeatUiModel = SeatUiModel(row, col, color)
 fun SeatUiModel.toDomain(): Seat = Seat(row, col)

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

@@ -5,6 +5,9 @@ import kotlinx.parcelize.Parcelize
 import java.time.LocalDate
 import java.time.LocalTime
 
+typealias TheaterName = String
+typealias ScreeningTimes = List<LocalTime>
+
 @Parcelize
 data class MovieUiModel(
  val title: String,
@@ -13,5 +16,5 @@ data class MovieUiModel(
  val runningTime: Int,
  val posterResourceId: Int,
  val summary: String,
- val schedule: Map<String, List<LocalTime>>,
+ val schedule: Map<TheaterName, ScreeningTimes>,
 ) : Parcelable

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

@@ -1,3 +1,4 @@
 package woowacourse.movie.view.model
-
-class SeatInfoUiModel(val row: Int, val col: Int, val colorOfRow: Map<Int, Int>)
+typealias row = Int
+typealias colorId = Int
+data class SeatInfoUiModel(val maxRow: Int, val maxCol: Int, val colorOfRow: Map<row, colorId>)

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

@@ -1,17 +1,18 @@
 package woowacourse.movie.view.model
 
 import android.os.Parcelable
+import androidx.annotation.ColorRes
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
-class SeatUiModel(val row: Int, val col: Int) : Parcelable {
+class SeatUiModel(val row: Int, val col: Int, @ColorRes val color: Int) : Parcelable {
  val seatId: String = ('A'.code + row).toChar() + (col + 1).toString()
 
  companion object {
- fun of(seatId: String): SeatUiModel {
+ fun of(seatId: String, @ColorRes color: Int = 0): SeatUiModel {
  val row = seatId[0].code - 'A'.code
  val col = seatId.substring(1).toInt() - 1
- return SeatUiModel(row, col)
+ return SeatUiModel(row, col, color)
  }
  }
 }

app/src/main/java/woowacourse/movie/view/moviemain/MovieMainActivity.kt

@@ -23,18 +23,18 @@ class MovieMainActivity : AppCompatActivity() {
  navigation.setOnItemSelectedListener { item ->
  when (item.itemId) {
  R.id.action_reservation_list -> {
- val fragment = supportFragmentManager.findFragmentByTag(TAG_RESERVATION_LIST) as? ReservationListFragment ?: ReservationListFragment().also { addFragment(it, TAG_RESERVATION_LIST) }
- replaceFragment(fragment)
+ val fragment = ReservationListFragment.of(supportFragmentManager)
+ replaceFragment(fragment, TAG_RESERVATION_LIST)
  return@setOnItemSelectedListener true
  }
  R.id.action_home -> {
- val fragment = supportFragmentManager.findFragmentByTag(TAG_MOVIE_LIST) as? MovieListFragment ?: MovieListFragment().also { addFragment(it, TAG_MOVIE_LIST) }
- replaceFragment(fragment)
+ val fragment = MovieListFragment.of(supportFragmentManager)
+ replaceFragment(fragment, TAG_MOVIE_LIST)
  return@setOnItemSelectedListener true
  }
  R.id.action_setting -> {
- val fragment = supportFragmentManager.findFragmentByTag(TAG_SETTING) as? SettingFragment ?: SettingFragment().also { addFragment(it, TAG_SETTING) }
- replaceFragment(fragment)
+ val fragment = SettingFragment.of(supportFragmentManager)
+ replaceFragment(fragment, TAG_SETTING)
  return@setOnItemSelectedListener true
  }
  else -> return@setOnItemSelectedListener false
@@ -43,10 +43,10 @@ class MovieMainActivity : AppCompatActivity() {
  navigation.selectedItemId = R.id.action_home
  }
 
- private fun replaceFragment(fragment: Fragment) {
+ private fun replaceFragment(fragment: Fragment, tag: String) {
  supportFragmentManager.commit {
  setReorderingAllowed(true)
- replace(R.id.fragment_container_view, fragment)
+ replace(R.id.fragment_container_view, fragment, tag)
  }
  }
 

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

@@ -1,6 +1,8 @@
 package woowacourse.movie.view.moviemain.movielist
 
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.annotation.DrawableRes
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.R
@@ -10,7 +12,8 @@ import woowacourse.movie.util.DATE_FORMATTER
 import woowacourse.movie.view.model.MovieUiModel
 
 sealed class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
- class MovieItemViewHolder(private val binding: MovieItemBinding) : ItemViewHolder(binding.root) {
+ class MovieItemViewHolder(private val binding: MovieItemBinding) :
+ ItemViewHolder(binding.root) {
  fun set(movie: MovieUiModel, onClick: MovieListAdapter.OnItemClick) {
  val context = binding.movieTitle.context
  binding.movie = movie
@@ -29,4 +32,14 @@ sealed class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  binding.adImageview.setImageResource(resId)
  }
  }
+
+ companion object {
+ fun of(parent: ViewGroup, type: ListViewType): ItemViewHolder {
+ val view = LayoutInflater.from(parent.context).inflate(type.id, parent, false)
+ return when (type) {
+ ListViewType.NORMAL_VIEWTYPE -> MovieItemViewHolder(MovieItemBinding.bind(view))
+ ListViewType.AD_VIEWTYPE -> AdItemViewHolder(MovieAdItemBinding.bind(view))
+ }
+ }
+ }
 }

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

@@ -1,11 +1,8 @@
 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.MovieAdItemBinding
-import woowacourse.movie.databinding.MovieItemBinding
 import woowacourse.movie.view.model.MovieUiModel
 
 class MovieListAdapter(
@@ -19,16 +16,7 @@ class MovieListAdapter(
  }
 
  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
- return when (ListViewType.values()[viewType]) {
- ListViewType.NORMAL_VIEWTYPE -> {
- val view = LayoutInflater.from(parent.context).inflate(ListViewType.NORMAL_VIEWTYPE.id, parent, false)
- ItemViewHolder.MovieItemViewHolder(MovieItemBinding.bind(view))
- }
- ListViewType.AD_VIEWTYPE -> {
- val view = LayoutInflater.from(parent.context).inflate(ListViewType.AD_VIEWTYPE.id, parent, false)
- ItemViewHolder.AdItemViewHolder(MovieAdItemBinding.bind(view))
- }
- }
+ return ItemViewHolder.of(parent, ListViewType.values()[viewType])
  }
 
  override fun getItemCount(): Int = movies.size + movies.size / adInterval

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

@@ -3,7 +3,11 @@ package woowacourse.movie.view.moviemain.movielist
 import woowacourse.movie.view.model.MovieUiModel
 
 interface MovieListContract {
+ interface View {
+ var presenter: Presenter
+ fun showMovieList(movies: List<MovieUiModel>)
+ }
  interface Presenter {
- fun getMovieListData(): List<MovieUiModel>
+ fun fetchMovieList()
  }
 }

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

@@ -3,21 +3,24 @@ package woowacourse.movie.view.moviemain.movielist
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.R
 import woowacourse.movie.data.movie.MovieMockRepository
-import woowacourse.movie.data.movie.MoviePosterMockRepository
 import woowacourse.movie.view.model.MovieUiModel
 
-class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
+class MovieListFragment : Fragment(R.layout.fragment_movie_list), MovieListContract.View {
+ override var presenter: MovieListContract.Presenter = MovieListPresenter(this, MovieMockRepository)
+
  override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
  super.onViewCreated(view, savedInstanceState)
- val presenter = MovieListPresenter(MovieMockRepository, MoviePosterMockRepository)
-  val movies = presenter.getMovieListData()
+ presenter.fetchMovieList()
+ }
 
+ override fun showMovieList(movies: List<MovieUiModel>) {
  val movieAdapter = MovieListAdapter(3, movies, ::onClick)
- val movieListView = view.findViewById<RecyclerView>(R.id.movie_recyclerview)
- movieListView.adapter = movieAdapter
+ val movieListView = view?.findViewById<RecyclerView>(R.id.movie_recyclerview)
+ movieListView?.adapter = movieAdapter
  }
 
  private fun onClick(item: MovieUiModel) {
@@ -28,5 +31,9 @@ class MovieListFragment : Fragment(R.layout.fragment_movie_list) {
 
  companion object {
  const val TAG_MOVIE_LIST = "MOVIE_LIST"
+ fun of(supportFragmentManager: FragmentManager): MovieListFragment {
+ return supportFragmentManager.findFragmentByTag(TAG_MOVIE_LIST) as? MovieListFragment
+ ?: MovieListFragment()
+ }
  }
 }

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

@@ -1,13 +1,15 @@
 package woowacourse.movie.view.moviemain.movielist
 
-import woowacourse.movie.data.movie.MoviePosterRepository
 import woowacourse.movie.domain.repository.MovieRepository
 import woowacourse.movie.view.mapper.toUiModel
-import woowacourse.movie.view.model.MovieUiModel
 
-class MovieListPresenter(private val movieRepository: MovieRepository, private val moviePosterRepository: MoviePosterRepository) : MovieListContract.Presenter {
- override fun getMovieListData(): List<MovieUiModel> {
- return movieRepository.findAll()
- .map { it.toUiModel(moviePosterRepository.findPoster(it.title)) }
+class MovieListPresenter(
+ private val view: MovieListContract.View,
+ private val movieRepository: MovieRepository,
+) : MovieListContract.Presenter {
+ override fun fetchMovieList() {
+ val movies = movieRepository.findAll()
+ .map { it.toUiModel() }
+ view.showMovieList(movies)
  }
 }

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

@@ -5,14 +5,14 @@ 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>>,
+ schedule: Map<String, List<LocalTime>>,
  private val onItemClick: OnItemClick,
 ) : RecyclerView.Adapter<TheaterItemViewHolder>() {
+ private val convertSchedule = schedule.toList()
+
  fun interface OnItemClick {
  fun onClick(name: String)
  }
@@ -23,11 +23,10 @@ class TheaterListAdapter(
  }
 
  override fun getItemCount(): Int {
- return schedule.size
+ return convertSchedule.size
  }
 
  override fun onBindViewHolder(holder: TheaterItemViewHolder, position: Int) {
- val key = schedule.getKeyFromIndex(position)
- holder.bind(key, schedule.getOrEmptyList(key))
+ holder.bind(convertSchedule[position].first, convertSchedule[position].second)
  }
 }