fix: change default name for lists (#4616)

chore: rename getProductListsDaoWithDefaultList to defaultIfEmpty in ProductListsActivity.kt Closes #3066
openfoodfacts · Apr 6, 2022 · 7b56644 · 7b56644
1 parent c780414
commit 7b56644
Show file tree

Hide file tree

Showing 751 changed files with 2,674 additions and 2,677 deletions.
diff --git a/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt b/...foodfacts/github/scrachx/openfood/features/product/view/summary/SummaryProductFragment.kt
@@ -51,7 +51,6 @@ import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.Dispatchers.IO
 import kotlinx.coroutines.Dispatchers.Main
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import openfoodfacts.github.scrachx.openfood.AppFlavors.OFF
 import openfoodfacts.github.scrachx.openfood.AppFlavors.isFlavors
@@ -63,9 +62,9 @@ import openfoodfacts.github.scrachx.openfood.customtabs.CustomTabsHelper
 import openfoodfacts.github.scrachx.openfood.customtabs.WebViewFallback
 import openfoodfacts.github.scrachx.openfood.databinding.FragmentSummaryProductBinding
 import openfoodfacts.github.scrachx.openfood.features.FullScreenActivityOpener
-import openfoodfacts.github.scrachx.openfood.features.images.manage.ImagesManageActivity
 import openfoodfacts.github.scrachx.openfood.features.additives.AdditiveFragmentHelper.showAdditives
 import openfoodfacts.github.scrachx.openfood.features.compare.ProductCompareActivity.Companion.start
+import openfoodfacts.github.scrachx.openfood.features.images.manage.ImagesManageActivity
 import openfoodfacts.github.scrachx.openfood.features.login.LoginActivity.Companion.LoginContract
 import openfoodfacts.github.scrachx.openfood.features.product.edit.ProductEditActivity
 import openfoodfacts.github.scrachx.openfood.features.product.edit.ProductEditActivity.Companion.KEY_STATE
@@ -74,7 +73,7 @@ import openfoodfacts.github.scrachx.openfood.features.product.view.ProductViewAc
 import openfoodfacts.github.scrachx.openfood.features.product.view.ingredients_analysis.IngredientsWithTagDialogFragment
 import openfoodfacts.github.scrachx.openfood.features.productlist.ProductListActivity
 import openfoodfacts.github.scrachx.openfood.features.productlists.ProductListsActivity
-import openfoodfacts.github.scrachx.openfood.features.productlists.ProductListsActivity.Companion.getProductListsDaoWithDefaultList
+import openfoodfacts.github.scrachx.openfood.features.productlists.ProductListsActivity.Companion.defaultIfEmpty
 import openfoodfacts.github.scrachx.openfood.features.search.ProductSearchActivity
 import openfoodfacts.github.scrachx.openfood.features.shared.BaseFragment
 import openfoodfacts.github.scrachx.openfood.features.shared.adapters.NutrientLevelListAdapter
@@ -92,8 +91,8 @@ import openfoodfacts.github.scrachx.openfood.models.entities.label.LabelName
 import openfoodfacts.github.scrachx.openfood.models.entities.tag.TagDao
 import openfoodfacts.github.scrachx.openfood.repositories.ProductRepository
 import openfoodfacts.github.scrachx.openfood.repositories.RobotoffRepository
-import openfoodfacts.github.scrachx.openfood.repositories.WikidataRepository
 import openfoodfacts.github.scrachx.openfood.repositories.TaxonomiesRepository
+import openfoodfacts.github.scrachx.openfood.repositories.WikidataRepository
 import openfoodfacts.github.scrachx.openfood.utils.*
 import java.io.File
 import javax.inject.Inject
@@ -896,12 +895,11 @@ class SummaryProductFragment : BaseFragment(), ISummaryProductPresenter.View {
     private fun onBookmarkProductButtonClick() {
         val context = requireContext()
 
-        // TODO: 19/06/2021 remove runBlocking
-        val productLists = runBlocking { daoSession.getProductListsDaoWithDefaultList(context).loadAll() }
+        val productLists = daoSession.productListsDao.defaultIfEmpty(context).loadAll()
 
         val dialog = MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.add_to_product_lists)
-            .setView(R.layout.dialog_add_to_list)
+            .setTitle(R.string.dialog_add_product_to_list_title)
+            .setView(R.layout.dialog_add_product_to_list)
             .show()
 
         // Set recycler view

diff --git a/.../java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt b/.../java/openfoodfacts/github/scrachx/openfood/features/productlists/ProductListsActivity.kt
@@ -29,7 +29,6 @@ import android.widget.FrameLayout
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.RequiresApi
-import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.ItemTouchHelper
@@ -41,8 +40,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
-import kotlinx.coroutines.withContext
 import openfoodfacts.github.scrachx.openfood.R
 import openfoodfacts.github.scrachx.openfood.analytics.AnalyticsEvent
 import openfoodfacts.github.scrachx.openfood.analytics.MatomoAnalytics
@@ -106,10 +103,10 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
         binding.fabAdd.setCompoundDrawablesWithIntrinsicBounds(R.drawable.ic_plus_blue_24, 0, 0, 0)
 
         // FIXME: remove runBlocking
-        productListsDao = runBlocking { daoSession.getProductListsDaoWithDefaultList(this@ProductListsActivity) }
+        productListsDao = daoSession.productListsDao.defaultIfEmpty(this)
         val productLists = productListsDao.loadAll().toMutableList()
 
-        adapter = ProductListsAdapter(this@ProductListsActivity, productLists)
+        adapter = ProductListsAdapter(this, productLists)
 
 
         binding.productListsRecyclerView.layoutManager = LinearLayoutManager(this)
@@ -152,7 +149,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
 
     private fun showCreateListDialog(productToAdd: Product? = null) {
         val inputEditText = EditText(this).apply {
-            setHint(R.string.create_new_list_list_name)
+            setHint(R.string.dialog_create_new_list_hint)
         }
         val view = FrameLayout(this).apply {
             val margin = resources.getDimensionPixelSize(R.dimen.activity_horizontal_margin)
@@ -161,7 +158,7 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
         }
         val dialog = MaterialAlertDialogBuilder(this)
             .setCancelable(false)
-            .setTitle(R.string.txt_create_new_list)
+            .setTitle(R.string.dialog_create_new_list_title)
             .setView(view)
             .setPositiveButton(R.string.dialog_create, null)
             .setNegativeButton(R.string.dialog_cancel, null)
@@ -336,14 +333,13 @@ class ProductListsActivity : BaseActivity(), SwipeController.Actions {
         @JvmStatic
         fun start(context: Context) = context.startActivity(Intent(context, ProductListsActivity::class.java))
 
-        suspend fun DaoSession.getProductListsDaoWithDefaultList(context: Context): ProductListsDao = withContext(Dispatchers.IO) {
-            if (productListsDao.isEmpty()) {
-                productListsDao.insertInTx(
-                    ProductLists(context.getString(R.string.txt_eaten_products), 0),
-                    ProductLists(context.getString(R.string.txt_products_to_buy), 0)
+        fun ProductListsDao.defaultIfEmpty(context: Context): ProductListsDao = also {
+            if (it.isEmpty()) {
+                it.insertInTx(
+                    ProductLists(context.getString(R.string.default_list_title_stored), 0),
+                    ProductLists(context.getString(R.string.default_list_title_to_buy), 0)
                 )
             }
-            return@withContext productListsDao
         }
     }
 }
diff --git a/...rc/main/res/layout/dialog_add_to_list.xml → ...res/layout/dialog_add_product_to_list.xml b/...rc/main/res/layout/dialog_add_to_list.xml → ...res/layout/dialog_add_product_to_list.xml
@@ -34,7 +34,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="@dimen/padding_short"
-        android:text="@string/txt_add_to_new_list"
+        android:text="@string/dialog_add_product_to_list_new"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
         android:textSize="@dimen/font_large"
         app:drawableLeftCompat="@drawable/ic_plus_dark_24"

diff --git a/app/src/main/res/values-aa-rER/strings.xml b/app/src/main/res/values-aa-rER/strings.xml
@@ -640,12 +640,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-aa/strings.xml b/app/src/main/res/values-aa/strings.xml
@@ -652,12 +652,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-ach-rUG/strings.xml b/app/src/main/res/values-ach-rUG/strings.xml
@@ -640,12 +640,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-ach/strings.xml b/app/src/main/res/values-ach/strings.xml
@@ -652,12 +652,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
@@ -640,12 +640,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
@@ -651,12 +651,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-ak-rGH/strings.xml b/app/src/main/res/values-ak-rGH/strings.xml
@@ -640,12 +640,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-ak/strings.xml b/app/src/main/res/values-ak/strings.xml
@@ -652,12 +652,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-am-rET/strings.xml b/app/src/main/res/values-am-rET/strings.xml
@@ -640,12 +640,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>

diff --git a/app/src/main/res/values-am/strings.xml b/app/src/main/res/values-am/strings.xml
@@ -651,12 +651,12 @@
     <string name="addtive_search">Search for a additive</string>
     <string name="additives">Additives</string>
     <!--used for product_lists implementation-->
-    <string name="add_to_product_lists">Add to your lists</string>
-    <string name="txt_create_new_list">Create a new list</string>
-    <string name="txt_add_to_new_list">Add to a new list</string>
-    <string name="create_new_list_list_name">List Name</string>
-    <string name="txt_eaten_products">Eaten products</string>
-    <string name="txt_products_to_buy">Products to buy</string>
+    <string name="dialog_add_product_to_list_title">Add to your lists</string>
+    <string name="dialog_create_new_list_title">Create a new list</string>
+    <string name="dialog_add_product_to_list_new">Add to a new list</string>
+    <string name="dialog_create_new_list_hint">List Name</string>
+    <string name="default_list_title_stored">Eaten products</string>
+    <string name="default_list_title_to_buy">Products to buy</string>
     <string name="txt_exporting_your_listed_products">Exporting Your Products…</string>
     <string name="txt_your_listed_products_exported">Your products have been exported</string>
     <string name="txt_discard">Discard</string>