diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt index aff85f63..a502dcf0 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/adapter/AutomaticAdapter.kt @@ -17,7 +17,7 @@ class AutomaticAdapter( ) } - fun updateItems( list: List){ + fun updateItems(list: List) { items = list notifyDataSetChanged() } @@ -26,9 +26,6 @@ class AutomaticAdapter( override fun onBindViewHolder(holder: ItemHolder, position: Int) { holder.bind(items[position]) - holder.binding.root.setOnClickListener { - onAutomaticItemClickListener.onAutomaticItemClickListener(position) - } } inner class ItemHolder( @@ -37,10 +34,12 @@ class AutomaticAdapter( private val res = binding.root.context.resources fun bind(item: Long) { binding.itemfkText.text = item.toString() + binding.deleteItem.setOnClickListener { + onAutomaticItemClickListener.onAutomaticItemClickListener( + layoutPosition + ) + } - /* binding.apply { - this.item = item - }*/ } } } \ No newline at end of file diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt index 8fdab103..5f4ffa1a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt @@ -24,10 +24,8 @@ class AutomaticAddItemFragment( ) : BaseFragment( UbicadorViewModel::class ) { - private var adapter: AutomaticAdapter? = null private var listItems: ArrayList = ArrayList() - private var contador = 0 private lateinit var customDialogList: CustomDialogList private var listShelvings: ArrayList = ArrayList() private var listShelvingsAdapter: BarcodeAdapter? = null @@ -54,19 +52,22 @@ class AutomaticAddItemFragment( private fun setSubtitle() { binding.mainToolbar.toolbarSubtitle.text = - getString(R.string.doubleText, getString(R.string.labels), contador.toString()) + getString( + R.string.doubleText, + getString(R.string.labels), + (listItems.size).toString() + ) } private fun setViews() { adapter = AutomaticAdapter(listItems, object : OnAutomaticItemClickListener { override fun onAutomaticItemClickListener(position: Int) { - contador -= 1 - setSubtitle() + if (listItems.size > position) { listItems.removeAt(position) adapter!!.notifyDataSetChanged() } - + setSubtitle() } }) binding.itemsRecyclerview.adapter = adapter @@ -80,8 +81,6 @@ class AutomaticAddItemFragment( if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { if (binding.editMatricula.text.toString().isNotEmpty()) { - contador += 1 - setSubtitle() try { listItems.add( 0, @@ -92,6 +91,7 @@ class AutomaticAddItemFragment( ).toString().toLong() ) + setSubtitle() adapter!!.notifyItemInserted(0) binding.itemsRecyclerview.scrollToPosition(0) } catch (ex: Exception) {