diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt index 2f4c2e6a..ed64ee9e 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt @@ -40,7 +40,7 @@ class PackagingCountFragment( override fun init() { - // binding.splashProgress.visibility = View.VISIBLE + viewModel.getItemsPackaging( mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID") ) @@ -101,19 +101,16 @@ class PackagingCountFragment( entryAdd.observe(viewLifecycleOwner) { if (it.isError) { - //binding.splashProgress.visibility = View.INVISIBLE ma.messageWithSound(it.errorMessage, true, true) } else { ma.messageWithSound(it.errorMessage, false, true) - //binding.splashProgress.visibility = View.VISIBLE viewModel.getItemsPackaging( mobileApplication.dataStoreApp.readDataStoreKey("SUPPLIERID"), mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID")) } } itemSupplierList.observe(viewLifecycleOwner) { - //binding.splashProgress.visibility = View.GONE adapteritemsupplier = ItemSupplierAdapter(it.list, object : OnImageUpdateClickListener { @@ -155,8 +152,6 @@ class PackagingCountFragment( if (customDialogInput.getValue().isNotEmpty()) { requireActivity().hideKeyboard() } - - //binding.splashProgress.visibility = View.VISIBLE viewModel.entry_addFromBuy( mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID"), item = item.id!!.toInt(), (if (mobileApplication.dataStoreApp.readDataStoreKey("ENTRYTYPE") == "Rec") { @@ -190,7 +185,6 @@ class PackagingCountFragment( ) { customDialog.cancel() customDialog.dismiss() - //binding.splashProgress.visibility = View.VISIBLE viewModel.entry_addFromBuy( mobileApplication.dataStoreApp.readDataStoreKey("ENTRYID"), item = item.id!!.toInt(), 0 diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt index a48f894e..752623a3 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt @@ -43,13 +43,13 @@ class PackagingSummaryFragment( binding.totalImages.text = mobileApplication.dataStoreApp.readDataStoreKey(ENTRYNUMBERIMAGES).toString() binding.observations.text = mobileApplication.dataStoreApp.readDataStoreKey(ENTRYOBSERVATIONS) - binding.splashProgress.visibility = View.VISIBLE + viewModel.getItemsPackaging( mobileApplication.dataStoreApp.readDataStoreKey(SUPPLIERID), mobileApplication.dataStoreApp.readDataStoreKey(ENTRYID) ) ma.hideBottomNavigation(View.GONE) - binding.splashProgress.visibility = View.GONE + setToolBar() setEvents() super.init() @@ -101,7 +101,7 @@ class PackagingSummaryFragment( with(viewModel) { itemSupplierList.observe(viewLifecycleOwner) { - binding.splashProgress.visibility = View.GONE + var mySummaryList = it.list.filter { it.quantity > 0 } adapteritemsupplier = ItemSupplierAdapter(mySummaryList, null, null, null, showItems = false) diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt index b53dbd9b..37117ed2 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt @@ -62,7 +62,7 @@ class PreControladorFragment : if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) { goBack = false if (!binding.scanInput.text.isNullOrEmpty()) { - binding.splashProgress.visibility = VISIBLE + try { //Tara 6276 @@ -92,7 +92,7 @@ class PreControladorFragment : override fun observeViewModel() { with(viewModel) { collectionTicketList.observe(viewLifecycleOwner, Observer { - binding.splashProgress.visibility = View.GONE + if (it.isError) { ma.messageWithSound(it.errorMessage, true, false)