refactor: ProductListActivity 리사이클러뷰 리팩터링

app/src/main/java/woowacourse/shopping/view/cart/CartPagination.kt → app/src/main/java/woowacourse/shopping/model/CartPagination.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.view.cart
+package woowacourse.shopping.model
 
 import woowacourse.shopping.model.NextPagination
 import woowacourse.shopping.model.PrevPagination

app/src/main/java/woowacourse/shopping/view/productlist/ProductListPagination.kt → app/src/main/java/woowacourse/shopping/model/ProductListPagination.kt

@@ -1,4 +1,4 @@
-package woowacourse.shopping.view.productlist
+package woowacourse.shopping.model
 
 import woowacourse.shopping.model.NextPagination
 import woowacourse.shopping.domain.Product

app/src/main/java/woowacourse/shopping/view/cart/CartPresenter.kt

@@ -3,6 +3,7 @@ package woowacourse.shopping.view.cart
 import woowacourse.shopping.domain.CartProduct
 import woowacourse.shopping.domain.CartRepository
 import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.model.CartPagination
 import woowacourse.shopping.model.toUiModel
 
 class CartPresenter(

app/src/main/java/woowacourse/shopping/view/productdetail/ProductDetailActivity.kt

@@ -17,6 +17,8 @@ import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 import woowacourse.shopping.util.getParcelableCompat
 import woowacourse.shopping.view.cart.CartActivity
+import woowacourse.shopping.view.productlist.ProductListActivity.Companion.ID
+import woowacourse.shopping.view.productlist.ProductListActivity.Companion.RESULT_VIEWED
 
 class ProductDetailActivity : AppCompatActivity(), ProductDetailContract.View {
  private lateinit var binding: ActivityProductDetailBinding
@@ -32,6 +34,7 @@ class ProductDetailActivity : AppCompatActivity(), ProductDetailContract.View {
  return
  }
  setUpInitView(product)
+ setUpResult(product.id)
  presenter.updateRecentViewedProducts(product.id)
  }
 
@@ -57,6 +60,11 @@ class ProductDetailActivity : AppCompatActivity(), ProductDetailContract.View {
  getString(R.string.korean_won, PriceFormatter.format(product.price))
  }
 
+ private fun setUpResult(id: Int) {
+ intent.putExtra(ID, id)
+ setResult(RESULT_VIEWED, intent)
+ }
+
  override fun startCartActivity() {
  val intent = CartActivity.newIntent(this)
  startActivity(intent)

app/src/main/java/woowacourse/shopping/view/productlist/ProductListActivity.kt

@@ -5,6 +5,8 @@ import android.os.Bundle
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.GridLayoutManager
 import woowacourse.shopping.R
@@ -18,12 +20,20 @@ import woowacourse.shopping.view.productdetail.ProductDetailActivity
 class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  private lateinit var binding: ActivityProductListBinding
  private lateinit var presenter: ProductListContract.Presenter
+ private val resultLauncher = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+ if(it.resultCode == RESULT_VIEWED) {
+ val id = it.data?.getIntExtra("id", -1)
+ presenter.updateRecentViewed(id ?: -1)
+ }
+ }
+
  override fun onCreate(savedInstanceState: Bundle?) {
  super.onCreate(savedInstanceState)
  setUpBinding()
  setContentView(binding.root)
  setUpPresenter()
  setUpActionBar()
+ presenter.fetchProducts()
  }
 
  private fun setUpBinding() {
@@ -39,21 +49,12 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  supportActionBar?.setDisplayShowCustomEnabled(true)
  }
 
- override fun onResume() {
- super.onResume()
- presenter.fetchProducts()
- }
-
- override fun showProducts(
- recentViewedProducts: List<ProductModel>,
- products: List<ProductModel>
- ) {
+ override fun showProducts(items: List<ProductListViewItem>) {
  val gridLayoutManager = GridLayoutManagerWrapper(this, 2)
  gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
  override fun getSpanSize(position: Int): Int {
- val isHeader = recentViewedProducts.isNotEmpty() && position == 0
- val isFooter =
- if (recentViewedProducts.isNotEmpty()) position == products.size + 1 else position == products.size
+ val isHeader = items[position].type == ProductListViewType.RECENT_VIEWED_ITEM
+ val isFooter = items[position].type == ProductListViewType.SHOW_MORE_ITEM
  return if (isHeader || isFooter) {
  HEADER_FOOTER_SPAN
  } else {
@@ -63,8 +64,7 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  }
  binding.gridProducts.layoutManager = gridLayoutManager
  binding.gridProducts.adapter = ProductListAdapter(
- recentViewedProducts,
- products,
+ items,
  object : ProductListAdapter.OnItemClick {
  override fun onProductClick(product: ProductModel) {
  showProductDetail(product)
@@ -81,9 +81,13 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  binding.gridProducts.adapter?.notifyItemRangeInserted(position, size)
  }
 
+ override fun notifyRecentViewedChanged() {
+ binding.gridProducts.adapter?.notifyItemChanged(0)
+ }
+
  private fun showProductDetail(product: ProductModel) {
  val intent = ProductDetailActivity.newIntent(binding.root.context, product)
- startActivity(intent)
+ resultLauncher.launch(intent)
  }
 
  override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -104,5 +108,7 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  companion object {
  private const val HEADER_FOOTER_SPAN = 2
  private const val PRODUCT_ITEM_SPAN = 1
+ const val RESULT_VIEWED = 200
+ const val ID = "id"
  }
 }

app/src/main/java/woowacourse/shopping/view/productlist/ProductListAdapter.kt

@@ -5,8 +5,7 @@ import androidx.recyclerview.widget.RecyclerView
 import woowacourse.shopping.model.ProductModel
 
 class ProductListAdapter(
- private val recentViewedProducts: List<ProductModel>,
- private val products: List<ProductModel>,
+ private val items: List<ProductListViewItem>,
  private val onItemClick: OnItemClick,
 ) : RecyclerView.Adapter<ProductViewHolder>() {
  interface OnItemClick {
@@ -19,32 +18,22 @@ class ProductListAdapter(
  }
 
  override fun getItemViewType(position: Int): Int {
- return if (position == 0 && isRecentViewedExist()) {
- ProductListViewType.RECENT_VIEWED_ITEM.ordinal
- } else if (position == itemCount - 1) {
- ProductListViewType.SHOW_MORE_ITEM.ordinal
- } else {
- ProductListViewType.PRODUCT_ITEM.ordinal
- }
+ return items[position].type.ordinal
  }
 
- override fun getItemCount(): Int =
- if (isRecentViewedExist()) products.size + 2 else products.size + 1
+ override fun getItemCount(): Int = items.size
 
  override fun onBindViewHolder(holder: ProductViewHolder, position: Int) {
  when (holder) {
  is ProductViewHolder.RecentViewedViewHolder -> {
- holder.bind(recentViewedProducts, onItemClick)
+ holder.bind(items[position] as ProductListViewItem.RecentViewedItem, onItemClick)
  }
  is ProductViewHolder.ProductItemViewHolder -> {
- val convertPosition = if (isRecentViewedExist()) position - 1 else position
- holder.bind(products[convertPosition])
+ holder.bind(items[position] as ProductListViewItem.ProductItem)
  }
  is ProductViewHolder.ShowMoreViewHolder -> {
  return
  }
  }
  }
-
- private fun isRecentViewedExist(): Boolean = recentViewedProducts.isNotEmpty()
 }

app/src/main/java/woowacourse/shopping/view/productlist/ProductListContract.kt

@@ -4,12 +4,15 @@ import woowacourse.shopping.model.ProductModel
 
 interface ProductListContract {
  interface View {
- fun showProducts(recentViewedProducts: List<ProductModel>, products: List<ProductModel>)
+ fun showProducts(items: List<ProductListViewItem>)
  fun notifyAddProducts(position: Int, size: Int)
+
+ fun notifyRecentViewedChanged()
  }
 
  interface Presenter {
  fun fetchProducts()
  fun showMoreProducts()
+ fun updateRecentViewed(id: Int)
  }
 }

app/src/main/java/woowacourse/shopping/view/productlist/ProductListPresenter.kt

@@ -1,29 +1,58 @@
 package woowacourse.shopping.view.productlist
 
+import android.util.Log
 import woowacourse.shopping.domain.ProductRepository
 import woowacourse.shopping.domain.RecentViewedRepository
+import woowacourse.shopping.model.ProductListPagination
 import woowacourse.shopping.model.toUiModel
 
 class ProductListPresenter(
  private val view: ProductListContract.View,
  private val productRepository: ProductRepository,
- recentViewedRepository: RecentViewedRepository,
+ private val recentViewedRepository: RecentViewedRepository,
 ) : ProductListContract.Presenter {
  private val productListPagination = ProductListPagination(PAGINATION_SIZE, productRepository)
  private val products = productListPagination.nextItems().map { it.toUiModel() }.toMutableList()
- private val viewedProducts = recentViewedRepository.findAll()
+ private val viewedProducts = recentViewedRepository.findAll().toMutableList()
+
+ private val productsListItems = mutableListOf<ProductListViewItem>()
  override fun fetchProducts() {
- val viewedProductsUiModel =
- viewedProducts.map { productRepository.find(it).toUiModel() }.reversed()
- view.showProducts(viewedProductsUiModel, products)
+ // 최근 본 항목
+ val viewedProducts = recentViewedRepository.findAll().reversed()
+ val viewedProductsItem =
+ ProductListViewItem.RecentViewedItem(viewedProducts.map { convertIdToProductModel(it) })
+ productsListItems.add(viewedProductsItem)
+ // 상품 리스트
+ productsListItems.addAll(products.map { ProductListViewItem.ProductItem(it) })
+ // 더보기
+ if(productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
+ view.showProducts(productsListItems)
  }
 
  override fun showMoreProducts() {
- val mark = if (viewedProducts.isNotEmpty()) products.size + 1 else products.size
- products.addAll(productListPagination.nextItems().map { it.toUiModel() })
+ val mark = if (isExistRecentViewed()) products.size + 1 else products.size
+ val nextProducts = productListPagination.nextItems().map { it.toUiModel() }
+ products.addAll(nextProducts)
+ // RecyclerView Items 수정
+ productsListItems.removeLast()
+ productsListItems.addAll(nextProducts.map { ProductListViewItem.ProductItem(it) })
+ if(productListPagination.isNextEnabled) productsListItems.add(ProductListViewItem.ShowMoreItem())
+ // Notify
  view.notifyAddProducts(mark, PAGINATION_SIZE)
  }
 
+ override fun updateRecentViewed(id: Int) {
+ if (id == -1) return
+ viewedProducts.add(0, id)
+ if (isExistRecentViewed()) productsListItems.removeAt(0)
+ productsListItems.add(0, ProductListViewItem.RecentViewedItem(viewedProducts.map { convertIdToProductModel(it) }))
+ view.notifyRecentViewedChanged()
+ }
+
+ private fun convertIdToProductModel(id: Int) = productRepository.find(id).toUiModel()
+
+ private fun isExistRecentViewed(): Boolean = productsListItems[0] is ProductListViewItem.RecentViewedItem
+
  companion object {
  private const val PAGINATION_SIZE = 20
  }

app/src/main/java/woowacourse/shopping/view/productlist/ProductListViewItem.kt

@@ -0,0 +1,18 @@
+package woowacourse.shopping.view.productlist
+
+import woowacourse.shopping.model.CartPageStatus
+import woowacourse.shopping.model.CartProductModel
+import woowacourse.shopping.model.ProductModel
+
+sealed interface ProductListViewItem {
+ val type: ProductListViewType
+ data class RecentViewedItem(val products: List<ProductModel>) : ProductListViewItem {
+ override val type = ProductListViewType.RECENT_VIEWED_ITEM
+ }
+ data class ProductItem(val product: ProductModel) : ProductListViewItem {
+ override val type = ProductListViewType.PRODUCT_ITEM
+ }
+ class ShowMoreItem : ProductListViewItem {
+ override val type = ProductListViewType.SHOW_MORE_ITEM
+ }
+}

app/src/main/java/woowacourse/shopping/view/productlist/ProductViewHolder.kt

@@ -17,11 +17,11 @@ sealed class ProductViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  class RecentViewedViewHolder(private val binding: ItemRecentViewedBinding) :
  ProductViewHolder(binding.root) {
  fun bind(
- recentViewedProducts: List<ProductModel>,
+ item: ProductListViewItem.RecentViewedItem,
  onItemClick: ProductListAdapter.OnItemClick
  ) {
  binding.recyclerRecentViewed.adapter =
- RecentViewedAdapter(recentViewedProducts, onItemClick)
+ RecentViewedAdapter(item.products, onItemClick)
  }
  }
 
@@ -33,13 +33,13 @@ sealed class ProductViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  binding.onItemClick = onItemClick
  }
 
- fun bind(product: ProductModel) {
- binding.product = product
+ fun bind(item: ProductListViewItem.ProductItem) {
+ binding.product = item.product
  binding.textPrice.text = binding.root.context.getString(
  R.string.korean_won,
- PriceFormatter.format(product.price)
+ PriceFormatter.format(item.product.price)
  )
- Glide.with(binding.root.context).load(product.imageUrl).into(binding.imgProduct)
+ Glide.with(binding.root.context).load(item.product.imageUrl).into(binding.imgProduct)
  }
  }