fix: wrong number of products for lists + analytics events (#4648)

* Fix: wrong number of products for lists + analytics events
* Use the dedicated method to launch ProductListsActivity
* Shop list name removed from analytics event

app/src/main/java/openfoodfacts/github/scrachx/openfood/analytics/AnalyticsEvent.kt

@@ -28,6 +28,12 @@ sealed class AnalyticsEvent(val category: String, val action: String, val name:
 
     object ShoppingListCreated : AnalyticsEvent("shopping-lists", "created", null, null)
 
+    data class ShoppingListProductAdded(val barcode: String) : AnalyticsEvent("shopping-lists", "add_product", barcode, null)
+
+    data class ShoppingListProductRemoved(val barcode: String) : AnalyticsEvent("shopping-lists", "remove_product", barcode, null)
+
+    object ShoppingListShared : AnalyticsEvent("shopping-lists", "shared", null, null)
+
     object ShoppingListExported : AnalyticsEvent("shopping-lists", "exported", null, null)
 
     data class IngredientAnalysisEnabled(val type: String) : AnalyticsEvent("ingredient-analysis", "enabled", type, null)

app/src/main/java/openfoodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt

@@ -82,6 +82,7 @@ import openfoodfacts.github.scrachx.openfood.images.ProductImage
 import openfoodfacts.github.scrachx.openfood.models.*
 import openfoodfacts.github.scrachx.openfood.models.entities.ListedProduct
 import openfoodfacts.github.scrachx.openfood.models.entities.ListedProductDao
+import openfoodfacts.github.scrachx.openfood.models.entities.ProductLists
 import openfoodfacts.github.scrachx.openfood.models.entities.additive.AdditiveName
 import openfoodfacts.github.scrachx.openfood.models.entities.allergen.AllergenHelper
 import openfoodfacts.github.scrachx.openfood.models.entities.allergen.AllergenName
@@ -883,20 +884,29 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
                 it.productDetails = product.getProductBrandsQuantityDetails()
                 it.imageUrl = product.getImageSmallUrl(localeManager.getLanguage())
             }
-            daoSession.listedProductDao.insertOrReplace(product)
+            addListedProductToDatabase(product, list)
+            matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListProductAdded(product.barcode))
             dialog.dismiss()
             onRefresh()
         }
 
         // Add listener to text view
         val addToNewList = dialog.findViewById<TextView>(R.id.tvAddToNewList)!!
         addToNewList.setOnClickListener {
-            context.startActivity(Intent(context, ProductListsActivity::class.java).apply {
-                putExtra("product", product)
-            })
+            ProductListsActivity.start(context, productToAdd = product)
         }
     }
 
+    private fun addListedProductToDatabase(
+        product: ListedProduct,
+        list: ProductLists
+    ) {
+        daoSession.listedProductDao.insertOrReplace(product)
+        daoSession.productListsDao.update(list.apply {
+            products.add(product)
+            numOfProducts++
+        })
+    }
 
     private fun takeMorePicture() {
         sendOther = true

app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlist/ProductListActivity.kt

@@ -372,16 +372,34 @@ class ProductListActivity : BaseActivity(), SwipeController.Actions {
             putExtra(Intent.EXTRA_TEXT, shareUrl)
             type = "text/plain"
         }, null))
+
+        matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListShared)
     }
 
     override fun onRightClicked(position: Int) {
         if (adapter.products.isEmpty()) return
 
         val productToRemove = adapter.products[position]
-        daoSession.listedProductDao.delete(productToRemove)
+        removeListedProductFromDatabase(productToRemove)
+
+        matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListProductRemoved(
+            barcode = productToRemove.barcode
+        ))
         adapter.remove(productToRemove)
     }
 
+    private fun removeListedProductFromDatabase(productToRemove: ListedProduct) {
+        daoSession.listedProductDao.delete(productToRemove)
+
+        productList.apply {
+            numOfProducts -= 1
+            products.remove(productToRemove)
+        }
+
+        daoSession.listedProductDao.delete(productToRemove)
+        daoSession.productListsDao.update(productList)
+    }
+
     override fun onBackPressed() {
         setResult(RESULT_OK, Intent().apply { putExtra("update", true) })
         super.onBackPressed()

app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt

@@ -67,7 +67,6 @@ import java.io.InputStream
 import java.io.InputStreamReader
 import javax.inject.Inject
 
-
 @AndroidEntryPoint
 class ProductListsActivity : BaseActivity(), SwipeController.Actions {
     private var _binding: ActivityProductListsBinding? = null
@@ -102,12 +101,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
 
         binding.fabAdd.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_plus_blue_24, 0, 0, 0)
 
-        // FIXME: remove runBlocking
-        productListsDao = daoSession.productListsDao.defaultIfEmpty(this)
-        val productLists = productListsDao.loadAll().toMutableList()
-
-        adapter = ProductListsAdapter(this, productLists)
-
+        adapter = ProductListsAdapter(this, mutableListOf())
 
         binding.productListsRecyclerView.layoutManager = LinearLayoutManager(this)
         binding.productListsRecyclerView.adapter = adapter
@@ -122,6 +116,8 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
 
         binding.productListsRecyclerView.addOnItemTouchListener(
             RecyclerItemClickListener(this) { _, position ->
+                val productLists = adapter.lists
+
                 val id = productLists[position].id
                 val listName = productLists[position].listName
                 Intent(this, ProductListActivity::class.java).apply {
@@ -138,6 +134,12 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
         binding.fabAdd.setOnClickListener { showCreateListDialog() }
     }
 
+    private fun refreshLists() {
+        // FIXME: remove runBlocking
+        productListsDao = daoSession.productListsDao.defaultIfEmpty(this)
+        adapter.replaceWith(productListsDao.loadAll())
+    }
+
     // On Android < 5, the drawableStart attribute in XML will cause a crash
     // That's why, it's instead done here in the code
     private fun fixFabIcon() {
@@ -181,7 +183,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
         matomoAnalytics.trackEvent(AnalyticsEvent.ShoppingListCreated)
         val productList = ProductLists(listName, if (productToAdd != null) 1 else 0)
 
-        adapter.lists.add(productList)
+        adapter.add(productList)
         productListsDao.insert(productList)
 
         adapter.notifyDataSetChanged()
@@ -261,6 +263,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
 
     public override fun onResume() {
         super.onResume()
+        refreshLists()
         binding.bottomNavigation.bottomNavigation.selectNavigationItem(R.id.my_lists)
     }
 

app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsAdapter.kt

@@ -3,13 +3,14 @@ package openfoodfacts.github.scrachx.openfood.features.productlists
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import openfoodfacts.github.scrachx.openfood.databinding.YourProductListsItemBinding
 import openfoodfacts.github.scrachx.openfood.models.entities.ProductLists
 
 class ProductListsAdapter(
-        internal val context: Context,
-        val lists: MutableList<ProductLists>
+    internal val context: Context,
+    val lists: MutableList<ProductLists>
 ) : RecyclerView.Adapter<ProductListsViewHolder>() {
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ProductListsViewHolder {
         val binding = YourProductListsItemBinding.inflate(LayoutInflater.from(context), parent, false)
@@ -27,12 +28,30 @@ class ProductListsAdapter(
 
     override fun getItemCount() = lists.size
 
+    fun add(productList: ProductLists) {
+        lists.add(productList)
+        notifyItemInserted(lists.size - 1)
+    }
+
     fun remove(data: ProductLists) {
         val position = lists.indexOf(data)
         lists.removeAt(position)
         notifyItemRemoved(position)
     }
 
+    fun replaceWith(newList: MutableList<ProductLists>) {
+        val oldList = lists.toList()
+        lists.clear()
+        lists.addAll(newList)
+
+        DiffUtil.calculateDiff(
+            ProductListsDiffCallback(
+                oldList,
+                newList
+            ),
+        ).dispatchUpdatesTo(this)
+    }
+
 }
 
 class ProductListsViewHolder(val binding: YourProductListsItemBinding) : RecyclerView.ViewHolder(binding.root)

app/src/main/java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsDiff.kt

@@ -0,0 +1,22 @@
+package openfoodfacts.github.scrachx.openfood.features.productlists
+
+import androidx.recyclerview.widget.DiffUtil
+import openfoodfacts.github.scrachx.openfood.models.entities.ProductLists
+
+class ProductListsDiffCallback(
+    private val oldItems: List<ProductLists>,
+    private val newItems: List<ProductLists>,
+) : DiffUtil.Callback() {
+
+    override fun getOldListSize(): Int = oldItems.size
+
+    override fun getNewListSize(): Int = newItems.size
+
+    override fun areItemsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return oldItems[oldItemPosition].id == newItems[newItemPosition].id
+    }
+
+    override fun areContentsTheSame(oldItemPosition: Int, newItemPosition: Int): Boolean {
+        return areItemsTheSame(oldItemPosition, newItemPosition)
+    }
+}