Mauricio Sanchez / deboinventariov20

Download as
Browse Code »

Commit 880347544ec163fb7af7b6afb0025f6bcabb1dd5

Authored by Mauricio Sanchez
1 parent 864e76ea40
Exists in master

22102020 0600

Showing 22 changed files with 353 additions and 288 deletions   Show diff stats
app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt
Diff comments   View file @ 8803475
... ... @@ -23,7 +23,6 @@ class SplashActivity : Activity() {
23 23 val bac = object : Thread() {
24 24 override fun run() {
25 25 try {
26   - sleep(3000)
27 26 val intent = Intent(baseContext, MainActivity::class.java)
28 27 startActivity(intent)
29 28 finish()
app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt
Diff comments   View file @ 8803475
1 1 package com.focasoftware.deboinventariov20.UI.actualizacionMaestros
2 2  
3 3 import android.os.Bundle
  4 +import android.os.SystemClock
4 5 import android.view.LayoutInflater
5 6 import android.view.View
6 7 import android.view.ViewGroup
7   -import android.widget.Button
8   -import android.widget.RadioButton
9   -import android.widget.Toast
  8 +import android.widget.*
10 9 import androidx.fragment.app.Fragment
11 10 import androidx.navigation.NavController
12 11 import androidx.navigation.Navigation
... ... @@ -29,19 +28,14 @@ import java.net.SocketTimeoutException
29 28  
30 29 private var serverPre: ServeInv? = null
31 30 private lateinit var navController: NavController
32   -
33   -
34 31 class ActuaMaestrosFragment : Fragment() {
35 32 private val job: Job = Job()
36 33 private val fragmentScopeAM = CoroutineScope(IO + job)
  34 + private lateinit var countriesList:TextView
  35 + private lateinit var loading_view:ProgressBar
37 36  
38 37 override fun onCreate(savedInstanceState: Bundle?) {
39 38 super.onCreate(savedInstanceState)
40   -
41   -// val servidor = urlBajada((activity as MainActivity))
42   -// if (servidor != "") {
43   -// tvServerConectado.text = "Conectado al servidor: $servidor"
44   -// }
45 39 }
46 40  
47 41 override fun onDestroy() {
... ... @@ -54,12 +48,13 @@ class ActuaMaestrosFragment : Fragment() {
54 48 val bConfirmarAct = v.findViewById<Button>(R.id.btnConfirmarAct)
55 49 val obPorWifi = v.findViewById<RadioButton>(R.id.obPorWifi)
56 50 val obImpInventarios = v.findViewById<RadioButton>(R.id.obImpInventarios)
57   -
  51 + countriesList = v.findViewById<TextView>(R.id.countriesList)
  52 + loading_view= v.findViewById<ProgressBar>(R.id.loading_view)
58 53 obPorWifi.setOnClickListener {
59 54 bConfirmarAct.text = ("Confirmar Importación")
60 55 }
61 56 obImpInventarios.setOnClickListener {
62   - bConfirmarAct.text = ("Buscar Inventarios sectorizados en servidor")
  57 + bConfirmarAct.text = ("Buscar Inventarios sectorizados")
63 58 }
64 59  
65 60 bConfirmarAct.setOnClickListener {
... ... @@ -156,6 +151,8 @@ class ActuaMaestrosFragment : Fragment() {
156 151 loading_view.visibility = View.GONE
157 152 }
158 153 }
  154 + SystemClock.sleep(2000);
  155 + //activity?.onBackPressed()
159 156 // val call = getInstance()
160 157 // ?.createService(WebServiceApi::class.java)
161 158 // ?.getProductos()
app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/InvSecImpFragment.kt
Diff comments   View file @ 8803475
... ... @@ -20,6 +20,7 @@ import com.focasoftware.deboinventariov20.Model.*
20 20 import com.focasoftware.deboinventariov20.R
21 21 import com.focasoftware.deboinventariov20.UI.MainActivity
22 22 import com.focasoftware.deboinventariov20.UI.Utils.*
  23 +
23 24 import kotlinx.android.synthetic.main.fragment_inv_importados.*
24 25 import kotlinx.coroutines.*
25 26 import kotlinx.coroutines.Dispatchers.IO
... ... @@ -56,6 +57,7 @@ class InvSecImpFragment : Fragment(), InvSecHeadListAdapter.OnCheckListener {
56 57 val btnConfirmarAct = view.findViewById<Button>(R.id.btnConfirmarAct)
57 58 val pbInvSec = view.findViewById<ProgressBar>(R.id.pbInvSec)
58 59 val tvMensaje = view.findViewById<TextView>(R.id.tvMensaje)
  60 +
59 61 recicler = view.findViewById(R.id.rcDescripcion)
60 62  
61 63 fragmentScopeInvSec.launch(Main) {
... ... @@ -124,9 +126,11 @@ class InvSecImpFragment : Fragment(), InvSecHeadListAdapter.OnCheckListener {
124 126  
125 127  
126 128 btnConfirmarAct.setOnClickListener {
127   - var entroAlFor=false
  129 + var finalizo=false
  130 + var contador=0
  131 +
128 132 for (inv in invSeleccionados) {
129   - entroAlFor=true
  133 +
130 134 GlobalScope.launch(Main) {
131 135 deleteAllInvHeadSec(inv.toInt())
132 136 deleteAllInvBodySec(inv.toInt())
... ... @@ -142,21 +146,55 @@ class InvSecImpFragment : Fragment(), InvSecHeadListAdapter.OnCheckListener {
142 146  
143 147 if (response.code() == 200) {
144 148 try {
145   - preparaParaInsertar(response.body(), inv)
  149 + if(preparaParaInsertar(response.body(), inv)) finalizo=true
  150 +// fragmentScopeInvSec.launch(Main) {
  151 +// if (response.body() != null) {
  152 +// for (head in listInv) {
  153 +// if (inv.toInt() == head.invnum) {
  154 +// val invHeadTemp = InvHeadSec(head.invnum, head.detalle, head.fecha, head.deposito == 1, "", head.fecha, 0)
  155 +// insertInvHeadSec(invHeadTemp)
  156 +// break
  157 +// }
  158 +// }
  159 +// for (body in response.body()!!) {
  160 +// val invBodyTemp = InvBodySec(
  161 +// body!!.INV.toInt(), body.SEC, body.ART, body.DET, body.PRE,
  162 +// body.uniVta,
  163 +// body.COS, "", body.DEPSN!!.toInt() != 0, body.EXIVTA, body.EXIDEP, body.CODBAR, "", ""
  164 +// )
  165 +// insertInvBodySec(invBodyTemp)
  166 +// }
  167 +// }
  168 +// contador+=1
  169 +// sleep(500)
  170 +// buscarCantArtInvSecHead(inv)
  171 +// sleep(500)
  172 +// if(contador==invSeleccionados.size){
  173 +// recicler.visibility = View.GONE
  174 +// btnConfirmarAct.isEnabled = false
  175 +// val modalDialog = InvSecImp()
  176 +// modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog")
  177 +//
  178 +// activity?.onBackPressed()
  179 +// }
  180 +// }
  181 +
146 182 } catch (e: SocketTimeoutException) {
147 183 }
148   - } else if (response.code() == 404) {
149   - }
  184 + } else if (response.code() == 404) { }
150 185 }
151   -
152 186 override fun onFailure(call: Call<List<InvBodySecR?>?>?, t: Throwable?) {}
153 187 })
  188 + finalizo=true
154 189 }
155   - if (entroAlFor) {
  190 + if (finalizo) {
156 191 recicler.visibility = View.GONE
157 192 btnConfirmarAct.isEnabled = false
158 193 val modalDialog = InvSecImp()
159 194 modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog")
  195 +
  196 +// activity?.onBackPressed()
  197 +
160 198 }
161 199 // navController.navigate(R.id.action_invSecImpFragment_to_mainFragment2)
162 200 }
... ... @@ -167,7 +205,7 @@ class InvSecImpFragment : Fragment(), InvSecHeadListAdapter.OnCheckListener {
167 205 return v
168 206 }
169 207  
170   - private fun preparaParaInsertar(list: List<InvBodySecR?>?, inv: String) {
  208 + private fun preparaParaInsertar(list: List<InvBodySecR?>?, inv: String):Boolean {
171 209  
172 210 fragmentScopeInvSec.launch(Main) {
173 211 if (list != null) {
... ... @@ -191,6 +229,7 @@ class InvSecImpFragment : Fragment(), InvSecHeadListAdapter.OnCheckListener {
191 229 buscarCantArtInvSecHead(inv)
192 230 sleep(500)
193 231 }
  232 + return true
194 233 }
195 234  
196 235 fun cargarRecicler(invNum: Int?, detalle: String?, fechaInicio: String?, deposito: Int?) {
app/src/main/java/com/focasoftware/deboinventariov20/UI/configuracion/ConfiguracionFragment.kt
Diff comments   View file @ 8803475
... ... @@ -220,7 +220,6 @@ class ConfiguracionFragment : Fragment() {
220 220  
221 221 Toast.makeText(v.context, "Los Datos se guardaron correctamente", Toast.LENGTH_SHORT).show()
222 222 navController.navigate(R.id.action_configuracionFragment_to_mainFragment2)
223   -
224 223 }
225 224 }
226 225 }
app/src/main/java/com/focasoftware/deboinventariov20/UI/detalleProducto/DetalleArtFragment.kt
Diff comments   View file @ 8803475
... ... @@ -84,10 +84,13 @@ class DetalleArtFragment : Fragment() {
84 84 else -> { tvBal.text="Otros"
85 85 }
86 86 }
87   - if(!artSerch!!.costo.toString().isNullOrEmpty()){}
88   - tvCosto.text=
89   - (Math.round(artSerch!!.costo.toString().toFloat() * 100.0) / 100.0).toString()
90   - tvPrecio.text= (Math.round( artSerch!!.precio.toString().toFloat() * 100.0) / 100.0).toString()
  87 + if(artSerch!!.costo!=null)
  88 + tvCosto.text= (Math.round(artSerch!!.costo.toString().toFloat() * 100.0) / 100.0).toString()
  89 + else tvCosto.text="0"
  90 +
  91 + if(artSerch!!.precio!=null )
  92 + tvPrecio.text= (Math.round( artSerch!!.precio.toString().toFloat() * 100.0) / 100.0).toString()
  93 + else tvPrecio.text="0"
91 94 }
92 95 }
93 96 }
app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt
Diff comments   View file @ 8803475
... ... @@ -42,6 +42,7 @@ import kotlinx.android.synthetic.main.login_dialog.view.btnAceptar
42 42 import kotlinx.coroutines.*
43 43 import kotlinx.coroutines.Dispatchers.IO
44 44 import kotlinx.coroutines.Dispatchers.Main
  45 +import okhttp3.internal.http2.ErrorCode
45 46 import retrofit2.Call
46 47 import retrofit2.Callback
47 48 import retrofit2.Response
... ... @@ -64,8 +65,7 @@ private var fCant = 0F
64 65 private var bFirst = false
65 66 private lateinit var deleteIcon: Drawable
66 67 lateinit var inventarioViewModel: ViewModel
67   -private var sectorBalanza = 0
68   -private var codigoBalanza = 0
  68 +private var codBarBalanza = ""
69 69 private var cantEnteraBalanza = 0
70 70 private var cantDecimalBalanza = 0
71 71 private var EsBalanza = false
... ... @@ -84,6 +84,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
84 84  
85 85 override fun onCreate(savedInstanceState: Bundle?) {
86 86 super.onCreate(savedInstanceState)
  87 + listArticulos.clear()
87 88 inventarioViewModel = ViewModelProviders.of(this).get(InventarioViewModel::class.java)
88 89  
89 90 sharedPreferences = (activity as MainActivity).getSharedPreferences("SP_INFO", Context.MODE_PRIVATE)
... ... @@ -168,27 +169,21 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
168 169 if (sChangeUpper.length == 13)
169 170 if (sChangeUpper.substring(0, 2) == "20" && sChangeUpper.substring(12, 13) == "2") {
170 171 EsBalanza=true
171   - sectorBalanza = sChangeUpper.substring(2, 4).toInt()
172   - codigoBalanza = sChangeUpper.substring(4, 7).toInt()
  172 + codBarBalanza = sChangeUpper.substring(2,7).toString()
173 173 cantEnteraBalanza = sChangeUpper.substring(7, 9).toInt()
174 174 cantDecimalBalanza = sChangeUpper.substring(9, 12).toInt()
175 175 }
176 176 }
177 177 }
178 178 GlobalScope.launch(Main) {
  179 + if (EsBalanza) sChangeUpper=codBarBalanza
179 180 indiceDelArtEncontrado = buscoArtEnRv(sChangeUpper.toUpperCase(Locale.ROOT), 0)//TODO Si encuentra el articulo en el RV devuelve el indice
180 181 //TODO (Si no lo encuentra devuelve -1)
181 182 if (indiceDelArtEncontrado != -1) {
182   - if (!EsBalanza) {
183   -// //TODO ACTUALIZO LA CANTIDAD EN LA BD
184   -// updateCantidad(
185   -// sectorBalanza.toString(),
186   -// codigoBalanza.toString(),
187   -// ("$cantEnteraBalanza.$cantDecimalBalanza").toFloat())
188   -// //TODO ACTUALIZO LA CANTIDAD EN EL RV
189   -// listArticulos[indiceDelArtEncontrado].cantTomada = ("$cantEnteraBalanza.$cantDecimalBalanza").toFloat()
190   -// viewAdapter.notifyDataSetChanged()
191   -// }else{
  183 + if (EsBalanza) {
  184 +// //TODO SI ES BALANZA NO HAGO NADA
  185 +
  186 + }else{
192 187 if (swSumaUno!!.isChecked) {
193 188 //TODO ACTUALIZO LA CANTIDAD EN LA BD
194 189 updateCantidad(
... ... @@ -207,7 +202,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
207 202 } else if (indiceDelArtEncontrado == -1) {// TODO: no lo encontro en el RV, lo va a buscar en al BD
208 203 //TODO BUSCO EN BASE DE DATOS
209 204 val artEncontrado:Articles? = if (EsBalanza) {
210   - buscarCodigoDeboEnBD(sectorBalanza.toString(), codigoBalanza.toString())
  205 + buscarCBEnBD(codBarBalanza)
211 206 }else{
212 207 buscarCBEnBD(sChangeUpper.toUpperCase(Locale.ROOT))
213 208 }
... ... @@ -219,7 +214,6 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
219 214 }
220 215 return@setOnKeyListener true
221 216  
222   -
223 217 }
224 218 1 -> {//TODO: BUSQUEDA POR DESCRIPCION**************************************************************************
225 219 // TODO: ESCONDE EL TECLADO VIRTUAL AL PRESIONAR ENTER
... ... @@ -436,8 +430,8 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
436 430 var fecInicio: String
437 431 var lug: Int
438 432 var itomInvC: ItomInvC
439   - lifecycleScope.launch(Main) {
440   -// fragmentScopeInvFrag.launch(Main) {
  433 +// lifecycleScope.launch(Main) {
  434 + fragmentScopeInvFrag.launch(Main) {
441 435  
442 436 val datosCabecera = foundInvHeadDB(inventario)
443 437 val datosCuerpo = foundInvBodyBD(inventario)
... ... @@ -448,8 +442,6 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
448 442 itomInvC = ItomInvC(fecInicio, fecActual, lug)
449 443 serverBajada = AppDb.getAppDb((activity as MainActivity))!!.ServeInvDao()!!.fetchServerPreOne()
450 444 exportarInventarioHead(itomInvC, datosCuerpo)
451   -
452   -
453 445 }
454 446 }
455 447  
... ... @@ -466,7 +458,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
466 458 ItomInv.request.insertarItominvc(aEnviar)
467 459 .enqueue(object : Callback<DefaultResponse> {
468 460 override fun onResponse(call: Call<DefaultResponse>, response: Response<DefaultResponse>) {
469   - lifecycleScope.launch(Main) {
  461 + fragmentScopeInvFrag.launch(Main) {
470 462 loading_view.visibility=View.VISIBLE
471 463 if(exportarInventarioBody(datosCuerpo)) {
472 464 borrarInvActualCabecera()
... ... @@ -704,8 +696,8 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
704 696  
705 697 if (artAcargar != null) { // TODO: Si lo encuentra en la BD
706 698 if (EsBalanza) {
707   - cargarArtEnBd(artAcargar, (Math.round(("$cantEnteraBalanza.$cantDecimalBalanza").toFloat() * 100.0) / 100.0).toFloat().toString())
708   - cargarRecicler(artAcargar, (Math.round(("$cantEnteraBalanza.$cantDecimalBalanza").toFloat() * 100.0) / 100.0).toFloat())
  699 + cargarArtEnBd(artAcargar, ("$cantEnteraBalanza.$cantDecimalBalanza"))
  700 + cargarRecicler(artAcargar, ("$cantEnteraBalanza.$cantDecimalBalanza").toFloat())
709 701 modificarCantidadEnCabecera((inventarioViewModel as InventarioViewModel).InventarioNuevo, true, requireContext())
710 702 EsBalanza=false
711 703 }else{
... ... @@ -879,15 +871,6 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
879 871 var bEncontrado = false
880 872 if (sTipoBusqueda == 0) {//TODO BUSQUEDA POR CODIGO DE BARRAS
881 873 // TODO CAMBIO DE CB A CODIGO DEBO
882   - if (EsBalanza){
883   - for (item in listArticulos) {
884   - if (item.sector!!.toInt() == sectorBalanza.toInt() && item.codigo!!.toInt() == codigoBalanza.toInt()) {
885   - bEncontrado = true
886   - break
887   - }
888   - indice += 1
889   - }
890   - }else {
891 874 val any = cambioCBporCodigoDebo(codigoBarras)
892 875 if (any != null) {
893 876 for (item in listArticulos) {
... ... @@ -898,7 +881,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList
898 881 indice += 1
899 882 }
900 883 }
901   - }
  884 +
902 885  
903 886 } else if (sTipoBusqueda == 1) {//TODO BUSQUEDA POR DESCRIPCION
904 887 for (item in listArticulos) {
app/src/main/java/com/focasoftware/deboinventariov20/UI/main/InventarioSecListAdapter.kt
Diff comments   View file @ 8803475
... ... @@ -10,7 +10,7 @@ import com.focasoftware.deboinventariov20.R
10 10 import com.focasoftware.deboinventariov20.UI.Utils.BaseViewHolder
11 11 import kotlinx.android.synthetic.main.item_principal.view.*
12 12  
13   -class InventarioSecListAdapter(private val context: Context, private val inv: ArrayList<InvHeadSec>, private val itemClickListener: MainFragment) :
  13 +class InventarioSecListAdapter(private val context: Context, private val inv: List<InvHeadSec>, private val itemClickListener: MainFragment) :
14 14 RecyclerView.Adapter<BaseViewHolder<*>>() {
15 15  
16 16 interface OnInventarioSecClickListener {
app/src/main/java/com/focasoftware/deboinventariov20/UI/main/MainFragment.kt
Diff comments   View file @ 8803475
... ... @@ -41,6 +41,7 @@ class MainFragment : Fragment(), InventarioListAdapter.OnInventarioClickListener
41 41 private var inventarios: List<InvHead>? = null
42 42 private var inventariosII: List<InvHeadSec>? = null
43 43 private lateinit var ordenado: List<InvHead>
  44 + private lateinit var ordenadoII: List<InvHeadSec>
44 45 private lateinit var rcInventario: RecyclerView
45 46 private lateinit var rcInventarioII: RecyclerView
46 47 private lateinit var viewAdapter: RecyclerView.Adapter<*>
... ... @@ -129,6 +130,8 @@ class MainFragment : Fragment(), InventarioListAdapter.OnInventarioClickListener
129 130 val tvInvImportados = v.findViewById<TextView>(R.id.tvInvImportados)
130 131 val ivSort19 = v.findViewById<ImageButton>(R.id.ivSort19)
131 132 val ivSort91 = v.findViewById<ImageButton>(R.id.ivSort91)
  133 + val ivSort19II = v.findViewById<ImageButton>(R.id.ivSort19II)
  134 + val ivSort91II = v.findViewById<ImageButton>(R.id.ivSort91II)
132 135 val cbVentas = v.findViewById<CheckBox>(R.id.cbVentas)
133 136 val cbDeposito = v.findViewById<CheckBox>(R.id.cbDeposito)
134 137 val tvTipo = v.findViewById<TextView>(R.id.tvTipo)
... ... @@ -182,6 +185,8 @@ class MainFragment : Fragment(), InventarioListAdapter.OnInventarioClickListener
182 185 if (!bAbiertoCerrado) {
183 186 bAbiertoCerrado = true
184 187 tvInvImportados.visibility = View.GONE
  188 + ivSort91II.visibility = View.GONE
  189 + ivSort19II.visibility = View.GONE
185 190 rcInventario.visibility = View.VISIBLE
186 191 ivSort91.visibility = View.INVISIBLE
187 192 ivSort19.visibility = View.VISIBLE
... ... @@ -253,16 +258,55 @@ class MainFragment : Fragment(), InventarioListAdapter.OnInventarioClickListener
253 258 ivPortada.visibility = View.GONE
254 259 tvInvDinamicos.visibility = View.GONE
255 260 rcInventarioII.visibility = View.VISIBLE
  261 + rcInventario.visibility = View.GONE
  262 + ivSort91II.visibility = View.INVISIBLE
  263 + ivSort19II.visibility = View.VISIBLE
256 264 tvInvImportados.text = "Inventarios Importados ($cantidadInventariosII) -"
257 265 } else {
258 266 bAbiertoCerradoII = false
259 267 ivPortada.visibility = View.VISIBLE
260 268 rcInventarioII.visibility = View.GONE
  269 + ivSort91II.visibility = View.GONE
  270 + ivSort19II.visibility = View.GONE
261 271 tvInvImportados.visibility = View.VISIBLE
262 272 tvInvDinamicos.visibility = View.VISIBLE
263 273 tvInvImportados.text = "Inventarios Importados ($cantidadInventariosII) +"
264 274 }
265 275 }
  276 + ordenadoII = inventariosII!!.sortedBy { it.invNum }
  277 +
  278 + ivSort19II.setOnClickListener {
  279 + ordenadoII = inventariosII!!.sortedByDescending {
  280 + it.invNum
  281 + }
  282 + viewAdapter = InventarioSecListAdapter(requireContext(), ordenadoII, this@MainFragment)
  283 + viewManager = LinearLayoutManager(requireContext())
  284 +
  285 + rcInventarioII.apply {
  286 + adapter = viewAdapter
  287 + layoutManager = viewManager
  288 + }
  289 + viewAdapter.notifyDataSetChanged()
  290 + ivSort19II.visibility = View.INVISIBLE
  291 + ivSort91II.visibility = View.VISIBLE
  292 + }
  293 +
  294 + ivSort91II.setOnClickListener {
  295 + ordenadoII = inventariosII!!.sortedBy {
  296 + it.invNum
  297 + }
  298 + viewAdapter = InventarioSecListAdapter(requireContext(), ordenadoII, this@MainFragment)
  299 + viewManager = LinearLayoutManager(requireContext())
  300 +
  301 + rcInventarioII.apply {
  302 + adapter = viewAdapter
  303 + layoutManager = viewManager
  304 + }
  305 + viewAdapter.notifyDataSetChanged()
  306 + ivSort91II.visibility = View.INVISIBLE
  307 + ivSort19II.visibility = View.VISIBLE
  308 + }
  309 +
266 310 }
267 311  
268 312 cbVentas.setOnClickListener {
app/src/main/res/layout-land/fragment_configuracion.xml
Diff comments   View file @ 8803475
... ... @@ -348,11 +348,11 @@
348 348 android:layout_width="wrap_content"
349 349 android:layout_height="wrap_content"
350 350 android:layout_margin="@dimen/PadingCbyRb"
351   - android:checked="false"
  351 + android:checked="true"
352 352 android:padding="@dimen/PadingCbyRb"
353 353 android:text="@string/cbAskTimeServerToStart"
354 354 android:textSize="@dimen/NormalText"
355   - android:visibility="visible"
  355 + android:visibility="invisible"
356 356 app:layout_constraintStart_toStartOf="parent"
357 357 app:layout_constraintTop_toBottomOf="@+id/cbMostrarStock" />
358 358  
app/src/main/res/layout-large-v26/fragment_main.xml
Diff comments   View file @ 8803475
... ... @@ -122,30 +122,43 @@
122 122 app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
123 123 app:layout_constraintVertical_bias="0.0" />
124 124  
125   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
126   -<!-- android:id="@+id/ivSort19II"-->
127   -<!-- android:layout_width="@dimen/icon_dim10"-->
128   -<!-- android:layout_height="@dimen/icon_dim10"-->
129   -<!-- android:layout_marginStart="10dp"-->
130   -<!-- android:padding="5dp"-->
131   -<!-- android:src="@drawable/ic_sort19"-->
132   -<!-- android:visibility="invisible"-->
133   -<!-- app:layout_constraintHorizontal_bias="0.0"-->
134   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
135   -<!-- app:layout_constraintStart_toStartOf="parent"-->
136   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
  125 + <androidx.appcompat.widget.AppCompatImageButton
  126 + android:id="@+id/ivSort19II"
  127 + android:layout_width="@dimen/icon_dim10"
  128 + android:layout_height="@dimen/icon_dim10"
  129 + android:layout_marginStart="10dp"
  130 + android:padding="5dp"
  131 + android:src="@drawable/ic_sort19"
  132 + android:visibility="gone"
  133 + app:layout_constraintStart_toStartOf="parent"
  134 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  135 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII" />
  136 +
  137 + <androidx.appcompat.widget.AppCompatImageButton
  138 + android:id="@+id/ivSort91II"
  139 + android:layout_width="@dimen/icon_dim10"
  140 + android:layout_height="@dimen/icon_dim10"
  141 + android:layout_marginStart="10dp"
  142 + android:padding="5dp"
  143 + android:src="@drawable/ic_sort91"
  144 + android:visibility="gone"
  145 + app:layout_constraintStart_toStartOf="parent"
  146 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  147 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII"/>
  148 +
  149 + <androidx.recyclerview.widget.RecyclerView
  150 + android:id="@+id/rcInventarioII"
  151 + android:layout_width="match_parent"
  152 + android:layout_height="0dp"
  153 + android:background="@android:color/darker_gray"
  154 + android:scrollbars="vertical"
  155 + android:visibility="gone"
  156 + app:layout_constraintEnd_toEndOf="parent"
  157 + app:layout_constraintStart_toStartOf="parent"
  158 + app:layout_constraintTop_toBottomOf="@id/ivSort91II"
  159 + tools:listitem="@layout/item_principal"
  160 + app:layout_constraintBottom_toTopOf="@+id/guideline1"/>
137 161  
138   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
139   -<!-- android:id="@+id/ivSort91II"-->
140   -<!-- android:layout_width="@dimen/icon_dim10"-->
141   -<!-- android:layout_height="@dimen/icon_dim10"-->
142   -<!-- android:layout_marginStart="10dp"-->
143   -<!-- android:padding="5dp"-->
144   -<!-- android:src="@drawable/ic_sort91"-->
145   -<!-- android:visibility="invisible"-->
146   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
147   -<!-- app:layout_constraintStart_toStartOf="parent"-->
148   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
149 162 <ImageView
150 163 android:id="@+id/ivPortada"
151 164 android:layout_width="452dp"
... ... @@ -158,19 +171,6 @@
158 171 app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
159 172 tools:srcCompat="@drawable/imagen_portada" />
160 173  
161   - <androidx.recyclerview.widget.RecyclerView
162   - android:id="@+id/rcInventarioII"
163   - android:layout_width="match_parent"
164   - android:layout_height="0dp"
165   - android:background="@android:color/darker_gray"
166   - android:scrollbars="vertical"
167   - android:visibility="gone"
168   - app:layout_constraintBottom_toTopOf="@+id/guideline6"
169   - app:layout_constraintEnd_toEndOf="parent"
170   - app:layout_constraintStart_toStartOf="parent"
171   - app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
172   - tools:listitem="@layout/item_principal" />
173   -
174 174 <androidx.constraintlayout.widget.Guideline
175 175 android:id="@+id/guideline6"
176 176 android:layout_width="wrap_content"
app/src/main/res/layout-large/fragment_main.xml
Diff comments   View file @ 8803475
... ... @@ -116,41 +116,29 @@
116 116 app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
117 117 app:layout_constraintVertical_bias="0.0" />
118 118  
119   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
120   -<!-- android:id="@+id/ivSort19II"-->
121   -<!-- android:layout_width="@dimen/icon_dim10"-->
122   -<!-- android:layout_height="@dimen/icon_dim10"-->
123   -<!-- android:layout_marginStart="10dp"-->
124   -<!-- android:padding="5dp"-->
125   -<!-- android:src="@drawable/ic_sort19"-->
126   -<!-- android:visibility="invisible"-->
127   -<!-- app:layout_constraintHorizontal_bias="0.0"-->
128   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
129   -<!-- app:layout_constraintStart_toStartOf="parent"-->
130   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
131   -
132   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
133   -<!-- android:id="@+id/ivSort91II"-->
134   -<!-- android:layout_width="@dimen/icon_dim10"-->
135   -<!-- android:layout_height="@dimen/icon_dim10"-->
136   -<!-- android:layout_marginStart="10dp"-->
137   -<!-- android:padding="5dp"-->
138   -<!-- android:src="@drawable/ic_sort91"-->
139   -<!-- android:visibility="invisible"-->
140   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
141   -<!-- app:layout_constraintStart_toStartOf="parent"-->
142   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
143   - <ImageView
144   - android:id="@+id/ivPortada"
145   - android:layout_width="706dp"
146   - android:layout_height="448dp"
147   - android:elevation="10dp"
148   - android:visibility="visible"
149   - app:layout_constraintBottom_toBottomOf="parent"
150   - app:layout_constraintEnd_toEndOf="parent"
  119 + <androidx.appcompat.widget.AppCompatImageButton
  120 + android:id="@+id/ivSort19II"
  121 + android:layout_width="@dimen/icon_dim10"
  122 + android:layout_height="@dimen/icon_dim10"
  123 + android:layout_marginStart="10dp"
  124 + android:padding="5dp"
  125 + android:src="@drawable/ic_sort19"
  126 + android:visibility="gone"
151 127 app:layout_constraintStart_toStartOf="parent"
152   - app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
153   - tools:srcCompat="@drawable/imagen_portada" />
  128 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  129 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII" />
  130 +
  131 + <androidx.appcompat.widget.AppCompatImageButton
  132 + android:id="@+id/ivSort91II"
  133 + android:layout_width="@dimen/icon_dim10"
  134 + android:layout_height="@dimen/icon_dim10"
  135 + android:layout_marginStart="10dp"
  136 + android:padding="5dp"
  137 + android:src="@drawable/ic_sort91"
  138 + android:visibility="gone"
  139 + app:layout_constraintStart_toStartOf="parent"
  140 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  141 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII"/>
154 142  
155 143 <androidx.recyclerview.widget.RecyclerView
156 144 android:id="@+id/rcInventarioII"
... ... @@ -159,11 +147,22 @@
159 147 android:background="@android:color/darker_gray"
160 148 android:scrollbars="vertical"
161 149 android:visibility="gone"
162   - app:layout_constraintBottom_toTopOf="@+id/guideline6"
163 150 app:layout_constraintEnd_toEndOf="parent"
164 151 app:layout_constraintStart_toStartOf="parent"
165   - app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
166   - tools:listitem="@layout/item_principal" />
  152 + app:layout_constraintTop_toBottomOf="@id/ivSort91II"
  153 + tools:listitem="@layout/item_principal"
  154 + app:layout_constraintBottom_toTopOf="@+id/guideline1"/>
  155 + <ImageView
  156 + android:id="@+id/ivPortada"
  157 + android:layout_width="706dp"
  158 + android:layout_height="448dp"
  159 + android:elevation="10dp"
  160 + android:visibility="gone"
  161 + app:layout_constraintBottom_toBottomOf="parent"
  162 + app:layout_constraintEnd_toEndOf="parent"
  163 + app:layout_constraintStart_toStartOf="parent"
  164 + app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
  165 + tools:srcCompat="@drawable/imagen_portada" />
167 166  
168 167 <androidx.constraintlayout.widget.Guideline
169 168 android:id="@+id/guideline6"
app/src/main/res/layout-xlarge-v26/fragment_actua_maestros.xml
Diff comments   View file @ 8803475
... ... @@ -10,7 +10,7 @@
10 10 android:id="@+id/tvActMaestros"
11 11 android:layout_width="match_parent"
12 12 android:layout_height="120dp"
13   - android:layout_marginTop="15dp"
  13 + android:layout_marginTop="25dp"
14 14 android:autoSizeMaxTextSize="100sp"
15 15 android:autoSizeMinTextSize="20sp"
16 16 android:autoSizeStepGranularity="5sp"
... ... @@ -30,12 +30,12 @@
30 30 android:layout_width="0dp"
31 31 android:layout_height="wrap_content"
32 32 android:layout_marginStart="@dimen/MarginBotAgreSer"
33   - android:layout_marginTop="20dp"
  33 + android:layout_marginTop="120dp"
34 34 android:gravity="start"
35 35 android:lines="1"
36 36 android:text="@string/tvMedio"
37 37 android:textColor="@android:color/black"
38   - android:textSize="@dimen/VentasDeposito10"
  38 + android:textSize="@dimen/tvServerConectado"
39 39 app:fontFamily="sans-serif-condensed"
40 40 app:layout_constraintEnd_toEndOf="parent"
41 41 app:layout_constraintStart_toStartOf="parent"
... ... @@ -45,10 +45,11 @@
45 45 android:id="@+id/rgTipoActualizacion"
46 46 android:layout_width="0dp"
47 47 android:layout_height="wrap_content"
48   - android:layout_marginTop="20dp"
  48 + android:layout_marginTop="84dp"
49 49 android:gravity="start"
50 50 android:orientation="vertical"
51 51 app:layout_constraintEnd_toEndOf="parent"
  52 + app:layout_constraintHorizontal_bias="0.0"
52 53 app:layout_constraintStart_toStartOf="parent"
53 54 app:layout_constraintTop_toBottomOf="@+id/tvSeleccioneServidor">
54 55  
... ... @@ -60,7 +61,7 @@
60 61 android:checked="true"
61 62 android:padding="5dp"
62 63 android:text="@string/obPorWifi"
63   - android:textSize="@dimen/SubTitulos10" />
  64 + android:textSize="@dimen/VentasDeposito10" />
64 65  
65 66 <RadioButton
66 67 android:id="@+id/obImpInventarios"
... ... @@ -70,14 +71,13 @@
70 71 android:checked="false"
71 72 android:padding="5dp"
72 73 android:text="@string/obViaArchivo"
73   - android:textSize="@dimen/SubTitulos10"/>
  74 + android:textSize="@dimen/VentasDeposito10" />
74 75 </RadioGroup>
75 76  
76 77 <TextView
77 78 android:id="@+id/tvServerConectado"
78 79 android:layout_width="match_parent"
79 80 android:layout_height="wrap_content"
80   - android:layout_margin="30dp"
81 81 android:gravity="center"
82 82 android:lines="2"
83 83 android:text=""
... ... @@ -86,7 +86,9 @@
86 86 android:textStyle="bold"
87 87 app:fontFamily="sans-serif-condensed"
88 88 app:layout_constraintBottom_toTopOf="@+id/countriesList"
89   - app:layout_constraintTop_toBottomOf="@+id/rgTipoActualizacion" />
  89 + app:layout_constraintTop_toBottomOf="@+id/rgTipoActualizacion"
  90 + app:layout_constraintVertical_bias="0.343"
  91 + tools:layout_editor_absoluteX="20dp" />
90 92  
91 93 <TextView
92 94 android:id="@+id/countriesList"
... ... @@ -105,7 +107,7 @@
105 107 app:layout_constraintHorizontal_bias="0.0"
106 108 app:layout_constraintStart_toStartOf="parent"
107 109 app:layout_constraintTop_toBottomOf="@+id/rgTipoActualizacion"
108   - app:layout_constraintVertical_bias="0.106" />
  110 + app:layout_constraintVertical_bias="0.229" />
109 111  
110 112 <Button
111 113 android:id="@+id/btnConfirmarAct"
app/src/main/res/layout-xlarge-v26/fragment_main.xml
Diff comments   View file @ 8803475
... ... @@ -122,30 +122,42 @@
122 122 app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
123 123 app:layout_constraintVertical_bias="0.0" />
124 124  
125   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
126   -<!-- android:id="@+id/ivSort19II"-->
127   -<!-- android:layout_width="@dimen/icon_dim10"-->
128   -<!-- android:layout_height="@dimen/icon_dim10"-->
129   -<!-- android:layout_marginStart="10dp"-->
130   -<!-- android:padding="5dp"-->
131   -<!-- android:src="@drawable/ic_sort19"-->
132   -<!-- android:visibility="invisible"-->
133   -<!-- app:layout_constraintHorizontal_bias="0.0"-->
134   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
135   -<!-- app:layout_constraintStart_toStartOf="parent"-->
136   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
  125 + <androidx.appcompat.widget.AppCompatImageButton
  126 + android:id="@+id/ivSort19II"
  127 + android:layout_width="@dimen/icon_dim10"
  128 + android:layout_height="@dimen/icon_dim10"
  129 + android:layout_marginStart="10dp"
  130 + android:padding="5dp"
  131 + android:src="@drawable/ic_sort19"
  132 + android:visibility="gone"
  133 + app:layout_constraintStart_toStartOf="parent"
  134 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  135 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII" />
  136 +
  137 + <androidx.appcompat.widget.AppCompatImageButton
  138 + android:id="@+id/ivSort91II"
  139 + android:layout_width="@dimen/icon_dim10"
  140 + android:layout_height="@dimen/icon_dim10"
  141 + android:layout_marginStart="10dp"
  142 + android:padding="5dp"
  143 + android:src="@drawable/ic_sort91"
  144 + android:visibility="gone"
  145 + app:layout_constraintStart_toStartOf="parent"
  146 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  147 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII"/>
137 148  
138   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
139   -<!-- android:id="@+id/ivSort91II"-->
140   -<!-- android:layout_width="@dimen/icon_dim10"-->
141   -<!-- android:layout_height="@dimen/icon_dim10"-->
142   -<!-- android:layout_marginStart="10dp"-->
143   -<!-- android:padding="5dp"-->
144   -<!-- android:src="@drawable/ic_sort91"-->
145   -<!-- android:visibility="invisible"-->
146   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
147   -<!-- app:layout_constraintStart_toStartOf="parent"-->
148   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
  149 + <androidx.recyclerview.widget.RecyclerView
  150 + android:id="@+id/rcInventarioII"
  151 + android:layout_width="match_parent"
  152 + android:layout_height="0dp"
  153 + android:background="@android:color/darker_gray"
  154 + android:scrollbars="vertical"
  155 + android:visibility="gone"
  156 + app:layout_constraintEnd_toEndOf="parent"
  157 + app:layout_constraintStart_toStartOf="parent"
  158 + app:layout_constraintTop_toBottomOf="@id/ivSort91II"
  159 + tools:listitem="@layout/item_principal"
  160 + app:layout_constraintBottom_toTopOf="@+id/guideline1"/>
149 161  
150 162 <ImageView
151 163 android:id="@+id/ivPortada"
... ... @@ -160,19 +172,6 @@
160 172 app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
161 173 tools:srcCompat="@drawable/imagen_portada" />
162 174  
163   - <androidx.recyclerview.widget.RecyclerView
164   - android:id="@+id/rcInventarioII"
165   - android:layout_width="match_parent"
166   - android:layout_height="0dp"
167   - android:background="@android:color/darker_gray"
168   - android:scrollbars="vertical"
169   - android:visibility="gone"
170   - app:layout_constraintBottom_toTopOf="@+id/guideline6"
171   - app:layout_constraintEnd_toEndOf="parent"
172   - app:layout_constraintStart_toStartOf="parent"
173   - app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
174   - tools:listitem="@layout/item_principal" />
175   -
176 175 <androidx.constraintlayout.widget.Guideline
177 176 android:id="@+id/guideline6"
178 177 android:layout_width="wrap_content"
app/src/main/res/layout-xlarge/fragment_actua_maestros.xml
Diff comments   View file @ 8803475
... ... @@ -10,8 +10,8 @@
10 10 android:id="@+id/tvActMaestros"
11 11 android:layout_width="match_parent"
12 12 android:layout_height="120dp"
13   - android:layout_marginTop="15dp"
14   - android:textSize="60sp"
  13 + android:layout_marginTop="25dp"
  14 + android:textSize="90sp"
15 15 android:gravity="center"
16 16 android:lines="1"
17 17 android:text="@string/tvActMaestros"
... ... @@ -27,7 +27,7 @@
27 27 android:layout_width="0dp"
28 28 android:layout_height="wrap_content"
29 29 android:layout_marginStart="@dimen/MarginBotAgreSer"
30   - android:layout_marginTop="20dp"
  30 + android:layout_marginTop="120dp"
31 31 android:gravity="start"
32 32 android:lines="1"
33 33 android:text="@string/tvMedio"
... ... @@ -42,7 +42,7 @@
42 42 android:id="@+id/rgTipoActualizacion"
43 43 android:layout_width="0dp"
44 44 android:layout_height="wrap_content"
45   - android:layout_marginTop="20dp"
  45 + android:layout_marginTop="84dp"
46 46 android:gravity="start"
47 47 android:orientation="vertical"
48 48 app:layout_constraintEnd_toEndOf="parent"
... ... @@ -57,7 +57,7 @@
57 57 android:checked="true"
58 58 android:padding="5dp"
59 59 android:text="@string/obPorWifi"
60   - android:textSize="@dimen/SubTitulos10" />
  60 + android:textSize="@dimen/VentasDeposito10" />
61 61  
62 62 <RadioButton
63 63 android:id="@+id/obImpInventarios"
... ... @@ -67,7 +67,7 @@
67 67 android:checked="false"
68 68 android:padding="5dp"
69 69 android:text="@string/obViaArchivo"
70   - android:textSize="@dimen/SubTitulos10"/>
  70 + android:textSize="@dimen/VentasDeposito10"/>
71 71 </RadioGroup>
72 72  
73 73 <TextView
app/src/main/res/layout-xlarge/fragment_configuracion.xml
Diff comments   View file @ 8803475
... ... @@ -290,8 +290,7 @@
290 290 android:padding="@dimen/PadingCbyRb"
291 291 android:text="@string/cbAskTimeServerToStart"
292 292 android:textSize="@dimen/SubTitulos10"
293   - android:visibility="visible"
294   -
  293 + android:visibility="invisible"
295 294 app:layout_constraintStart_toStartOf="parent"
296 295 app:layout_constraintTop_toBottomOf="@+id/cbMostrarStock" />
297 296  
app/src/main/res/layout-xlarge/fragment_main.xml
Diff comments   View file @ 8803475
... ... @@ -116,43 +116,42 @@
116 116 app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
117 117 app:layout_constraintVertical_bias="0.0" />
118 118  
119   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
120   -<!-- android:id="@+id/ivSort19II"-->
121   -<!-- android:layout_width="@dimen/icon_dim10"-->
122   -<!-- android:layout_height="@dimen/icon_dim10"-->
123   -<!-- android:layout_marginStart="10dp"-->
124   -<!-- android:padding="5dp"-->
125   -<!-- android:src="@drawable/ic_sort19"-->
126   -<!-- android:visibility="invisible"-->
127   -<!-- app:layout_constraintHorizontal_bias="0.0"-->
128   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
129   -<!-- app:layout_constraintStart_toStartOf="parent"-->
130   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
  119 + <androidx.appcompat.widget.AppCompatImageButton
  120 + android:id="@+id/ivSort19II"
  121 + android:layout_width="@dimen/icon_dim10"
  122 + android:layout_height="@dimen/icon_dim10"
  123 + android:layout_marginStart="10dp"
  124 + android:padding="5dp"
  125 + android:src="@drawable/ic_sort19"
  126 + android:visibility="gone"
  127 + app:layout_constraintStart_toStartOf="parent"
  128 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  129 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII" />
131 130  
132   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
133   -<!-- android:id="@+id/ivSort91II"-->
134   -<!-- android:layout_width="@dimen/icon_dim10"-->
135   -<!-- android:layout_height="@dimen/icon_dim10"-->
136   -<!-- android:layout_marginStart="10dp"-->
137   -<!-- android:padding="5dp"-->
138   -<!-- android:src="@drawable/ic_sort91"-->
139   -<!-- android:visibility="invisible"-->
140   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
141   -<!-- app:layout_constraintStart_toStartOf="parent"-->
142   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
  131 + <androidx.appcompat.widget.AppCompatImageButton
  132 + android:id="@+id/ivSort91II"
  133 + android:layout_width="@dimen/icon_dim10"
  134 + android:layout_height="@dimen/icon_dim10"
  135 + android:layout_marginStart="10dp"
  136 + android:padding="5dp"
  137 + android:src="@drawable/ic_sort91"
  138 + android:visibility="gone"
  139 + app:layout_constraintStart_toStartOf="parent"
  140 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  141 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII"/>
143 142  
144   - <androidx.recyclerview.widget.RecyclerView
145   - android:id="@+id/rcInventarioII"
146   - android:layout_width="match_parent"
147   - android:layout_height="0dp"
148   - android:background="@android:color/darker_gray"
149   - android:scrollbars="vertical"
150   - android:visibility="gone"
151   - app:layout_constraintBottom_toTopOf="@+id/guideline6"
152   - app:layout_constraintEnd_toEndOf="parent"
153   - app:layout_constraintStart_toStartOf="parent"
154   - app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
155   - tools:listitem="@layout/item_principal" />
  143 + <androidx.recyclerview.widget.RecyclerView
  144 + android:id="@+id/rcInventarioII"
  145 + android:layout_width="match_parent"
  146 + android:layout_height="0dp"
  147 + android:background="@android:color/darker_gray"
  148 + android:scrollbars="vertical"
  149 + android:visibility="gone"
  150 + app:layout_constraintEnd_toEndOf="parent"
  151 + app:layout_constraintStart_toStartOf="parent"
  152 + app:layout_constraintTop_toBottomOf="@id/ivSort91II"
  153 + tools:listitem="@layout/item_principal"
  154 + app:layout_constraintBottom_toTopOf="@+id/guideline1"/>
156 155  
157 156 <androidx.constraintlayout.widget.Guideline
158 157 android:id="@+id/guideline6"
app/src/main/res/layout-xlarge/nav_header_main.xml
Diff comments   View file @ 8803475
... ... @@ -12,20 +12,20 @@
12 12 android:paddingBottom="@dimen/activity_vertical_margin"
13 13 android:theme="@style/ThemeOverlay.AppCompat.Dark">
14 14  
15   - <ImageView
16   - android:id="@+id/imageView"
17   - android:layout_width="246dp"
18   - android:layout_height="136dp"
19   - android:contentDescription=" "
20   - android:paddingTop="@dimen/nav_header_vertical_spacing"
21   - app:srcCompat="@drawable/logo" />
  15 +<!-- <ImageView-->
  16 +<!-- android:id="@+id/imageView"-->
  17 +<!-- android:layout_width="246dp"-->
  18 +<!-- android:layout_height="136dp"-->
  19 +<!-- android:contentDescription=" "-->
  20 +<!-- android:paddingTop="@dimen/nav_header_vertical_spacing"-->
  21 +<!-- app:srcCompat="@drawable/logo" />-->
22 22  
23 23 <TextView
24   - android:layout_width="match_parent"
  24 + android:layout_width="wrap_content"
25 25 android:layout_height="wrap_content"
26 26 android:paddingTop="@dimen/nav_header_vertical_spacing"
27   - android:textSize="@dimen/SubTitulos10"
28   - android:text="Debo Inventario"
  27 + android:textSize="90sp"
  28 + android:text="DEBO Inventario"
29 29 android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
30 30  
31 31 <TextView
... ... @@ -33,5 +33,5 @@
33 33 android:layout_width="wrap_content"
34 34 android:layout_height="wrap_content"
35 35 android:text="FocaSoftware SA"
36   - android:textSize="@dimen/SubTitulos10"/>
  36 + android:textSize="@dimen/tvServerConectado"/>
37 37 </LinearLayout>
38 38 \ No newline at end of file
app/src/main/res/layout/fragment_actua_maestros.xml
Diff comments   View file @ 8803475
... ... @@ -25,7 +25,8 @@
25 25 android:id="@+id/tvSeleccioneServidor"
26 26 android:layout_width="0dp"
27 27 android:layout_height="wrap_content"
28   - android:layout_margin="30dp"
  28 +
  29 + android:layout_marginTop="40dp"
29 30 android:gravity="center"
30 31 android:lines="2"
31 32 android:text="@string/tvMedio"
... ... @@ -41,9 +42,11 @@
41 42 android:layout_width="0dp"
42 43 android:layout_height="wrap_content"
43 44 android:layout_margin="25dp"
  45 + android:layout_marginTop="100dp"
44 46 android:gravity="center"
45 47 android:orientation="horizontal"
46 48 app:layout_constraintEnd_toEndOf="parent"
  49 + app:layout_constraintHorizontal_bias="0.32"
47 50 app:layout_constraintStart_toStartOf="parent"
48 51 app:layout_constraintTop_toBottomOf="@+id/tvSeleccioneServidor">
49 52  
... ... @@ -99,7 +102,7 @@
99 102 app:layout_constraintHorizontal_bias="0.0"
100 103 app:layout_constraintStart_toStartOf="parent"
101 104 app:layout_constraintTop_toBottomOf="@+id/rgTipoActualizacion"
102   - app:layout_constraintVertical_bias="0.106" />
  105 + app:layout_constraintVertical_bias="0.312" />
103 106  
104 107 <Button
105 108 android:id="@+id/btnConfirmarAct"
... ... @@ -120,15 +123,15 @@
120 123 android:layout_width="wrap_content"
121 124 android:layout_height="wrap_content"
122 125 android:layout_marginStart="8dp"
123   - android:layout_marginLeft="8dp"
124 126 android:layout_marginTop="8dp"
125 127 android:layout_marginEnd="8dp"
126   - android:layout_marginRight="8dp"
127 128 android:layout_marginBottom="8dp"
128 129 android:visibility="invisible"
129 130 app:layout_constraintBottom_toBottomOf="parent"
130 131 app:layout_constraintEnd_toEndOf="parent"
  132 + app:layout_constraintHorizontal_bias="0.524"
131 133 app:layout_constraintStart_toStartOf="parent"
132   - app:layout_constraintTop_toTopOf="parent" />
  134 + app:layout_constraintTop_toTopOf="parent"
  135 + app:layout_constraintVertical_bias="0.619" />
133 136  
134 137 </androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_configuracion.xml
Diff comments   View file @ 8803475
... ... @@ -189,7 +189,6 @@
189 189 android:id="@+id/tvLosProductos"
190 190 android:layout_width="0dp"
191 191 android:layout_height="wrap_content"
192   -
193 192 android:layout_marginStart="@dimen/MarginBotAgreSer"
194 193 android:layout_marginEnd="@dimen/MarginTopSubTitulos"
195 194 android:gravity="start"
... ... @@ -337,11 +336,11 @@
337 336 android:layout_width="wrap_content"
338 337 android:layout_height="wrap_content"
339 338 android:layout_margin="5dp"
340   - android:checked="false"
  339 + android:checked="true"
341 340 android:padding="@dimen/PadingCbyRb"
342 341 android:text="@string/cbAskTimeServerToStart"
343 342 android:textSize="@dimen/NormalText"
344   - android:visibility="visible"
  343 + android:visibility="invisible"
345 344 app:layout_constraintStart_toEndOf="@+id/btnAskTimeServer"
346 345 app:layout_constraintTop_toBottomOf="@+id/cbMostrarStock" />
347 346  
app/src/main/res/layout/fragment_main.xml
Diff comments   View file @ 8803475
... ... @@ -120,40 +120,29 @@
120 120 app:layout_constraintTop_toBottomOf="@id/tvInvDinamicos"
121 121 app:layout_constraintVertical_bias="0.0" />
122 122  
123   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
124   -<!-- android:id="@+id/ivSort19II"-->
125   -<!-- android:layout_width="50dp"-->
126   -<!-- android:layout_height="50dp"-->
127   -<!-- android:layout_marginStart="10dp"-->
128   -<!-- android:padding="5dp"-->
129   -<!-- android:src="@drawable/ic_sort19"-->
130   -<!-- android:visibility="gone"-->
131   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
132   -<!-- app:layout_constraintStart_toStartOf="parent"-->
133   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
134   -
135   -<!-- <androidx.appcompat.widget.AppCompatImageButton-->
136   -<!-- android:id="@+id/ivSort91II"-->
137   -<!-- android:layout_width="50dp"-->
138   -<!-- android:layout_height="50dp"-->
139   -<!-- android:layout_marginStart="10dp"-->
140   -<!-- android:padding="5dp"-->
141   -<!-- android:src="@drawable/ic_sort91"-->
142   -<!-- android:visibility="invisible"-->
143   -<!-- app:layout_constraintHorizontal_chainStyle="packed"-->
144   -<!-- app:layout_constraintStart_toStartOf="parent"-->
145   -<!-- app:layout_constraintTop_toBottomOf="@id/tvInvImportados" />-->
146   - <ImageView
147   - android:id="@+id/ivPortada"
148   - android:layout_width="404dp"
149   - android:layout_height="248dp"
150   - android:elevation="10dp"
151   - android:visibility="visible"
152   - app:layout_constraintBottom_toBottomOf="parent"
153   - app:layout_constraintEnd_toEndOf="parent"
  123 + <androidx.appcompat.widget.AppCompatImageButton
  124 + android:id="@+id/ivSort19II"
  125 + android:layout_width="50dp"
  126 + android:layout_height="50dp"
  127 + android:layout_marginStart="10dp"
  128 + android:padding="5dp"
  129 + android:src="@drawable/ic_sort19"
  130 + android:visibility="gone"
154 131 app:layout_constraintStart_toStartOf="parent"
155   - app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
156   - tools:srcCompat="@drawable/imagen_portada" />
  132 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  133 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII" />
  134 +
  135 + <androidx.appcompat.widget.AppCompatImageButton
  136 + android:id="@+id/ivSort91II"
  137 + android:layout_width="50dp"
  138 + android:layout_height="50dp"
  139 + android:layout_marginStart="10dp"
  140 + android:padding="5dp"
  141 + android:src="@drawable/ic_sort91"
  142 + android:visibility="gone"
  143 + app:layout_constraintStart_toStartOf="parent"
  144 + app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  145 + app:layout_constraintBottom_toTopOf="@+id/rcInventarioII"/>
157 146  
158 147 <androidx.recyclerview.widget.RecyclerView
159 148 android:id="@+id/rcInventarioII"
... ... @@ -164,10 +153,22 @@
164 153 android:visibility="gone"
165 154 app:layout_constraintEnd_toEndOf="parent"
166 155 app:layout_constraintStart_toStartOf="parent"
167   - app:layout_constraintTop_toBottomOf="@id/tvInvImportados"
  156 + app:layout_constraintTop_toBottomOf="@id/ivSort91II"
168 157 tools:listitem="@layout/item_principal"
169 158 app:layout_constraintBottom_toTopOf="@+id/guideline1"/>
170 159  
  160 + <ImageView
  161 + android:id="@+id/ivPortada"
  162 + android:layout_width="404dp"
  163 + android:layout_height="248dp"
  164 + android:elevation="10dp"
  165 + android:visibility="gone"
  166 + app:layout_constraintBottom_toBottomOf="parent"
  167 + app:layout_constraintEnd_toEndOf="parent"
  168 + app:layout_constraintStart_toStartOf="parent"
  169 + app:layout_constraintTop_toBottomOf="@+id/tvInvImportados"
  170 + tools:srcCompat="@drawable/imagen_portada" />
  171 +
171 172 <androidx.constraintlayout.widget.Guideline
172 173 android:id="@+id/guideline1"
173 174 android:layout_width="wrap_content"
app/src/main/res/layout/nav_header_main.xml
Diff comments   View file @ 8803475
... ... @@ -12,20 +12,20 @@
12 12 android:paddingBottom="@dimen/activity_vertical_margin"
13 13 android:theme="@style/ThemeOverlay.AppCompat.Dark">
14 14  
15   - <ImageView
16   - android:id="@+id/imageView"
17   - android:layout_width="141dp"
18   - android:layout_height="wrap_content"
19   - android:contentDescription=" "
20   - android:paddingTop="@dimen/nav_header_vertical_spacing"
21   - app:srcCompat="@drawable/logo" />
  15 +<!-- <ImageView-->
  16 +<!-- android:id="@+id/imageView"-->
  17 +<!-- android:layout_width="141dp"-->
  18 +<!-- android:layout_height="wrap_content"-->
  19 +<!-- android:contentDescription=" "-->
  20 +<!-- android:paddingTop="@dimen/nav_header_vertical_spacing"-->
  21 +<!-- app:srcCompat="@drawable/logo" />-->
22 22  
23 23 <TextView
24   - android:layout_width="match_parent"
  24 + android:layout_width="wrap_content"
25 25 android:layout_height="wrap_content"
26 26 android:paddingTop="@dimen/nav_header_vertical_spacing"
27   - android:textSize="@dimen/md_message_textsize"
28   - android:text="Debo Inventario"
  27 + android:textSize="@dimen/tvServerConectado"
  28 + android:text="DEBO Inventario"
29 29 android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
30 30  
31 31 <TextView
app/src/main/res/values/strings.xml
Diff comments   View file @ 8803475
... ... @@ -53,11 +53,11 @@
53 53 <string name="tvTituloArea">Area de Inventario</string>
54 54 <string name="rbVentas">Inventarios de Ventas</string>
55 55 <string name="rbDeposito">Inventarios de Depositos</string>
56   - <string name="tvLosProductos">Los productos no contabilizados en Inventarios</string>
  56 + <string name="tvLosProductos">Para los productos no contabilizados en Inventarios</string>
57 57 <string name="tvColumnas">Columnas a Visualizar</string>
58 58  
59 59 <string name="rbProInclu">Solo se ajustan los productos incluidos en el conteo.</string>
60   - <string name="rbProNoInclu">Ajusta productos no incluidos en el conteo con stock en cero.</string>
  60 + <string name="rbProNoInclu">Ajustar los productos no incluidos en el conteo con stock en cero.</string>
61 61  
62 62 <string name="cbMostrarStock">Mostror stock en el sistema al momento de la descarga del maestro.</string>
63 63 <string name="cbHabiLectura">Habilitar Lectura de código de barras en balanza.</string>