From c1c9b23894b1638b33e222f229a8e2d5f8366689 Mon Sep 17 00:00:00 2001
From: Mauricio Sanchez <msanchez@focasoftware.com>
Date: Sun, 6 Sep 2020 22:33:22 -0300
Subject: [PATCH] 06092020 2207

---
 app/build.gradle                                   |  14 +-
 .../deboinventariov20/DB/DAO/ArticulosDAO.kt       |  11 +-
 .../focasoftware/deboinventariov20/Model/Tablas.kt |   2 +-
 .../actualizacionMaestros/ActuaMaestrosFragment.kt |  23 ++--
 .../ui/configuracion/ConfiguracionFragment.kt      |  92 ++++++++-----
 .../ui/descripcionFragment/DescripcionFragment.kt  |  70 ++++++----
 .../ui/dialogos/DialogNoEncontrado.kt              |  20 ---
 .../deboinventariov20/ui/dialogos/DialogoLogin.kt  |  44 -------
 .../deboinventariov20/ui/dialogos/InsertCant.kt    |  48 -------
 .../ui/dialogos/SingleChoiceAlertDialog.kt         |  53 --------
 .../ui/inventario/InventarioFragment.kt            | 144 ++++++++++-----------
 .../ui/main/InventarioListAdapter.kt               |   5 +-
 .../deboinventariov20/ui/main/MainFragment.kt      |   4 +-
 .../ui/servidores/ServidoresFragment.kt            |   4 +-
 .../ui/util/Base/dialogos/DialogNoEncontrado.kt    |  20 +++
 .../ui/util/Base/dialogos/DialogoLogin.kt          |  44 +++++++
 .../ui/util/Base/dialogos/InsertCant.kt            |  45 +++++++
 .../util/Base/dialogos/SingleChoiceAlertDialog.kt  |  53 ++++++++
 app/src/main/res/layout/fragment_descripcion.xml   |  28 ++--
 app/src/main/res/layout/fragment_main.xml          |  92 +++++++------
 app/src/main/res/layout/item_principal.xml         |  80 ++++++++----
 app/src/main/res/layout/login_dialog.xml           |  81 ++++++------
 app/src/main/res/navigation/mobile_navigation.xml  |  12 +-
 app/src/main/res/values/strings.xml                |   2 +-
 24 files changed, 534 insertions(+), 457 deletions(-)
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogoLogin.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/InsertCant.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/SingleChoiceAlertDialog.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogNoEncontrado.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogoLogin.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/InsertCant.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/SingleChoiceAlertDialog.kt

diff --git a/app/build.gradle b/app/build.gradle
index bdd8ed2..be22373 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
-apply plugin: 'kotlin-kapt'
+
 
 android {
     compileSdkVersion 30
@@ -44,7 +44,7 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
     implementation 'androidx.navigation:navigation-fragment:2.3.0'
     implementation 'androidx.navigation:navigation-ui:2.3.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -52,14 +52,14 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     testImplementation 'junit:junit:4.13'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
 
 
     //Room
     implementation 'androidx.room:room-ktx:2.2.5'
     implementation "androidx.room:room-runtime:2.2.5"
-    kapt "androidx.room:room-compiler:2.2.5"
+    annotationProcessor 'androidx.room:room-compiler:2.2.5'
 
     //Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@@ -69,6 +69,8 @@ dependencies {
 
     //Gson library
     implementation "com.google.code.gson:gson:2.8.6"
-    annotationProcessor 'androidx.room:room-compiler:2.2.5'
 
+    // ViewModel and LiveData
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    annotationProcessor 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt
index 51efcb3..faf3396 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DAO/ArticulosDAO.kt
@@ -47,6 +47,9 @@ interface InvHeadDAO {
 
     @Query("SELECT * FROM $TABLA_INV_H ORDER BY INV_FEI")
     suspend fun fetchAllInvHead(): List<InvHead>
+
+    @Query("UPDATE $TABLA_INV_H SET INV_PRODCONT=:cant WHERE INV_NUM=:inven")
+    suspend fun UpdateInvBody(cant: Float, inven: Int)
 }
 
 @Dao
@@ -89,9 +92,9 @@ interface ServeInvDao {
     @Query("UPDATE $TABLA_SERV_INV SET SER_PRE=0")
     suspend fun UpdateServerPreInZero()
 
-    @Query("UPDATE $TABLA_SERV_INV SET SER_PRE=1 WHERE SER_DESC LIKE :description AND SER_DIR LIKE :dir")
-    suspend fun UpdateServerPre(description: String, dir: String)
+    @Query("UPDATE $TABLA_SERV_INV SET SER_PRE=1 WHERE SER_NUM = :numero")
+    suspend fun UpdateServerPre(numero: Int)
 
-    @Query("SELECT * FROM $TABLA_SERV_INV WHERE SER_PRE =:sOne")
-    suspend fun fetchServerPreOne(sOne: String): ServeInv
+    @Query("SELECT * FROM $TABLA_SERV_INV WHERE SER_PRE= 1")
+    suspend fun fetchServerPreOne(): ServeInv
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt b/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt
index 6702130..15f6b16 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt
@@ -83,7 +83,7 @@ data class InvBody(@ColumnInfo(name = "INV_NUM") var invNum: Int,
 data class ServeInv(
     @ColumnInfo(name = "SER_DESC") var descripcion: String?,
     @ColumnInfo(name = "SER_DIR") var direccion: String?,
-    @ColumnInfo(name = "SER_PRE") var predeterminado: String?):
+    @ColumnInfo(name = "SER_PRE") var predeterminado: Int?):
     Serializable { @PrimaryKey(autoGenerate = true)
 @ColumnInfo(name = "SER_NUM")
 var servNum: Int=0
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/actualizacionMaestros/ActuaMaestrosFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/actualizacionMaestros/ActuaMaestrosFragment.kt
index a40aafb..11804c5 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/actualizacionMaestros/ActuaMaestrosFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/actualizacionMaestros/ActuaMaestrosFragment.kt
@@ -6,17 +6,16 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
-import com.focasoftware.deboinventariov20.Model.Articles
-import com.focasoftware.deboinventariov20.Model.Productos
-import com.focasoftware.deboinventariov20.Model.ProductosService
-import com.focasoftware.deboinventariov20.Model.ServeInv
+import com.focasoftware.deboinventariov20.Model.*
 import com.focasoftware.deboinventariov20.R
 import com.google.android.material.bottomappbar.BottomAppBarTopEdgeTreatment
 import kotlinx.android.synthetic.main.fragment_actua_maestros.*
 import kotlinx.coroutines.*
 
-var BASE_URL =""
+public var BASE_URL =""
 class ActuaMaestrosFragment : Fragment() {
 
     var job: Job? = null
@@ -25,18 +24,16 @@ class ActuaMaestrosFragment : Fragment() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 //        GlobalScope.launch(Dispatchers.Main) {
-//
-//            BASE_URL = fetchServerPre().direccion.toString()
-//    }
-        BASE_URL="http://10.0.2.2:3000/"
+//            val invbody = fetchServerPreOne()
+            //BASE_URL= invbody!!.direccion.toString()
+            BASE_URL="http://10.0.2.2:3000/"
+//        }
 //        mostrarArticulos()
     }
 
-    suspend fun fetchServerPre(): ServeInv {
-        var busqueda: ServeInv
+    private suspend fun fetchServerPreOne(): ServeInv? {
         return GlobalScope.async(Dispatchers.IO) {
-            busqueda = AppDb.getAppDb(requireContext())!!.ServeInvDao()!!.fetchServerPreOne("1")
-            return@async busqueda
+            return@async AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.fetchServerPreOne()
         }.await()
     }
 
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
index f19c3e1..774e4f4 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/configuracion/ConfiguracionFragment.kt
@@ -8,6 +8,8 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.*
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
 import androidx.navigation.fragment.findNavController
@@ -16,10 +18,7 @@ import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
 import com.focasoftware.deboinventariov20.ui.servidores.SpinnerAdapterServidor
 import kotlinx.android.synthetic.main.fragment_configuracion.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
 
 class ConfiguracionFragment : Fragment() {
 
@@ -166,19 +165,19 @@ class ConfiguracionFragment : Fragment() {
         }
         btnAgregarServidor.setOnClickListener { findNavController().navigate(R.id.servidoresFragment) }
         btnValidarServidor.setOnClickListener { Toast.makeText(requireContext(), "Dirección correcta", Toast.LENGTH_LONG).show() }
-        spServidor?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            override fun onNothingSelected(parent: AdapterView<*>?) {}
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { itemSelect = position }
-        }
         GlobalScope.launch(Dispatchers.Main) {
             adapterSpinnerServidor = SpinnerAdapterServidor(requireContext(), getDescServers())
             spServidor.adapter = adapterSpinnerServidor
-
             if (sharedPreferences.contains("ServerPredeterminado")) {
                 spServidor.setSelection(sharedPreferences.getString("ServerPredeterminado", "").toString().toInt())
             } else (spServidor.setSelection(0))
         }
-
+        spServidor?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                itemSelect = position
+            }
+        }
         return v
     }
 
@@ -189,31 +188,54 @@ class ConfiguracionFragment : Fragment() {
     }
 
     fun guardarPreferencias() {
-        try {
-            val editor = sharedPreferences.edit()
-
-            if (etRuta.text.isNotEmpty()) editor?.putString("etRuta", etRuta.text.toString())
-
-            if (rbProInclu.isChecked) editor?.putString("rbProInclu", "1") else editor?.putString("rbProInclu", "0")
-            if (rbProNoInclu.isChecked) editor?.putString("rbProNoInclu", "1") else editor?.putString("rbProNoInclu", "0")
-
-            if (cbHabiLectura.isChecked) editor?.putString("cbHabiLectura", "1") else editor?.putString("cbHabiLectura", "0")
-            if (cbMostrarStock.isChecked) editor?.putString("cbMostrarStock", "1") else editor?.putString("cbMostrarStock", "0")
-            if (rbVentas.isChecked) editor?.putString("rbVentas", "1") else editor?.putString("rbVentas", "0")
-            if (rbDeposito.isChecked) editor?.putString("rbDeposito", "1") else editor?.putString("rbDeposito", "0")
-            if (rbCodigoDebo.isChecked) editor?.putString("rbCodigoDebo", "1") else editor?.putString("rbCodigoDebo", "0")
-            if (rbCodigoOrigen.isChecked) editor?.putString("rbCodigoOrigen", "1") else editor?.putString("rbCodigoOrigen", "0")
-            if (rbCodigoBarras.isChecked) editor?.putString("rbCodigoBarras", "1") else editor?.putString("rbCodigoBarras", "0")
-            if (cbMostrarExistencia.isChecked) editor?.putString("cbMostrarExistencia", "1") else editor?.putString("cbMostrarExistencia", "0")
-            if (cbMostrarPrecio.isChecked) editor?.putString("cbMostrarPrecio", "1") else editor?.putString("cbMostrarPrecio", "0")
-            editor?.putString("ServerPredeterminado", itemSelect.toString())
-
-            editor?.apply()
-            editor.commit()
-
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
+//        try {
+        val editor = sharedPreferences.edit()
+
+        if (etRuta.text.isNotEmpty()) editor?.putString("etRuta", etRuta.text.toString())
+
+        if (rbProInclu.isChecked) editor?.putString("rbProInclu", "1") else editor?.putString("rbProInclu", "0")
+        if (rbProNoInclu.isChecked) editor?.putString("rbProNoInclu", "1") else editor?.putString("rbProNoInclu", "0")
+
+        if (cbHabiLectura.isChecked) editor?.putString("cbHabiLectura", "1") else editor?.putString("cbHabiLectura", "0")
+        if (cbMostrarStock.isChecked) editor?.putString("cbMostrarStock", "1") else editor?.putString("cbMostrarStock", "0")
+        if (rbVentas.isChecked) editor?.putString("rbVentas", "1") else editor?.putString("rbVentas", "0")
+        if (rbDeposito.isChecked) editor?.putString("rbDeposito", "1") else editor?.putString("rbDeposito", "0")
+        if (rbCodigoDebo.isChecked) editor?.putString("rbCodigoDebo", "1") else editor?.putString("rbCodigoDebo", "0")
+        if (rbCodigoOrigen.isChecked) editor?.putString("rbCodigoOrigen", "1") else editor?.putString("rbCodigoOrigen", "0")
+        if (rbCodigoBarras.isChecked) editor?.putString("rbCodigoBarras", "1") else editor?.putString("rbCodigoBarras", "0")
+        if (cbMostrarExistencia.isChecked) editor?.putString("cbMostrarExistencia", "1") else editor?.putString("cbMostrarExistencia", "0")
+        if (cbMostrarPrecio.isChecked) editor?.putString("cbMostrarPrecio", "1") else editor?.putString("cbMostrarPrecio", "0")
+        editor?.putString("ServerPredeterminado", itemSelect.toString())
+        updateServerPreInZero()
+        updateServerPre(itemSelect+1)
+
+        editor?.apply()
+        editor.commit()
+
+//        } catch (e: Exception) {
+//            Toast.makeText(requireContext(),    "Error ", Toast.LENGTH_LONG).show()
+//            e.printStackTrace()
+//        }
     }
 
+    private fun updateServerPreInZero() {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                val activity: FragmentActivity? = activity
+                if (activity != null && isAdded) {
+                    AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.UpdateServerPreInZero()
+                }
+            }
+        }
+    }
+    private fun updateServerPre(server:Int) {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                val activity: FragmentActivity? = activity
+                if (activity != null && isAdded) {
+                    AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.UpdateServerPre(server)
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
index 62539fc..4b9b68b 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
@@ -61,13 +61,14 @@ class DescripcionFragment : Fragment() {
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val v = inflater.inflate(R.layout.fragment_descripcion, container, false)
         rcDescripcion = v.findViewById(R.id.rcDescripcion)
-        val btnSalir = v.findViewById<Button>(R.id.btnSalir)
+//        val btnSalir = v.findViewById<Button>(R.id.btnSalir)
 
         IngresarRecicler(artAcargar2)
 
-        btnSalir.setOnClickListener {
-            VolverAinventario()
-        }
+//        btnSalir.setOnClickListener {
+//            activity?.onBackPressed();
+////            VolverAinventario()
+//        }
         return v
     }
 
@@ -124,7 +125,8 @@ class DescripcionFragment : Fragment() {
                                     InventarioFragment().ObtenerFechaActual(),
                                     InventarioFragment().ObtenerFechaActual())
                                 InsertarArtEnDB(body)// TODO: MANDO A CARGAR A LA BASE DE DATOS
-                                VolverAinventario()
+//                                VolverAinventario()
+                                activity?.onBackPressed()
                                 mAlertDialog.dismiss()
                             }
                         }
@@ -133,44 +135,57 @@ class DescripcionFragment : Fragment() {
                         val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
                         val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Producto '${artCargadoEnBD!!.descripcion}', se encuentra cargado.").setCancelable(false)
                         if (artCargadoEnBD!!.balanza.toString().contains("1" ) || artCargadoEnBD!!.balanza.toString().contains("3") || artCargadoEnBD!!.balanza.toString().contains("7")) mDialogView.tvNuevaCantidad.inputType= InputType.TYPE_CLASS_NUMBER
-                        mDialogView.tvCantInicial.text = artCargadoEnBD!!.cantTomada
+                        mDialogView.tvCantInicial.text =String.format("%.2f", artCargadoEnBD!!.cantTomada.toString().toFloat())
 
                         val mAlertDialog = mBuilder.show()
                         mDialogView.rbSumar.setOnClickListener {
                             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                                mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
+                                mDialogView.tvResultado.text = String.format("%.2f",(mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()))
                                 mDialogView.tvNuevaCantidad.isEnabled=false
                             }
                         }
                         mDialogView.rbRestar.setOnClickListener {
                             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
                                 if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) {
-                                    mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
-                                    mDialogView.tvNuevaCantidad.isEnabled=false
+                                    mDialogView.tvResultado.text =  String.format("%.2f",mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat())
+                                    mDialogView.tvNuevaCantidad.isEnabled = false
+                                }else{
+                                    mDialogView.tvResultado.text=""
+                                    mDialogView.tvResultado.error = "Operación No Valida"
+                                    mDialogView.tvResultado.requestFocus()
+                                    mDialogView.tvResultado.hint = "Error"
                                 }
                             }
                         }
                         mDialogView.rbMdodificar.setOnClickListener {
                             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                                mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
-                                mDialogView.tvNuevaCantidad.isEnabled=false
+                                mDialogView.tvResultado.text = String.format("%.2f", (mDialogView.tvNuevaCantidad.text.toString().toFloat()))
+                                mDialogView.tvNuevaCantidad.isEnabled = false
                             }
                         }
                         mDialogView.btnAceptar.setOnClickListener {
-                            if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                                val name = mDialogView.tvgenerico4.text.toString().toFloat()
+                            if (mDialogView.tvNuevaCantidad.text.isNotEmpty() || !mDialogView.tvNuevaCantidad.text.isBlank()) {
+                                if (mDialogView.tvResultado.text.isNotEmpty() || !mDialogView.tvResultado.text.isBlank()) {
+
                                 updateCantidad((viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.sector.toString(),
                                     (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codigo.toString(),
-                                    name)
-                                VolverAinventario()
+                                   mDialogView.tvResultado.text.toString().toFloat())
+//                                VolverAinventario()
+                                activity?.onBackPressed();
                                 mAlertDialog.dismiss()
-                            } else if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                                mDialogView.tvNuevaCantidad.error = "No vacio"
-                                mDialogView.tvNuevaCantidad.requestFocus()
-                                mDialogView.tvNuevaCantidad.hint = "Ingrese un valor"
+                            } else if (mDialogView.tvNuevaCantidad.text.isNotEmpty() || mDialogView.tvNuevaCantidad.text.isBlank()) {
+                                mDialogView.tvResultado.error = "Operación Requerida"
+                                mDialogView.tvResultado.requestFocus()
+                                mDialogView.tvResultado.hint = "Seleccione Operación"
                             }
+                        } else if (mDialogView.tvNuevaCantidad.text.isEmpty() || mDialogView.tvNuevaCantidad.text.isBlank()) {
+                            mDialogView.tvNuevaCantidad.error = "Completar"
+                            mDialogView.tvNuevaCantidad.requestFocus()
+                            mDialogView.tvNuevaCantidad.hint = "Ingrese un valor"
+                        }
                         }
                         mDialogView.dialogCancelBtn.setOnClickListener {
+                            activity?.onBackPressed();
                             mAlertDialog.dismiss()
                         }
                     }
@@ -207,14 +222,14 @@ class DescripcionFragment : Fragment() {
         }
     }
 
-    fun VolverAinventario() {
-
-        val editor = sharedPreferences.edit()
-        editor?.putString("Inventario", numeroInventario.toString())
-        editor?.apply()
-        editor.commit()
-        navController.navigate(R.id.action_descripcionFragment_to_inventarioFragment)
-    }
+//    fun VolverAinventario() {
+//
+//        val editor = sharedPreferences.edit()
+//        editor?.putString("Inventario", numeroInventario.toString())
+//        editor?.apply()
+//        editor.commit()
+//        navController.navigate(R.id.action_descripcionFragment_to_inventarioFragment)
+//    }
 
     suspend fun buscarCodigoDeboEnBD(sector: String, codigo: String, numInventario: String): InvBody? {
         //TODO BUSQUEDA POR CODIGO DE BARRAS
@@ -232,7 +247,6 @@ class DescripcionFragment : Fragment() {
                 if (activity != null && isAdded) {
                     AppDb.getAppDb(requireActivity())!!.InvBodyDAO()!!.UpdateInvBody(cantidad, sector, codigo)
                 }
-
             }
         }
     }
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
deleted file mode 100644
index b039fbd..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogNoEncontrado.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.dialogos
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-
-class DialogNoEncontrado : DialogFragment() {
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return activity?.let {
-            val title = "Busqueda de Productos"
-            val content = "Producto no encotrado."
-            val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity())
-            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/dialogos/DialogoLogin.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogoLogin.kt
deleted file mode 100644
index 3c90fc8..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/DialogoLogin.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.dialogos
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.content.SharedPreferences
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import com.focasoftware.deboinventariov20.R
-
-class DialogoLogin() : DialogFragment() {
-    private lateinit var sharedPreferences: SharedPreferences
-
-    interface OnContinueCancelClickListener {
-        fun onPositiveClick()
-        fun onCancelClick()
-    }
-
-    fun newInstance(s: String): DialogoLogin? {
-        val dialog = DialogoLogin()
-
-        val args = Bundle()
-        args.putString("title", s)
-        dialog.arguments = args
-
-        return dialog
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return activity?.let {
-            val builder = AlertDialog.Builder(it)
-
-            val inflater = requireActivity().layoutInflater;
-
-            builder.setView(inflater.inflate(R.layout.login_dialog, null)).setTitle("El producto ya fue escaneado").setPositiveButton(android.R.string.ok) { _, _ ->
-                    val listener = activity as OnContinueCancelClickListener?
-                    listener!!.onPositiveClick()
-                }.setNegativeButton(android.R.string.cancel) { _, _ ->
-                    val listener = activity as OnContinueCancelClickListener?
-                    listener!!.onCancelClick()
-                }
-            builder.create()
-        } ?: throw IllegalStateException("Activity cannot be null")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/InsertCant.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/InsertCant.kt
deleted file mode 100644
index bf8231f..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/InsertCant.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.dialogos
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.content.Context
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import android.widget.EditText
-import androidx.fragment.app.DialogFragment
-import com.focasoftware.deboinventariov20.R
-
-class InsertCant() : DialogFragment() {
-
-        private lateinit var sharedPreferences: SharedPreferences
-
-        interface OnContinueCancelClickListener {
-            fun onPositiveClick()
-            fun onCancelClick()
-        }
-
-        fun newInstance(s: String): InsertCant? {
-            val dialog = InsertCant()
-
-            val args = Bundle()
-            args.putString("title", s)
-            dialog.arguments = args
-
-            return dialog
-        }
-
-        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-            return activity?.let {
-                val builder = AlertDialog.Builder(it)
-
-                val inflater = requireActivity().layoutInflater;
-
-                builder.setView(inflater.inflate(R.layout.ingresar_cantidad, null)).setTitle("").setPositiveButton(android.R.string.ok) { _, _ ->
-                    val listener = activity as OnContinueCancelClickListener?
-                    listener!!.onPositiveClick()
-                }.setNegativeButton(android.R.string.cancel) { _, _ ->
-                    val listener = activity as OnContinueCancelClickListener?
-                    listener!!.onCancelClick()
-                }
-                builder.create()
-            } ?: throw IllegalStateException("Activity cannot be null")
-        }
-    }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/SingleChoiceAlertDialog.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/SingleChoiceAlertDialog.kt
deleted file mode 100644
index a685ce5..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/dialogos/SingleChoiceAlertDialog.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.dialogos
-
-import android.app.AlertDialog
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-
-class SingleChoiceAlertDialog : DialogFragment() {
-
-    interface OnDialogSelectorListener {
-        fun onSelectedOption(dialogId: Int)
-    }
-
-
-    var mDialogSelectorCallback: OnDialogSelectorListener? = null
-
-    fun newInstance(title: String, values: Array<String>, selected: Int = -1): SingleChoiceAlertDialog? {
-        val dialog = SingleChoiceAlertDialog()
-
-        val args = Bundle()
-        args.putString("title", title)
-        args.putStringArray("values", values)
-        args.putInt("selected", selected)
-        dialog.arguments = args
-
-        return dialog
-
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-
-        return activity?.let {
-
-            val args = requireArguments()
-            val title = args.getString("title")
-            val values = args.getStringArray("values")
-            val selectedIndex = args.getInt("selected")
-
-            val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity())
-
-            builder.setSingleChoiceItems(values, selectedIndex) { _, which ->
-                //val item = values?.get(which)
-                mDialogSelectorCallback?.onSelectedOption(which)
-                dialog?.dismiss()
-            }
-            builder.setTitle(title)
-
-            return builder.create()
-        } ?: throw IllegalStateException("Activity cannot be null")
-    }
-
-
-}
\ No newline at end of file
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 5391061..73fab06 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
@@ -9,9 +9,7 @@ import android.graphics.Canvas
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Bundle
-import android.text.InputType
 import android.text.InputType.TYPE_CLASS_NUMBER
-import android.text.InputType.TYPE_NUMBER_FLAG_DECIMAL
 import android.view.KeyEvent
 import android.view.LayoutInflater
 import android.view.View
@@ -33,19 +31,18 @@ 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 com.focasoftware.deboinventariov20.ui.util.Base.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.*
 import kotlinx.android.synthetic.main.login_dialog.view.btnAceptar
 import kotlinx.coroutines.*
-import java.lang.Integer.TYPE
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 import java.util.*
 
 
-class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickListener{
+class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickListener {
 
     private lateinit var sharedPreferences: SharedPreferences
     private var iArea: Int = 0
@@ -89,7 +86,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
                 //TODO: BUSCO EL ULTIMO INVENTARIO EN LA BD PARA PODER CREAR EL PROXIMO
                 InventarioNuevo = AppDb.getAppDb(requireActivity())?.InvHeadDAO()?.findLastInv()?.plus(1) ?: 1
                 //TODO: CREAMOS EL INVENTARIO EN LA CABECERA DEL INVENTARIO
-                invHead = InvHead(InventarioNuevo,  if (SerchArea() == 0) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont())
+                invHead = InvHead(InventarioNuevo, if (SerchArea() == 0) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont())
                 AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.insertInvHead(invHead)
                 tvTitulo.text = "Inventario Dinamico" + " N° $InventarioNuevo"
             }
@@ -122,12 +119,14 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
 //                                        fCant = listArticulos[indiceDelArtEncontrado].cantTomada
 //                                        fCant += 1F
                                         //TODO ACTUALIZO LA CANTIDAD EN LA BD
-                                        updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), listArticulos[indiceDelArtEncontrado].cantTomada+1)
+                                        updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(),
+                                            listArticulos[indiceDelArtEncontrado].codigo.toString(),
+                                            listArticulos[indiceDelArtEncontrado].cantTomada + 1)
                                         //TODO ACTUALIZO LA CANTIDAD EN EL RV
-                                        listArticulos[indiceDelArtEncontrado].cantTomada = listArticulos[indiceDelArtEncontrado].cantTomada+1
+                                        listArticulos[indiceDelArtEncontrado].cantTomada = listArticulos[indiceDelArtEncontrado].cantTomada + 1
                                         viewAdapter.notifyDataSetChanged()
                                     } else {
-                                        dialogoSumaResta(requireContext(),indiceDelArtEncontrado, listArticulos[indiceDelArtEncontrado].univta)
+                                        dialogoSumaResta(requireContext(), indiceDelArtEncontrado, listArticulos[indiceDelArtEncontrado].univta, false)
                                     }
 
                                 } else if (indiceDelArtEncontrado == -1) {// no lo encontro en el RV, lo va a buscar en al BD
@@ -280,41 +279,29 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
 //        modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog")
 
         btnBorrarInv.setOnClickListener {
-            AlertDialog.Builder(requireContext())
-                .setTitle("Eliminación de Inventarios")
-                .setMessage("¿Confirma que desea eliminar el inventario?")
-                .setPositiveButton(R.string.btnOk,
-                    DialogInterface.OnClickListener { dialog, which ->
+            AlertDialog.Builder(requireContext()).setTitle("Eliminación de Inventarios").setMessage("¿Confirma que desea eliminar el inventario?")
+                .setPositiveButton(R.string.btnOk, DialogInterface.OnClickListener { dialog, which ->
                     BorrarInvActual()
                     Toast.makeText(requireContext(), "El inventario $InventarioNuevo fue Borrado", Toast.LENGTH_LONG).show()
                     navController.navigate(R.id.action_inventarioFragment_to_mainFragment2)
                     InventarioNuevo = 0
 
-                    })
-                .setNegativeButton(R.string.btnCancelar,
-                    DialogInterface.OnClickListener { dialog, which ->
-                        //botón cancel pulsado
-                    })
-                .show()
+                }).setNegativeButton(R.string.btnCancelar, DialogInterface.OnClickListener { dialog, which ->
+                    //botón cancel pulsado
+                }).show()
         }
 
         btnExportarInv.setOnClickListener {
-            AlertDialog.Builder(requireContext())
-                .setTitle(R.string.sTituloExportar)
-                .setMessage(R.string.sMensajeExportar)
-                .setPositiveButton(R.string.btnOk,
-                    DialogInterface.OnClickListener { dialog, which ->
-                        BorrarInvActual()
-                        Toast.makeText(requireContext(), "El inventario $InventarioNuevo fue Exportado al Servidor", Toast.LENGTH_LONG).show()
-                        navController.navigate(R.id.action_inventarioFragment_to_mainFragment2)
-                        InventarioNuevo = 0
-
-                    })
-                .setNegativeButton(R.string.btnCancelar,
-                    DialogInterface.OnClickListener { dialog, which ->
-                        //botón cancel pulsado
-                    })
-                .show()
+            AlertDialog.Builder(requireContext()).setTitle(R.string.sTituloExportar).setMessage(R.string.sMensajeExportar)
+                .setPositiveButton(R.string.btnOk, DialogInterface.OnClickListener { dialog, which ->
+                    BorrarInvActual()
+                    Toast.makeText(requireContext(), "El inventario $InventarioNuevo fue Exportado al Servidor", Toast.LENGTH_LONG).show()
+                    navController.navigate(R.id.action_inventarioFragment_to_mainFragment2)
+                    InventarioNuevo = 0
+
+                }).setNegativeButton(R.string.btnCancelar, DialogInterface.OnClickListener { dialog, which ->
+                    //botón cancel pulsado
+                }).show()
 
 //            MaterialDialog(requireContext()).show {
 //                title(R.string.sTituloExportar)
@@ -422,11 +409,11 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
 //                cargarArtEnBd(acargarPorDesc, fCant)
 //                cargarRecicler(acargarPorDesc, fCant)
 //            } else {
-                var bundle = Bundle()
-                bundle = bundleOf("ArrayDesc" to artAcargar)
-                bundle.putInt("numeroInv", InventarioNuevo)
-                navController.navigate(R.id.action_inventarioFragment_to_descripcionFragment, bundle)
-                //navController.backStack.removeLast()
+            var bundle = Bundle()
+            bundle = bundleOf("ArrayDesc" to artAcargar)
+            bundle.putInt("numeroInv", InventarioNuevo)
+            navController.navigate(R.id.action_inventarioFragment_to_descripcionFragment, bundle)
+            //navController.backStack.removeLast()
 //            }
 //            } else {//SI NO ESTA +1
 //                if (artAcargar.size == 1) { // TODO: SI EN EL ARRAY SOLO HAY UN ITEM LO METE DIRECTAMENTE AL RV
@@ -480,11 +467,11 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
             if (swSumaUno!!.isChecked) {//TODO: SI ESTA +1, PONE CANTIDAD 1
                 fCant = 0F
                 fCant += 1F
-                cargarArtEnBd(artAcargar, fCant)
+                cargarArtEnBd(artAcargar, String.format("%.3f", fCant))
                 cargarRecicler(artAcargar, fCant)
             } else {//SI NO ESTA +1 PREGUNTA CANTIDAD
 
-                DialogingresarCantidad(requireContext(),artAcargar)
+                DialogingresarCantidad(requireContext(), artAcargar)
             }
         } else {// TODO si no lo encuentra en la BD
             val modalDialog = DialogNoEncontrado()
@@ -497,9 +484,8 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
 
     fun DialogingresarCantidad(cnxt: Context, artAcargar: Articles?) {
         val mDialogView = LayoutInflater.from(cnxt).inflate(R.layout.ingresar_cantidad, null)
-        val mBuilder = AlertDialog.Builder(cnxt).setView(mDialogView)
-            .setCancelable(false)
-        if (artAcargar!!.balanza!!.toInt()==1 || artAcargar.balanza!!.toInt()==3 || artAcargar.balanza!!.toInt()==7) mDialogView.etCantidad.inputType=TYPE_CLASS_NUMBER
+        val mBuilder = AlertDialog.Builder(cnxt).setView(mDialogView).setCancelable(false)
+        if (artAcargar!!.balanza!!.toInt() == 1 || artAcargar.balanza!!.toInt() == 3 || artAcargar.balanza!!.toInt() == 7) mDialogView.etCantidad.inputType = TYPE_CLASS_NUMBER
         mDialogView.tvTitulo.text = artAcargar.descripcion.toString()
         val mAlertDialog = mBuilder.show()
         mDialogView.btnAceptar.setOnClickListener {
@@ -509,53 +495,61 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
                 mDialogView.etCantidad.hint = "Ingrese un valor"
             } else if (!mDialogView.etCantidad.text.isNullOrEmpty()) {
                 mAlertDialog.dismiss()
-                cargarArtEnBd(artAcargar,  mDialogView.etCantidad.text.toString().toFloat())
-                cargarRecicler(artAcargar,  mDialogView.etCantidad.text.toString().toFloat())
+                cargarArtEnBd(artAcargar, String.format("%.2f", mDialogView.etCantidad.text.toString().toFloat()))
+                cargarRecicler(artAcargar, mDialogView.etCantidad.text.toString().toFloat())
             }
         }
     }
 
-    fun dialogoSumaResta(context: Context, indiceDelArtEncontrado: Int, univta: String) {
+    fun dialogoSumaResta(context: Context, indiceDelArtEncontrado: Int, univta: String, cancelable: Boolean) {
         val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
-        val mBuilder =
-            AlertDialog.Builder(context).setView(mDialogView).setTitle("${listArticulos[indiceDelArtEncontrado].descripcion} se encuentra cargado.")
-//                                                .setCancelable(false)
-        if (univta.contains("1" ) || univta.contains("3") || univta.contains("7")) mDialogView.tvNuevaCantidad.inputType=TYPE_CLASS_NUMBER
+        val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("${listArticulos[indiceDelArtEncontrado].descripcion} se encuentra cargado.").setCancelable(cancelable)
+        // TODO: SI PERMITE QUE INGRESE DECIMALES
+        if (univta.contains("1") || univta.contains("3") || univta.contains("7")) mDialogView.tvNuevaCantidad.inputType = TYPE_CLASS_NUMBER
 
-        mDialogView.tvCantInicial.text = listArticulos[indiceDelArtEncontrado].cantTomada.toString()
+        mDialogView.tvCantInicial.text = String.format("%.2f", listArticulos[indiceDelArtEncontrado].cantTomada)
         val mAlertDialog = mBuilder.show()
         mDialogView.rbSumar.setOnClickListener {
             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                mDialogView.tvgenerico4.text = (mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
-                mDialogView.tvNuevaCantidad.isEnabled=false
+                mDialogView.tvResultado.text = String.format("%.2f", mDialogView.tvCantInicial.text.toString().toFloat() + mDialogView.tvNuevaCantidad.text.toString().toFloat())
+                mDialogView.tvNuevaCantidad.isEnabled = false
             }
         }
         mDialogView.rbRestar.setOnClickListener {
             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
                 if (mDialogView.tvCantInicial.text.toString().toFloat() >= mDialogView.tvNuevaCantidad.text.toString().toFloat()) {
-                    mDialogView.tvgenerico4.text =
-                        (mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
-                    mDialogView.tvNuevaCantidad.isEnabled=false
+                    mDialogView.tvResultado.text = String.format("%.2f", mDialogView.tvCantInicial.text.toString().toFloat() - mDialogView.tvNuevaCantidad.text.toString().toFloat())
+                    mDialogView.tvNuevaCantidad.isEnabled = false
+                } else {
+                    mDialogView.tvResultado.text = ""
+                    mDialogView.tvResultado.error = "Operación No Valida"
+                    mDialogView.tvResultado.requestFocus()
+                    mDialogView.tvResultado.hint = "Error"
                 }
             }
         }
         mDialogView.rbMdodificar.setOnClickListener {
             if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                mDialogView.tvgenerico4.text = (mDialogView.tvNuevaCantidad.text.toString().toFloat()).toString()
-                mDialogView.tvNuevaCantidad.isEnabled=false
+                mDialogView.tvResultado.text = String.format("%.2f", mDialogView.tvNuevaCantidad.text.toString().toFloat())
+                mDialogView.tvNuevaCantidad.isEnabled = false
             }
         }
         mDialogView.btnAceptar.setOnClickListener {
-            if (!mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                mAlertDialog.dismiss()
-//                                                val name = mDialogView.tvgenerico4.text.toString().toFloat()
-//                                                fCant = 0F
-//                                                fCant = name
-                listArticulos[indiceDelArtEncontrado].cantTomada = mDialogView.tvgenerico4.text.toString().toFloat()
-                updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), mDialogView.tvgenerico4.text.toString().toFloat())
-                viewAdapter.notifyDataSetChanged()
-            } else if (mDialogView.tvNuevaCantidad.text.isNullOrEmpty()) {
-                mDialogView.tvNuevaCantidad.error = "No vacio"
+            if (mDialogView.tvNuevaCantidad.text.isNotEmpty() || !mDialogView.tvNuevaCantidad.text.isBlank()) {
+                if (mDialogView.tvResultado.text.isNotEmpty() || !mDialogView.tvResultado.text.isBlank()) {
+                    mAlertDialog.dismiss()
+                    listArticulos[indiceDelArtEncontrado].cantTomada = String.format("%.2f", mDialogView.tvResultado.text.toString().toFloat()).toFloat()
+                    updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(),
+                        String.format("%.2f", mDialogView.tvResultado.text.toString().toFloat()).toFloat())
+
+                    viewAdapter.notifyDataSetChanged()
+                } else if (mDialogView.tvNuevaCantidad.text.isNotEmpty() || mDialogView.tvNuevaCantidad.text.isBlank()) {
+                    mDialogView.tvResultado.error = "Operación Requerida"
+                    mDialogView.tvResultado.requestFocus()
+                    mDialogView.tvResultado.hint = "Seleccione Operación"
+                }
+            } else if (mDialogView.tvNuevaCantidad.text.isEmpty() || mDialogView.tvNuevaCantidad.text.isBlank()) {
+                mDialogView.tvNuevaCantidad.error = "Completar"
                 mDialogView.tvNuevaCantidad.requestFocus()
                 mDialogView.tvNuevaCantidad.hint = "Ingrese un valor"
             }
@@ -640,12 +634,12 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
         }.await()
     }
 
-    private fun cargarArtEnBd(articulos: Articles, cant: Float) {
+    private fun cargarArtEnBd(articulos: Articles, cant: String) {
         val body = InvBody(InventarioNuevo,// TODO PREPARO PARA MANDAR A CARGAR EN LA BD
             articulos.sector,
             articulos.codigo,
             articulos.descripcion,
-            cant.toString(),
+            cant,
             articulos.codBar,
             articulos.codOrigen,
             articulos.precio,
@@ -659,7 +653,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
 
     fun cargarRecicler(articulos: Articles, cant: Float) {
         //TODO CARGO EN LE RV
-        val item = ItemsRecycler(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar, articulos.codOrigen, articulos.balanza.toString(),articulos.de.toString())
+        val item = ItemsRecycler(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar, articulos.codOrigen, articulos.balanza.toString(), articulos.de.toString())
         listArticulos.add(item)
 
         viewAdapter = ProductosListAdapter(requireContext(), listArticulos, this)
@@ -764,7 +758,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
     }
 
     override fun onImagePenClick(sector: String?, codigo: String?, cantidad: String?, position: String) {
-        dialogoSumaResta(requireContext(), position.toInt(), listArticulos[position.toInt()].univta)
+        dialogoSumaResta(requireContext(), position.toInt(), listArticulos[position.toInt()].univta, true)
 
 //        val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
 //        val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("${listArticulos[position.toInt()].descripcion}")
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
index af4956c..3b696b8 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
@@ -25,8 +25,11 @@ class InventarioListAdapter(private val context: Context, private val inv: List<
     inner class ItemsViewHolder(itemView: View) : BaseViewHolder<InvHead>(itemView) {
         override fun bind(item: InvHead, position: Int) {
             itemView.setOnClickListener {itemClickListener.onItemClick(item.invNum.toString())}
-            itemView.tvPrincipalinventario.text = item.invNum.toString()
+            itemView.tvPrincipalinventario.text = if ( item.invNum < 10) "0${ item.invNum.toString()}" else  item.invNum.toString()
+
             itemView.tvDescription.text=item.descripcion.toString()
+            itemView.tvFecha.text=item.fechaInicio.toString()
+            itemView.tvCantContada.text=item.prodContados.toString()
         }
     }
 
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/MainFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/MainFragment.kt
index ad333ea..d06fa69 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/MainFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/MainFragment.kt
@@ -48,7 +48,7 @@ private var listIvn2 = ArrayList<InvHead>()
         val ivSort91= v.findViewById<ImageButton>(R.id.ivSort91)
         val cbVentas= v.findViewById<CheckBox>(R.id.cbVentas)
         val cbDeposito= v.findViewById<CheckBox>(R.id.cbDeposito)
-
+         val tvTipo = v.findViewById<TextView>(R.id.tvTipo)
         rcInventario = v.findViewById(R.id.rcInventario)
 
         GlobalScope.launch(Dispatchers.Main) {
@@ -76,6 +76,7 @@ private var listIvn2 = ArrayList<InvHead>()
                     ivSort19.visibility = View.VISIBLE
                     cbVentas.visibility = View.VISIBLE
                     cbDeposito.visibility = View.VISIBLE
+                    tvTipo.visibility = View.VISIBLE
                     tvInvDinamicos.text = "Inventarios Dinamicos (${cantidadInventarios.toString()}) -"
                 } else {
                     bAbiertoCerrado = false
@@ -85,6 +86,7 @@ private var listIvn2 = ArrayList<InvHead>()
                     txtDeposito.visibility = View.VISIBLE
                     cbVentas.visibility = View.GONE
                     cbDeposito.visibility = View.GONE
+                    tvTipo.visibility = View.GONE
                     tvInvDinamicos.text = "Inventarios Dinamicos (${cantidadInventarios.toString()}) +"
                 }
             }
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
index bd507da..8b4047d 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ServidoresFragment.kt
@@ -51,7 +51,7 @@ class ServidoresFragment : Fragment() {
             if (!etDireccionServidor.text.isNullOrBlank() || !etNombreServidor.text.isNullOrBlank()) {
 //                GlobalScope.launch(Dispatchers.Main) {
 //                    ServerNew =AppDb.getAppDb(requireContext())?.ServeInvDao()?.findLastServer()?.plus(1) ?: 1
-                val servidor = ServeInv(etNombreServidor.text.toString(), "http://${etDireccionServidor.text}/", "0")
+                val servidor = ServeInv(etNombreServidor.text.toString(), "http://${etDireccionServidor.text}/", 0)
                 ingresarDatos(servidor)
                 cargarRecicler(servidor)
                 Toast.makeText(requireContext(), "Servidor ${etNombreServidor.text} Guardado", Toast.LENGTH_LONG).show()
@@ -95,7 +95,7 @@ class ServidoresFragment : Fragment() {
     fun cargarRecicler(ser: ServeInv) {
         //TODO CARGO EN LE RV
         deleteIcon = ContextCompat.getDrawable(requireContext(), R.drawable.borrar)!!
-        val item = ItemsServidores(ser.descripcion, ser.direccion, ser.predeterminado)
+        val item = ItemsServidores(ser.descripcion, ser.direccion, ser.predeterminado.toString())
 
         listServ.add(item)
 
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogNoEncontrado.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogNoEncontrado.kt
new file mode 100644
index 0000000..4bd3f59
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogNoEncontrado.kt
@@ -0,0 +1,20 @@
+package com.focasoftware.deboinventariov20.ui.util.Base.dialogos
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+
+class DialogNoEncontrado : DialogFragment() {
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val title = "Busqueda de Productos"
+            val content = "Producto no encotrado."
+            val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity())
+            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/util/Base/dialogos/DialogoLogin.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogoLogin.kt
new file mode 100644
index 0000000..27e1054
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/DialogoLogin.kt
@@ -0,0 +1,44 @@
+package com.focasoftware.deboinventariov20.ui.util.Base.dialogos
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.focasoftware.deboinventariov20.R
+
+class DialogoLogin() : DialogFragment() {
+    private lateinit var sharedPreferences: SharedPreferences
+
+    interface OnContinueCancelClickListener {
+        fun onPositiveClick()
+        fun onCancelClick()
+    }
+
+    fun newInstance(s: String): DialogoLogin? {
+        val dialog = DialogoLogin()
+
+        val args = Bundle()
+        args.putString("title", s)
+        dialog.arguments = args
+
+        return dialog
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        return activity?.let {
+            val builder = AlertDialog.Builder(it)
+
+            val inflater = requireActivity().layoutInflater;
+
+            builder.setView(inflater.inflate(R.layout.login_dialog, null)).setTitle("El producto ya fue escaneado").setPositiveButton(android.R.string.ok) { _, _ ->
+                    val listener = activity as OnContinueCancelClickListener?
+                    listener!!.onPositiveClick()
+                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                    val listener = activity as OnContinueCancelClickListener?
+                    listener!!.onCancelClick()
+                }
+            builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/InsertCant.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/InsertCant.kt
new file mode 100644
index 0000000..a30768c
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/InsertCant.kt
@@ -0,0 +1,45 @@
+package com.focasoftware.deboinventariov20.ui.util.Base.dialogos
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.content.SharedPreferences
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+import com.focasoftware.deboinventariov20.R
+
+class InsertCant() : DialogFragment() {
+
+        private lateinit var sharedPreferences: SharedPreferences
+
+        interface OnContinueCancelClickListener {
+            fun onPositiveClick()
+            fun onCancelClick()
+        }
+
+        fun newInstance(s: String): InsertCant? {
+            val dialog = InsertCant()
+
+            val args = Bundle()
+            args.putString("title", s)
+            dialog.arguments = args
+
+            return dialog
+        }
+
+        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+            return activity?.let {
+                val builder = AlertDialog.Builder(it)
+
+                val inflater = requireActivity().layoutInflater;
+
+                builder.setView(inflater.inflate(R.layout.ingresar_cantidad, null)).setTitle("").setPositiveButton(android.R.string.ok) { _, _ ->
+                    val listener = activity as OnContinueCancelClickListener?
+                    listener!!.onPositiveClick()
+                }.setNegativeButton(android.R.string.cancel) { _, _ ->
+                    val listener = activity as OnContinueCancelClickListener?
+                    listener!!.onCancelClick()
+                }
+                builder.create()
+            } ?: throw IllegalStateException("Activity cannot be null")
+        }
+    }
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/SingleChoiceAlertDialog.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/SingleChoiceAlertDialog.kt
new file mode 100644
index 0000000..e1f2af8
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/util/Base/dialogos/SingleChoiceAlertDialog.kt
@@ -0,0 +1,53 @@
+package com.focasoftware.deboinventariov20.ui.util.Base.dialogos
+
+import android.app.AlertDialog
+import android.app.Dialog
+import android.os.Bundle
+import androidx.fragment.app.DialogFragment
+
+class SingleChoiceAlertDialog : DialogFragment() {
+
+    interface OnDialogSelectorListener {
+        fun onSelectedOption(dialogId: Int)
+    }
+
+
+    var mDialogSelectorCallback: OnDialogSelectorListener? = null
+
+    fun newInstance(title: String, values: Array<String>, selected: Int = -1): SingleChoiceAlertDialog? {
+        val dialog = SingleChoiceAlertDialog()
+
+        val args = Bundle()
+        args.putString("title", title)
+        args.putStringArray("values", values)
+        args.putInt("selected", selected)
+        dialog.arguments = args
+
+        return dialog
+
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        return activity?.let {
+
+            val args = requireArguments()
+            val title = args.getString("title")
+            val values = args.getStringArray("values")
+            val selectedIndex = args.getInt("selected")
+
+            val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity())
+
+            builder.setSingleChoiceItems(values, selectedIndex) { _, which ->
+                //val item = values?.get(which)
+                mDialogSelectorCallback?.onSelectedOption(which)
+                dialog?.dismiss()
+            }
+            builder.setTitle(title)
+
+            return builder.create()
+        } ?: throw IllegalStateException("Activity cannot be null")
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_descripcion.xml b/app/src/main/res/layout/fragment_descripcion.xml
index 64b8dca..778032e 100644
--- a/app/src/main/res/layout/fragment_descripcion.xml
+++ b/app/src/main/res/layout/fragment_descripcion.xml
@@ -17,24 +17,24 @@
         android:background="@android:color/darker_gray"
         android:scrollbars="vertical"
 app:layout_constraintTop_toBottomOf="@id/guideline4"
-        app:layout_constraintBottom_toTopOf="@+id/guideline5"
+        app:layout_constraintBottom_toTopOf="@+id/guideline6"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         tools:listitem="@layout/item" />
 
-        <Button
-            android:id="@+id/btnSalir"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/btnCancelar"
-            android:textColor="@android:color/white"
-            android:padding="10dp"
-            android:background="@drawable/boton_borde_redondeado"
-            app:layout_constraintBottom_toBottomOf="@+id/guideline6"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_chainStyle="spread"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/rcInventarios" />
+<!--        <Button-->
+<!--            android:id="@+id/btnSalir"-->
+<!--            android:layout_width="0dp"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:text="@string/btnCancelar"-->
+<!--            android:textColor="@android:color/white"-->
+<!--            android:padding="10dp"-->
+<!--            android:background="@drawable/boton_borde_redondeado"-->
+<!--            app:layout_constraintBottom_toBottomOf="@+id/guideline6"-->
+<!--            app:layout_constraintEnd_toEndOf="parent"-->
+<!--            app:layout_constraintHorizontal_chainStyle="spread"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toBottomOf="@+id/rcInventarios" />-->
 
         <androidx.constraintlayout.widget.Guideline
             android:id="@+id/guideline4"
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 0d48fad..cb78c67 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -27,10 +27,10 @@
         android:id="@+id/ivSort19"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_margin="10dp"
+        android:layout_marginStart="10dp"
         android:padding="5dp"
-        android:visibility="gone"
         android:src="@drawable/ic_sort19"
+        android:visibility="gone"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
@@ -40,36 +40,34 @@
         android:id="@+id/ivSort91"
         android:layout_width="50dp"
         android:layout_height="50dp"
-        android:layout_margin="10dp"
+        android:layout_marginStart="10dp"
         android:padding="5dp"
-        android:layout_marginTop="12dp"
-        android:visibility="gone"
         android:src="@drawable/ic_sort91"
-        app:layout_constraintHorizontal_bias="1.0"
+        android:visibility="gone"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos" />
 
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rcInventario"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="@android:color/darker_gray"
-        android:scrollbars="vertical"
+    <TextView
+        android:id="@+id/tvTipo"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="5dp"
+        android:text="Tipo:"
+        android:layout_marginTop="12dp"
+        android:textSize="15sp"
         android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/ivSort19"
-        tools:listitem="@layout/item_principal" />
+        app:layout_constraintBaseline_toBaselineOf="@+id/cbVentas"
+        app:layout_constraintEnd_toStartOf="@+id/cbVentas" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/cbVentas"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:text="Ventas"
         android:checked="true"
+        android:text="Ventas"
+        android:layout_marginTop="12dp"
         android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@+id/cbDeposito"
         app:layout_constraintTop_toBottomOf="@+id/tvInvDinamicos" />
@@ -79,30 +77,44 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:visibility="gone"
-        android:text="Deposito"
         android:checked="true"
+        android:text="Deposito"
+        android:layout_marginTop="12dp"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvInvDinamicos" />
 
-        <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/txtDeposito"
-            android:layout_width="match_parent"
-            android:layout_height="90dp"
-            android:autoSizeMaxTextSize="150sp"
-            android:autoSizeMinTextSize="25sp"
-            android:autoSizeStepGranularity="5sp"
-            android:autoSizeTextType="uniform"
-            android:gravity="start"
-            android:lines="1"
-            android:padding="10dp"
-            android:text="@string/invDinamicoCompra"
-            android:textColor="@color/colorAccent"
-            android:visibility="visible"
-            app:fontFamily="sans-serif-condensed"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
-            app:layout_constraintVertical_bias="0.0" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rcInventario"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="@android:color/darker_gray"
+        android:scrollbars="vertical"
+        android:visibility="gone"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/ivSort19"
+        tools:listitem="@layout/item_principal" />
+
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/txtDeposito"
+        android:layout_width="match_parent"
+        android:layout_height="90dp"
+        android:autoSizeMaxTextSize="150sp"
+        android:autoSizeMinTextSize="25sp"
+        android:autoSizeStepGranularity="5sp"
+        android:autoSizeTextType="uniform"
+        android:gravity="start"
+        android:lines="1"
+        android:padding="10dp"
+        android:text="@string/invDinamicoCompra"
+        android:textColor="@color/colorAccent"
+        android:visibility="visible"
+        app:fontFamily="sans-serif-condensed"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
+        app:layout_constraintVertical_bias="0.0" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_principal.xml b/app/src/main/res/layout/item_principal.xml
index 1f27fb0..4d16b07 100644
--- a/app/src/main/res/layout/item_principal.xml
+++ b/app/src/main/res/layout/item_principal.xml
@@ -15,33 +15,14 @@
         android:layout_gravity="center_horizontal|center_vertical"
         android:orientation="vertical">
 
-<!--        <androidx.appcompat.widget.AppCompatImageView-->
-<!--            android:id="@+id/ivCamara"-->
-<!--            android:layout_width="80dp"-->
-<!--            android:layout_height="80dp"-->
-<!--            android:layout_margin="10dp"-->
-<!--            android:layout_marginTop="15dp"-->
-<!--            android:background="@drawable/boton_redondo2"-->
-<!--            android:clickable="true"-->
-<!--            android:contentDescription="@string/ibBusCB"-->
-<!--            android:elevation="5dp"-->
-<!--            android:focusable="false"-->
-<!--            android:scaleType="fitEnd"-->
-<!--            -->
-<!--            app:layout_constraintBottom_toTopOf="@+id/ivFondo"-->
-<!--            app:layout_constraintCircleRadius="40dp"-->
-<!--            app:layout_constraintStart_toStartOf="parent"-->
-<!--            app:layout_constraintTop_toTopOf="parent"-->
-<!--            />-->
-
         <TextView
             android:id="@+id/tvPrincipalinventario"
             android:layout_width="50dp"
             android:layout_height="50dp"
             android:layout_margin="10dp"
+            android:background="@drawable/boton_redondo2"
             android:gravity="center"
             android:lines="2"
-            android:background="@drawable/boton_redondo2"
             android:textColor="@android:color/black"
             android:textSize="@dimen/TitulosMedios"
             android:textStyle="bold"
@@ -51,16 +32,69 @@
             tools:text="99" />
 
         <TextView
+            android:id="@+id/textView6"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="5dp"
+            android:text="Fecha Inicio"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.217"
+            app:layout_constraintStart_toEndOf="@id/tvPrincipalinventario"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvFecha"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:text="01/01/2020 12:20:20"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBaseline_toBaselineOf="@+id/textView6"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@id/textView6" />
+
+        <TextView
+            android:id="@+id/textView7"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:text="Art. Contados"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.23"
+            app:layout_constraintStart_toEndOf="@+id/tvPrincipalinventario"
+            app:layout_constraintTop_toBottomOf="@id/textView6" />
+
+        <TextView
+            android:id="@+id/tvCantContada"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:layout_marginStart="5dp"
+            android:text="002"
+            android:textSize="15sp"
+            android:textStyle="bold"
+            app:layout_constraintBaseline_toBaselineOf="@+id/textView7"
+            app:layout_constraintStart_toEndOf="@+id/textView7"
+            app:layout_constraintTop_toBottomOf="@+id/tvFecha" />
+
+        <TextView
             android:id="@+id/tvDescription"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="prueba"
             app:layout_constraintBottom_toTopOf="@id/ivFondo"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.046"
+            app:layout_constraintHorizontal_bias="0.489"
             app:layout_constraintStart_toEndOf="@id/tvPrincipalinventario"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.607" />
+            app:layout_constraintTop_toBottomOf="@+id/tvFecha"
+            app:layout_constraintVertical_bias="1.0" />
+
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/ivFondo"
diff --git a/app/src/main/res/layout/login_dialog.xml b/app/src/main/res/layout/login_dialog.xml
index 05730a0..c2c0b87 100644
--- a/app/src/main/res/layout/login_dialog.xml
+++ b/app/src/main/res/layout/login_dialog.xml
@@ -45,22 +45,22 @@
         android:id="@+id/tvNuevaCantidad"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:autofillHints=""
         android:hint=""
         android:inputType="numberDecimal"
         app:layout_constraintBaseline_toBaselineOf="@+id/tvgenerico"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/tvgenerico"
-        android:autofillHints="" />
+        app:layout_constraintStart_toEndOf="@id/tvgenerico" />
 
     <TextView
         android:id="@+id/tvgenerico2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
-        android:visibility="gone"
         android:gravity="center"
         android:text="@string/tvSeleccion"
         android:textSize="20sp"
+        android:visibility="gone"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvgenerico" />
 
@@ -68,7 +68,6 @@
         android:id="@+id/rgFechaHora"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="5dp"
         android:gravity="start"
         android:orientation="horizontal"
         app:layout_constraintEnd_toEndOf="parent"
@@ -82,29 +81,29 @@
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:checked="false"
-            android:padding="5dp"
+
             android:text="@string/rbSumar"
             android:textSize="@dimen/text_size2" />
 
         <RadioButton
-            android:id="@+id/rbRestar"
+            android:id="@+id/rbMdodificar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:checked="false"
-            android:padding="5dp"
-            android:text="@string/rbRestar"
+            android:text="@string/rbModificar"
             android:textSize="@dimen/text_size2" />
 
         <RadioButton
-            android:id="@+id/rbMdodificar"
+            android:id="@+id/rbRestar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_margin="5dp"
             android:checked="false"
             android:padding="5dp"
-            android:text="@string/rbModificar"
+            android:text="@string/rbRestar"
             android:textSize="@dimen/text_size2" />
+
     </RadioGroup>
 
     <TextView
@@ -121,7 +120,7 @@
         app:layout_constraintTop_toBottomOf="@+id/rgFechaHora" />
 
     <TextView
-        android:id="@+id/tvgenerico4"
+        android:id="@+id/tvResultado"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="5dp"
@@ -133,36 +132,36 @@
         app:layout_constraintStart_toEndOf="@+id/tvgenerico3"
         app:layout_constraintTop_toBottomOf="@+id/rgFechaHora" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvResultado">
+
+        <Button
+            android:id="@+id/btnAceptar"
+            style="@style/Base.Widget.AppCompat.Button.Colored"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="5dp"
+            android:background="@drawable/boton_borde_redondeado"
+            android:padding="20dp"
+            android:text="@string/btnOk"
+            android:textColor="@android:color/white" />
+
+        <Button
+            android:id="@+id/dialogCancelBtn"
+            style="@style/Base.Widget.AppCompat.Button.Colored"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:gravity="center"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvgenerico4">
-
-            <Button
-                android:id="@+id/btnAceptar"
-                style="@style/Base.Widget.AppCompat.Button.Colored"
-                android:layout_width="wrap_content"
-                android:textColor="@android:color/white"
-                android:padding="20dp"
-                android:background="@drawable/boton_borde_redondeado"
-                android:layout_margin="5dp"
-                android:layout_height="wrap_content"
-                android:text="@string/btnOk" />
-
-            <Button
-                android:id="@+id/dialogCancelBtn"
-                style="@style/Base.Widget.AppCompat.Button.Colored"
-                android:textColor="@android:color/white"
-                android:padding="20dp"
-                android:background="@drawable/boton_borde_redondeado"
-                android:layout_margin="5dp"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/btnCancelar" />
-        </LinearLayout>
+            android:layout_margin="5dp"
+            android:background="@drawable/boton_borde_redondeado"
+            android:padding="20dp"
+            android:text="@string/btnCancelar"
+            android:textColor="@android:color/white" />
+    </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 8f0957d..9081ef7 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -67,8 +67,7 @@
             app:popExitAnim="@anim/slide_out_right"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
-            app:popUpTo="@+id/inventarioFragment"
-            app:popUpToInclusive="true"/>
+            />
         <action
             android:id="@+id/action_inventarioFragment_to_mainFragment2"
             app:destination="@id/mainFragment2"
@@ -111,20 +110,19 @@
             app:popExitAnim="@anim/slide_out_right"
             app:enterAnim="@anim/slide_in_right"
             app:exitAnim="@anim/slide_out_left"
-            app:popUpTo="@+id/descripcionFragment"
-            app:popUpToInclusive="true"/>
+            />
     </fragment>
     <dialog
         android:id="@+id/dialogNoEncontrado"
-        android:name="com.focasoftware.deboinventariov20.ui.dialogos.DialogNoEncontrado"
+        android:name="com.focasoftware.deboinventariov20.ui.util.Base.dialogos.DialogNoEncontrado"
         android:label="DialogNoEncontrado" />
     <fragment
         android:id="@+id/dialogoLogin"
-        android:name="com.focasoftware.deboinventariov20.ui.dialogos.DialogoLogin"
+        android:name="com.focasoftware.deboinventariov20.ui.util.Base.dialogos.DialogoLogin"
         android:label="dialogoLogin" />
     <fragment
         android:id="@+id/singleChoiceAlertDialog"
-        android:name="com.focasoftware.deboinventariov20.ui.dialogos.SingleChoiceAlertDialog"
+        android:name="com.focasoftware.deboinventariov20.ui.util.Base.dialogos.SingleChoiceAlertDialog"
         android:label="SingleChoiceAlertDialog" />
 
     <fragment
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0716b04..5136c49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,7 +121,7 @@
     <string name="rbRestar">Restar</string>
     <string name="rbModificar">Reemplazar</string>
     <string name="tvTotal">Cantidad Final</string>tvTotal
-    <string name="tvResultado">Cantidad final:</string>tvTotal
+    <string name="tvResultado">Resultado:</string>tvTotal
 
     <string name="large_text">
         "Material is the metaphor.\n\n"
-- 
1.9.1