From a0d8dd74dd0d924dbcc9e0a269fb346485ef05f8 Mon Sep 17 00:00:00 2001
From: Mauricio Sanchez <msanchez@focasoftware.com>
Date: Tue, 1 Sep 2020 01:28:49 -0300
Subject: [PATCH] 01092020 0128

---
 .../deboinventariov20/DB/DAO/ArticulosDAO.kt       |  16 ++--
 .../focasoftware/deboinventariov20/Model/Tablas.kt |   8 +-
 .../actualizacionMaestros/ActuaMaestrosFragment.kt |   2 +-
 .../ui/configuracion/ConfiguracionFragment.kt      | 100 +++++++++++----------
 .../deboinventariov20/ui/main/MainFragment.kt      |   9 +-
 .../ui/servidores/AdapterServidores.kt             |   5 --
 .../ui/servidores/ItemsServidores.kt               |   2 +-
 .../ui/servidores/ServidoresFragment.kt            |  52 ++++-------
 app/src/main/res/layout/fragment_main.xml          |  14 ++-
 app/src/main/res/values/strings.xml                |   2 +-
 10 files changed, 98 insertions(+), 112 deletions(-)

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 7dc2f87..49bd990 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
@@ -77,12 +77,18 @@ interface ServeInvDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertServer(servidor: ServeInv)
 
-    @Query("SELECT * FROM ServeInv")
+    @Query("SELECT * FROM $TABLA_SERV_INV")
     suspend fun fetchAllServers(): List<ServeInv>
 
-    @Query("DELETE FROM ServeInv WHERE SER_NUM = :number")
-    suspend fun deleteServer(number: Long)
+    @Query("DELETE FROM $TABLA_SERV_INV WHERE SER_DESC LIKE :description AND SER_DIR LIKE :dir")
+    suspend fun deleteServer(description: String, dir: String)
 
-    @Query("SELECT SER_NUM FROM ServeInv ORDER BY SER_NUM DESC")
-    suspend fun findLastSer(): Long
+    @Query("SELECT SER_NUM FROM $TABLA_SERV_INV ORDER BY SER_NUM DESC")
+    suspend fun findLastServer(): Int
+
+    @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)
 }
\ 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 c3efdb5..6702130 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/Model/Tablas.kt
@@ -81,10 +81,12 @@ data class InvBody(@ColumnInfo(name = "INV_NUM") var invNum: Int,
 
 @Entity(tableName = TABLA_SERV_INV)
 data class ServeInv(
-
-    @PrimaryKey(autoGenerate = true) @ColumnInfo(name = "SER_NUM") var SER_NUM: Long,
     @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: String?):
+    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 18f56b8..bd24c5d 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
@@ -36,7 +36,7 @@ class ActuaMaestrosFragment : Fragment() {
         val bConfirmarAct = v.findViewById<Button>(R.id.btnConfirmarAct)
         bConfirmarAct.setOnClickListener {
             loading_view.visibility = View.VISIBLE
-            countriesList.text = "Obteniendo Maestros Aguarde,por favor."
+            countriesList.text = "Obteniendo Maestros de artículos, aguarde por favor."
             obtenerArticulos()
         }
         return v
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 c71baf4..05b7475 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
@@ -3,14 +3,20 @@ package com.focasoftware.deboinventariov20.ui.configuracion
 import android.content.Context
 import android.content.SharedPreferences
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.*
+import androidx.fragment.app.Fragment
 import androidx.navigation.fragment.findNavController
+import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
+import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
 import kotlinx.android.synthetic.main.fragment_configuracion.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.launch
 
 class ConfiguracionFragment : Fragment() {
 
@@ -21,10 +27,7 @@ class ConfiguracionFragment : Fragment() {
         sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? {
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         val v = inflater.inflate(R.layout.fragment_configuracion, container, false)
 
         val etRuta = v.findViewById<EditText>(R.id.etRuta)
@@ -41,14 +44,14 @@ class ConfiguracionFragment : Fragment() {
         val cbMostrarExistencia = v.findViewById<CheckBox>(R.id.cbMostrarExistencia)
         val cbMostrarPrecio = v.findViewById<CheckBox>(R.id.cbMostrarPrecio)
         val btnAgregarServidor = v.findViewById<Button>(R.id.btnAgregarServidor)
+        val spServidor = v.findViewById<Spinner>(R.id.spServidor)
+        val btnValidarServidor = v.findViewById<Button>(R.id.btnValidarServidor)
 
-        if (sharedPreferences.contains("etRuta")) etRuta.setText(
-            sharedPreferences.getString("etRuta", "").toString()
-        )
+        if (sharedPreferences.contains("etRuta")) etRuta.setText(sharedPreferences.getString("etRuta", "").toString())
 
         if (sharedPreferences.contains("rbProInclu")) {
             if (sharedPreferences.getString("rbProInclu", "").toString() == "0") {
-                rbProInclu.isChecked=false
+                rbProInclu.isChecked = false
                 rbProNoInclu.isChecked = true
             } else if (sharedPreferences.getString("rbProInclu", "").toString() == "1") {
                 rbProInclu.isChecked = true
@@ -62,14 +65,14 @@ class ConfiguracionFragment : Fragment() {
                 rbProInclu.isChecked = true
             } else if (sharedPreferences.getString("rbProNoInclu", "").toString() == "1") {
                 rbProNoInclu.isChecked = true
-                rbProInclu.isChecked=false
+                rbProInclu.isChecked = false
             }
         } else (sharedPreferences.getString("rbProNoInclu", "").toString() == "")
 
 
         if (sharedPreferences.contains("cbHabiLectura")) {
             if (sharedPreferences.getString("cbHabiLectura", "").toString() == "0") {
-                cbHabiLectura.isChecked=false
+                cbHabiLectura.isChecked = false
             } else if (sharedPreferences.getString("cbHabiLectura", "").toString() == "1") {
                 cbHabiLectura.isChecked = true
             }
@@ -87,7 +90,7 @@ class ConfiguracionFragment : Fragment() {
 
         if (sharedPreferences.contains("rbVentas")) {
             if (sharedPreferences.getString("rbVentas", "").toString() == "0") {
-                rbVentas.isChecked=false
+                rbVentas.isChecked = false
                 rbDeposito.isChecked = true
             } else if (sharedPreferences.getString("rbVentas", "").toString() == "1") {
                 rbVentas.isChecked = true
@@ -101,15 +104,13 @@ class ConfiguracionFragment : Fragment() {
                 rbVentas.isChecked = true
             } else if (sharedPreferences.getString("rbDeposito", "").toString() == "1") {
                 rbDeposito.isChecked = true
-                rbVentas.isChecked=false
+                rbVentas.isChecked = false
             }
         } else (sharedPreferences.getString("rbDeposito", "").toString() == "")
 
-
-
         if (sharedPreferences.contains("rbCodigoDebo")) {
             if (sharedPreferences.getString("rbCodigoDebo", "").toString() == "0") {
-                rbCodigoDebo.isChecked=false
+                rbCodigoDebo.isChecked = false
                 rbCodigoOrigen.isChecked = false
                 rbCodigoBarras.isChecked = false
             } else if (sharedPreferences.getString("rbCodigoDebo", "").toString() == "1") {
@@ -137,7 +138,7 @@ class ConfiguracionFragment : Fragment() {
 
         if (sharedPreferences.contains("cbMostrarExistencia")) {
             if (sharedPreferences.getString("cbMostrarExistencia", "").toString() == "0") {
-                cbMostrarExistencia.isChecked=false
+                cbMostrarExistencia.isChecked = false
             } else if (sharedPreferences.getString("cbMostrarExistencia", "").toString() == "1") {
                 cbMostrarExistencia.isChecked = true
             }
@@ -154,17 +155,32 @@ class ConfiguracionFragment : Fragment() {
 
         btnGuardar.setOnClickListener {
             guardarPreferencias()
-            Toast.makeText(v.context, "Los Datos se guardaron correctamente", Toast.LENGTH_LONG)
-                .show()
+            Toast.makeText(v.context, "Los Datos se guardaron correctamente", Toast.LENGTH_LONG).show()
         }
-        btnAgregarServidor.setOnClickListener {
+        btnAgregarServidor.setOnClickListener { findNavController().navigate(R.id.servidoresFragment) }
 
-            findNavController().navigate(R.id.servidoresFragment)
+        GlobalScope.launch(Dispatchers.Main) {
+            val listServerDescription = arrayListOf<String>()
+            for (any in getDescServers()) {
+                listServerDescription.add(any.descripcion.toString())
+            }
+            if (spServidor != null) {
+                val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, listServerDescription)
+                spServidor.adapter = adapter
+            }
+        }
+        btnValidarServidor.setOnClickListener {
+            Toast.makeText(requireContext(), "Dirección correcta", Toast.LENGTH_LONG).show()
         }
-
         return v
     }
 
+    suspend fun getDescServers(): List<ServeInv> {
+        return GlobalScope.async(Dispatchers.IO) {
+            return@async AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.fetchAllServers()
+        }.await()
+    }
+
     fun guardarPreferencias() {
         try {
             val editor = sharedPreferences.edit()
@@ -174,36 +190,22 @@ class ConfiguracionFragment : Fragment() {
             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")
+            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?.apply()
             editor.commit()
+            GlobalScope.launch(Dispatchers.Main) {
+
+
+            }
         } catch (e: Exception) {
             e.printStackTrace()
         }
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 411c7b2..6f1454c 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
@@ -6,10 +6,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
-import android.widget.ImageView
-import android.widget.LinearLayout
-import android.widget.TextView
+import android.widget.*
 import androidx.fragment.app.Fragment
 import androidx.navigation.NavController
 import androidx.navigation.Navigation
@@ -47,8 +44,8 @@ private var listIvn2 = ArrayList<InvHead>()
         val v = inflater.inflate(R.layout.fragment_main, container, false)
         val tvInvDinamicos = v.findViewById<TextView>(R.id.tvInvDinamicos)
         val txtDeposito = v.findViewById<TextView>(R.id.txtDeposito)
-        val ivSort19= v.findViewById<ImageView>(R.id.ivSort19)
-        val ivSort91= v.findViewById<ImageView>(R.id.ivSort91)
+        val ivSort19= v.findViewById<ImageButton>(R.id.ivSort19)
+        val ivSort91= v.findViewById<ImageButton>(R.id.ivSort91)
         val cbVentas= v.findViewById<CheckBox>(R.id.cbVentas)
         val cbDeposito= v.findViewById<CheckBox>(R.id.cbDeposito)
 
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 c02316b..65420ce 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
@@ -42,10 +42,5 @@ class AdapterServidores(private val servidor: ArrayList<ItemsServidores>, privat
 
         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/ItemsServidores.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ItemsServidores.kt
index c05e18d..f4b81d5 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ItemsServidores.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/ItemsServidores.kt
@@ -1,3 +1,3 @@
 package com.focasoftware.deboinventariov20.ui.servidores
 
-data class ItemsServidores(val ID: Long?, val descripcion: String?, var direccion: String?, var predeterminado: String?)
\ No newline at end of file
+data class ItemsServidores(val descripcion: String?, var direccion: String?, var predeterminado: String?)
\ 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 27e8133..1f105f4 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
@@ -25,7 +25,7 @@ class ServidoresFragment : Fragment() {
     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 var listServ = ArrayList<ItemsServidores>()
     private lateinit var servidores: List<ServeInv>
     private lateinit var deleteIcon: Drawable
 
@@ -37,9 +37,6 @@ class ServidoresFragment : Fragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-//        rvServidores.layoutManager = LinearLayoutManager(context)
-//        rvServidores.itemAnimator = DefaultItemAnimator()
-
         btnGuardarServidores.setOnClickListener {
             if (etNombreServidor.text.isNullOrBlank()) {
                 etNombreServidor.error = "Nombre no valido"
@@ -52,15 +49,15 @@ class ServidoresFragment : Fragment() {
                 etDireccionServidor.hint = "Dirección no valida"
             }
             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")
+                ingresarDatos(servidor)
+                cargarRecicler(servidor)
                 Toast.makeText(requireContext(), "Servidor ${etNombreServidor.text} Guardado", Toast.LENGTH_LONG).show()
-                GlobalScope.launch(Dispatchers.Main) {
-                    val num: Long = buscaUltimoNroEnBD()
-                    val servidor = ServeInv(num, etNombreServidor.text.toString(), "http://${etDireccionServidor.text}/", "0")
-                    ingresarDatos(servidor)
-                    cargarRecicler(servidor)
-                }
                 etNombreServidor.text.clear()
                 etDireccionServidor.text.clear()
+//                }
             }
         }
     }
@@ -71,17 +68,7 @@ class ServidoresFragment : Fragment() {
         return v
     }
 
-
-    suspend fun buscaUltimoNroEnBD(): Long {
-
-        var busqueda: Long
-        return GlobalScope.async(Dispatchers.IO) {
-            busqueda = AppDb.getAppDb(requireContext())!!.ServeInvDao()!!.findLastSer()
-            return@async busqueda
-        }.await()
-    }
-
-    fun ingresarDatos(servidor:ServeInv) {
+    fun ingresarDatos(servidor: ServeInv) {
         val Job = GlobalScope.launch {
             AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.insertServer(servidor)
         }
@@ -100,7 +87,7 @@ class ServidoresFragment : Fragment() {
         GlobalScope.launch(Dispatchers.Main) {
             servidores = buscarEnBD()
             for ((i, item) in servidores.withIndex()) {
-                val ser = ServeInv(servidores[i].SER_NUM, servidores[i].descripcion, servidores[i].direccion, servidores[i].predeterminado)
+                val ser = ServeInv(servidores[i].descripcion, servidores[i].direccion, servidores[i].predeterminado)
                 cargarRecicler(ser)
             }
         }
@@ -109,11 +96,11 @@ class ServidoresFragment : Fragment() {
     fun cargarRecicler(ser: ServeInv) {
         //TODO CARGO EN LE RV
         deleteIcon = ContextCompat.getDrawable(requireContext(), R.drawable.borrar)!!
-        val item = ItemsServidores(ser.SER_NUM, ser.descripcion, ser.direccion, ser.predeterminado)
+        val item = ItemsServidores(ser.descripcion, ser.direccion, ser.predeterminado)
 
-        listIvn.add(item)
+        listServ.add(item)
 
-        viewAdapter = AdapterServidores(listIvn, requireContext())
+        viewAdapter = AdapterServidores(listServ, requireContext())
         viewManager = LinearLayoutManager(requireContext())
 
         rvServidores.apply {
@@ -126,11 +113,12 @@ class ServidoresFragment : Fragment() {
             }
 
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, position: Int) {
-//                viewManager[
-//                BorrarInvActual(viewHolder.adapterPosition.toInt())
+                GlobalScope.launch(Dispatchers.Main) {
+                    deleteServer(listServ[viewHolder.adapterPosition].descripcion.toString(), listServ[viewHolder.adapterPosition].direccion.toString())
 
-                (viewAdapter as AdapterServidores).removeItem(viewHolder)
-                viewAdapter.notifyDataSetChanged()
+                    (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) {
@@ -145,10 +133,8 @@ class ServidoresFragment : Fragment() {
                     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)
-
             }
         }
 
@@ -156,10 +142,10 @@ class ServidoresFragment : Fragment() {
         itemTouchHelper.attachToRecyclerView(rvServidores)
     }
 
-    private fun BorrarInvActual(idServer: Long) {
+    suspend fun deleteServer(serverName: String, serverDir: String) {
         lifecycleScope.launch {
             withContext(Dispatchers.IO) {
-                AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.deleteServer(idServer)
+                AppDb.getAppDb(requireActivity())!!.ServeInvDao()!!.deleteServer(serverName, serverDir)
             }
         }
     }
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 89a59ce..0d48fad 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -23,13 +23,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/ivSort19"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_margin="10dp"
         android:padding="5dp"
-        android:contentDescription=" "
         android:visibility="gone"
         android:src="@drawable/ic_sort19"
         app:layout_constraintHorizontal_bias="0.0"
@@ -37,14 +36,13 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/ivSort91"
-        android:layout_width="35dp"
-        android:layout_height="35dp"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
         android:layout_margin="10dp"
         android:padding="5dp"
         android:layout_marginTop="12dp"
-        android:contentDescription="Fecha"
         android:visibility="gone"
         android:src="@drawable/ic_sort91"
         app:layout_constraintHorizontal_bias="1.0"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eda5c11..0716b04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,7 +25,7 @@
 
     <!--    inventarios dinamicos-->
     <string name="invDinamicoVenta">Inventarios Dinamicos</string>
-    <string name="invDinamicoCompra">Inventarios Importados(0)+</string>
+    <string name="invDinamicoCompra">Inventarios Importados(0) +</string>
 
     <!--    ventana emergente-->
     <string name="adv">Ingrese la cantidad contada</string>
-- 
1.9.1