From 23f89b25e16d24bb2c1e6326896d073308794dc6 Mon Sep 17 00:00:00 2001
From: Mauricio Sanchez <msanchez@focasoftware.com>
Date: Fri, 21 Aug 2020 23:13:27 -0300
Subject: [PATCH] 21082020 2313

---
 .../deboinventariov20/DB/DAO/ArticulosDAO.kt       |  10 +-
 .../ui/descripcionFragment/DescripcionFragment.kt  | 157 ++++++++++
 .../descripcionFragment/DescripcionListAdapter.kt  |  48 +++
 .../ui/descripcionFragment/ItemDescripcion.kt      |   3 +
 .../ui/inventario/BaseFragment.kt                  |  29 --
 .../ui/inventario/DescripcionFragment.kt           | 156 ---------
 .../ui/inventario/DescripcionListAdapter.kt        |  48 ---
 .../ui/inventario/InventarioFragment.kt            | 348 +++++++++++++--------
 .../ui/inventario/ItemDescripcion.kt               |   3 -
 .../ui/inventario/ItemsRecycler.kt                 |   2 +-
 .../ui/inventario/ProductosListAdapter.kt          |   5 +-
 .../deboinventariov20/ui/main/MainFragment.kt      |   2 +-
 .../ui/servidores/AdapterServidores.kt             |  21 +-
 .../ui/servidores/ServidoresFragment.kt            | 154 +++++++--
 .../res/drawable-v24/boton_borde_redondeado.xml    |   8 +
 app/src/main/res/drawable/boton_redondo.xml        |   8 +
 app/src/main/res/drawable/cod_origen.png           | Bin 0 -> 2223 bytes
 app/src/main/res/drawable/codbar.png               | Bin 0 -> 1569 bytes
 app/src/main/res/drawable/desc.png                 | Bin 0 -> 2295 bytes
 .../main/res/layout/fragment_actua_maestros.xml    |   4 +
 app/src/main/res/layout/fragment_configuracion.xml |  14 +-
 app/src/main/res/layout/fragment_descripcion.xml   |   5 +-
 app/src/main/res/layout/fragment_inventario.xml    |  91 +++---
 app/src/main/res/layout/fragment_servidores.xml    |   3 +
 app/src/main/res/layout/ingresar_cantidad.xml      |   4 +-
 app/src/main/res/layout/item.xml                   |  17 +-
 app/src/main/res/layout/login_dialog.xml           |   4 +
 app/src/main/res/navigation/mobile_navigation.xml  |   2 +-
 app/src/main/res/values/colors.xml                 |   4 +-
 app/src/main/res/values/strings.xml                |   5 +-
 30 files changed, 697 insertions(+), 458 deletions(-)
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionListAdapter.kt
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/ItemDescripcion.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/BaseFragment.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionFragment.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionListAdapter.kt
 delete mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemDescripcion.kt
 create mode 100644 app/src/main/res/drawable-v24/boton_borde_redondeado.xml
 create mode 100644 app/src/main/res/drawable/boton_redondo.xml
 create mode 100644 app/src/main/res/drawable/cod_origen.png
 create mode 100644 app/src/main/res/drawable/codbar.png
 create mode 100644 app/src/main/res/drawable/desc.png

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 7ad3f08..0b9ebcc 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
@@ -4,6 +4,7 @@ import androidx.room.*
 import com.focasoftware.deboinventario.ui.actualizacionMaestros.Constans.Companion.TABLA_ART
 import com.focasoftware.deboinventario.ui.actualizacionMaestros.Constans.Companion.TABLA_INV_B
 import com.focasoftware.deboinventario.ui.actualizacionMaestros.Constans.Companion.TABLA_INV_H
+import com.focasoftware.deboinventario.ui.actualizacionMaestros.Constans.Companion.TABLA_SERV_INV
 import com.focasoftware.deboinventariov20.Model.*
 
 @Dao
@@ -16,7 +17,7 @@ interface ArticulosDAO {
     @Query("SELECT * FROM $TABLA_ART ORDER BY DES DESC")
     suspend fun findAllArticulos(): List<Articles>
 
-    @Query("SELECT * FROM $TABLA_ART WHERE DEPSN=:dep AND DES LIKE '%' || :description || '%' GROUP BY DES ORDER BY SEC, COD")
+    @Query("SELECT * FROM $TABLA_ART WHERE DEPSN=:dep AND DES LIKE '%' || :description || '%' GROUP BY DES ORDER BY DES")
     suspend fun findArticuloByDesc(description: String?, dep: Int): List<Articles>
 
     @Query("SELECT * FROM $TABLA_ART WHERE DEPSN=:dep AND CB LIKE :codBarra")
@@ -66,6 +67,9 @@ interface ServeInvDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertServer(servidor: ServeInv)
 
-    @Query("SELECT SER_NUM,SER_DESC, SER_DIR FROM ServeInv")
-    suspend fun findAllServers(): List<ServeInv>
+    @Query("SELECT SER_NUM,SER_DESC, SER_DIR FROM $TABLA_SERV_INV")
+    suspend fun fetchAllServers(): List<ServeInv>
+
+    @Query("DELETE FROM ServeInv WHERE SER_NUM = :number")
+    suspend fun deleteServer(number: Long)
 }
\ 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
new file mode 100644
index 0000000..56dabb0
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionFragment.kt
@@ -0,0 +1,157 @@
+package com.focasoftware.deboinventariov20.ui.descripcionFragment
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
+import androidx.navigation.NavController
+import androidx.navigation.Navigation
+import androidx.recyclerview.widget.ItemTouchHelper
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.input.input
+import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
+import com.focasoftware.deboinventariov20.Model.Articles
+import com.focasoftware.deboinventariov20.Model.InvBody
+import com.focasoftware.deboinventariov20.R
+import com.focasoftware.deboinventariov20.ui.inventario.InventarioFragment
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+
+class DescripcionFragment : Fragment() {
+    private var artAcargar2: List<Articles>? = null
+    private var listArticulos2: List<Articles>? = null
+    lateinit var viewAdapter2: RecyclerView.Adapter<*>
+    private lateinit var viewManager2: RecyclerView.LayoutManager
+    private lateinit var rcDescripcion: RecyclerView
+    private var swipeBackground: ColorDrawable = ColorDrawable(Color.YELLOW)
+    private var cantidad = 0F
+    private var numeroInventario = 0
+    lateinit var navController: NavController
+    lateinit var sharedPreferences: SharedPreferences
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
+        arguments.apply {
+            artAcargar2 = requireArguments().getSerializable("ArrayDesc") as List<Articles>
+            numeroInventario = requireArguments().getInt("numeroInv")
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        navController = Navigation.findNavController(view)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        // Inflate the layout for this fragment
+        val v = inflater.inflate(R.layout.fragment_descripcion, container, false)
+        rcDescripcion = v.findViewById(R.id.rcDescripcion)
+        val btnSalir = v.findViewById<Button>(R.id.btnSalir)
+
+        IngresarRecicler(artAcargar2)
+
+        btnSalir.setOnClickListener {
+            VolverAinventario()
+        }
+        return v
+    }
+
+    fun IngresarRecicler(articulos: List<Articles>?) {
+
+        viewAdapter2 = DescripcionListAdapter(articulos)
+        viewManager2 = LinearLayoutManager(requireContext())
+
+        rcDescripcion.apply {
+            adapter = viewAdapter2
+            layoutManager = viewManager2
+        }
+        val itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
+            override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+                return false
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, position: Int) {
+                MaterialDialog(requireContext()).show {
+                    title(R.string.sTitulo)
+                    message(R.string.sMensajeEncontrado)
+                    input { materialDialog, charSequence ->
+                        cantidad = 0F
+                        cantidad = charSequence.toString().toFloat()
+                    }
+//                                .input("Cantidad",1,,1,0,InputType.TYPE_CLASS_NUMBER,0,waitForPositiveButton = true,false,positiveButton ())
+                    positiveButton(R.string.btnOk) {
+                        dismiss()
+                        var indice = 0
+                        indice=viewHolder.layoutPosition
+
+                        val body = InvBody(numeroInventario,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.sector,
+                            // TODO PREPARO PARA MANDAR A CARGAR EN LA BD
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codigo,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.descripcion,
+                            cantidad.toString(),
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codBar,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codOrigen,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.precio,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.precio,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.balanza,
+                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.depSn,
+                            InventarioFragment().ObtenerFechaActual(),
+                            InventarioFragment().ObtenerFechaActual())
+                        InsertarArtEnDB(body)// TODO: MANDO A CARGAR A LA BASE DE DATOS
+                        VolverAinventario()
+                    }
+                }.cancelOnTouchOutside(false).cornerRadius(10F)
+            }
+
+            override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
+                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+                val itemView = viewHolder.itemView
+
+                c.clipRect(0f, itemView.top.toFloat(), dX, itemView.bottom.toFloat())
+
+                if (dX > 0) {
+
+                    c.drawColor(Color.RED)
+                } else if (dX < 0) {
+                    // swipeBackground.setBounds(itemView.right+dX.toInt(),itemView.top,itemView.right,itemView.bottom)
+                    c.drawColor(Color.YELLOW)
+                }
+                swipeBackground.draw(c)
+                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+            }
+        }
+        val itemTouchHelper2 = ItemTouchHelper(itemTouchHelperCallback)
+        itemTouchHelper2.attachToRecyclerView(rcDescripcion)
+
+    }
+
+    fun InsertarArtEnDB(cuarpoInventario: InvBody) {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                AppDb.getAppDb(requireActivity())!!.InvBodyDAO()!!.insertInvBody(cuarpoInventario)
+            }
+        }
+    }
+    fun VolverAinventario(){
+
+        val editor = sharedPreferences.edit()
+        editor?.putString("Inventario", numeroInventario.toString())
+        editor?.apply()
+        editor.commit()
+        navController.navigate(R.id.action_descripcionFragment_to_inventarioFragment)
+    }
+}
+
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionListAdapter.kt
new file mode 100644
index 0000000..ad7e3d2
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/DescripcionListAdapter.kt
@@ -0,0 +1,48 @@
+package com.focasoftware.deboinventariov20.ui.descripcionFragment
+
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.focasoftware.deboinventariov20.Model.Articles
+import com.focasoftware.deboinventariov20.R
+import kotlinx.android.synthetic.main.item.view.*
+
+class DescripcionListAdapter(private val productos: List<Articles>?) :
+    RecyclerView.Adapter<DescripcionListAdapter.ItemsViewHolder>() {
+    internal var items2: List<Articles>? = null
+
+    init {
+        this.items2 = productos
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, p1: Int) = ItemsViewHolder(
+        LayoutInflater.from(parent.context).inflate(R.layout.item_descripcion, parent, false)
+    )
+
+    override fun getItemCount() = productos!!.size
+
+    override fun onBindViewHolder(holder: ItemsViewHolder, position: Int) {
+        when (holder) {
+            is ItemsViewHolder -> {
+                holder.bind(items2!![position])
+            }
+        }
+    }
+
+
+    class ItemsViewHolder constructor(view: View) : RecyclerView.ViewHolder(view) {
+
+        val sector = view.tvSector
+        val codigo = view.tvCodigo
+        val descripcion = view.tvDescripcion
+        val codigoBarras = view.tvCodigoBarras
+
+        fun bind(pro: Articles) {
+            sector.text = pro.sector
+            codigo.text = pro.codigo
+            descripcion.text = pro.descripcion
+            codigoBarras.text = pro.codBar
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/ItemDescripcion.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/ItemDescripcion.kt
new file mode 100644
index 0000000..d813584
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/descripcionFragment/ItemDescripcion.kt
@@ -0,0 +1,3 @@
+package com.focasoftware.deboinventariov20.ui.descripcionFragment
+
+data class ItemDescripcion(val sector: String?,val codigo: String?, val descripcion: String?, val codigoBarras: String?)
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/BaseFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/BaseFragment.kt
deleted file mode 100644
index 369e464..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/BaseFragment.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.inventario
-
-import android.os.Bundle
-import androidx.fragment.app.Fragment
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlin.coroutines.CoroutineContext
-
-abstract class BaseFragment : Fragment(), CoroutineScope {
-
-
-    lateinit var job: Job
-
-    override val coroutineContext: CoroutineContext
-        get() = job + Dispatchers.Main
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        job = Job()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        job.cancel()
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionFragment.kt
deleted file mode 100644
index 0cc48f1..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionFragment.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.inventario
-
-import android.content.Context
-import android.content.SharedPreferences
-import android.graphics.Canvas
-import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Button
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.NavController
-import androidx.navigation.Navigation
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.input.input
-import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
-import com.focasoftware.deboinventariov20.Model.Articles
-import com.focasoftware.deboinventariov20.Model.InvBody
-import com.focasoftware.deboinventariov20.R
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class DescripcionFragment : Fragment() {
-    private var artAcargar2: List<Articles>? = null
-    private var listArticulos2: List<Articles>? = null
-    lateinit var viewAdapter2: RecyclerView.Adapter<*>
-    private lateinit var viewManager2: RecyclerView.LayoutManager
-    private lateinit var rcDescripcion: RecyclerView
-    private var swipeBackground: ColorDrawable = ColorDrawable(Color.YELLOW)
-    private var cantidad = 0F
-    private var numeroInventario = 0
-    lateinit var navController: NavController
-    lateinit var sharedPreferences: SharedPreferences
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
-        arguments.apply {
-            artAcargar2 = requireArguments().getSerializable("ArrayDesc") as List<Articles>
-            numeroInventario = requireArguments().getInt("numeroInv")
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        navController = Navigation.findNavController(view)
-    }
-
-    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        // Inflate the layout for this fragment
-        val v = inflater.inflate(R.layout.fragment_descripcion, container, false)
-        rcDescripcion = v.findViewById(R.id.rcDescripcion)
-        val btnSalir = v.findViewById<Button>(R.id.btnSalir)
-
-        IngresarRecicler(artAcargar2)
-
-        btnSalir.setOnClickListener {
-            VolverAinventario()
-        }
-        return v
-    }
-
-    fun IngresarRecicler(articulos: List<Articles>?) {
-
-        viewAdapter2 = DescripcionListAdapter(articulos)
-        viewManager2 = LinearLayoutManager(requireContext())
-
-        rcDescripcion.apply {
-            adapter = viewAdapter2
-            layoutManager = viewManager2
-        }
-        val itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
-            override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-                return false
-            }
-
-            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, position: Int) {
-                MaterialDialog(requireContext()).show {
-                    title(R.string.sTitulo)
-                    message(R.string.sMensajeEncontrado)
-                    input { materialDialog, charSequence ->
-                        cantidad = 0F
-                        cantidad = charSequence.toString().toFloat()
-                    }
-//                                .input("Cantidad",1,,1,0,InputType.TYPE_CLASS_NUMBER,0,waitForPositiveButton = true,false,positiveButton ())
-                    positiveButton(R.string.btnOk) {
-                        dismiss()
-                        var indice = 0
-                        indice=viewHolder.layoutPosition
-
-                        val body = InvBody(numeroInventario,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.sector,
-                            // TODO PREPARO PARA MANDAR A CARGAR EN LA BD
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codigo,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.descripcion,
-                            cantidad.toString(),
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codBar,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.codOrigen,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.precio,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.precio,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.balanza,
-                            (viewAdapter2 as DescripcionListAdapter).items2?.get(indice)!!.depSn,
-                            InventarioFragment().ObtenerFechaActual(),
-                            InventarioFragment().ObtenerFechaActual())
-                        InsertarArtEnDB(body)// TODO: MANDO A CARGAR A LA BASE DE DATOS
-                        VolverAinventario()
-                    }
-                }.cancelOnTouchOutside(false).cornerRadius(10F)
-            }
-
-            override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
-                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-                val itemView = viewHolder.itemView
-
-                c.clipRect(0f, itemView.top.toFloat(), dX, itemView.bottom.toFloat())
-
-                if (dX > 0) {
-
-                    c.drawColor(Color.RED)
-                } else if (dX < 0) {
-                    // swipeBackground.setBounds(itemView.right+dX.toInt(),itemView.top,itemView.right,itemView.bottom)
-                    c.drawColor(Color.YELLOW)
-                }
-                swipeBackground.draw(c)
-                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-            }
-        }
-        val itemTouchHelper2 = ItemTouchHelper(itemTouchHelperCallback)
-        itemTouchHelper2.attachToRecyclerView(rcDescripcion)
-
-    }
-
-    fun InsertarArtEnDB(cuarpoInventario: InvBody) {
-        lifecycleScope.launch {
-            withContext(Dispatchers.IO) {
-                AppDb.getAppDb(requireActivity())!!.InvBodyDAO()!!.insertInvBody(cuarpoInventario)
-            }
-        }
-    }
-    fun VolverAinventario(){
-
-        val editor = sharedPreferences.edit()
-        editor?.putString("Inventario", numeroInventario.toString())
-        editor?.apply()
-        editor.commit()
-        navController.navigate(R.id.action_descripcionFragment_to_inventarioFragment)
-    }
-}
-
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionListAdapter.kt
deleted file mode 100644
index 1b23fed..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/DescripcionListAdapter.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.inventario
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.RecyclerView
-import com.focasoftware.deboinventariov20.Model.Articles
-import com.focasoftware.deboinventariov20.R
-import kotlinx.android.synthetic.main.item.view.*
-
-class DescripcionListAdapter(private val productos: List<Articles>?) :
-    RecyclerView.Adapter<DescripcionListAdapter.ItemsViewHolder>() {
-    internal var items2: List<Articles>? = null
-
-    init {
-        this.items2 = productos
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, p1: Int) = ItemsViewHolder(
-        LayoutInflater.from(parent.context).inflate(R.layout.item_descripcion, parent, false)
-    )
-
-    override fun getItemCount() = productos!!.size
-
-    override fun onBindViewHolder(holder: ItemsViewHolder, position: Int) {
-        when (holder) {
-            is ItemsViewHolder -> {
-                holder.bind(items2!![position])
-            }
-        }
-    }
-
-
-    class ItemsViewHolder constructor(view: View) : RecyclerView.ViewHolder(view) {
-
-        val sector = view.tvSector
-        val codigo = view.tvCodigo
-        val descripcion = view.tvDescripcion
-        val codigoBarras = view.tvCodigoBarras
-
-        fun bind(pro: Articles) {
-            sector.text = pro.sector
-            codigo.text = pro.codigo
-            descripcion.text = pro.descripcion
-            codigoBarras.text = pro.codBar
-        }
-    }
-}
\ 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 01cbc9c..e92739b 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
@@ -13,7 +13,6 @@ import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
-import android.widget.ToggleButton
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
@@ -43,13 +42,15 @@ class InventarioFragment : Fragment() {
     private var iArea: Int = 0
     private lateinit var invHead: InvHead
     private lateinit var rcInventarios: RecyclerView
-    lateinit var viewAdapter: RecyclerView.Adapter<*>
+    private lateinit var viewAdapter: RecyclerView.Adapter<*>
     private lateinit var viewManager: RecyclerView.LayoutManager
     private lateinit var sChangeUpper: String
     private var listArticulos = ArrayList<ItemsRecycler>()
-    lateinit var navController: NavController
-    var InventarioNuevo: Int = 0
-    var fCant = 0F
+    private lateinit var navController: NavController
+    private var InventarioNuevo: Int = 0
+    private var iEstado = 0
+    private var fCant = 0F
+    private var bFirst = false
     private lateinit var deleteIcon: Drawable
 //    private var editTT: EditText? = null
 //    private var dialogoModificacion: DialogPersoComplexCantidadModificacion? = null
@@ -73,7 +74,6 @@ class InventarioFragment : Fragment() {
         val tCodigoBarras = v.findViewById<EditText>(R.id.etCodigoBarras)
         rcInventarios = v.findViewById(R.id.rcInventarios)
         val tvTitulo = v.findViewById<TextView>(R.id.tvTitulo)
-        val toggleButton = v.findViewById<ToggleButton>(R.id.toggleButton)
 
 
         if (InventarioNuevo == 0) {// TODO: SI INVETNARIO NUEVO
@@ -99,108 +99,175 @@ class InventarioFragment : Fragment() {
                 var indiceDelArtEncontrado = 0
 
                 //TODO COMIENZA LA BUSQUEDA POR CODIGO DE BARRAS
-                if (toggleButton.isChecked) {
-                    indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 0)//TODO Si encuentra el articulo en el RV devuelve el indice
-                    //TODO Si no lo encuentra devuelve -1
-                    if (indiceDelArtEncontrado != -1) {
-                        if (swSumaUno!!.isChecked) {
-                            fCant = 0F
-                            fCant = listArticulos[indiceDelArtEncontrado].cantTomada
-                            fCant += 1F
-                            //TODO ACTUALIZO LA CANTIDAD EN LA BD
-                            updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
-                            //TODO ACTUALIZO LA CANTIDAD EN EL RV
-                            listArticulos[indiceDelArtEncontrado].cantTomada = fCant
-                            viewAdapter.notifyDataSetChanged()
-                        } else {
-//                        val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
-//                        val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Login Form").setCancelable(false)
-//                        val mAlertDialog = mBuilder.show()
-//                        mDialogView.dialogLoginBtn.setOnClickListener {
-//                            mAlertDialog.dismiss()
-//                            //get text from EditTexts of custom layout
-//                            val name = mDialogView.dialogNameEt.text.toString()
-//                            val email = mDialogView.dialogEmailEt.text.toString()
-//                            val password = mDialogView.dialogPasswEt.text.toString()
-//                            fCant = 0F
-//                            fCant = name.toFloat()
-//                        }
-//                        mDialogView.dialogCancelBtn.setOnClickListener {
-//                            mAlertDialog.dismiss()
-//                        }
-                            fCant = listArticulos[indiceDelArtEncontrado].cantTomada
-                            MaterialDialog(requireContext()).show {
-                                title(R.string.sTituloNueva)
-                                message(R.string.sCantidadNueva)
-                                input { materialDialog, charSequence ->
-                                    fCant = 0F
-                                    fCant = charSequence.toString().toFloat()
-                                }
-                                positiveButton(R.string.btnOk) {
-                                    //TODO ACTUALIZO CANTIADAD EN BD
-                                    updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
-                                    //TODO ACTUALIZO CANTIDAD EN RV
-                                    listArticulos[indiceDelArtEncontrado].cantTomada = fCant
-                                    viewAdapter.notifyDataSetChanged()
-                                    dismiss()
-                                }
-                            }.cancelOnTouchOutside(false).cornerRadius(10F)
+                when (iEstado) {
+                    0 -> {
+                        indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 0)//TODO Si encuentra el articulo en el RV devuelve el indice
+                        //TODO Si no lo encuentra devuelve -1
+                        if (indiceDelArtEncontrado != -1) {
+                            if (swSumaUno!!.isChecked) {
+                                fCant = 0F
+                                fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                                fCant += 1F
+                                //TODO ACTUALIZO LA CANTIDAD EN LA BD
+                                updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
+                                //TODO ACTUALIZO LA CANTIDAD EN EL RV
+                                listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                                viewAdapter.notifyDataSetChanged()
+                            } else {
+                //                        val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
+                //                        val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Login Form").setCancelable(false)
+                //                        val mAlertDialog = mBuilder.show()
+                //                        mDialogView.dialogLoginBtn.setOnClickListener {
+                //                            mAlertDialog.dismiss()
+                //                            //get text from EditTexts of custom layout
+                //                            val name = mDialogView.dialogNameEt.text.toString()
+                //                            val email = mDialogView.dialogEmailEt.text.toString()
+                //                            val password = mDialogView.dialogPasswEt.text.toString()
+                //                            fCant = 0F
+                //                            fCant = name.toFloat()
+                //                        }
+                //                        mDialogView.dialogCancelBtn.setOnClickListener {
+                //                            mAlertDialog.dismiss()
+                //                        }
+                                fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                                MaterialDialog(requireContext()).show {
+                                    title(R.string.sTituloNueva)
+                                    message(R.string.sCantidadNueva)
+                                    input { materialDialog, charSequence ->
+                                        fCant = 0F
+                                        fCant = charSequence.toString().toFloat()
+                                    }
+                                    positiveButton(R.string.btnOk) {
+                                        //TODO ACTUALIZO CANTIADAD EN BD
+                                        updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
+                                        //TODO ACTUALIZO CANTIDAD EN RV
+                                        listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                                        viewAdapter.notifyDataSetChanged()
+                                        dismiss()
+                                    }
+                                }.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) {
+                                //TODO BUSCO EN BASE DE DATOS
+                                val artEncontrado = buscarCBEnBD(sChangeUpper.toUpperCase(Locale.ROOT))
+                                ContinuarCargaCB(artEncontrado)
+                            }
                         }
 
-                    } else if (indiceDelArtEncontrado == -1) {// no lo encontro en el RV, lo va a buscar en al BD
+                        tCodigoBarras.focusable = View.FOCUSABLE
+                        tCodigoBarras.setText("")
+                        tCodigoBarras.selectAll()
+                        return@setOnKeyListener true
 
-                        GlobalScope.launch(Dispatchers.Main) {
-                            //TODO BUSCO EN BASE DE DATOS
-                            val artEncontrado = buscarCBEnBD(sChangeUpper.toUpperCase(Locale.ROOT))
-                            ContinuarCargaCB(artEncontrado)
-                        }
-                    }
 
-                    tCodigoBarras.focusable = View.FOCUSABLE
-                    tCodigoBarras.setText("")
-                    tCodigoBarras.selectAll()
-                    return@setOnKeyListener true
-
-
-                } else {//TODO: BUSQUEDA POR DESCRIPCION**************************************************************************
-//
-//                    indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 1) //TODO :Si encuentra el articulo en el RV devuelve el indice
-//                    //TODO Si no lo encuentra devuelve -1
-//                    if (indiceDelArtEncontrado != -1) {
-////                        if (swSumaUno!!.isChecked) {
-////                            fCant = 0F
-////                            fCant = listArticulos[indiceDelArtEncontrado].cantTomada
-////                            fCant += 1F
-////                            listArticulos[indiceDelArtEncontrado].cantTomada = fCant
-////                            viewAdapter.notifyDataSetChanged()
-////                        } else {
-//                        fCant = listArticulos[indiceDelArtEncontrado].cantTomada
-//                        MaterialDialog(requireContext()).show {
-//                            title(R.string.sTituloNueva)
-//                            message(R.string.sCantidadNueva)
-//                            input { materialDialog, charSequence ->
-//                                fCant = 0F
-//                                fCant = charSequence.toString().toFloat()
-//                            }
-//                            positiveButton(R.string.btnOk) {
-//                                listArticulos[indiceDelArtEncontrado].cantTomada = fCant
-//                                viewAdapter.notifyDataSetChanged()
-//                                dismiss()
-//                            }
-//                        }.cancelOnTouchOutside(false).cornerRadius(10F)
-////                        }
-//
-//                    } else if
-//                       (indiceDelArtEncontrado == -1) {// TODO: no lo encontro en el RV, lo va a buscar en al BD
+                    }
+                    1 -> {//TODO: BUSQUEDA POR DESCRIPCION**************************************************************************
+                //
+                //                    indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 1) //TODO :Si encuentra el articulo en el RV devuelve el indice
+                //                    //TODO Si no lo encuentra devuelve -1
+                //                    if (indiceDelArtEncontrado != -1) {
+                ////                        if (swSumaUno!!.isChecked) {
+                ////                            fCant = 0F
+                ////                            fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                ////                            fCant += 1F
+                ////                            listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                ////                            viewAdapter.notifyDataSetChanged()
+                ////                        } else {
+                //                        fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                //                        MaterialDialog(requireContext()).show {
+                //                            title(R.string.sTituloNueva)
+                //                            message(R.string.sCantidadNueva)
+                //                            input { materialDialog, charSequence ->
+                //                                fCant = 0F
+                //                                fCant = charSequence.toString().toFloat()
+                //                            }
+                //                            positiveButton(R.string.btnOk) {
+                //                                listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                //                                viewAdapter.notifyDataSetChanged()
+                //                                dismiss()
+                //                            }
+                //                        }.cancelOnTouchOutside(false).cornerRadius(10F)
+                ////                        }
+                //
+                //                    } else if
+                //                       (indiceDelArtEncontrado == -1) {// TODO: no lo encontro en el RV, lo va a buscar en al BD
                         GlobalScope.launch(Dispatchers.Main) {
                             val artEncontrado = buscarDescEnBD(sChangeUpper.toUpperCase(Locale.ROOT))
                             ContinuarCargaDesc(artEncontrado as ArrayList<Articles>)
                         }
-//                    }
-                    tCodigoBarras.focusable = View.FOCUSABLE
-                    tCodigoBarras.setText("")
-                    tCodigoBarras.selectAll()
-                    return@setOnKeyListener true
+                //                    }
+                        tCodigoBarras.focusable = View.FOCUSABLE
+                        tCodigoBarras.setText("")
+                        tCodigoBarras.selectAll()
+                        return@setOnKeyListener true
+                    }
+                    2 -> {//TODO: BUSQUEDA POR CODIGO DE ORIGEN**************************************************************************
+                        indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 3)//TODO Si encuentra el articulo en el RV devuelve el indice
+                        //TODO Si no lo encuentra devuelve -1
+                        if (indiceDelArtEncontrado != -1) {
+                            if (swSumaUno!!.isChecked) {
+                                fCant = 0F
+                                fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                                fCant += 1F
+                                //TODO ACTUALIZO LA CANTIDAD EN LA BD
+                                updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
+                                //TODO ACTUALIZO LA CANTIDAD EN EL RV
+                                listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                                viewAdapter.notifyDataSetChanged()
+                            } else {
+                                //                        val mDialogView = LayoutInflater.from(context).inflate(R.layout.login_dialog, null)
+                                //                        val mBuilder = AlertDialog.Builder(context).setView(mDialogView).setTitle("Login Form").setCancelable(false)
+                                //                        val mAlertDialog = mBuilder.show()
+                                //                        mDialogView.dialogLoginBtn.setOnClickListener {
+                                //                            mAlertDialog.dismiss()
+                                //                            //get text from EditTexts of custom layout
+                                //                            val name = mDialogView.dialogNameEt.text.toString()
+                                //                            val email = mDialogView.dialogEmailEt.text.toString()
+                                //                            val password = mDialogView.dialogPasswEt.text.toString()
+                                //                            fCant = 0F
+                                //                            fCant = name.toFloat()
+                                //                        }
+                                //                        mDialogView.dialogCancelBtn.setOnClickListener {
+                                //                            mAlertDialog.dismiss()
+                                //                        }
+                                fCant = listArticulos[indiceDelArtEncontrado].cantTomada
+                                MaterialDialog(requireContext()).show {
+                                    title(R.string.sTituloNueva)
+                                    message(R.string.sCantidadNueva)
+                                    input { materialDialog, charSequence ->
+                                        fCant = 0F
+                                        fCant = charSequence.toString().toFloat()
+                                    }
+                                    positiveButton(R.string.btnOk) {
+                                        //TODO ACTUALIZO CANTIADAD EN BD
+                                        updateCantidad(listArticulos[indiceDelArtEncontrado].sector.toString(), listArticulos[indiceDelArtEncontrado].codigo.toString(), fCant)
+                                        //TODO ACTUALIZO CANTIDAD EN RV
+                                        listArticulos[indiceDelArtEncontrado].cantTomada = fCant
+                                        viewAdapter.notifyDataSetChanged()
+                                        dismiss()
+                                    }
+                                }.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) {
+                                //TODO BUSCO EN BASE DE DATOS
+                                val artEncontrado = buscarCBEnBD(sChangeUpper.toUpperCase(Locale.ROOT))
+                                ContinuarCargaCB(artEncontrado)
+                            }
+                        }
+
+                        tCodigoBarras.focusable = View.FOCUSABLE
+                        tCodigoBarras.setText("")
+                        tCodigoBarras.selectAll()
+                        return@setOnKeyListener true
+
+
+                    }
                 }
             }
             return@setOnKeyListener false
@@ -246,6 +313,33 @@ class InventarioFragment : Fragment() {
                 }
             }.cancelOnTouchOutside(false).cornerRadius(10F)
         }
+        ivCamara.setOnClickListener {
+            if (!bFirst) {
+                iEstado = 1
+                bFirst = true
+            }
+
+            when (iEstado) {
+                0 -> {
+                    ivCamara.setImageResource(R.drawable.codbar)
+                    etCodigoBarras.hint = "Busqueda por C. Barras"
+                    swSumaUno.visibility = View.VISIBLE
+                    iEstado = 1
+                }
+                1 -> {
+                    ivCamara.setImageResource(R.drawable.desc)
+                    etCodigoBarras.hint = "Busqueda por Descripción"
+                    swSumaUno.visibility = View.GONE
+                    iEstado = 2
+                }
+                2 -> {
+                    ivCamara.setImageResource(R.drawable.cod_origen)
+                    etCodigoBarras.hint = "Busqueda por C. Origen"
+                    swSumaUno.visibility = View.GONE
+                    iEstado = 0
+                }
+            }
+        }
     }
 
     private fun BorrarInvActual() {
@@ -327,7 +421,7 @@ class InventarioFragment : Fragment() {
 //                        artAcargar[0].codigo,
 //                        artAcargar[0].descripcion,
 //                        artAcargar[0].codBar,
-//                        artAcargar[0].codOrigen,
+//                        artAcargar[0].cod_origen,
 //                        artAcargar[0].precio,
 //                        artAcargar[0].costo,
 //                        artAcargar[0].balanza,
@@ -424,7 +518,7 @@ class InventarioFragment : Fragment() {
                 }
                 indice += 1
             }
-        } else {//TODO BUSQUEDA POR DESCRIPCION
+        } else if (sTipoBusqueda == 1) {//TODO BUSQUEDA POR DESCRIPCION
             for (item in listArticulos) {
                 if (item.descripcion!!.toUpperCase(Locale.ROOT).contains(codigoBarras)) {
                     bEncontrado = true
@@ -432,6 +526,14 @@ class InventarioFragment : Fragment() {
                 }
                 indice += 1
             }
+        }else if (sTipoBusqueda == 2) {//TODO BUSQUEDA POR CODIGO DE ORIGEN
+            for (item in listArticulos) {
+                if (item.codigoOrigen!!.toUpperCase(Locale.ROOT).contains(codigoBarras)) {
+                    bEncontrado = true
+                    break
+                }
+                indice += 1
+            }
         }
         return if (bEncontrado) indice
         else -1
@@ -457,7 +559,7 @@ class InventarioFragment : Fragment() {
     fun cargarRecicler(articulos: Articles, cant: Float) {
 
         //TODO CARGO EN LE RV
-        val item = ItemsRecycler(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar)
+        val item = ItemsRecycler(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar,articulos.codOrigen)
         listArticulos.add(item)
 
         viewAdapter = ProductosListAdapter(listArticulos)
@@ -468,32 +570,32 @@ class InventarioFragment : Fragment() {
             layoutManager = viewManager
         }
         val itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
-            override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
-                return false
-            }
+                override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+                    return false
+                }
 
-            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
-                (viewAdapter as ProductosListAdapter).removeItem(viewHolder)
-                viewAdapter.notifyDataSetChanged()
-            }
+                override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                    (viewAdapter as ProductosListAdapter).removeItem(viewHolder)
+                    viewAdapter.notifyDataSetChanged()
+                }
 
-            override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
-                val itemView = viewHolder.itemView
-                val iconMargin = (itemView.height - deleteIcon.intrinsicHeight) / 2
-                c.clipRect(0f, itemView.top.toFloat(), dX, itemView.bottom.toFloat())
+                override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
+                    val itemView = viewHolder.itemView
+                    val iconMargin = (itemView.height - deleteIcon.intrinsicHeight) / 2
+                    c.clipRect(0f, itemView.top.toFloat(), dX, itemView.bottom.toFloat())
 
-                if (dX > 0) {
+                    if (dX > 0) {
 
-                    if (dX < c.width / 2) c.drawColor(Color.GREEN)
-                    else c.drawColor(Color.RED)
-                    deleteIcon.setBounds(itemView.left + iconMargin, itemView.top + iconMargin, itemView.left + iconMargin + deleteIcon.intrinsicWidth, itemView.bottom - iconMargin)
-                } else {
+                        if (dX < c.width / 2) c.drawColor(Color.GREEN)
+                        else c.drawColor(Color.RED)
+                        deleteIcon.setBounds(itemView.left + iconMargin, itemView.top + iconMargin, itemView.left + iconMargin + deleteIcon.intrinsicWidth, itemView.bottom - iconMargin)
+                    } else {
 
-                }
+                    }
 
-                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-                deleteIcon.draw(c)
-            }
+                    super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+                    deleteIcon.draw(c)
+                }
         }
 
         val itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemDescripcion.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemDescripcion.kt
deleted file mode 100644
index b7a551e..0000000
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemDescripcion.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package com.focasoftware.deboinventariov20.ui.inventario
-
-data class ItemDescripcion(val sector: String?,val codigo: String?, val descripcion: String?, val codigoBarras: String?)
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemsRecycler.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemsRecycler.kt
index 89233b0..399c9f9 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemsRecycler.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ItemsRecycler.kt
@@ -1,3 +1,3 @@
 package com.focasoftware.deboinventariov20.ui.inventario
 
-data class ItemsRecycler(val sector: String?,val codigo: String?, val descripcion: String?, var cantTomada: Float, val codigoBarras: String?)
\ No newline at end of file
+data class ItemsRecycler(val sector: String?,val codigo: String?, val descripcion: String?, var cantTomada: Float, val codigoBarras: String?, val codigoOrigen: String?)
\ No newline at end of file
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ProductosListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ProductosListAdapter.kt
index c83b94a..5676274 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ProductosListAdapter.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/inventario/ProductosListAdapter.kt
@@ -38,6 +38,7 @@ class ProductosListAdapter(private val productos: ArrayList<ItemsRecycler>) : Re
         val descripcion = view.tvDescripcion
         val cantCont = view.tvCantidad
         val codigoBarras = view.tvCodigoBarras
+        val codigoOrigen = view.tvCodigoOrigen
 
         fun bind(pro: ItemsRecycler) {
             sector.text = pro.sector
@@ -45,6 +46,7 @@ class ProductosListAdapter(private val productos: ArrayList<ItemsRecycler>) : Re
             descripcion.text = pro.descripcion
             cantCont.text = pro.cantTomada.toString()
             codigoBarras.text = pro.codigoBarras
+            codigoOrigen.text = pro.codigoOrigen
         }
     }
 
@@ -60,7 +62,4 @@ class ProductosListAdapter(private val productos: ArrayList<ItemsRecycler>) : Re
             notifyItemInserted(removePosition)
         }.show()
     }
-//    interface OnItemClickListener{
-//        fun OnImageClick(position: Int)
-//    }
 }
\ No newline at end of file
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 d25f1b7..5df3a2d 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
@@ -91,7 +91,7 @@ class MainFragment : Fragment(), InventarioListAdapter.OnItemClickListener {
     override fun OnItemClick(position: Int) {
         val editor = sharedPreferences.edit()
         var invSel:String = listIvn[position].inventario.toString()
-        invSel=invSel.substring(13, 15)
+        invSel=invSel.substring(3, 5)
         editor?.putString("Inventario", invSel)
         editor?.apply()
         editor.commit()
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/AdapterServidores.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/AdapterServidores.kt
index d66e0a4..c02316b 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/AdapterServidores.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/AdapterServidores.kt
@@ -6,14 +6,14 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import com.focasoftware.deboinventariov20.R
+import com.focasoftware.deboinventariov20.ui.inventario.ItemsRecycler
+import com.google.android.material.snackbar.Snackbar
 import kotlinx.android.synthetic.main.item_servidores.view.*
 
-class AdapterServidores(
-    private val servidor: ArrayList<ItemsServidores>,
-    private var contexto: Context
-) :
+class AdapterServidores(private val servidor: ArrayList<ItemsServidores>, private var contexto: Context) :
     RecyclerView.Adapter<AdapterServidores.ViewHolder>() {
-
+    private var removePosition: Int = 0
+    private var removedItem: ItemsServidores? = null
 
     class ViewHolder(var vista: View) : RecyclerView.ViewHolder(vista) {
         fun bind(itemsServidores: ItemsServidores) {
@@ -36,5 +36,16 @@ class AdapterServidores(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         holder.bind(servidor[position])
     }
+    fun removeItem(viewHolder: RecyclerView.ViewHolder) {
+        removePosition = viewHolder.adapterPosition
+        removedItem = servidor[viewHolder.adapterPosition]
+
+        servidor.removeAt(viewHolder.adapterPosition)
+        notifyItemRemoved(viewHolder.adapterPosition)
 
+        Snackbar.make(viewHolder.itemView, "El articulo fue ${removedItem!!.descripcion} eliminado", Snackbar.LENGTH_LONG).setAction("Rehacer") {
+            servidor.add(removePosition, removedItem!!)
+            notifyItemInserted(removePosition)
+        }.show()
+    }
 }
\ No newline at end of file
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 599e23e..b8de4af 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
@@ -1,58 +1,158 @@
 package com.focasoftware.deboinventariov20.ui.servidores
 
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
 import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
+import com.focasoftware.deboinventariov20.ui.inventario.ProductosListAdapter
 import kotlinx.android.synthetic.main.fragment_servidores.*
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import java.text.FieldPosition
 
 class ServidoresFragment : Fragment() {
-    val servidorNuevo = ArrayList<ItemsServidores>()
-    var index=0
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
-        val v = inflater.inflate(R.layout.fragment_servidores, container, false)
+    private val servidorNuevo = ArrayList<ItemsServidores>()
+    private var index = 0
+    private lateinit var rvServidores: RecyclerView
+    private lateinit var viewAdapter: RecyclerView.Adapter<*>
+    private lateinit var viewManager: RecyclerView.LayoutManager
+    private var listIvn = java.util.ArrayList<ItemsServidores>()
+    private lateinit var servidores: List<ServeInv>
+    private lateinit var deleteIcon: Drawable
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        buscaEnBD()
+    }
 
-        val btnGuardarServidores = v.findViewById<Button>(R.id.btnGuardarServidores)
-        val rvServidores = v.findViewById<RecyclerView>(R.id.rvServidores)
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
 
         rvServidores.layoutManager = LinearLayoutManager(context)
         rvServidores.itemAnimator = DefaultItemAnimator()
 
         btnGuardarServidores.setOnClickListener {
-            rvServidores.adapter = AdapterServidores(ingregarDatos(), requireContext())
+            if (etNombreServidor.text.isNullOrBlank()){
+                etNombreServidor.error="Nombre no valido"
+                etNombreServidor.requestFocus()
+                etNombreServidor.hint="Nombre no valido"
+            }
+            if (etDireccionServidor.text.isNullOrBlank()){
+                etDireccionServidor.error="Dirección no valida"
+                etDireccionServidor.requestFocus()
+                etDireccionServidor.hint="Dirección no valida"
+            }
+            if (!etDireccionServidor.text.isNullOrBlank() || !etNombreServidor.text.isNullOrBlank()){
+                btnGuardarServidores.isEnabled=true
+                buscaEnBD()
+                rvServidores.adapter = AdapterServidores(ingresarDatos(), requireContext())
+                btnGuardarServidores.isEnabled=false
+            }
         }
-        return v
     }
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        val v = inflater.inflate(R.layout.fragment_servidores, container, false)
+        rvServidores = v.findViewById(R.id.rvServidores)
 
-    fun ingregarDatos(): ArrayList<ItemsServidores> {
+        return v
+    }
 
-        val item=ItemsServidores(etNombreServidor.text.toString(),etDireccionServidor.text.toString(),"0")
+    fun ingresarDatos(): ArrayList<ItemsServidores> {
 
-        val servidor = ServeInv(
-            etNombreServidor.text.toString(),
-            etDireccionServidor.text.toString(),
-            "0")
-        index+=index
+        val item = ItemsServidores(etNombreServidor.text.toString(), etDireccionServidor.text.toString(), "0")
+        val servidor = ServeInv(etNombreServidor.text.toString(), etDireccionServidor.text.toString(), "0")
+        index += index
         servidorNuevo.add(item)
         val Job = GlobalScope.launch {
-                AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.insertServer(servidor)
-            }
+            AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.insertServer(servidor)
+        }
 
         return servidorNuevo
     }
-}
\ No newline at end of file
+
+    suspend fun buscarEnBD(): List<ServeInv> {
+        //TODO BUSQUEDA POR DESCRIPCION
+        var busqueda: List<ServeInv>
+        return GlobalScope.async(Dispatchers.IO) {
+            busqueda = AppDb.getAppDb(requireContext())!!.ServeInvDao()!!.fetchAllServers()
+            return@async busqueda
+        }.await()
+    }
+
+    fun buscaEnBD() {
+        GlobalScope.launch(Dispatchers.Main) {
+            servidores = buscarEnBD()
+            for ((i, item) in servidores.withIndex()) {
+                val ser = ServeInv(servidores[i].descripcion, servidores[i].direccion, servidores[i].predeterminado)
+                cargarRecicler(ser)
+            }
+        }
+    }
+
+    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)
+        index += index
+        listIvn.add(item)
+
+        viewAdapter = AdapterServidores(listIvn, requireContext())
+        viewManager = LinearLayoutManager(requireContext())
+
+        rvServidores.apply {
+            adapter = viewAdapter
+            layoutManager = viewManager
+        }
+        val itemTouchHelperCallback = object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.RIGHT) {
+            override fun onMove(p0: RecyclerView, p1: RecyclerView.ViewHolder, target: RecyclerView.ViewHolder): Boolean {
+                return false
+            }
+
+            override fun onSwiped(viewHolder: RecyclerView.ViewHolder, position: Int) {
+                BorrarInvActual(viewHolder.adapterPosition.toLong())
+
+                (viewAdapter as AdapterServidores).removeItem(viewHolder)
+                viewAdapter.notifyDataSetChanged()
+            }
+
+            override fun onChildDraw(c: Canvas, recyclerView: RecyclerView, viewHolder: RecyclerView.ViewHolder, dX: Float, dY: Float, actionState: Int, isCurrentlyActive: Boolean) {
+                val itemView = viewHolder.itemView
+                val iconMargin = (itemView.height - deleteIcon.intrinsicHeight) / 2
+                c.clipRect(0f, itemView.top.toFloat(), dX, itemView.bottom.toFloat())
+
+                if (dX > 0) {
+
+                    if (dX < c.width / 2) c.drawColor(Color.GREEN)
+                    else c.drawColor(Color.RED)
+                    deleteIcon.setBounds(itemView.left + iconMargin, itemView.top + iconMargin, itemView.left + iconMargin + deleteIcon.intrinsicWidth, itemView.bottom - iconMargin)
+                } else { }
+
+                super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
+                deleteIcon.draw(c)
+
+            }
+        }
+
+        val itemTouchHelper = ItemTouchHelper(itemTouchHelperCallback)
+        itemTouchHelper.attachToRecyclerView(rvServidores)
+    }
+    private fun BorrarInvActual(idServer: Long) {
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO) {
+                AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.deleteServer(idServer)
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/drawable-v24/boton_borde_redondeado.xml b/app/src/main/res/drawable-v24/boton_borde_redondeado.xml
new file mode 100644
index 0000000..cf99c81
--- /dev/null
+++ b/app/src/main/res/drawable-v24/boton_borde_redondeado.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorPrimary"/>
+    <corners android:radius="40dp"/>
+
+
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/boton_redondo.xml b/app/src/main/res/drawable/boton_redondo.xml
new file mode 100644
index 0000000..4a4fa81
--- /dev/null
+++ b/app/src/main/res/drawable/boton_redondo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorAccent"/>
+    <corners android:radius="80dp"/>
+
+
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/cod_origen.png b/app/src/main/res/drawable/cod_origen.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b7d668440475af4371696da996eada9b4bc136d
GIT binary patch
literal 2223
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/codbar.png b/app/src/main/res/drawable/codbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b8dd6723cab11124862821fc472270e0571e7f2
GIT binary patch
literal 1569
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
T_txUg00000NkvXXu0mjf3svqK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/desc.png b/app/src/main/res/drawable/desc.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de2b3690e310c6b9de4c8071aa8ddb4ae46ad23
GIT binary patch
literal 2295
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
R!(RXZ002ovPDHLkV1l4#VLAW+

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/fragment_actua_maestros.xml b/app/src/main/res/layout/fragment_actua_maestros.xml
index 489e9c0..340908d 100644
--- a/app/src/main/res/layout/fragment_actua_maestros.xml
+++ b/app/src/main/res/layout/fragment_actua_maestros.xml
@@ -98,6 +98,9 @@
         android:layout_margin="20dp"
         android:text="@string/btnConfirmarAct"
         android:textSize="@dimen/NormalText"
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
@@ -118,4 +121,5 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_configuracion.xml b/app/src/main/res/layout/fragment_configuracion.xml
index 7534fab..1637020 100644
--- a/app/src/main/res/layout/fragment_configuracion.xml
+++ b/app/src/main/res/layout/fragment_configuracion.xml
@@ -68,7 +68,9 @@
         android:id="@+id/btnValidarServidor"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         android:text="@string/btnValidarServidor"
         android:textSize="@dimen/NormalText"
         app:layout_constraintBottom_toTopOf="@+id/btnAgregarServidor"
@@ -85,6 +87,9 @@
         android:layout_marginEnd="@dimen/MarginBotAgreSer"
         android:text="@string/btnAgregarServidor"
         android:textSize="@dimen/NormalText"
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         app:layout_constraintBottom_toTopOf="@+id/tvUbicacionCarpetas"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -115,6 +120,9 @@
         android:layout_height="37dp"
         android:layout_margin="10dp"
         android:src="@drawable/search"
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         app:layout_constraintEnd_toStartOf="@+id/etRuta"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvUbicacionCarpetas" />
@@ -351,7 +359,9 @@
         android:text="@string/btnGuardar"
         android:textSize="@dimen/NormalText"
         app:layout_constraintEnd_toEndOf="parent"
-
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/cbMostrarPrecio" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_descripcion.xml b/app/src/main/res/layout/fragment_descripcion.xml
index 3df7439..64b8dca 100644
--- a/app/src/main/res/layout/fragment_descripcion.xml
+++ b/app/src/main/res/layout/fragment_descripcion.xml
@@ -7,7 +7,7 @@
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.inventario.DescripcionFragment">
+        tools:context=".ui.descripcionFragment.DescripcionFragment">
 
 
     <androidx.recyclerview.widget.RecyclerView
@@ -27,6 +27,9 @@ app:layout_constraintTop_toBottomOf="@id/guideline4"
             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"
diff --git a/app/src/main/res/layout/fragment_inventario.xml b/app/src/main/res/layout/fragment_inventario.xml
index 966c498..2d283d3 100644
--- a/app/src/main/res/layout/fragment_inventario.xml
+++ b/app/src/main/res/layout/fragment_inventario.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/frameLayout"
@@ -31,64 +30,59 @@
         app:layout_constraintTop_toTopOf="@id/guideline" />
 
 
-    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/tvCodigoBarras"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
-        android:text="@string/invCodigoBarras"
-        android:textColor="@color/colorAccent"
-        android:textSize="@dimen/subTitulos"
-        app:fontFamily="sans-serif-condensed"
-        app:layout_constraintBottom_toTopOf="@+id/guideline3"
-        app:layout_constraintEnd_toStartOf="@+id/etCodigoBarras"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/guideline2" />
+        <ImageButton
+            android:id="@+id/ivCamara"
+            android:layout_width="80dp"
+            android:layout_height="80dp"
+
+            android:clickable="true"
+            android:contentDescription="@string/ibBusCB"
+            android:elevation="5dp"
+            android:background="@drawable/boton_redondo"
+            android:layout_margin="10dp"
+            android:focusable="false"
+            android:scaleType="fitEnd"
+            app:layout_constraintCircleRadius="40dp"
+            android:src="@drawable/codbar"
+            app:layout_constraintBottom_toTopOf="@id/guideline3"
+            app:layout_constraintEnd_toStartOf="@+id/etCodigoBarras"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/guideline2" />
 
     <EditText
         android:id="@+id/etCodigoBarras"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:autofillHints=""
         android:clickable="true"
         android:ems="10"
         android:focusable="true"
-        android:textAllCaps="true"
+        android:hint="@string/ibBusCB"
         android:inputType="textPersonName"
         android:lines="1"
-        android:text=""
+        android:textAllCaps="true"
         android:textSize="20sp"
-        app:layout_constraintBaseline_toBaselineOf="@+id/tvCodigoBarras"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/guideline3"
+        app:layout_constraintEnd_toStartOf="@+id/swSumaUno"
+        app:layout_constraintHorizontal_bias="0.49"
         app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toEndOf="@id/tvCodigoBarras"
-        android:autofillHints="" />
+        app:layout_constraintStart_toEndOf="@+id/ivCamara"
+        app:layout_constraintTop_toBottomOf="@+id/guideline2" />
+
 
     <Switch
         android:id="@+id/swSumaUno"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="5dp"
         android:text="@string/switch_1"
         app:layout_constraintBottom_toTopOf="@+id/guideline3"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/etCodigoBarras"
         app:layout_constraintTop_toTopOf="@id/guideline2"
+        app:layout_constraintVertical_bias="1.0"
         tools:ignore="UseSwitchCompatOrMaterialXml" />
 
-    <ImageButton
-        android:id="@+id/ivCamara"
-        android:layout_width="74dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="10dp"
-        android:clickable="true"
-        android:contentDescription="TODO"
-        android:src="@drawable/camera"
-        app:layout_constraintBottom_toTopOf="@+id/guideline4"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/guideline3" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rcInventarios"
         android:layout_width="match_parent"
@@ -97,8 +91,8 @@
         app:layout_constraintBottom_toBottomOf="@+id/guideline5"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:listitem="@layout/item"
-        app:layout_constraintTop_toBottomOf="@+id/guideline4" />
+        app:layout_constraintTop_toBottomOf="@+id/guideline4"
+        tools:listitem="@layout/item" />
 
 
     <Button
@@ -106,6 +100,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/btnExportarInv"
+        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"
@@ -121,6 +118,9 @@
         app:layout_constraintEnd_toStartOf="@id/btnExportarInv"
         app:layout_constraintHorizontal_chainStyle="spread"
         app:layout_constraintStart_toStartOf="parent"
+        android:textColor="@android:color/white"
+        android:padding="10dp"
+        android:background="@drawable/boton_borde_redondeado"
         app:layout_constraintTop_toBottomOf="@+id/guideline5" />
 
     <androidx.constraintlayout.widget.Guideline
@@ -128,14 +128,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.05" />
+        app:layout_constraintGuide_percent="0.02" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        app:layout_constraintGuide_percent="0.15" />
+        app:layout_constraintGuide_percent="0.12" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline3"
@@ -165,14 +165,5 @@
         android:orientation="horizontal"
         app:layout_constraintGuide_percent="0.97" />
 
-    <ToggleButton
-        android:id="@+id/toggleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="ToggleButton"
-        app:layout_constraintBottom_toTopOf="@+id/rcInventarios"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/ivCamara" />
-
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_servidores.xml b/app/src/main/res/layout/fragment_servidores.xml
index cea06e0..6182235 100644
--- a/app/src/main/res/layout/fragment_servidores.xml
+++ b/app/src/main/res/layout/fragment_servidores.xml
@@ -119,6 +119,9 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:text="@string/btnGuardarServidores"
+        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_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/ingresar_cantidad.xml b/app/src/main/res/layout/ingresar_cantidad.xml
index d710e04..876b8e0 100644
--- a/app/src/main/res/layout/ingresar_cantidad.xml
+++ b/app/src/main/res/layout/ingresar_cantidad.xml
@@ -75,9 +75,11 @@
                     android:layout_marginBottom="20dp"
                     android:clickable="true"
                     android:focusable="true"
+                    android:textColor="@android:color/white"
+                    android:padding="10dp"
+                    android:background="@drawable/boton_borde_redondeado"
                     android:text="@string/btnConfirmar"
                     android:textAlignment="center"
-                    android:textColor="@android:color/black"
                     android:textSize="20sp"
                     android:textStyle="bold"
                     app:cardBackgroundColor="@android:color/darker_gray"
diff --git a/app/src/main/res/layout/item.xml b/app/src/main/res/layout/item.xml
index 47dca66..6d8ffcf 100644
--- a/app/src/main/res/layout/item.xml
+++ b/app/src/main/res/layout/item.xml
@@ -145,7 +145,22 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/textView85"
             app:layout_constraintTop_toBottomOf="@+id/tvCodigo" />
-
+        <TextView
+            android:id="@+id/tvCodigoOrigen"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="3dp"
+            android:layout_marginTop="8dp"
+            android:maxLines="2"
+            android:text=""
+            android:textAppearance="@style/TextAppearance.AppCompat.Large"
+            android:textSize="14sp"
+            android:visibility="gone"
+            android:textStyle="bold"
+            app:layout_constraintBaseline_toBaselineOf="@+id/textView85"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/textView85"
+            app:layout_constraintTop_toBottomOf="@+id/tvCodigo" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/login_dialog.xml b/app/src/main/res/layout/login_dialog.xml
index dc8ff00..ed888b0 100644
--- a/app/src/main/res/layout/login_dialog.xml
+++ b/app/src/main/res/layout/login_dialog.xml
@@ -145,7 +145,9 @@
                 android:id="@+id/dialogLoginBtn"
                 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" />
@@ -153,7 +155,9 @@
             <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"
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 5b6d746..193b0b8 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -91,7 +91,7 @@
     </fragment>
     <fragment
         android:id="@+id/descripcionFragment"
-        android:name="com.focasoftware.deboinventariov20.ui.inventario.DescripcionFragment"
+        android:name="com.focasoftware.deboinventariov20.ui.descripcionFragment.DescripcionFragment"
         android:label="Productos Encontrados">
 
         <action
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5ad97c3..cf82058 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimaryDark">#3700B3</color>
-    <color name="colorAccent">#03DAC5</color>
+    <color name="colorPrimaryDark">#085394</color>
+    <color name="colorAccent">#3F51B5</color>
     <color name="colorPrimary">#085394</color>
     <color name="backMenu">#dddddd</color>
     <color name="LightGray">#E0E0E0</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 827f816..6f99c87 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -43,12 +43,15 @@
 
 
     <!--    Fragment Inventario-->
-    <string name="invTitulo">Inventarios Dinamicos</string>
+    <string name="invTitulo">Inventarios Dinámicos</string>
     <string name="invTituloV">Inventarios de Ventas</string>
     <string name="invTituloD">Inventarios de Depositos</string>
     <string name="invCodigoBarras">Código Barras:</string>
     <string name="btnExportarInv">Exportar Inventario</string>
     <string name="btnBorrarInv">Borrar Inventario</string>
+    <string name="ibBusDesc">Busqueda por Descripción</string>
+    <string name="ibBusCB">Busqueda por C. Barras</string>
+    <string name="ibBusCO">Busqueda por Código de Origen</string>
     <string name="switch_1">+ 1</string>
 
     <!--    Fragmento Configuraciones-->
-- 
1.9.1