verdnatura/vn-warehouse
verdnatura
/
vn-warehouse
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refs #6284 refactor:deprecated

This commit is contained in:
Sergio De la torre 2024-02-28 09:33:56 +01:00
parent 37751d99dd
commit 51160cd1d3
59 changed files with 128 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/es/verdnatura/presentation/testing/testPrint.kt
View File

@ -71,7 +71,7 @@ class testPrint(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.buttonPrintTemplate.setOnClickListener {

2
app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt
View File

@ -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(

13
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt
View File

@ -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) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemProposalFragment.kt
View File

@ -110,7 +110,7 @@ class ItemProposalFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferFragment.kt
View File

@ -30,7 +30,7 @@ class BufferFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

5
app/src/main/java/es/verdnatura/presentation/view/feature/buffer/fragment/BufferLoadFragment.kt
View File

@ -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()

2
app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemFragment.kt
View File

@ -64,7 +64,7 @@ class BuscarItemFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/claim/fragment/ClaimFragment.kt
View File

@ -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()

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt
View File

@ -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()
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPicker.kt
View File

@ -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()
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPreChecker.kt
View File

@ -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()
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt
View File

@ -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()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/controlador/fragment/ControladorFragment.kt
View File

@ -50,7 +50,7 @@ class ControladorFragment :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

2
app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoUsuarioFragment.kt
View File

@ -120,7 +120,7 @@ class ControlVehiculoUsuarioFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt
View File

@ -25,7 +25,7 @@ class InfoFragment(var title: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

10
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LoadUnloadFragment.kt
View File

@ -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

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/RoutesFragment.kt
View File

@ -187,7 +187,7 @@ class RoutesFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
View File

@ -205,7 +205,7 @@ class SummaryFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt
View File

@ -212,7 +212,7 @@ class TicketsFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
if (!binding.itemcardLayout.isVisible) {
requireActivity().onBackPressed()
ma.onBackPressed()
} else {
setSettingsRoute()

2
app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleFragment.kt
View File

@ -92,7 +92,7 @@ class DayOfSaleFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloFragment.kt
View File

@ -118,7 +118,7 @@ class HistoricoArticuloFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.filterNameordateitem.setOnKeyListener { v, keyCode, event ->

2
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt
View File

@ -61,7 +61,7 @@ class ItemShelvingLogFragment(
false
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt
View File

@ -63,7 +63,7 @@ class ShelvingLogFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoFragment.kt
View File

@ -41,7 +41,7 @@ class HistoricoVehiculoFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt
View File

@ -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()) {

2
app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt
View File

@ -336,7 +336,7 @@ class InventaryParkingFragment(
binding.mainToolbar.backButton.setOnClickListener {
isBack = true
if (shelvingSaved.isNullOrBlank()) {
requireActivity().onBackPressed()
ma.onBackPressed()
} else {
resetChecking()

47
app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt
View File

@ -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) {

7
app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt
View File

@ -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
)

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/ObservFragment.kt
View File

@ -125,7 +125,7 @@ class ObservFragment(
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.openPickerImages.setOnClickListener {
val config = ImagePickerConfig {

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingCountFragment.kt
View File

@ -102,7 +102,7 @@ class PackagingCountFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/PackagingSummaryFragment.kt
View File

@ -113,7 +113,7 @@ class PackagingSummaryFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/packaging/fragment/SupplierFragment.kt
View File

@ -129,7 +129,7 @@ class SupplierFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.radiobuttonTypePackaging.setOnCheckedChangeListener { buttonView, isChecked ->

2
app/src/main/java/es/verdnatura/presentation/view/feature/packingHolland/fragment/PackingHollandFragment.kt
View File

@ -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, _ ->

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/CmrExpeditionPalletFragment.kt
View File

@ -51,7 +51,7 @@ class CmrExpeditionPalletFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}

6
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailFragment.kt
View File

@ -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()
}
})

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletFragment.kt
View File

@ -87,7 +87,7 @@ class ExpeditionPalletFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanFragment.kt
View File

@ -89,7 +89,7 @@ class ExpeditionScanFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanSorterFragment.kt
View File

@ -44,7 +44,7 @@ class ExpeditionScanSorterFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionStateFragment.kt
View File

@ -66,7 +66,7 @@ class ExpeditionStateFragment(
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListFragment.kt
View File

@ -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()

2
app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/PalletScanFragment.kt
View File

@ -42,7 +42,7 @@ class PalletScanFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/parking/fragment/ParkingFragment.kt
View File

@ -59,7 +59,7 @@ class ParkingFragment(var menuOrigin: String) :
}
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt
View File

@ -78,7 +78,7 @@ class PasilleroFragment(
}
binding.mainToolbarDesign.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt
View File

@ -102,7 +102,7 @@ class PhotosFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.editItemFk.setOnEditorActionListener { _, actionId, _ ->

2
app/src/main/java/es/verdnatura/presentation/view/feature/precontrol/PreControladorFragment.kt
View File

@ -55,7 +55,7 @@ class PreControladorFragment :
private fun setEvents() {
binding.scanInput.visibility = VISIBLE
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

2
app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt
View File

@ -118,7 +118,7 @@ class EndSacadorFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
//ESCANER =========f

2
app/src/main/java/es/verdnatura/presentation/view/feature/qr/QrFragment.kt
View File

@ -46,7 +46,7 @@ class QrFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

2
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt
View File

@ -85,7 +85,7 @@ class ReubicationCollectionFragment(
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.collectionSwipe.setOnRefreshListener {

2
app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationFragment.kt
View File

@ -49,7 +49,7 @@ class ReubicationFragment(var entrypoint: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragment.kt
View File

@ -85,7 +85,7 @@ class SacadorFragment(
ma.hideBottomNavigation(View.VISIBLE)
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
val listIcons: ArrayList<ImageView> = ArrayList()

17
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt
View File

@ -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

2
app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/showticket/ShowTicketFragment.kt
View File

@ -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

2
app/src/main/java/es/verdnatura/presentation/view/feature/ticket/fragment/TicketAdvanceFragment.kt
View File

@ -30,7 +30,7 @@ class TicketAdvanceFragment(var title: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

4
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
View File

@ -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()
})
}
}

4
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragmentOld.kt
View File

@ -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()
})
}

2
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
View File

@ -221,7 +221,7 @@ class UbicadorFragment(
@SuppressLint("SetTextI18n")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
setTooltips()

2
app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragmentNew.kt
View File

@ -227,7 +227,7 @@ class UbicadorFragmentNew(
@SuppressLint("SetTextI18n")
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
setTooltips()

2
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/PackingMistakeFragment.kt
View File

@ -65,7 +65,7 @@ class PackingMistakeFragment(var menuOrigin: String) :
private fun setEvents() {
binding.mainToolbar.backButton.setOnClickListener {
requireActivity().onBackPressed()
ma.onBackPressed()
}
binding.scanInput.requestFocus()

2
app/src/main/java/es/verdnatura/presentation/view/feature/workermistake/fragment/WorkermistakeFragment.kt
View File

@ -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