feat: 더보기 구현중

app/src/main/java/woowacourse/shopping/data/ProductMockRepository.kt

@@ -126,6 +126,143 @@ object ProductMockRepository : ProductRepository {
  10000,
  ),
  ),
+ Product(
+ 15,
+ "15",
+ "https://thumbnail9.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2418649993082166-2bfb64be-78dc-4c05-a2e3-1749f856fef8.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 16,
+ "16",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1721669748108539-877f91ca-5964-4761-b3e0-bff7b970c31c.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 17,
+ "17",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2700754094560515-ebc4cbaa-4c4f-4750-8b41-2e6ae5ab26ed.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 18,
+ "18",
+ "https://thumbnail9.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2418649993082166-2bfb64be-78dc-4c05-a2e3-1749f856fef8.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 19,
+ "19",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1721669748108539-877f91ca-5964-4761-b3e0-bff7b970c31c.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 20,
+ "20",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2700754094560515-ebc4cbaa-4c4f-4750-8b41-2e6ae5ab26ed.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 21,
+ "21",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/6769030628798948-183ad194-f24c-44e6-b92f-1ed198b347cd.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 22,
+ "22",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1237954167000478-5b27108a-ee70-4e14-b605-181191a57bcb.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 23,
+ "23",
+ "https://thumbnail9.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2418649993082166-2bfb64be-78dc-4c05-a2e3-1749f856fef8.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 24,
+ "24",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1721669748108539-877f91ca-5964-4761-b3e0-bff7b970c31c.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 25,
+ "25",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2700754094560515-ebc4cbaa-4c4f-4750-8b41-2e6ae5ab26ed.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 26,
+ "26",
+ "https://thumbnail9.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2418649993082166-2bfb64be-78dc-4c05-a2e3-1749f856fef8.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 27,
+ "27",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1721669748108539-877f91ca-5964-4761-b3e0-bff7b970c31c.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 28,
+ "28",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2700754094560515-ebc4cbaa-4c4f-4750-8b41-2e6ae5ab26ed.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 29,
+ "29",
+ "https://thumbnail9.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2418649993082166-2bfb64be-78dc-4c05-a2e3-1749f856fef8.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 30,
+ "30",
+ "https://thumbnail6.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/1721669748108539-877f91ca-5964-4761-b3e0-bff7b970c31c.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+ Product(
+ 31,
+ "31",
+ "https://thumbnail7.coupangcdn.com/thumbnails/remote/230x230ex/image/retail/images/2700754094560515-ebc4cbaa-4c4f-4750-8b41-2e6ae5ab26ed.jpg",
+ Price(
+ 10000,
+ ),
+ ),
+
  )
 
  override fun findAll(): List<Product> {

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

@@ -5,5 +5,6 @@ import woowacourse.shopping.R
 
 enum class ItemViewType(@LayoutRes val id: Int) {
  RECENT_VIEWED_ITEM(R.layout.item_recent_viewed),
- PRODUCT_ITEM(R.layout.item_product)
+ PRODUCT_ITEM(R.layout.item_product),
+ SHOW_MORE_ITEM(R.layout.item_show_more)
 }

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

@@ -1,20 +1,23 @@
 package woowacourse.shopping.view.productlist
 
-import android.util.Log
 import woowacourse.shopping.domain.Product
 import woowacourse.shopping.domain.ProductRepository
 
 class Pagination(private val rangeSize: Int, private val productRepository: ProductRepository) {
  private var mark = 0
+ private var isEnabled = nextItemExist()
 
  fun nextItems(): List<Product> {
- Log.d("MARK", mark.toString())
- val items = productRepository.findRange(mark, rangeSize)
- mark += rangeSize
- return items
+ if (isEnabled) {
+ val items = productRepository.findRange(mark, rangeSize)
+ mark += rangeSize
+ isEnabled = nextItemExist()
+ return items
+ }
+ return emptyList()
  }
 
- fun nextItemExist(): Boolean {
+ private fun nextItemExist(): Boolean {
  return productRepository.isExistByMark(mark)
  }
 }

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

@@ -23,7 +23,6 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  binding = ActivityProductListBinding.inflate(layoutInflater)
  setContentView(binding.root)
  presenter = ProductListPresenter(this, ProductMockRepository, RecentViewedDbRepository(this))
- presenter.fetchProducts()
  supportActionBar?.setDisplayShowCustomEnabled(true)
  }
 
@@ -36,24 +35,36 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  val gridLayoutManager = GridLayoutManager(this, 2)
  gridLayoutManager.spanSizeLookup = object : GridLayoutManager.SpanSizeLookup() {
  override fun getSpanSize(position: Int): Int {
- return if (recentViewedProducts.isNotEmpty() && position == 0) {
+ val isHeader = recentViewedProducts.isNotEmpty() && position == 0
+ val isFooter = if (recentViewedProducts.isNotEmpty()) position == products.size + 1 else position == products.size
+ return if (isHeader || isFooter) {
  2
  } else {
  1
  }
  }
  }
  binding.gridProducts.layoutManager = gridLayoutManager
- binding.gridProducts.adapter = ProductListAdapter(recentViewedProducts, products) {
- onClick(it)
- }
+ binding.gridProducts.adapter = ProductListAdapter(
+ recentViewedProducts,
+ products,
+ object : ProductListAdapter.OnItemClick {
+ override fun onProductClick(product: ProductModel) {
+ showProductDetail(product)
+ }
+
+ override fun onShowMoreClick() {
+ presenter.showMoreProducts()
+ }
+ },
+ )
  }
 
- override fun addProducts() {
- binding.gridProducts.adapter?.notifyDataSetChanged()
+ override fun addProducts(position: Int, size: Int) {
+// binding.gridProducts.adapter?.notifyItemRangeInserted(position, size)
  }
 
- private fun onClick(product: ProductModel) {
+ private fun showProductDetail(product: ProductModel) {
  val intent = ProductDetailActivity.newIntent(binding.root.context, product)
  startActivity(intent)
  }

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

@@ -9,32 +9,39 @@ class ProductListAdapter(
  private val products: List<ProductModel>,
  private val onItemClick: OnItemClick,
 ) : RecyclerView.Adapter<ProductViewHolder>() {
- fun interface OnItemClick {
- fun onClick(product: ProductModel)
+ interface OnItemClick {
+ fun onProductClick(product: ProductModel)
+ fun onShowMoreClick()
  }
 
  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProductViewHolder {
- return ProductViewHolder.of(parent, ItemViewType.values()[viewType])
+ return ProductViewHolder.of(parent, ItemViewType.values()[viewType], onItemClick)
  }
 
  override fun getItemViewType(position: Int): Int {
  return if (position == 0 && isRecentViewedExist()) {
  ItemViewType.RECENT_VIEWED_ITEM.ordinal
+ } else if (position == itemCount - 1) {
+ ItemViewType.SHOW_MORE_ITEM.ordinal
  } else {
  ItemViewType.PRODUCT_ITEM.ordinal
  }
  }
 
- override fun getItemCount(): Int = if (isRecentViewedExist()) products.size + 1 else products.size
+ override fun getItemCount(): Int = if (isRecentViewedExist()) products.size + 2 else products.size + 1
 
  override fun onBindViewHolder(holder: ProductViewHolder, position: Int) {
+ holder.adapterPosition
  when (holder) {
  is ProductViewHolder.RecentViewedViewHolder -> {
  holder.bind(recentViewedProducts, onItemClick)
  }
  is ProductViewHolder.ProductItemViewHolder -> {
  val convertPosition = if (isRecentViewedExist()) position - 1 else position
- holder.bind(products[convertPosition], onItemClick)
+ holder.bind(products[convertPosition])
+ }
+ is ProductViewHolder.ShowMoreViewHolder -> {
+ return
  }
  }
  }

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

@@ -5,7 +5,7 @@ import woowacourse.shopping.model.ProductModel
 interface ProductListContract {
  interface View {
  fun showProducts(recentViewedProducts: List<ProductModel>, products: List<ProductModel>)
- fun addProducts()
+ fun addProducts(position: Int, size: Int)
  }
 
  interface Presenter {

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

@@ -22,5 +22,12 @@ class ProductListPresenter(
  }
 
  override fun showMoreProducts() {
+ val mark = products.size
+ products.addAll(pagination.nextItems().map { it.toUiModel() })
+ view.addProducts(mark, PAGINATION_SIZE)
+ }
+
+ companion object {
+ private const val PAGINATION_SIZE = 20
  }
 }

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

@@ -8,6 +8,7 @@ import com.bumptech.glide.Glide
 import woowacourse.shopping.R
 import woowacourse.shopping.databinding.ItemProductBinding
 import woowacourse.shopping.databinding.ItemRecentViewedBinding
+import woowacourse.shopping.databinding.ItemShowMoreBinding
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 import woowacourse.shopping.view.productlist.recentviewed.RecentViewedAdapter
@@ -19,21 +20,30 @@ sealed class ProductViewHolder(view: View) : RecyclerView.ViewHolder(view) {
  }
  }
 
- class ProductItemViewHolder(private val binding: ItemProductBinding) : ProductViewHolder(binding.root) {
- fun bind(product: ProductModel, onClick: ProductListAdapter.OnItemClick) {
+ class ProductItemViewHolder(private val binding: ItemProductBinding, onItemClick: ProductListAdapter.OnItemClick) : ProductViewHolder(binding.root) {
+ init {
+ binding.onItemClick = onItemClick
+ }
+ fun bind(product: ProductModel) {
  binding.product = product
- binding.onItemClick = onClick
  binding.textPrice.text = binding.root.context.getString(R.string.korean_won, PriceFormatter.format(product.price))
  Glide.with(binding.root.context).load(product.imageUrl).into(binding.imgProduct)
  }
  }
 
+ class ShowMoreViewHolder(binding: ItemShowMoreBinding, onItemClick: ProductListAdapter.OnItemClick) : ProductViewHolder(binding.root) {
+ init {
+ binding.onItemClick = onItemClick
+ }
+ }
+
  companion object {
- fun of(parent: ViewGroup, type: ItemViewType): ProductViewHolder {
+ fun of(parent: ViewGroup, type: ItemViewType, onItemClick: ProductListAdapter.OnItemClick): ProductViewHolder {
  val view = LayoutInflater.from(parent.context).inflate(type.id, parent, false)
  return when (type) {
  ItemViewType.RECENT_VIEWED_ITEM -> RecentViewedViewHolder(ItemRecentViewedBinding.bind(view))
- ItemViewType.PRODUCT_ITEM -> ProductItemViewHolder(ItemProductBinding.bind(view))
+ ItemViewType.PRODUCT_ITEM -> ProductItemViewHolder(ItemProductBinding.bind(view), onItemClick)
+ ItemViewType.SHOW_MORE_ITEM -> ShowMoreViewHolder(ItemShowMoreBinding.bind(view), onItemClick)
  }
  }
  }

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape android:shape="rectangle" xmlns:android="http:https://schemas.android.com/apk/res/android">
+ <corners android:radius="4dp" />
+ <stroke android:width="3dp" android:color="@color/rounded_rectangle_stroke" />
+</shape>

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

@@ -16,7 +16,7 @@
  android:layout_height="wrap_content"
  android:paddingHorizontal="20dp"
  android:paddingVertical="25dp"
- android:onClick="@{() -> onItemClick.onClick(product)}"
+ android:onClick="@{() -> onItemClick.onProductClick(product)}"
  android:background="?attr/selectableItemBackground">
  <ImageView
  android:id="@+id/img_product"

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

@@ -16,7 +16,7 @@
  android:layout_height="wrap_content"
  android:layout_margin="10dp"
  android:background="?attr/selectableItemBackground"
- android:onClick="@{() -> onItemClick.onClick(product)}">
+ android:onClick="@{() -> onItemClick.onProductClick(product)}">
 
  <ImageView
  android:id="@+id/img_product"

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

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout>
+ <data>
+ <variable
+ name="onItemClick"
+ type="woowacourse.shopping.view.productlist.ProductListAdapter.OnItemClick" />
+ </data>
+
+ <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http:https://schemas.android.com/apk/res/android"
+ xmlns:app="http:https://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <androidx.appcompat.widget.AppCompatButton
+ android:id="@+id/button_show_more"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="20dp"
+ android:background="@drawable/back_rounded_bold"
+ android:onClick="@{() -> onItemClick.onShowMoreClick()}"
+ android:text="@string/show_more"
+ android:textSize="16sp"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toTopOf="parent" />
+ </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>