feat: ProductList OnClick 추가, DB 적용

app/src/main/AndroidManifest.xml

@@ -14,7 +14,7 @@
  android:theme="@style/Theme.Shopping"
  tools:targetApi="31">
  <activity
- android:name=".ProductDetailActivity"
+ android:name=".view.productdetail.ProductDetailActivity"
  android:exported="false" />
  <activity
  android:name=".view.cart.CartActivity"

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

@@ -50,4 +50,8 @@ object ProductMockRepository : ProductRepository {
  override fun findAll(): List<Product> {
  return products
  }
+
+ override fun find(id: Int): Product {
+ return products[id]
+ }
 }

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

@@ -6,6 +6,7 @@ import android.os.Bundle
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.LinearLayoutManager
+import woowacourse.shopping.data.CartDbRepository
 import woowacourse.shopping.data.ProductMockRepository
 import woowacourse.shopping.databinding.ActivityCartBinding
 
@@ -20,7 +21,7 @@ class CartActivity : AppCompatActivity() {
  supportActionBar?.title = "Cart"
 
  // ID Product로 변환 과정 필요
- val cartProducts = ProductMockRepository.findAll()
+ val cartProducts = CartDbRepository(this).findAll().map { ProductMockRepository.find(it.id) }
  binding.recyclerCart.layoutManager = LinearLayoutManager(this, LinearLayoutManager.VERTICAL, false)
  binding.recyclerCart.setHasFixedSize(true)
  binding.recyclerCart.adapter = CartAdapter(cartProducts)

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

@@ -1,11 +1,15 @@
 package woowacourse.shopping.view.productdetail
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.bumptech.glide.Glide
 import woowacourse.shopping.R
+import woowacourse.shopping.data.CartDbRepository
 import woowacourse.shopping.databinding.ActivityProductDetailBinding
+import woowacourse.shopping.domain.CartRepository
 import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 import woowacourse.shopping.util.getParcelableCompat
@@ -28,12 +32,21 @@ class ProductDetailActivity : AppCompatActivity() {
  Glide.with(binding.root.context).load(product.imageUrl).into(binding.imgProduct)
  binding.textPrice.text = getString(R.string.korean_won, PriceFormatter.format(product.price))
  binding.btnPutInCart.setOnClickListener {
- CartActivity.newIntent(this)
+ val cartRepository: CartRepository = CartDbRepository(this)
+ cartRepository.add(product.id, 1)
+ val intent = CartActivity.newIntent(this)
+ startActivity(intent)
  }
  }
 
  companion object {
  const val PRODUCT = "PRODUCT"
  private const val NOT_EXIST_DATA_ERROR = "데이터가 넘어오지 않았습니다."
+
+ fun newIntent(context: Context, product: ProductModel): Intent {
+ val intent = Intent(context, ProductDetailActivity::class.java)
+ intent.putExtra(PRODUCT, product)
+ return intent
+ }
  }
 }

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

@@ -9,8 +9,9 @@ import androidx.appcompat.app.AppCompatActivity
 import woowacourse.shopping.R
 import woowacourse.shopping.data.ProductMockRepository
 import woowacourse.shopping.databinding.ActivityProductListBinding
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.view.cart.CartActivity
+import woowacourse.shopping.view.productdetail.ProductDetailActivity
 
 class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  private lateinit var binding: ActivityProductListBinding
@@ -24,8 +25,15 @@ class ProductListActivity : AppCompatActivity(), ProductListContract.View {
  supportActionBar?.setDisplayShowCustomEnabled(true)
  }
 
- override fun showProducts(products: List<Product>) {
- binding.gridProducts.adapter = ProductListAdapter(products)
+ override fun showProducts(products: List<ProductModel>) {
+ binding.gridProducts.adapter = ProductListAdapter(products) {
+ onClick(it)
+ }
+ }
+
+ private fun onClick(product: ProductModel) {
+ val intent = ProductDetailActivity.newIntent(binding.root.context, product)
+ startActivity(intent)
  }
 
  override fun onCreateOptionsMenu(menu: Menu?): Boolean {

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

@@ -5,9 +5,16 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import woowacourse.shopping.R
 import woowacourse.shopping.databinding.ItemProductBinding
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.model.ProductModel
+
+class ProductListAdapter(
+ private val products: List<ProductModel>,
+ private val onItemClick: OnItemClick,
+) : RecyclerView.Adapter<ProductViewHolder>() {
+ fun interface OnItemClick {
+ fun onClick(product: ProductModel)
+ }
 
-class ProductListAdapter(private val products: List<Product>) : RecyclerView.Adapter<ProductViewHolder>() {
  override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProductViewHolder {
  val view = LayoutInflater.from(parent.context).inflate(R.layout.item_product, parent, false)
  return ProductViewHolder(ItemProductBinding.bind(view))
@@ -16,6 +23,6 @@ class ProductListAdapter(private val products: List<Product>) : RecyclerView.Ada
  override fun getItemCount(): Int = products.size
 
  override fun onBindViewHolder(holder: ProductViewHolder, position: Int) {
- holder.bind(products[position])
+ holder.bind(products[position], onItemClick)
  }
 }

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

@@ -1,10 +1,10 @@
 package woowacourse.shopping.view.productlist
 
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.model.ProductModel
 
 interface ProductListContract {
  interface View {
- fun showProducts(products: List<Product>)
+ fun showProducts(products: List<ProductModel>)
  }
 
  interface Presenter {

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

@@ -1,13 +1,14 @@
 package woowacourse.shopping.view.productlist
 
 import woowacourse.shopping.domain.ProductRepository
+import woowacourse.shopping.model.toUiModel
 
 class ProductListPresenter(
  private val view: ProductListContract.View,
  private val productRepository: ProductRepository,
 ) : ProductListContract.Presenter {
  override fun fetchProducts() {
  val products = productRepository.findAll()
- view.showProducts(products)
+ view.showProducts(products.map { it.toUiModel() })
  }
 }

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

@@ -4,13 +4,14 @@ import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
 import woowacourse.shopping.R
 import woowacourse.shopping.databinding.ItemProductBinding
-import woowacourse.shopping.domain.Product
+import woowacourse.shopping.model.ProductModel
 import woowacourse.shopping.util.PriceFormatter
 
 class ProductViewHolder(private val binding: ItemProductBinding) : RecyclerView.ViewHolder(binding.root) {
- fun bind(product: Product) {
+ fun bind(product: ProductModel, onClick: ProductListAdapter.OnItemClick) {
  binding.product = product
- binding.textPrice.text = binding.root.context.getString(R.string.korean_won, PriceFormatter.format(product.price.price))
+ 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)
  }
 }

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

@@ -5,14 +5,19 @@
  <data>
  <variable
  name="product"
- type="woowacourse.shopping.domain.Product" />
+ type="woowacourse.shopping.model.ProductModel" />
+ <variable
+ name="onItemClick"
+ type="woowacourse.shopping.view.productlist.ProductListAdapter.OnItemClick" />
  </data>
 
 <androidx.constraintlayout.widget.ConstraintLayout
  android:layout_width="match_parent"
  android:layout_height="wrap_content"
  android:paddingHorizontal="6dp"
- android:paddingVertical="10dp">
+ android:paddingVertical="10dp"
+ android:onClick="@{() -> onItemClick.onClick(product)}"
+ android:background="?attr/selectableItemBackground">
  <ImageView
  android:id="@+id/img_product"
  android:layout_width="0dp"

domain/src/main/java/woowacourse/shopping/domain/ProductRepository.kt

@@ -2,4 +2,6 @@ package woowacourse.shopping.domain
 
 interface ProductRepository {
  fun findAll(): List<Product>
+
+ fun find(id: Int): Product
 }