diff --git a/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt b/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt
index cca21049..b3306807 100644
--- a/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt
+++ b/app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt
@@ -71,7 +71,7 @@ class testPrint(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.buttonPrintTemplate.setOnClickListener {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
index 90ef767d..69b98494 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
@@ -134,7 +134,7 @@ class AjustesFragment :
if (item.id == 0) {
viewModel.getSectorsSalix()
} else if (item.id == 5) {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
} else if (item.id == 1) {
ma.messageWithSound(
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 3a680c64..acd0881f 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
@@ -1,7 +1,6 @@
package es.verdnatura.presentation.view.feature.articulo.fragment
import android.app.AlertDialog
-import android.content.Intent
import android.graphics.drawable.Drawable
import android.os.Build
import android.text.InputType
@@ -30,7 +29,6 @@ import es.verdnatura.presentation.view.feature.articulo.model.BarcodeVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardRowVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemCardVO
import es.verdnatura.presentation.view.feature.articulo.model.ItemPackingType
-import es.verdnatura.presentation.view.feature.imageview.activity.ImageViewActivity
import es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO
class ItemCardFragment(
@@ -107,6 +105,7 @@ class ItemCardFragment(
binding.mainToolbar.toolbarIcons.adapter =
ToolBarAdapterTooltip(listIcons, object : OnOptionsSelectedListener {
+ @RequiresApi(Build.VERSION_CODES.O)
override fun onOptionsItemSelected(item: Drawable) {
when (item) {
@@ -179,19 +178,12 @@ class ItemCardFragment(
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
customDynamic.removeViewsDialog()
customDynamic.cancel()
}
- binding.itemcardImage.setOnClickListener {
-
- val i = Intent(activity, ImageViewActivity::class.java)
- i.putExtra(getString(R.string.url), urlLarge)
- i.putExtra(getString(R.string.title), titleImage)
- startActivity(i)
- }
}
private fun getItemCard(itemFk: String) {
@@ -402,6 +394,7 @@ class ItemCardFragment(
listBarcodes = itemInfo.barcodes as ArrayList<BarcodeVO>
adapter = ItemCardAdapter(listItemsRow, object : OnItemCardRowClickListener {
+ @RequiresApi(Build.VERSION_CODES.O)
override fun onItemCardRowClickListener(item: ItemCardRowVO) {
when (item.action) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt
index 887abba2..eb334b46 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt
@@ -110,7 +110,7 @@ class ItemProposalFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
index ba1f6ae8..dabcfda1 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
@@ -30,7 +30,7 @@ class BufferFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
index dc598e5e..711530bf 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
@@ -80,7 +80,8 @@ class BufferLoadFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
+
}
}
@@ -128,7 +129,7 @@ class BufferLoadFragment(
ma.hideKeyboard(customDialogList.getEditText())
listTags.clear()
customDialogList.dismiss()
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}.setValue("").show()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
index 654b96c4..be6d52c9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
@@ -64,7 +64,7 @@ class BuscarItemFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
index f5f74313..b8ef7807 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
@@ -64,7 +64,7 @@ class ClaimFragment(
binding.mainToolbar.backButton.setOnClickListener {
customDialogList.dismiss()
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
@@ -118,7 +118,7 @@ class ClaimFragment(
ma.hideKeyboard(customDialogList.getEditText())
customDialogList.dismiss()
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}.setValue("").show()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
index 88b8183d..edf3639e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
@@ -369,7 +369,7 @@ class CollectionFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
//ESCANER =========
hideKeyboards()
@@ -478,7 +478,7 @@ class CollectionFragment(
customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) {
customDialog.dismiss()
- if (activity != null) requireActivity().onBackPressed()
+ if (activity != null) ma.onBackPressed()
}.show()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
index d42b6986..31117459 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
@@ -363,7 +363,7 @@ class CollectionFragmentPicker(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
//ESCANER =========
hideKeyboards()
@@ -472,7 +472,7 @@ class CollectionFragmentPicker(
customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) {
customDialog.dismiss()
- if (activity != null) requireActivity().onBackPressed()
+ if (activity != null) ma.onBackPressed()
}.show()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
index 5dfc190a..9f211ad0 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
@@ -366,7 +366,7 @@ class CollectionFragmentPreChecker(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
//ESCANER =========
hideKeyboards()
@@ -493,7 +493,7 @@ class CollectionFragmentPreChecker(
customDialog.setTitle(getString(R.string.error)).setDescription(it.errorMessage)
.setOkButton(getString(R.string.accept)) {
customDialog.dismiss()
- if (activity != null) requireActivity().onBackPressed()
+ if (activity != null) ma.onBackPressed()
}.show()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
index 6dd2b7dc..2d0c6e61 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
@@ -179,7 +179,7 @@ class CollectionShowTicketFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
@@ -248,7 +248,7 @@ class CollectionShowTicketFragment(
}
} else {
ma.messageWithSound(it.errorMessage, it.isError, false)
- if (activity != null) requireActivity().onBackPressed()
+ if (activity != null) ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
index e754385b..9be3b67f 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
@@ -50,7 +50,7 @@ class ControladorFragment :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt
index 380f9d8e..0c54190d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt
@@ -120,7 +120,7 @@ class ControlVehiculoUsuarioFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
index 0c4b94aa..777a903e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
@@ -25,7 +25,7 @@ class InfoFragment(var title: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
index aeec44e9..fa66583c 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
@@ -212,16 +212,18 @@ class LoadUnloadFragment(
intent.putExtra("objectSigned", "ticket") //cmr
startActivity(intent)
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
private fun setEvents() {
+
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
- if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == EditorInfo.IME_ACTION_NEXT) {
+ if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_UNSPECIFIED) {
+
if (!binding.scanInput.text.isNullOrEmpty()) {
try {
@@ -317,7 +319,7 @@ class LoadUnloadFragment(
if (state == "DELIVERED") {
openSignActivity()
} else {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
} else {
binding.mainToolbar.switchButton.isChecked = false
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
index b3ba71db..f3bdac97 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
@@ -187,7 +187,7 @@ class RoutesFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
index c4059b07..964e9ab4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
@@ -205,7 +205,7 @@ class SummaryFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
index caffe5bd..0d7430df 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
@@ -212,7 +212,7 @@ class TicketsFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
if (!binding.itemcardLayout.isVisible) {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
} else {
setSettingsRoute()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt
index 966ccc70..6c4c4e4e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt
@@ -92,7 +92,7 @@ class DayOfSaleFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
index cf896d42..92c8307d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
@@ -118,7 +118,7 @@ class HistoricoArticuloFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.filterNameordateitem.setOnKeyListener { v, keyCode, event ->
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt
index cdd67b37..c4a59241 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt
@@ -61,7 +61,7 @@ class ItemShelvingLogFragment(
false
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
index 36bc2847..2c095c56 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
@@ -63,7 +63,7 @@ class ShelvingLogFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt
index 0d53bf02..c6407189 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt
@@ -41,7 +41,7 @@ class HistoricoVehiculoFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
index 98d63b65..a1fed06e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
@@ -148,7 +148,7 @@ class InventaryFragment :
@SuppressLint("NotifyDataSetChanged")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.filterItemFk.setOnKeyListener { v, keyCode, event ->
if (binding.filterItemFk.text.toString().isEmpty()) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
index e97c0d45..e78a2302 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
@@ -336,7 +336,7 @@ class InventaryParkingFragment(
binding.mainToolbar.backButton.setOnClickListener {
isBack = true
if (shelvingSaved.isNullOrBlank()) {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
} else {
resetChecking()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
index bd82f2d5..2ce81f50 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
@@ -6,9 +6,7 @@ import android.content.pm.PackageInfo
import android.content.pm.PackageManager
import android.net.Uri
import android.os.Build
-import android.os.Environment
import android.provider.Settings
-import android.util.Log.d
import android.view.View.VISIBLE
import androidx.annotation.RequiresApi
import androidx.datastore.preferences.core.stringPreferencesKey
@@ -41,7 +39,6 @@ import es.verdnatura.presentation.view.feature.login.adapter.WorkFormAdapter
import es.verdnatura.presentation.view.feature.login.model.WorkForms
import es.verdnatura.presentation.view.feature.main.activity.MainActivity
import kotlinx.coroutines.runBlocking
-import java.io.File
import java.util.*
import kotlin.system.exitProcess
@@ -64,7 +61,7 @@ class LoginFragment(var imageUri: Uri?) :
override fun init() {
customDialogList = CustomDialogList(requireContext())
customDialog = CustomDialog(requireContext())
- createFolderSerial()
+ //createFolderSerial()
saveIdentifiers()
checkUser()
binding.buttonLogin.setOnClickListener {
@@ -129,7 +126,19 @@ class LoginFragment(var imageUri: Uri?) :
}
- private fun createFolderSerial() {
+ private fun getDevicePDA(): Int? {
+ return try {
+ Settings.Global.getString(
+ mobileApplication.contentResolver,
+ Settings.Global.DEVICE_NAME
+ ).toInt()
+ } catch (ex: Exception) {
+ null
+ }
+
+ }
+
+/* private fun createFolderSerial() {
val directory = File(
requireContext().getExternalFilesDir(Environment.DIRECTORY_DOCUMENTS), "/dataSerial"
@@ -146,7 +155,7 @@ class LoginFragment(var imageUri: Uri?) :
d("VERDNATURA:", getString(R.string.errorFile))
}
- }
+ }*/
private fun setAdapter(listWorkForms: List<WorkForms>) {
@@ -348,6 +357,15 @@ class LoginFragment(var imageUri: Uri?) :
}
}
+ serialNumber.observe(viewLifecycleOwner){
+ mobileApplication.serialNumber = it
+ viewModel.getCurrentUserData(
+ getString(R.string.logAppName),
+ getInfoVersionNameApp(),
+ mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID),
+ it
+ )
+ }
logindevice.observe(viewLifecycleOwner) {
if (it.isError) {
@@ -422,12 +440,17 @@ class LoginFragment(var imageUri: Uri?) :
}.show()
}
- viewModel.getCurrentUserData(
- getString(R.string.logAppName),
- getInfoVersionNameApp(),
- mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID)
- )
- // viewModel.operator_getNumberOfWagons()
+ //Retrocompatibilidad y asegurarnos que no se meten strings
+ if (getDevicePDA() != null) {
+ viewModel.getSerialNumber(getDevicePDA()!!)
+ } else {
+ viewModel.getCurrentUserData(
+ getString(R.string.logAppName),
+ getInfoVersionNameApp(),
+ mobileApplication.dataStoreApp.readDataStoreKey(ANDROID_ID),
+ )
+ }
+
}
devicelogresponse.observe(viewLifecycleOwner) {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt
index 9de1fb60..1b6126cb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt
@@ -7,4 +7,11 @@ data class ItemMenuVO(
val title: String,
val defaultImage: Drawable?,
val selectedImage: Drawable?
+)
+
+data class WorkerActionSalix(
+ val workerFk:Int,
+ val workerActivityTypeFk:String,
+ val inTimed:String? = null,
+ val outTimed:String? = null
)
\ No newline at end of file
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
index 9d11ada3..8ca85c0d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
@@ -125,7 +125,7 @@ class ObservFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.openPickerImages.setOnClickListener {
val config = ImagePickerConfig {
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 f0dd09af..78647a47 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
@@ -102,7 +102,7 @@ class PackagingCountFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
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 15490cfc..a3a5efd0 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
@@ -113,7 +113,7 @@ class PackagingSummaryFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
index 9b0bffd8..681b5734 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
@@ -129,7 +129,7 @@ class SupplierFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.radiobuttonTypePackaging.setOnCheckedChangeListener { buttonView, isChecked ->
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt
index 66b0b2c1..a542bcb8 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt
@@ -34,7 +34,7 @@ class PackingHollandFragment(var entrypoint: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
binding.scanInput.setOnEditorActionListener { _, actionId, _ ->
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
index 8a4d7771..120e1c54 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
@@ -51,7 +51,7 @@ class CmrExpeditionPalletFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
index 258daa5b..1ce3a5ab 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
@@ -68,11 +68,11 @@ class ExpeditionPalletDetailFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.buttonOk.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
@@ -160,7 +160,7 @@ class ExpeditionPalletDetailFragment(
if (it.isError) {
ma.messageWithSound(it.errorMessage, true, false)
} else {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
})
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
index 92397560..2e92560a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
@@ -87,7 +87,7 @@ class ExpeditionPalletFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt
index eacd93a1..8cbae496 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt
@@ -89,7 +89,7 @@ class ExpeditionScanFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt
index 89a5aa8a..b2dcb4e4 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt
@@ -44,7 +44,7 @@ class ExpeditionScanSorterFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateFragment.kt
index b1389506..f8feb86b 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateFragment.kt
@@ -66,7 +66,7 @@ class ExpeditionStateFragment(
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt
index 3e5d5b1f..db34856b 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt
@@ -51,7 +51,7 @@ class ExpeditionTruckListFragment :
customDialogHor = CustomDialogHour(requireContext())
binding.mainToolbar.toolbarTitle.text = getString(R.string.psScan) + getCURDATE()
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
setToolBar()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt
index a5e9094c..01e12916 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt
@@ -42,7 +42,7 @@ class PalletScanFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
index e2685bd8..1d307a2b 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
@@ -59,7 +59,7 @@ class ParkingFragment(var menuOrigin: String) :
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt
index 0a91a3b7..c6bed440 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt
@@ -78,7 +78,7 @@ class PasilleroFragment(
}
binding.mainToolbarDesign.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
index 1fc788ac..293b5a97 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
@@ -102,7 +102,7 @@ class PhotosFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.editItemFk.setOnEditorActionListener { _, actionId, _ ->
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 bd3dad4e..8418e6fe 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
@@ -55,7 +55,7 @@ class PreControladorFragment :
private fun setEvents() {
binding.scanInput.visibility = VISIBLE
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
index 7519be43..27006928 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
@@ -118,7 +118,7 @@ class EndSacadorFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
//ESCANER =========f
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
index 4dfbd4ab..e28bcfc3 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
@@ -46,7 +46,7 @@ class QrFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
index 9bc1e6ef..0fbb14d5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
@@ -85,7 +85,7 @@ class ReubicationCollectionFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.collectionSwipe.setOnRefreshListener {
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
index 8dc270de..c0af033e 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
@@ -49,7 +49,7 @@ class ReubicationFragment(var entrypoint: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
index 8d05add8..0a499cc6 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
@@ -85,7 +85,7 @@ class SacadorFragment(
ma.hideBottomNavigation(View.VISIBLE)
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
val listIcons: ArrayList<ImageView> = ArrayList()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
index a2c3a951..b2943b5a 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
@@ -86,7 +86,7 @@ class SacadorFragmentNew(
ma.hideBottomNavigation(View.VISIBLE)
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
val listIcons: ArrayList<ImageView> = ArrayList()
@@ -124,7 +124,11 @@ class SacadorFragmentNew(
viewModel.collection_assignNew(
)
} else {
- viewModel.sectorCollectionNew(mobileApplication.dataStoreApp.readDataStoreKey(SECTORFK))
+ viewModel.sectorCollectionNew(
+ mobileApplication.dataStoreApp.readDataStoreKey(
+ SECTORFK
+ )
+ )
}
}
@@ -175,7 +179,9 @@ class SacadorFragmentNew(
) {
if (ma.havePrinter()) {
viewModel.ticketPrintLabelPrevious(customDialogInput.getValue().toInt())
- (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(PRINTERNAME)).toast(
+ (getString(R.string.Imprimiendo) + mobileApplication.dataStoreApp.readDataStoreKey<String>(
+ PRINTERNAME
+ )).toast(
requireContext()
)
} else {
@@ -215,8 +221,9 @@ class SacadorFragmentNew(
ma.messageWithSound(it.errorMessage, true, false)
} else {
- if (goBack) {
- if (!it.response.isNullOrBlank()) addCollectionToList(it.response.toInt())
+ if (!it.response.isNullOrBlank()) {
+ addCollectionToList(it.response.toInt())
+ viewModel.collectionGetSalixLocal()
}
}
goBack = false
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
index ee6dbc4a..da515cd5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
@@ -66,7 +66,7 @@ class ShowTicketFragment(var menuOrigin: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.sacadorSwipe.setOnRefreshListener {
binding.sacadorSwipe.isRefreshing = true
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt
index 1b6f183e..4a72cd33 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt
@@ -30,7 +30,7 @@ class TicketAdvanceFragment(var title: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
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 5ba0ff70..907fee55 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
@@ -128,7 +128,7 @@ class AutomaticAddItemFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
@@ -136,7 +136,7 @@ class AutomaticAddItemFragment(
with(viewModel) {
binding.splashAnimation.visibility = View.INVISIBLE
response.observe(viewLifecycleOwner, Observer {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
})
}
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragmentOld.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragmentOld.kt
index 441fddaa..39698f34 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragmentOld.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragmentOld.kt
@@ -126,14 +126,14 @@ class AutomaticAddItemFragmentOld(
}
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
}
override fun observeViewModel() {
with(viewModel) {
response.observe(viewLifecycleOwner, Observer {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
})
}
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 3b5ed979..a29cb284 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -221,7 +221,7 @@ class UbicadorFragment(
@SuppressLint("SetTextI18n")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
setTooltips()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
index 22ec1d69..04560cd5 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
@@ -227,7 +227,7 @@ class UbicadorFragmentNew(
@SuppressLint("SetTextI18n")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
setTooltips()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
index 49e75e7d..808c048d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
@@ -65,7 +65,7 @@ class PackingMistakeFragment(var menuOrigin: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
binding.scanInput.requestFocus()
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
index 08e1bd1a..556a0751 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
@@ -123,7 +123,7 @@ class WorkermistakeFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
- requireActivity().onBackPressed()
+ ma.onBackPressed()
}
if (binding.filterDepartment.text.isNullOrEmpty()) {
binding.filterItemFk.isEnabled = false