diff --git a/.idea/workspace.xml b/.idea/workspace.xml index a5a93d98..9bf75dec 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -83,10 +83,15 @@ - + + + + + + @@ -842,7 +847,6 @@ + + + + file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt + 313 + + + diff --git a/app/build.gradle b/app/build.gradle index 6a51bd6d..4949b13b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "es.verdnatura" minSdkVersion 24 //21 targetSdkVersion 33 - versionCode 176 - versionName = "23.10" + versionCode 177 + versionName = "23.14Beta" //versionName = "23.10" versionCode 174 //versionName = "23.10.2Beta" versionCode 174 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt index 8974cf96..7d0fe011 100644 --- a/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt +++ b/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt @@ -539,7 +539,7 @@ abstract class BaseFragment(viewModelCla "ENTRYTYPE" -> prefs.getString(name, "").toString() "ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString() "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString() - + "SERIALNUMBER" -> prefs.getString(name, "").toString() "base_url" -> { val preferences = PreferenceManager.getDefaultSharedPreferences(context) 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 2366a1f4..4932c3b8 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 @@ -15,7 +15,9 @@ import es.verdnatura.databinding.FragmentAjustesBinding import es.verdnatura.domain.notNull import es.verdnatura.presentation.base.BaseFragment import es.verdnatura.presentation.common.OnAjustesItemClickListener +import es.verdnatura.presentation.common.hideKeyboard import es.verdnatura.presentation.view.component.CustomDialog +import es.verdnatura.presentation.view.component.CustomDialogInput import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO import es.verdnatura.presentation.view.feature.ajustes.model.Printers @@ -28,6 +30,7 @@ class AjustesFragment : BaseFragment(AjustesViewModel::class) { private lateinit var customDialog: CustomDialog + private lateinit var customDialogInput: CustomDialogInput private var sectorListVO: List = listOf() private var printersList: List = listOf() private var trainsList: List = listOf() @@ -44,11 +47,13 @@ class AjustesFragment : companion object { fun newInstance() = AjustesFragment() } + override fun getLayoutId(): Int = R.layout.fragment_ajustes override fun onCreate(savedInstanceState: Bundle?) { prefs = requireActivity().getSharedPreferences(PREFS_USER, 0) customDialog = CustomDialog(requireContext()) + customDialogInput = CustomDialogInput(requireContext()) super.onCreate(savedInstanceState) } @@ -65,11 +70,12 @@ class AjustesFragment : requireActivity().packageName, 0 ).versionName!! - binding.itemVersion.setText(versionName) + binding.itemVersion.text = versionName + binding.androididText.text = getData(ANDROID_ID) + + // Tarea 4815 + // binding.serialNumber.text = getData("SERIALNUMBER") - binding.androididText.setText( - getData(ANDROID_ID) - ) binding.txtserver.setText(getData(getString(R.string.baseurl))) super.init() @@ -80,6 +86,22 @@ class AjustesFragment : fun setEvents() { binding.androididText.setOnClickListener { copyanddrag(binding.androididText.text.toString()) } binding.androididText.setOnLongClickListener { copyanddrag(binding.androididText.text.toString()) } + binding.serialText.setOnLongClickListener { + customDialogInput.setTitle(getString(R.string.serialNumberDescrip)) + .setDescription(getString(R.string.serialNumber)) + .setOkButton(getString(R.string.save)) { + saveData("SERIALNUMBER",customDialogInput.getValue()) + binding.serialNumber.text = customDialogInput.getValue() + ma.hideKeyboard() + customDialogInput.dismiss() + }.setKoButton(getString(R.string.cancel)){ + customDialogInput.dismiss() + } + .show() + customDialogInput.setFocusText() + true + } + } override fun observeViewModel() { @@ -91,7 +113,7 @@ class AjustesFragment : if (item.action) { if (item.id == 0) { - binding.splashProgress.visibility =VISIBLE + binding.splashProgress.visibility = VISIBLE // viewModel.getSectors(getData(USER),getData(PASSWORD)) viewModel.getSectorsSalix() } else if (item.id == 5) { @@ -100,7 +122,7 @@ class AjustesFragment : //Tarea 4351 quitar parte de mostrar los carros y quitar del layout el ">" del final ma.messageWithSound( - "El número de carros ahora solo se puede modificar por los encargados", + getString(R.string.managerWagon), true, true, "Información", @@ -125,7 +147,7 @@ class AjustesFragment : ) } else if (item.id == 6) { - binding.splashProgress.visibility=VISIBLE + binding.splashProgress.visibility = VISIBLE viewModel.train_get() } else if (item.id == 7) { viewModel.getItemPackingTypeSalix() @@ -205,7 +227,7 @@ class AjustesFragment : } loadUpdatePacking.observe(viewLifecycleOwner) { event -> event.getContentIfNotHandled().notNull { - binding.splashProgress.visibility=View.GONE + binding.splashProgress.visibility = View.GONE } } @@ -218,16 +240,12 @@ class AjustesFragment : if (it.isError) it.errorMessage else { getString(R.string.itemUpdated) }, it.isError, false - )} + ) + } workerupdatePrinter.observe(viewLifecycleOwner) { binding.splashProgress.visibility = View.GONE - /* ma.messageWithSound( - if (it.isError) it.errorMessage else { - getString(R.string.printerUpdated) - }, it.isError, false - )*/ } isLoadingProgress.observe(viewLifecycleOwner) { binding.splashProgress.visibility = it @@ -429,7 +447,7 @@ class AjustesFragment : editor.apply() viewModel.ajustesitem[3].selected = it.name - binding.splashProgress.visibility=VISIBLE + binding.splashProgress.visibility = VISIBLE viewModel.operator_updateTrain( it.id!! ) 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 89515c1f..f513628f 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 @@ -309,6 +309,8 @@ class CollectionFragment( if (!customDialogList.getValue().isEmpty()) { ma.hideKeyboard(customDialogList.getEditText()) var saleGroupScanned = customDialogList.getValue() + isScanned = + event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER markPrevia(saleGroupScanned) customDialogList.dismiss() } diff --git a/app/src/main/res/layout/fragment_ajustes.xml b/app/src/main/res/layout/fragment_ajustes.xml index 007814c5..cfe56de3 100644 --- a/app/src/main/res/layout/fragment_ajustes.xml +++ b/app/src/main/res/layout/fragment_ajustes.xml @@ -45,7 +45,7 @@ > @@ -70,7 +70,7 @@ android:orientation="horizontal"> @@ -92,7 +92,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + + + + + + Elemento introducido no válido Packing Holanda Permite moficar el packing de los ítems de Holanda + Número serie + El número de carros ahora solo se puede modificar por los encargados + Va a modificar el número de serie asociado a su dispositivo. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0f507705..1ef9a293 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -134,6 +134,8 @@ From Until Android_id + Serial Number + You are going to change the Serial Number. Be carefull Copied Tags type Device name : @@ -551,5 +553,6 @@ Modify It\'s not possible to update. Problem with the download of app "Introduce new packing for the item : " + The number of wagons can now only be changed by managers