お気に入り画面のアイテムタブの作成 一個前のプルリクはクローズしました

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/FavoriteItemFragment.kt

@@ -3,25 +3,77 @@ package com.nemo.androiduitraining.view.fragment.favorite
 import android.os.Bundle
 import android.view.View
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.viewModels
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.viewbinding.ViewBinding
 import com.nemo.androiduitraining.R
 import com.nemo.androiduitraining.databinding.FragmentFavoriteItemBinding
+import com.nemo.androiduitraining.view.fragment.favorite.uiModel.item.*
+import com.nemo.androiduitraining.viewModel.favorite.FavoriteItemViewModel
+import com.xwray.groupie.GroupieAdapter
+import com.xwray.groupie.viewbinding.BindableItem
+import dagger.hilt.android.AndroidEntryPoint
+import java.util.*
 
+@AndroidEntryPoint
 class FavoriteItemFragment : Fragment(R.layout.fragment_favorite_item) {
     companion object {
         fun newInstance() = FavoriteItemFragment()
     }
 
-    private var _binding: FragmentFavoriteItemBinding? = null
-    private val binding: FragmentFavoriteItemBinding
-        get() = _binding!!
+    private val viewModel: FavoriteItemViewModel by viewModels()
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFavoriteItemBinding.bind(view)
+        val binding = FragmentFavoriteItemBinding.bind(view)
+
+        val adapter = CustomGroupieAdapter()
+        fetchClothsAndUpdateList(adapter)
+        setupRecycler(binding, adapter)
+    }
+
+    private fun fetchClothsAndUpdateList(adapter: CustomGroupieAdapter) {
+        viewModel.clothsLD.observe(viewLifecycleOwner) { cloths ->
+            adapter.updateList(cloths)
+        }
+        viewModel.fetchDisplayClothsList()
+    }
+
+    private fun setupRecycler(
+        binding: FragmentFavoriteItemBinding,
+        adapter: CustomGroupieAdapter
+    ) {
+        val spanSize = adapter.itemList.maxOf { item -> (item as HasSpanSizeItem).spanSize }
+        val gridLayoutManager = GridLayoutManager(requireContext(), spanSize).also {
+            it.spanSizeLookup = CustomGridSpanSizeLookup(adapter)
+        }
+        binding.favoriteItemRecycler.layoutManager = gridLayoutManager
+        binding.favoriteItemRecycler.adapter = adapter
+    }
+
+    private class CustomGroupieAdapter : GroupieAdapter() {
+        private var _itemList: List<BindableItem<out ViewBinding>> = makeDefaultList()
+        val itemList: List<BindableItem<out ViewBinding>>
+            get() = _itemList
+
+        private fun makeDefaultList(): List<BindableItem<out ViewBinding>> = listOf(
+            FavoriteItemNoItem(),
+            FavoriteItemNowPopular()
+        )
+
+        fun updateList(newItems: List<FavoriteItemViewModel.DisplayClothsData>) {
+            val newItemList: List<BindableItem<out ViewBinding>> = newItems.map {
+                FavoriteItemDescription(displayData = it)
+            }
+            _itemList = makeDefaultList() + newItemList
+            updateAsync(_itemList)
+        }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private class CustomGridSpanSizeLookup(
+        private val adapter: CustomGroupieAdapter
+    ) : GridLayoutManager.SpanSizeLookup() {
+        override fun getSpanSize(position: Int) =
+            (adapter.getItem(position) as? HasSpanSizeItem)?.spanSize ?: 0
     }
 }

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/FavoriteNewItemFragment.kt

@@ -10,9 +10,9 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.viewbinding.ViewBinding
 import com.nemo.androiduitraining.R
 import com.nemo.androiduitraining.databinding.FragmentFavoriteNewItemBinding
-import com.nemo.androiduitraining.view.fragment.favorite.entity.FavoriteItemCell
-import com.nemo.androiduitraining.view.fragment.favorite.entity.FavoriteNoBrandRegistered
-import com.nemo.androiduitraining.view.fragment.favorite.entity.FavoriteNowPopular
+import com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem.FavoriteNewItemCell
+import com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem.FavoriteNewNoBrand
+import com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem.FavoriteNewNowPopular
 import com.nemo.androiduitraining.viewModel.favorite.FavoriteNewItemViewModel
 import com.xwray.groupie.GroupieAdapter
 import com.xwray.groupie.viewbinding.BindableItem
@@ -65,13 +65,13 @@ class FavoriteNewItemFragment : Fragment(R.layout.fragment_favorite_new_item) {
         private var itemList: List<BindableItem<out ViewBinding>> = listOf()
 
         private val defaultViewList = mutableListOf(
-            FavoriteNoBrandRegistered(),
-            FavoriteNowPopular()
+            FavoriteNewNoBrand(),
+            FavoriteNewNowPopular()
         )
 
         fun updateList(brandsList: List<FavoriteNewItemViewModel.BrandItem>) {
             this.itemList = defaultViewList + brandsList.map {
-                FavoriteItemCell(
+                FavoriteNewItemCell(
                     brandName = it.name,
                     brandNameJapanese = it.nameJapanese
                 )

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/item/FavoriteItemDescription.kt

@@ -0,0 +1,31 @@
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.item
+
+import android.view.View
+import com.nemo.androiduitraining.R
+import com.nemo.androiduitraining.databinding.FavoriteItemDescriptionBinding
+import com.nemo.androiduitraining.viewModel.favorite.FavoriteItemViewModel
+import com.xwray.groupie.Item
+import com.xwray.groupie.viewbinding.BindableItem
+
+class FavoriteItemDescription(
+    val displayData: FavoriteItemViewModel.DisplayClothsData
+) : BindableItem<FavoriteItemDescriptionBinding>(), HasSpanSizeItem {
+    override val spanSize = 1
+    override fun bind(viewBinding: FavoriteItemDescriptionBinding, position: Int) {
+        viewBinding.displayClothsData = displayData
+    }
+
+    override fun getLayout() = R.layout.favorite_item_description
+
+    override fun initializeViewBinding(view: View): FavoriteItemDescriptionBinding {
+        return FavoriteItemDescriptionBinding.bind(view)
+    }
+
+    override fun isSameAs(other: Item<*>): Boolean {
+        return (other as? FavoriteItemDescription)?.displayData == this.displayData
+    }
+
+    override fun hasSameContentAs(other: Item<*>): Boolean {
+        return (other as? FavoriteItemDescription)?.displayData?.id == this.displayData.id
+    }
+}

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/item/FavoriteItemNoItem.kt

@@ -0,0 +1,28 @@
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.item
+
+import android.view.View
+import com.nemo.androiduitraining.R
+import com.nemo.androiduitraining.databinding.FavoriteItemNoItemRegisteredBinding
+import com.xwray.groupie.Item
+import com.xwray.groupie.viewbinding.BindableItem
+
+class FavoriteItemNoItem : BindableItem<FavoriteItemNoItemRegisteredBinding>(), HasSpanSizeItem {
+    override val spanSize = 3
+    override fun bind(viewBinding: FavoriteItemNoItemRegisteredBinding, position: Int) {
+    }
+
+    override fun getLayout() = R.layout.favorite_item_no_item_registered
+
+    override fun initializeViewBinding(view: View): FavoriteItemNoItemRegisteredBinding {
+        return FavoriteItemNoItemRegisteredBinding.bind(view)
+    }
+
+    /**現状FavoriteItemNoItemは一つしか表示しないので classが等しければ更新は不要*/
+    override fun isSameAs(other: Item<*>): Boolean {
+        return other is FavoriteItemNoItem
+    }
+
+    override fun hasSameContentAs(other: Item<*>): Boolean {
+        return isSameAs(other)
+    }
+}

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/item/FavoriteItemNowPopular.kt

@@ -0,0 +1,27 @@
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.item
+
+import android.view.View
+import com.nemo.androiduitraining.R
+import com.nemo.androiduitraining.databinding.FavoriteItemNowPopularBinding
+import com.xwray.groupie.Item
+import com.xwray.groupie.viewbinding.BindableItem
+
+class FavoriteItemNowPopular : BindableItem<FavoriteItemNowPopularBinding>(), HasSpanSizeItem {
+    override val spanSize = 3
+    override fun bind(viewBinding: FavoriteItemNowPopularBinding, position: Int) {
+    }
+
+    override fun getLayout() = R.layout.favorite_item_now_popular
+
+    override fun initializeViewBinding(view: View): FavoriteItemNowPopularBinding {
+        return FavoriteItemNowPopularBinding.bind(view)
+    }
+
+    override fun isSameAs(other: Item<*>): Boolean {
+        return other is FavoriteItemNowPopular
+    }
+
+    override fun hasSameContentAs(other: Item<*>): Boolean {
+        return isSameAs(other)
+    }
+}

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/item/HasSpanSizeItem.kt

@@ -0,0 +1,5 @@
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.item
+
+interface HasSpanSizeItem {
+    val spanSize: Int
+}

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/entity/FavoriteItemCell.kt → app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/newItem/FavoriteNewItemCell.kt

@@ -1,11 +1,11 @@
-package com.nemo.androiduitraining.view.fragment.favorite.entity
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem
 
 import android.view.View
 import com.nemo.androiduitraining.R
 import com.nemo.androiduitraining.databinding.FavoriteNewItemItemCellBinding
 import com.xwray.groupie.viewbinding.BindableItem
 
-class FavoriteItemCell(
+class FavoriteNewItemCell(
     private val brandName: String,
     private val brandNameJapanese: String
 ) : BindableItem<FavoriteNewItemItemCellBinding>() {

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/entity/FavoriteNoBrandRegistered.kt → app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/newItem/FavoriteNewNoBrand.kt

@@ -1,11 +1,11 @@
-package com.nemo.androiduitraining.view.fragment.favorite.entity
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem
 
 import android.view.View
 import com.nemo.androiduitraining.R
 import com.nemo.androiduitraining.databinding.FavoriteNewItemNoBrandRegisteredBinding
 import com.xwray.groupie.viewbinding.BindableItem
 
-class FavoriteNoBrandRegistered : BindableItem<FavoriteNewItemNoBrandRegisteredBinding>() {
+class FavoriteNewNoBrand : BindableItem<FavoriteNewItemNoBrandRegisteredBinding>() {
     override fun bind(viewBinding: FavoriteNewItemNoBrandRegisteredBinding, position: Int) {
     }
 

app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/entity/FavoriteNowPopular.kt → app/src/main/java/com/nemo/androiduitraining/view/fragment/favorite/uiModel/newItem/FavoriteNewNowPopular.kt

@@ -1,11 +1,11 @@
-package com.nemo.androiduitraining.view.fragment.favorite.entity
+package com.nemo.androiduitraining.view.fragment.favorite.uiModel.newItem
 
 import android.view.View
 import com.nemo.androiduitraining.R
 import com.nemo.androiduitraining.databinding.FavoriteNewItemNowPopularBinding
 import com.xwray.groupie.viewbinding.BindableItem
 
-class FavoriteNowPopular : BindableItem<FavoriteNewItemNowPopularBinding>() {
+class FavoriteNewNowPopular : BindableItem<FavoriteNewItemNowPopularBinding>() {
     override fun bind(viewBinding: FavoriteNewItemNowPopularBinding, position: Int) {
     }
 

app/src/main/java/com/nemo/androiduitraining/viewModel/favorite/FavoriteItemViewModel.kt

@@ -0,0 +1,88 @@
+package com.nemo.androiduitraining.viewModel.favorite
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import dagger.hilt.android.lifecycle.HiltViewModel
+import java.util.*
+import javax.inject.Inject
+import kotlin.random.Random
+
+@HiltViewModel
+class FavoriteItemViewModel @Inject constructor() : ViewModel() {
+    private val _clothsLD = MutableLiveData<List<DisplayClothsData>>()
+    val clothsLD: LiveData<List<DisplayClothsData>>
+        get() = _clothsLD
+
+    fun fetchDisplayClothsList() {
+        val displayList = mutableListOf<DisplayClothsData>()
+
+        for (i in 0..29) {
+            val data = when (Random.nextInt(4)) {
+                0 -> fullData
+                1 -> missPercentData
+                2 -> missCouponData
+                else -> missBothData
+            }
+            displayList.add(data)
+        }
+
+        _clothsLD.postValue(displayList)
+    }
+
+    private val fullData = DisplayClothsData(
+        id = UUID.randomUUID().toString(),
+        itemImage = "https://shop.adidas.jp/photo/GN/GN3458/z-GN3458-on_model-standard_view.jpg",
+        discountPercent = 50,
+        couponPrice = 300,
+        itemName = "アディパン",
+        itemGenre = "いかつい",
+        itemPrice = 3000
+    )
+
+    private val missPercentData = DisplayClothsData(
+        id = UUID.randomUUID().toString(),
+        itemImage = "https://shop.adidas.jp/photo/GN/GN3458/z-GN3458-on_model-standard_view.jpg",
+        discountPercent = null,
+        couponPrice = 300,
+        itemName = "アディパン",
+        itemGenre = "いかつい",
+        itemPrice = 3000
+    )
+
+    private val missCouponData = DisplayClothsData(
+        id = UUID.randomUUID().toString(),
+        itemImage = "https://shop.adidas.jp/photo/GN/GN3458/z-GN3458-on_model-standard_view.jpg",
+        discountPercent = 50,
+        couponPrice = null,
+        itemName = "アディパン",
+        itemGenre = "いかつい",
+        itemPrice = 3000
+    )
+
+    private val missBothData = DisplayClothsData(
+        id = UUID.randomUUID().toString(),
+        itemImage = "https://shop.adidas.jp/photo/GN/GN3458/z-GN3458-on_model-standard_view.jpg",
+        discountPercent = null,
+        couponPrice = null,
+        itemName = "アディパン",
+        itemGenre = "いかつい",
+        itemPrice = 3000
+    )
+
+    data class DisplayClothsData(
+        val id: String,
+        val itemImage: String,
+        val discountPercent: Int?,
+        val couponPrice: Int?,
+        val itemName: String,
+        val itemGenre: String,
+        val itemPrice: Int
+    ) {
+        fun hasDiscountPercent() = discountPercent != null
+        fun hasCouponPrice() = couponPrice != null
+        fun makePriceText(price: Int) = "¥$price"
+        fun makeCouponPrice(couponPrice: Int?) = "¥${couponPrice}クーポン"
+        fun makeCouponDiscountPercent(discountPercent: Int?) = "$discountPercent%OFF"
+    }
+}