feat(MovieListFragment): 영화 목록 화면 fragment로 변경

README.md

@@ -1,7 +1,4 @@
-<<<<<<< HEAD
 # android-movie-theater
-=======
-# android-movie-ticket
 
 ## domain
 

app/build.gradle.kts

@@ -45,6 +45,7 @@ dependencies {
  implementation("androidx.appcompat:appcompat:1.6.0")
  implementation("com.google.android.material:material:1.7.0")
  implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+ implementation("androidx.fragment:fragment-ktx:1.4.0")
  testImplementation("junit:junit:4.13.2")
  androidTestImplementation("androidx.test.ext:junit:1.1.5")
  androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
  android:name=".view.ReservationActivity"
  android:exported="false" />
  <activity
- android:name=".view.MovieListActivity"
+ android:name=".view.moviemain.MovieMainActivity"
  android:exported="true">
  <intent-filter>
  <action android:name="android.intent.action.MAIN" />

app/src/main/java/woowacourse/movie/view/ReservationCompletedActivity.kt

@@ -11,6 +11,7 @@ import woowacourse.movie.databinding.ActivityReservationCompletedBinding
 import woowacourse.movie.util.DATE_TIME_FORMATTER
 import woowacourse.movie.util.getParcelableCompat
 import woowacourse.movie.view.model.ReservationUiModel
+import woowacourse.movie.view.moviemain.MovieMainActivity
 import java.text.DecimalFormat
 
 class ReservationCompletedActivity : AppCompatActivity() {
@@ -31,7 +32,7 @@ class ReservationCompletedActivity : AppCompatActivity() {
  object : OnBackPressedCallback(true) {
  override fun handleOnBackPressed() {
  val intent =
- Intent(this@ReservationCompletedActivity, MovieListActivity::class.java)
+ Intent(this@ReservationCompletedActivity, MovieMainActivity::class.java)
  intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
  startActivity(intent)
  }
@@ -57,7 +58,7 @@ class ReservationCompletedActivity : AppCompatActivity() {
  override fun onOptionsItemSelected(item: MenuItem): Boolean {
  when (item.itemId) {
  android.R.id.home -> {
- val intent = Intent(this, MovieListActivity::class.java)
+ val intent = Intent(this, MovieMainActivity::class.java)
  intent.flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP
  startActivity(intent)
  }

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

@@ -0,0 +1,19 @@
+package woowacourse.movie.view.moviemain
+
+import android.os.Bundle
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.commit
+import woowacourse.movie.R
+import woowacourse.movie.view.moviemain.movielist.MovieListFragment
+
+class MovieMainActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_movie_list)
+
+ supportFragmentManager.commit {
+ setReorderingAllowed(true)
+ add(R.id.fragment_container_view, MovieListFragment())
+ }
+ }
+}

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

@@ -1,4 +1,4 @@
-package woowacourse.movie.view
+package woowacourse.movie.view.moviemain.movielist
 
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.databinding.MovieAdItemBinding

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

@@ -1,4 +1,4 @@
-package woowacourse.movie.view
+package woowacourse.movie.view.moviemain.movielist
 
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.R

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

@@ -1,4 +1,4 @@
-package woowacourse.movie.view
+package woowacourse.movie.view.moviemain.movielist
 
 import android.view.LayoutInflater
 import android.view.ViewGroup

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

@@ -1,29 +1,40 @@
-package woowacourse.movie.view
+package woowacourse.movie.view.moviemain.movielist
 
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.movie.R
 import woowacourse.movie.domain.Movie
 import woowacourse.movie.repository.MovieMockRepository
+import woowacourse.movie.view.ReservationActivity
 import woowacourse.movie.view.mapper.toUiModel
 import woowacourse.movie.view.model.MovieListModel
 
-class MovieListActivity : AppCompatActivity() {
- override fun onCreate(savedInstanceState: Bundle?) {
- super.onCreate(savedInstanceState)
- setContentView(R.layout.activity_movie_list)
+class MovieListFragment : Fragment() {
 
+ override fun onCreateView(
+ inflater: LayoutInflater,
+ container: ViewGroup?,
+ savedInstanceState: Bundle?
+ ): View? {
+ return inflater.inflate(R.layout.fragment_movie_list, container, false)
+ }
+
+ override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+ super.onViewCreated(view, savedInstanceState)
  val movies = MovieMockRepository.findAll()
  val dataList = generateMovieListData(movies)
 
  val movieAdapter = MovieListAdapter(
  dataList = dataList,
  onItemClick = object : MovieListAdapter.OnItemClick {
  override fun onMovieClick(movie: MovieListModel.MovieUiModel) {
- val intent = ReservationActivity.newIntent(this@MovieListActivity, movie)
+ val intent = ReservationActivity.newIntent(requireContext(), movie)
  startActivity(intent)
  }
 
@@ -33,18 +44,27 @@ class MovieListActivity : AppCompatActivity() {
  }
  }
  )
- val movieListView = findViewById<RecyclerView>(R.id.movie_recyclerview)
+ val movieListView = view.findViewById<RecyclerView>(R.id.movie_recyclerview)
  movieListView.adapter = movieAdapter
  }
 
  private fun generateMovieListData(movies: List<Movie>): List<MovieListModel> {
- val dataList = mutableListOf<MovieListModel>()
  val ad = MovieListModel.MovieAdModel(
  R.drawable.woowacourse_banner,
  "https://woowacourse.github.io/"
  )
+
+ return mixMovieAdData(movies, ad, AD_POST_INTERVAL)
+ }
+
+ private fun mixMovieAdData(
+ movies: List<Movie>,
+ ad: MovieListModel.MovieAdModel,
+ adPostInterval: Int
+ ): List<MovieListModel> {
+ val dataList = mutableListOf<MovieListModel>()
  movies.forEachIndexed { index, movie ->
- if (index % AD_POST_INTERVAL == AD_POST_INTERVAL - 1) {
+ if (index % adPostInterval == adPostInterval - 1) {
  dataList.add(movie.toUiModel())
  dataList.add(ad)
  return@forEachIndexed

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

@@ -1,4 +1,4 @@
-package woowacourse.movie.view
+package woowacourse.movie.view.moviemain.movielist
 
 import woowacourse.movie.R
 

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

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
- xmlns:app="http:https://schemas.android.com/apk/res-auto"
  xmlns:tools="http:https://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- tools:context=".view.MovieListActivity">
+ tools:context=".view.moviemain.MovieMainActivity">
 
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/movie_recyclerview"
+ <androidx.fragment.app.FragmentContainerView
+ android:id="@+id/fragment_container_view"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
+ tools:layout="@layout/fragment_movie_list" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
+ xmlns:app="http:https://schemas.android.com/apk/res-auto"
+ xmlns:tools="http:https://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".view.moviemain.movielist.MovieListFragment">
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/movie_recyclerview"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ tools:listitem="@layout/movie_item"/>
+
+</FrameLayout>

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

@@ -21,4 +21,6 @@
  <string name="cancel">취소</string>
  <string name="empty_view">empty view</string>
  <string name="ad_banner_image">ad banner image</string>
+ <!-- TODO: Remove or change this placeholder text -->
+ <string name="hello_blank_fragment">Hello blank fragment</string>
 </resources>

domain/build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
 }
 
 java {
- sourceCompatibility = JavaVersion.VERSION_1_7
- targetCompatibility = JavaVersion.VERSION_1_7
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
 }
 dependencies {
  testImplementation("junit:junit:4.13.2")