diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt index 42d54cbb..541ad95a 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt @@ -130,7 +130,7 @@ class ItemCardFragment( } iconSalix.drawable -> { - binding.splashProgress.visibility = View.VISIBLE + val itemId = itemInfoG!!.id val entryPoint = Gson().toJson( mutableMapOf( @@ -202,7 +202,7 @@ class ItemCardFragment( private fun getItemCard(itemFk: String) { warehouseFk = mobileApplication.dataStoreApp.readDataStoreKey(WAREHOUSEFK) as Int - binding.splashProgressTwo.visibility = View.VISIBLE + viewModel.getItemCard(itemFk.toLong(), warehouseFk!!) this.itemFk = itemFk @@ -214,7 +214,7 @@ class ItemCardFragment( if (it.isError) { binding.itemcardLayout.visibility = GONE - binding.splashProgressTwo.visibility = GONE + binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard) ma.messageWithSound(it.errorMessage, true, false) @@ -224,7 +224,7 @@ class ItemCardFragment( setItemCard(it) binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE } else { - binding.splashProgressTwo.visibility = GONE + binding.itemcardLayout.visibility = GONE binding.mainToolbar.toolbarTitle.text = getString(R.string.itemCard) ma.messageWithSound( @@ -240,18 +240,18 @@ class ItemCardFragment( }) itemspackinglist.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE + createItemTypeTypeList(it.list) }) response.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE + getItemCard(itemInfoG!!.id.toString()) }) addressLosesList.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = GONE + if (it.list.isEmpty()) { ma.messageWithSound(getString(R.string.NotAddress), true, false) } else { @@ -462,7 +462,7 @@ class ItemCardFragment( binding.itemcardImage.getLocationInWindow(position) binding.scrollView.scrollTo(0, position[1]) } - binding.splashProgressTwo.visibility = GONE + } private fun showCustomDialog(item: ItemCardRowVO, textDescrip: String) { @@ -562,7 +562,7 @@ class ItemCardFragment( } private fun showProgress() { - binding.splashProgress.visibility = View.VISIBLE + } private fun prepareItemStockUpdate2(itemB: ItemCardRowVO, value: Int) { @@ -670,7 +670,7 @@ class ItemCardFragment( } private fun updateItemPackingType(itemPackingType: String) { - binding.splashProgress.visibility = View.VISIBLE + viewModel.updatePackingTypeSalix( itemInfoG!!.id, itemPackingType @@ -679,7 +679,7 @@ class ItemCardFragment( override fun onClickDynamic(addressFK: Int) { - binding.splashProgress.visibility = View.VISIBLE + viewModel.setVisibleDiscard(itemInfoG!!.id, warehouseFk!!, quantityToDiscard, addressFK) customDynamic.dismiss() customDynamic.cancel() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt index dbea417b..0dec7fd7 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt @@ -132,7 +132,6 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) { addressFk: Int?, ) { - 1 salix.setVisibleDiscard( ItemDiscardSalixShortage(itemFk, warehouseFk, quantity, addressFk)