Merge pull request #3916 from naivekook/fix/fix-broken-develop

Fix broken develop
openfoodfacts · Apr 2, 2021 · c69f14d · c69f14d
2 parents 4740512 + 85c979a
commit c69f14d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...in/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryActivity.kt b/...in/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryActivity.kt
@@ -42,6 +42,7 @@ import openfoodfacts.github.scrachx.openfood.utils.SortType.*
 import java.io.File
 import java.text.SimpleDateFormat
 import java.util.*
+import javax.inject.Inject
 
 @AndroidEntryPoint
 class ScanHistoryActivity : BaseActivity() {
@@ -58,7 +59,7 @@ class ScanHistoryActivity : BaseActivity() {
     private var menuButtonsEnabled = false
 
     private val adapter by lazy {
-        ScanHistoryAdapter(isLowBatteryMode = isDisableImageLoad() && isBatteryLevelLow()) {
+        ScanHistoryAdapter(isLowBatteryMode = isDisableImageLoad() && isBatteryLevelLow(), picasso) {
             openProductActivity(it.barcode)
         }
     }

diff --git a/...ain/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryAdapter.kt b/...ain/java/openfoodfacts/github/scrachx/openfood/features/scanhistory/ScanHistoryAdapter.kt
@@ -13,16 +13,15 @@ import openfoodfacts.github.scrachx.openfood.databinding.HistoryListItemBinding
 import openfoodfacts.github.scrachx.openfood.models.HistoryProduct
 import openfoodfacts.github.scrachx.openfood.models.getProductBrandsQuantityDetails
 import openfoodfacts.github.scrachx.openfood.utils.*
-import openfoodfacts.github.scrachx.openfood.utils.Utils.picassoBuilder
 import kotlin.properties.Delegates
 
 /**
  * @param isLowBatteryMode determine if image should be loaded or not
  */
 class ScanHistoryAdapter(
         private val isLowBatteryMode: Boolean,
-        private val onItemClicked: (HistoryProduct) -> Unit,
-        private val picasso: Picasso
+        private val picasso: Picasso,
+        private val onItemClicked: (HistoryProduct) -> Unit
 ) : RecyclerView.Adapter<ScanHistoryAdapter.ViewHolder>(), AutoUpdatableAdapter {
 
     var products: List<HistoryProduct> by Delegates.observable(emptyList()) { _, oldList, newList ->