From ea6d4ed726409da9942637c47a77deacd39cbef6 Mon Sep 17 00:00:00 2001
From: Mauricio Sanchez <msanchez@focasoftware.com>
Date: Wed, 2 Sep 2020 02:07:21 -0300
Subject: [PATCH] 02092020 0207

---
 .../deboinventariov20/DB/DAO/ArticulosDAO.kt       |  2 +-
 .../actualizacionMaestros/ActuaMaestrosFragment.kt | 11 ++--
 .../ui/configuracion/ConfiguracionFragment.kt      | 57 +++++++----------
 .../ui/main/InventarioListAdapter.kt               |  1 +
 .../deboinventariov20/ui/main/ItemPrincipal.kt     |  2 +-
 .../deboinventariov20/ui/main/MainFragment.kt      |  6 +-
 .../ui/servidores/SpinnerAdapter.kt                | 40 ++++++++++++
 app/src/main/res/drawable-v24/boton_redondo2.xml   |  5 ++
 app/src/main/res/drawable/boton_redondo.xml        |  3 -
 app/src/main/res/layout/fragment_configuracion.xml | 11 +---
 app/src/main/res/layout/item_principal.xml         | 73 +++++++++++++++++-----
 app/src/main/res/layout/item_spinner.xml           | 13 ++++
 app/src/main/res/layout/nav_header_main.xml        |  2 +-
 app/src/main/res/navigation/mobile_navigation.xml  | 19 +++---
 app/src/main/res/values/arrays.xml                 |  8 ---
 app/src/main/res/values/colors.xml                 |  2 +
 16 files changed, 170 insertions(+), 85 deletions(-)
 create mode 100644 app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/SpinnerAdapter.kt
 create mode 100644 app/src/main/res/drawable-v24/boton_redondo2.xml
 create mode 100644 app/src/main/res/layout/item_spinner.xml
 delete mode 100644 app/src/main/res/values/arrays.xml

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 8563833..51efcb3 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,7 +77,7 @@ interface ServeInvDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     fun insertServer(servidor: ServeInv)
 
-    @Query("SELECT * FROM $TABLA_SERV_INV")
+    @Query("SELECT * FROM $TABLA_SERV_INV ORDER BY SER_NUM")
     suspend fun fetchAllServers(): List<ServeInv>
 
     @Query("DELETE FROM $TABLA_SERV_INV WHERE SER_DESC LIKE :description AND SER_DIR LIKE :dir")
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 4df6243..a40aafb 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
@@ -12,6 +12,7 @@ import com.focasoftware.deboinventariov20.Model.Productos
 import com.focasoftware.deboinventariov20.Model.ProductosService
 import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
+import com.google.android.material.bottomappbar.BottomAppBarTopEdgeTreatment
 import kotlinx.android.synthetic.main.fragment_actua_maestros.*
 import kotlinx.coroutines.*
 
@@ -23,10 +24,12 @@ class ActuaMaestrosFragment : Fragment() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        GlobalScope.launch(Dispatchers.Main) {
-            BASE_URL = fetchServerPre().direccion.toString()
-        }
-        mostrarArticulos()
+//        GlobalScope.launch(Dispatchers.Main) {
+//
+//            BASE_URL = fetchServerPre().direccion.toString()
+//    }
+        BASE_URL="http://10.0.2.2:3000/"
+//        mostrarArticulos()
     }
 
     suspend fun fetchServerPre(): ServeInv {
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 7a04128..f19c3e1 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
@@ -14,7 +14,7 @@ import androidx.navigation.fragment.findNavController
 import com.focasoftware.deboinventariov20.DB.DataBase.AppDb
 import com.focasoftware.deboinventariov20.Model.ServeInv
 import com.focasoftware.deboinventariov20.R
-import com.focasoftware.deboinventariov20.ui.servidores.ItemsServidores
+import com.focasoftware.deboinventariov20.ui.servidores.SpinnerAdapterServidor
 import kotlinx.android.synthetic.main.fragment_configuracion.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -25,7 +25,9 @@ class ConfiguracionFragment : Fragment() {
 
     lateinit var sharedPreferences: SharedPreferences
     private lateinit var navController: NavController
-    private lateinit var listaServers : MutableMap<Int,String>
+    lateinit var adapterSpinnerServidor: SpinnerAdapterServidor
+    var itemSelect: Int = 0
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
@@ -34,12 +36,11 @@ class ConfiguracionFragment : Fragment() {
     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? {
 
-        var index=0
-        val listServerDescription = arrayListOf<String>()
         val v = inflater.inflate(R.layout.fragment_configuracion, container, false)
         val etRuta = v.findViewById<EditText>(R.id.etRuta)
         val btnGuardar = v.findViewById<Button>(R.id.btnGuardar)
@@ -58,16 +59,15 @@ class ConfiguracionFragment : Fragment() {
         val spServidor = v.findViewById<Spinner>(R.id.spServidor)
         val btnValidarServidor = v.findViewById<Button>(R.id.btnValidarServidor)
 
-        if (sharedPreferences.contains("etRuta"))
-            if (sharedPreferences.contains("rbProInclu")) {
-                if (sharedPreferences.getString("rbProInclu", "").toString() == "0") {
-                    rbProInclu.isChecked = false
-                    rbProNoInclu.isChecked = true
-                } else if (sharedPreferences.getString("rbProInclu", "").toString() == "1") {
-                    rbProInclu.isChecked = true
-                    rbProNoInclu.isChecked = false
-                }
-            } else (sharedPreferences.getString("rbProInclu", "").toString() == "")
+        if (sharedPreferences.contains("etRuta")) if (sharedPreferences.contains("rbProInclu")) {
+            if (sharedPreferences.getString("rbProInclu", "").toString() == "0") {
+                rbProInclu.isChecked = false
+                rbProNoInclu.isChecked = true
+            } else if (sharedPreferences.getString("rbProInclu", "").toString() == "1") {
+                rbProInclu.isChecked = true
+                rbProNoInclu.isChecked = false
+            }
+        } else (sharedPreferences.getString("rbProInclu", "").toString() == "")
 
         if (sharedPreferences.contains("rbProNoInclu")) {
             if (sharedPreferences.getString("rbProNoInclu", "").toString() == "0") {
@@ -166,28 +166,19 @@ class ConfiguracionFragment : Fragment() {
         }
         btnAgregarServidor.setOnClickListener { findNavController().navigate(R.id.servidoresFragment) }
         btnValidarServidor.setOnClickListener { Toast.makeText(requireContext(), "Dirección correcta", Toast.LENGTH_LONG).show() }
-
+        spServidor?.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { itemSelect = position }
+        }
         GlobalScope.launch(Dispatchers.Main) {
+            adapterSpinnerServidor = SpinnerAdapterServidor(requireContext(), getDescServers())
+            spServidor.adapter = adapterSpinnerServidor
 
-            for (any in getDescServers()) {
-                listServerDescription.add(any.descripcion.toString())
-                listaServers[index]=(any.direccion.toString())
-                index+=index
-            }
-
-            if (spServidor != null) {
-                val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item, listServerDescription)
-                spServidor.adapter = adapter
-            }
+            if (sharedPreferences.contains("ServerPredeterminado")) {
+                spServidor.setSelection(sharedPreferences.getString("ServerPredeterminado", "").toString().toInt())
+            } else (spServidor.setSelection(0))
         }
-        if (sharedPreferences.contains("ServerPredeterminado")) {
-            spServidor.setSelection(sharedPreferences.getString("ServerPredeterminado", "").toString().toInt())
 
-        } else (spServidor.setSelection(2))
-
-        spServidor.setOnItemClickListener { adapterView, view, i, l ->
-
-        }
         return v
     }
 
@@ -215,7 +206,7 @@ class ConfiguracionFragment : Fragment() {
             if (rbCodigoBarras.isChecked) editor?.putString("rbCodigoBarras", "1") else editor?.putString("rbCodigoBarras", "0")
             if (cbMostrarExistencia.isChecked) editor?.putString("cbMostrarExistencia", "1") else editor?.putString("cbMostrarExistencia", "0")
             if (cbMostrarPrecio.isChecked) editor?.putString("cbMostrarPrecio", "1") else editor?.putString("cbMostrarPrecio", "0")
-            editor?.putString("ServerPredeterminado", spServidor.selectedItemId.toString())
+            editor?.putString("ServerPredeterminado", itemSelect.toString())
 
             editor?.apply()
             editor.commit()
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
index 6107be5..af4956c 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/InventarioListAdapter.kt
@@ -26,6 +26,7 @@ class InventarioListAdapter(private val context: Context, private val inv: List<
         override fun bind(item: InvHead, position: Int) {
             itemView.setOnClickListener {itemClickListener.onItemClick(item.invNum.toString())}
             itemView.tvPrincipalinventario.text = item.invNum.toString()
+            itemView.tvDescription.text=item.descripcion.toString()
         }
     }
 
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/ItemPrincipal.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/ItemPrincipal.kt
index b8ecc0a..3dcc580 100644
--- a/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/ItemPrincipal.kt
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/main/ItemPrincipal.kt
@@ -1,3 +1,3 @@
 package com.focasoftware.deboinventariov20.ui.main
 
-data class ItemInventario(val inventario: String?)
\ No newline at end of file
+data class ItemInventario(val inventario: String?, val descripcion: String?)
\ 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 6f1454c..ad333ea 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
@@ -134,9 +134,9 @@ private var listIvn2 = ArrayList<InvHead>()
     fun cargarRecicler(inv: InvHead) {
         //TODO CARGO EN LE RV
 
-        val number = if (inv.invNum.toLong() < 10) "0${inv.invNum.toLong()}" else inv.invNum.toString()
-        val item = ItemInventario("N° $number ${inv.descripcion}. Fecha: ${inv.fechaFinal}")
-        //(articulos.sector, articulos.codigo, articulos.descripcion, cant, articulos.codBar)
+//        val number = if (inv.invNum.toLong() < 10) "0${inv.invNum.toLong()}" else inv.invNum.toString()
+//        val item = ItemInventario("N° $number ${inv.descripcion}. Fecha: ${inv.fechaFinal}")
+
 //        listIvn.add(item)
         listIvn2.add(inv)
         viewAdapter = InventarioListAdapter(requireContext(), listIvn2, this)
diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/SpinnerAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/SpinnerAdapter.kt
new file mode 100644
index 0000000..d09377a
--- /dev/null
+++ b/app/src/main/java/com/focasoftware/deboinventariov20/ui/servidores/SpinnerAdapter.kt
@@ -0,0 +1,40 @@
+package com.focasoftware.deboinventariov20.ui.servidores
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.TextView
+import com.focasoftware.deboinventariov20.Model.ServeInv
+import com.focasoftware.deboinventariov20.R
+
+
+class SpinnerAdapterServidor internal constructor(internal var context: Context, internal var list: List<ServeInv>) : BaseAdapter() {
+    override fun getCount(): Int {
+        return list.size
+    }
+
+    override fun getItem(i: Int): Any? {
+        return null
+    }
+
+    override fun getItemId(i: Int): Long {
+        return 0
+    }
+
+    override fun getView(i: Int, view1: View?, viewGroup: ViewGroup): View {
+        var views=view1
+        if (views == null) {
+            val inflater = LayoutInflater.from(context)
+
+            views = inflater.inflate(R.layout.item_spinner, viewGroup, false)
+        }
+
+        val tvServidorDesc = views!!.findViewById<TextView>(R.id.tvServidorDesc)
+        tvServidorDesc.text=list[i].descripcion
+        return tvServidorDesc
+
+    }
+}
+
diff --git a/app/src/main/res/drawable-v24/boton_redondo2.xml b/app/src/main/res/drawable-v24/boton_redondo2.xml
new file mode 100644
index 0000000..5fe7004
--- /dev/null
+++ b/app/src/main/res/drawable-v24/boton_redondo2.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#B6B7BC"/>
+    <corners android:radius="80dp"/>
+</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
index 4a4fa81..704fa92 100644
--- a/app/src/main/res/drawable/boton_redondo.xml
+++ b/app/src/main/res/drawable/boton_redondo.xml
@@ -2,7 +2,4 @@
 <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/layout/fragment_configuracion.xml b/app/src/main/res/layout/fragment_configuracion.xml
index 0030e84..e971c31 100644
--- a/app/src/main/res/layout/fragment_configuracion.xml
+++ b/app/src/main/res/layout/fragment_configuracion.xml
@@ -45,24 +45,18 @@
 
     <Spinner
         android:id="@+id/spServidor"
+        style="@android:style/Widget.Holo.Light.Spinner"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:backgroundTint="@color/LightGray"
         android:elevation="5dp"
-        android:fadeScrollbars="true"
-        android:foregroundTint="@android:color/holo_orange_dark"
-        android:soundEffectsEnabled="true"
-        android:spinnerMode="dropdown"
 
-        android:splitMotionEvents="true"
-        android:textAlignment="textStart"
         android:textSize="@dimen/NormalText"
         app:layout_constraintBottom_toTopOf="@+id/btnAgregarServidor"
         app:layout_constraintEnd_toStartOf="@+id/btnValidarServidor"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvSeleccioneServidor"
-        android:prompt="@string/leyendaSpinner"/>
+        />
 
     <Button
         android:id="@+id/btnValidarServidor"
@@ -364,5 +358,6 @@
         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/item_principal.xml b/app/src/main/res/layout/item_principal.xml
index bbf3e99..1f27fb0 100644
--- a/app/src/main/res/layout/item_principal.xml
+++ b/app/src/main/res/layout/item_principal.xml
@@ -1,36 +1,77 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView 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:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
-    app:cardCornerRadius="2dp"
+    app:cardCornerRadius="5dp"
     app:cardElevation="10dp"
-    app:contentPadding="5dp"
     app:cardPreventCornerOverlap="false">
 
-    <LinearLayout
-        android:layout_width="wrap_content"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|center_vertical"
         android:orientation="vertical">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:src="@drawable/inventario" />
+<!--        <androidx.appcompat.widget.AppCompatImageView-->
+<!--            android:id="@+id/ivCamara"-->
+<!--            android:layout_width="80dp"-->
+<!--            android:layout_height="80dp"-->
+<!--            android:layout_margin="10dp"-->
+<!--            android:layout_marginTop="15dp"-->
+<!--            android:background="@drawable/boton_redondo2"-->
+<!--            android:clickable="true"-->
+<!--            android:contentDescription="@string/ibBusCB"-->
+<!--            android:elevation="5dp"-->
+<!--            android:focusable="false"-->
+<!--            android:scaleType="fitEnd"-->
+<!--            -->
+<!--            app:layout_constraintBottom_toTopOf="@+id/ivFondo"-->
+<!--            app:layout_constraintCircleRadius="40dp"-->
+<!--            app:layout_constraintStart_toStartOf="parent"-->
+<!--            app:layout_constraintTop_toTopOf="parent"-->
+<!--            />-->
 
         <TextView
             android:id="@+id/tvPrincipalinventario"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_margin="10dp"
             android:gravity="center"
             android:lines="2"
-            tools:text="Demo text"
+            android:background="@drawable/boton_redondo2"
             android:textColor="@android:color/black"
-            android:textStyle="bold" />
-    </LinearLayout>
+            android:textSize="@dimen/TitulosMedios"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toTopOf="@+id/ivFondo"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:text="99" />
+
+        <TextView
+            android:id="@+id/tvDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="prueba"
+            app:layout_constraintBottom_toTopOf="@id/ivFondo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.046"
+            app:layout_constraintStart_toEndOf="@id/tvPrincipalinventario"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.607" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/ivFondo"
+            android:layout_width="0dp"
+            android:layout_height="10dp"
+            android:background="@android:drawable/progress_horizontal"
+            android:elevation="10dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintCircleRadius="5dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            tools:srcCompat="@android:drawable/progress_horizontal" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/item_spinner.xml b/app/src/main/res/layout/item_spinner.xml
new file mode 100644
index 0000000..d9e18e6
--- /dev/null
+++ b/app/src/main/res/layout/item_spinner.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:id="@+id/tvServidorDesc"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 95e222d..bb85e55 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -29,7 +29,7 @@
         android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
 
     <TextView
-        android:id="@+id/textView"
+        android:id="@+id/textView1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="FocaSoftware SA" />
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 420214f..8f0957d 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -42,6 +42,7 @@
         android:name="com.focasoftware.deboinventariov20.ui.actualizacionMaestros.ActuaMaestrosFragment"
         android:label="Importaciones Varias"
         tools:layout="@layout/fragment_actua_maestros" />
+
     <fragment
         android:id="@+id/servidoresFragment"
         android:name="com.focasoftware.deboinventariov20.ui.servidores.ServidoresFragment"
@@ -50,11 +51,10 @@
         <action
             android:id="@+id/action_servidoresFragment_to_configuracionFragment"
             app:destination="@id/configuracionFragment"
-            app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left"
-            app:popEnterAnim="@anim/slide_in_left"
-            app:popExitAnim="@anim/slide_out_right" />
+            app:popUpTo="@id/servidoresFragment"
+            app:popUpToInclusive="true" />
     </fragment>
+
     <fragment
         android:id="@+id/inventarioFragment"
         android:name="com.focasoftware.deboinventariov20.ui.inventario.InventarioFragment"
@@ -66,7 +66,9 @@
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
             app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left" />
+            app:exitAnim="@anim/slide_out_left"
+            app:popUpTo="@+id/inventarioFragment"
+            app:popUpToInclusive="true"/>
         <action
             android:id="@+id/action_inventarioFragment_to_mainFragment2"
             app:destination="@id/mainFragment2"
@@ -90,7 +92,9 @@
             app:popEnterAnim="@anim/slide_in_left"
             app:popExitAnim="@anim/slide_out_right"
             app:enterAnim="@anim/slide_in_right"
-            app:exitAnim="@anim/slide_out_left" />
+            app:exitAnim="@anim/slide_out_left"
+            app:popUpTo="@id/configuracionFragment"
+            app:popUpToInclusive="true" />
         <action
             android:id="@+id/action_configuracionFragment_to_mainFragment2"
             app:destination="@id/mainFragment2" />
@@ -116,12 +120,13 @@
         android:label="DialogNoEncontrado" />
     <fragment
         android:id="@+id/dialogoLogin"
-        android:name="com.focasoftware.deboinventariov20.ui.dialogos.dialogoLogin"
+        android:name="com.focasoftware.deboinventariov20.ui.dialogos.DialogoLogin"
         android:label="dialogoLogin" />
     <fragment
         android:id="@+id/singleChoiceAlertDialog"
         android:name="com.focasoftware.deboinventariov20.ui.dialogos.SingleChoiceAlertDialog"
         android:label="SingleChoiceAlertDialog" />
+
     <fragment
         android:id="@+id/detalleArtFragment"
         android:name="com.focasoftware.deboinventariov20.ui.detalleProducto.DetalleArtFragment"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
deleted file mode 100644
index 5b17233..0000000
--- a/app/src/main/res/values/arrays.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="sort_array">
-        <item>Suma</item>
-        <item>Resta</item>
-        <item>Modifica</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cf82058..d594045 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -5,4 +5,6 @@
     <color name="colorPrimary">#085394</color>
     <color name="backMenu">#dddddd</color>
     <color name="LightGray">#E0E0E0</color>
+<!--    TODO: ITEM PRINCIPAL-->
+    <color name="barrainferior">#074865</color>
 </resources>
\ No newline at end of file
-- 
1.9.1