From 10d0868ed80f1628f49d64b9cf674dc9f6285387 Mon Sep 17 00:00:00 2001 From: Mauricio Sanchez Date: Thu, 27 Aug 2020 00:32:05 -0300 Subject: [PATCH] 27022020 0031 --- app/build.gradle | 1 - .../ui/dialogos/DialogNoEncontrado.kt | 33 ++++--------------- .../ui/inventario/InventarioFragment.kt | 37 ++++++++++++---------- 3 files changed, 26 insertions(+), 45 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index adac532..455082c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,6 @@ dependencies { annotationProcessor 'androidx.room:room-compiler:2.2.5' - implementation 'com.afollestad.material-dialogs:bottomsheets:3.2.1' implementation 'com.afollestad.material-dialogs:core:3.3.0' implementation 'com.afollestad.material-dialogs:input:3.3.0' } \ No newline at end of file diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt index dff625b..b039fbd 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt @@ -2,40 +2,19 @@ package com.focasoftware.deboinventariov20.ui.dialogos import android.app.AlertDialog import android.app.Dialog -import android.content.DialogInterface import android.os.Bundle -import android.view.LayoutInflater import androidx.fragment.app.DialogFragment -import com.focasoftware.deboinventariov20.R -import kotlinx.android.synthetic.main.ingresar_cantidad.* -import kotlinx.android.synthetic.main.ingresar_cantidad.view.* class DialogNoEncontrado : DialogFragment() { - - fun newInstance(title: String, s: String): DialogNoEncontrado? { - val dialog = DialogNoEncontrado() - - val args = Bundle() - args.putString("title", title) - args.putString("s", s) - dialog.arguments = args - return dialog - } override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return activity?.let { - val args = requireArguments() - - + val title = "Busqueda de Productos" + val content = "Producto no encotrado." val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) - val inflater = requireActivity().layoutInflater; - - builder.setView(inflater.inflate(R.layout.ingresar_cantidad, null)) - .setPositiveButton(R.string.btnOk, DialogInterface.OnClickListener { dialog, id ->}) - - - builder.create() + builder.setTitle(title).setMessage(content).setPositiveButton(android.R.string.ok) { _, _ -> + //Todo OK click + } + return builder.create() } ?: throw IllegalStateException("Activity cannot be null") } - } - diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/InventarioFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/InventarioFragment.kt index 9c754a4..57b88fc 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/InventarioFragment.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/InventarioFragment.kt @@ -29,6 +29,7 @@ import com.focasoftware.deboinventariov20.Model.Articles import com.focasoftware.deboinventariov20.Model.InvBody import com.focasoftware.deboinventariov20.Model.InvHead import com.focasoftware.deboinventariov20.R +import com.focasoftware.deboinventariov20.ui.dialogos.DialogNoEncontrado import kotlinx.android.synthetic.main.fragment_inventario.* import kotlinx.android.synthetic.main.ingresar_cantidad.view.* import kotlinx.android.synthetic.main.login_dialog.view.* @@ -205,9 +206,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList ContinuarCargaDesc(artEncontrado as ArrayList) } // } - tCodigoBarras.focusable = View.FOCUSABLE - tCodigoBarras.setText("") - tCodigoBarras.selectAll() + return@setOnKeyListener true } 2 -> {//TODO: BUSQUEDA POR CODIGO DE ORIGEN************************************************************************** @@ -278,7 +277,6 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList // } // }.cancelOnTouchOutside(false).cornerRadius(10F) } - } else if (indiceDelArtEncontrado == -1) {// no lo encontro en el RV, lo va a buscar en al BD GlobalScope.launch(Dispatchers.Main) { @@ -288,13 +286,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList ContinuarCargaCB(artEncontrado) } } - - tCodigoBarras.focusable = View.FOCUSABLE - tCodigoBarras.setText("") - tCodigoBarras.selectAll() return@setOnKeyListener true - - } } } @@ -475,14 +467,22 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList // } // } } else {//TODO si no lo encuentra en la BD - MaterialDialog(requireContext()).show { - title(text = "El articulo ${etCodigoBarras.text}") - message(R.string.sMensaje) - positiveButton(R.string.btnOk) { - dismiss() - } - }.cornerRadius(10F) + val modalDialog = DialogNoEncontrado() + + modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") + +// MaterialDialog(requireContext()).show { +// val t=etCodigoBarras.text +// title(text = "El articulo ${etCodigoBarras.text.toString()}") +// message(R.string.sMensaje) +// positiveButton(R.string.btnOk) { +// dismiss() +// } +// }.cornerRadius(10F) } + etCodigoBarras.focusable = View.FOCUSABLE + etCodigoBarras.setText("") + etCodigoBarras.selectAll() } private fun ContinuarCargaCB(artAcargar: Articles?) { @@ -516,6 +516,9 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList dismiss() } } + etCodigoBarras.focusable = View.FOCUSABLE + etCodigoBarras.setText("") + etCodigoBarras.selectAll() } suspend fun buscarCBEnBD(CodigoBarras: String): Articles? { -- 1.9.1