diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8e94347..a68dbba 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,6 +13,7 @@ android:label="@string/app_name" android:roundIcon="@drawable/icono_inventario_big" android:supportsRtl="true" + android:windowSoftInputMode="adjustNothing" android:theme="@style/AppTheme" android:usesCleartextTraffic="true"> diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DataBase/AppDb.kt b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DataBase/AppDb.kt index 5e53c8f..619f39e 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/DB/DataBase/AppDb.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/DB/DataBase/AppDb.kt @@ -12,7 +12,7 @@ import com.focasoftware.deboinventariov20.Model.InvHead import com.focasoftware.deboinventariov20.Model.ServeInv -@Database(entities = [Articles::class, InvHead::class, InvBody::class, ServeInv::class], version = 1, exportSchema = false) +@Database(entities = [Articles::class, InvHead::class, InvBody::class, ServeInv::class], version = 1, exportSchema = true) abstract class AppDb : RoomDatabase() { abstract fun ArticulosDAO(): ArticulosDAO? abstract fun InvHeadDAO(): InvHeadDAO? diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt index 4d46324..ab7f7fa 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt @@ -15,7 +15,7 @@ class SplashActivity : Activity() { val bac = object : Thread(){ override fun run(){ try { - Thread.sleep(3) + Thread.sleep(3000) val intent = Intent(baseContext, MainActivity:: class.java) startActivity(intent) finish() diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt index 0e7d08d..5142523 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/Utils/Utils.kt @@ -40,6 +40,7 @@ open class AlertDialogBorrarInv : DialogFragment() { val content = "¿Seguro que desea Borrar el inventario?" val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> val listener = activity as OnBorrarInvClickListener? listener!!.onPositiveClick() @@ -56,9 +57,11 @@ open class AlertDialogBorrarInv : DialogFragment() { class NoEncontradoSimple : DialogFragment() { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { return activity?.let { + val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.show() val title = "" val content = "¡El producto buscado NO fue encontrado!" - val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.setTitle(title).setMessage(content) .setPositiveButton(android.R.string.ok) { _, _ -> } return builder.create() @@ -123,4 +126,16 @@ class serverNoValido : DialogFragment() { return builder.create() } ?: throw IllegalStateException("Activity cannot be null") } +} +class serverNoConf : DialogFragment() { + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + return activity?.let { + val title = "Servidor no Valido" + val content = "!Debe configurar el Servidor en Configuraciones¡" + val builder: AlertDialog.Builder = AlertDialog.Builder(requireActivity()) + builder.setTitle(title).setMessage(content) + .setPositiveButton(android.R.string.ok) { _, _ -> } + return builder.create() + } ?: throw IllegalStateException("Activity cannot be null") + } } \ No newline at end of file diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt index f345f34..4aecafc 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 @@ -5,6 +5,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.Button +import android.widget.Toast import androidx.fragment.app.Fragment import com.focasoftware.deboinventariov20.DB.DataBase.AppDb import com.focasoftware.deboinventariov20.Model.Articles @@ -12,6 +13,8 @@ import com.focasoftware.deboinventariov20.Model.ProductosService import com.focasoftware.deboinventariov20.Model.ServeInv import com.focasoftware.deboinventariov20.R import com.focasoftware.deboinventariov20.UI.Utils.noServerConf +import com.focasoftware.deboinventariov20.UI.Utils.serverNoConf +import com.focasoftware.deboinventariov20.UI.Utils.serverValido import kotlinx.android.synthetic.main.fragment_actua_maestros.* import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO @@ -20,20 +23,30 @@ import java.net.SocketTimeoutException var BASE_URL = "" - +var serverPre:ServeInv?=null class ActuaMaestrosFragment : Fragment() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) GlobalScope.launch(Main) { - val serverPre = fetchServerPreOne() - if (serverPre!!.direccion.isNullOrEmpty()) { - val modalDialog = noServerConf() + + serverPre = fetchServerPreOne() + if (serverPre!=null) { + btnConfirmarAct.isEnabled=true + if (serverPre!!.direccion.isNullOrEmpty()) { + val modalDialog = noServerConf() + modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") + } else { + BASE_URL = serverPre!!.direccion.toString() + ":" + serverPre!!.puerto.toString() + "/" + tvServerConectado.text = "Conectado al servidor: ${serverPre!!.descripcion}" + } + }else{ + val modalDialog = serverNoConf() modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") - } else { - BASE_URL = serverPre.direccion.toString() + ":" + serverPre.puerto.toString() + "/" - tvServerConectado.text = "Conectado al servidor: ${serverPre.descripcion}" + + btnConfirmarAct.isEnabled=false + } } 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 281f8fe..482fdf4 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 @@ -231,54 +231,17 @@ class ConfiguracionFragment : Fragment() { if (etRuta.text.isNotEmpty()) editor?.putString("etRuta", etRuta.text.toString()) - if (rbProInclu.isChecked) editor?.putString( - "rbProInclu", - "1" - ) else editor?.putString("rbProInclu", "0") - if (rbProNoInclu.isChecked) editor?.putString( - "rbProNoInclu", - "1" - ) else editor?.putString("rbProNoInclu", "0") - - if (cbHabiLectura.isChecked) editor?.putString( - "cbHabiLectura", - "1" - ) else editor?.putString( - "cbHabiLectura", - "0" - ) - if (cbMostrarStock.isChecked) editor?.putString( - "cbMostrarStock", - "1" - ) else editor?.putString("cbMostrarStock", "0") - if (rbVentas.isChecked) editor?.putString( - "rbVentas", - "1" - ) else editor?.putString("rbVentas", "0") - if (rbDeposito.isChecked) editor?.putString( - "rbDeposito", - "1" - ) else editor?.putString("rbDeposito", "0") - if (rbCodigoDebo.isChecked) editor?.putString( - "rbCodigoDebo", - "1" - ) else editor?.putString("rbCodigoDebo", "0") - if (rbCodigoOrigen.isChecked) editor?.putString( - "rbCodigoOrigen", - "1" - ) else editor?.putString("rbCodigoOrigen", "0") - if (rbCodigoBarras.isChecked) editor?.putString( - "rbCodigoBarras", - "1" - ) else editor?.putString("rbCodigoBarras", "0") - if (cbMostrarExistencia.isChecked) editor?.putString( - "cbMostrarExistencia", - "1" - ) else editor?.putString("cbMostrarExistencia", "0") - if (cbMostrarPrecio.isChecked) editor?.putString( - "cbMostrarPrecio", - "1" - ) else editor?.putString("cbMostrarPrecio", "0") + if (rbProInclu.isChecked) editor?.putString("rbProInclu", "1") else editor?.putString("rbProInclu", "0") + if (rbProNoInclu.isChecked) editor?.putString("rbProNoInclu", "1") else editor?.putString("rbProNoInclu", "0") + if (cbHabiLectura.isChecked) editor?.putString("cbHabiLectura", "1") else editor?.putString("cbHabiLectura", "0") + if (cbMostrarStock.isChecked) editor?.putString("cbMostrarStock", "1") else editor?.putString("cbMostrarStock", "0") + if (rbVentas.isChecked) editor?.putString("rbVentas","1") else editor?.putString("rbVentas", "0") + if (rbDeposito.isChecked) editor?.putString("rbDeposito","1") else editor?.putString("rbDeposito", "0") +// if (rbCodigoDebo.isChecked) editor?.putString("rbCodigoDebo", "1") else editor?.putString("rbCodigoDebo", "0") +// if (rbCodigoOrigen.isChecked) editor?.putString("rbCodigoOrigen", "1") else editor?.putString("rbCodigoOrigen", "0") +// if (rbCodigoBarras.isChecked) editor?.putString("rbCodigoBarras", "1") else editor?.putString("rbCodigoBarras", "0") +// if (cbMostrarExistencia.isChecked) editor?.putString("cbMostrarExistencia", "1") else editor?.putString("cbMostrarExistencia", "0") +// if (cbMostrarPrecio.isChecked) editor?.putString("cbMostrarPrecio", "1") else editor?.putString("cbMostrarPrecio", "0") editor?.putString("ServerPredeterminado", indexSelect.toString()) updateServerPreInZero() updateServerPre(itemSelect) diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionFragment.kt index 555e31a..28f2550 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionFragment.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionFragment.kt @@ -123,7 +123,8 @@ class DescripcionFragment : Fragment() { mDialogView.etCantidad.requestFocus() mDialogView.etCantidad.hint = "Ingrese un valor" } else if (!mDialogView.etCantidad.text.isNullOrEmpty()) { - cantidad = String.format("%.2f", mDialogView.etCantidad.text.toString().toFloat()).toFloat() + + cantidad = String.format("%.2f",mDialogView.etCantidad.text.toString().toFloat()).toFloat() val body = InvBody( numeroInventario, (viewAdapter2 as DescripcionListAdapter).items2?.get(viewHolder.layoutPosition)!!.sector, diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt index 3c9cf8f..fcbdd13 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt @@ -22,6 +22,9 @@ import android.widget.Toast import androidx.core.content.ContextCompat import androidx.core.os.bundleOf import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.lifecycleScope import androidx.navigation.NavController import androidx.navigation.Navigation @@ -35,6 +38,7 @@ import com.focasoftware.deboinventariov20.Model.InvHead import com.focasoftware.deboinventariov20.R import com.focasoftware.deboinventariov20.UI.Utils.NoEncontradoSimple import com.focasoftware.deboinventariov20.UI.Utils.modificarCantidadEnCabecera +import com.focasoftware.deboinventariov20.UI.inventario.viewModel.InventarioViewModel import kotlinx.android.synthetic.main.fragment_inventario.* import kotlinx.android.synthetic.main.ingresar_cantidad.view.* import kotlinx.android.synthetic.main.login_dialog.view.* @@ -63,14 +67,16 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList private var bFirst = false private lateinit var deleteIcon: Drawable lateinit var mDialogView: View + lateinit var inventarioViewModel: ViewModel @SuppressLint("MissingPermission") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + inventarioViewModel= ViewModelProviders.of(this).get(InventarioViewModel::class.java) + sharedPreferences = requireActivity().getSharedPreferences("SP_INFO", Context.MODE_PRIVATE) if (sharedPreferences.contains("Inventario")) if (sharedPreferences.getString("Inventario", "").toString() != "-1") { - InventarioNuevo = sharedPreferences.getString("Inventario", "").toString().toInt() + (inventarioViewModel as InventarioViewModel).InventarioNuevo = sharedPreferences.getString("Inventario", "").toString().toInt() val editor = sharedPreferences.edit() editor?.putString("Inventario", "-1") editor?.apply() @@ -94,19 +100,19 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList rcInventarios = v.findViewById(R.id.rcInventarios) val tvTitulo = v.findViewById(R.id.tvTitulo) - if (InventarioNuevo == 0) {// TODO: SI INVETNARIO NUEVO + if ((inventarioViewModel as InventarioViewModel).InventarioNuevo == 0) {// TODO: SI INVETNARIO NUEVO GlobalScope.launch(Dispatchers.Main) { //TODO: BUSCO EL ULTIMO INVENTARIO EN LA BD PARA PODER CREAR EL PROXIMO - InventarioNuevo = AppDb.getAppDb(requireActivity())?.InvHeadDAO()?.findLastInv()?.plus(1) ?: 1 + (inventarioViewModel as InventarioViewModel).InventarioNuevo = AppDb.getAppDb(requireActivity())?.InvHeadDAO()?.findLastInv()?.plus(1) ?: 1 //TODO: CREAMOS EL INVENTARIO EN LA CABECERA DEL INVENTARIO - invHead = InvHead(InventarioNuevo, if (!SerchArea()) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont()) + invHead = InvHead((inventarioViewModel as InventarioViewModel).InventarioNuevo, if (!SerchArea()) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont()) AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.insertInvHead(invHead) - tvTitulo.text = "Inventario " + " # $InventarioNuevo" + tvTitulo.text = "Inventario " + " # ${(inventarioViewModel as InventarioViewModel).InventarioNuevo}" } } else {// TODO (SI VENGO DE FRAGMENT DESCRIPCION) listArticulos.clear() - CargarDeBdInventario(InventarioNuevo) - tvTitulo.text = "Inventario " + " # $InventarioNuevo" + CargarDeBdInventario((inventarioViewModel as InventarioViewModel).InventarioNuevo) + tvTitulo.text = "Inventario " + " # ${(inventarioViewModel as InventarioViewModel).InventarioNuevo}" } tCodigoBarras.setOnKeyListener { _, keyCode, keyEvent -> @@ -315,9 +321,9 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList AlertDialog.Builder(requireContext()).setTitle("Eliminación de Inventarios").setMessage("¿Confirma que desea eliminar el inventario?") .setPositiveButton(R.string.btnOk, DialogInterface.OnClickListener { dialog, which -> BorrarInvActual() - Toast.makeText(requireContext(), "El inventario $InventarioNuevo fue Borrado", Toast.LENGTH_LONG).show() + Toast.makeText(requireContext(), "El inventario $(inventarioViewModel as InventarioViewModel).InventarioNuevo fue Borrado", Toast.LENGTH_LONG).show() navController.navigate(R.id.action_inventarioFragment_to_mainFragment2) - InventarioNuevo = 0 + (inventarioViewModel as InventarioViewModel).InventarioNuevo = 0 }).setNegativeButton(R.string.btnCancelar, DialogInterface.OnClickListener { dialog, which -> //botón cancel pulsado @@ -328,9 +334,9 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList AlertDialog.Builder(requireContext()).setTitle(R.string.sTituloExportar).setMessage(R.string.sMensajeExportar) .setPositiveButton(R.string.btnOk, DialogInterface.OnClickListener { dialog, which -> BorrarInvActual() - Toast.makeText(requireContext(), "El inventario $InventarioNuevo fue Exportado al Servidor", Toast.LENGTH_LONG).show() + Toast.makeText(requireContext(), "El inventario $(inventarioViewModel as InventarioViewModel).InventarioNuevo fue Exportado al Servidor", Toast.LENGTH_LONG).show() navController.navigate(R.id.action_inventarioFragment_to_mainFragment2) - InventarioNuevo = 0 + (inventarioViewModel as InventarioViewModel).InventarioNuevo = 0 }).setNegativeButton(R.string.btnCancelar, DialogInterface.OnClickListener { dialog, which -> }).show() } @@ -343,7 +349,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList when (iEstado) { 0 -> { ivCamara.setImageResource(R.drawable.codbar) - etCodigoBarras.hint = "Busqueda por C. Barras" + etCodigoBarras.hint = "Busqueda por Código de Barras" swSumaUno.visibility = View.VISIBLE iBusquedaPor = 0 iEstado = 1 @@ -357,7 +363,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList } 2 -> { ivCamara.setImageResource(R.drawable.cod_origen) - etCodigoBarras.hint = "Busqueda por C. Origen" + etCodigoBarras.hint = "Busqueda por Código de Origen" swSumaUno.visibility = View.GONE iBusquedaPor = 2 iEstado = 0 @@ -369,8 +375,8 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList private fun BorrarInvActual() { lifecycleScope.launch { withContext(Dispatchers.IO) { - AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.deleteinvHead(InventarioNuevo.toLong()) - AppDb.getAppDb(requireActivity())!!.InvBodyDAO()!!.deleteInvBody(InventarioNuevo.toLong()) + AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.deleteinvHead((inventarioViewModel as InventarioViewModel).InventarioNuevo.toLong()) + AppDb.getAppDb(requireActivity())!!.InvBodyDAO()!!.deleteInvBody((inventarioViewModel as InventarioViewModel).InventarioNuevo.toLong()) } } } @@ -406,7 +412,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList var bundle = Bundle() bundle = bundleOf("ArrayDesc" to artAcargar) - bundle.putInt("numeroInv", InventarioNuevo) + bundle.putInt("numeroInv", (inventarioViewModel as InventarioViewModel).InventarioNuevo) navController.navigate(R.id.action_inventarioFragment_to_codigoOriFragment, bundle) } else {//TODO si no lo encuentra en la BD @@ -449,7 +455,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList imm!!.hideSoftInputFromWindow(requireActivity().currentFocus?.windowToken, InputMethodManager.HIDE_NOT_ALWAYS) var bundle = Bundle() bundle = bundleOf("ArrayDesc" to artAcargar) - bundle.putInt("numeroInv", InventarioNuevo) + bundle.putInt("numeroInv", (inventarioViewModel as InventarioViewModel).InventarioNuevo) navController.navigate(R.id.action_inventarioFragment_to_descripcionFragment, bundle) //navController.backStack.removeLast() // } @@ -486,7 +492,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList // } else { // var bundle = Bundle() // bundle = bundleOf("ArrayDesc" to artAcargar) -// bundle.putInt("numeroInv", InventarioNuevo) +// bundle.putInt("numeroInv", (inventarioViewModel as InventarioViewModel).InventarioNuevo) // navController.navigate(R.id.action_inventarioFragment_to_descripcionFragment, bundle) // } // } @@ -543,7 +549,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList cantidad = mDialogView.etCantidad.text.toString().toFloat() cargarArtEnBd(artAcargar, String.format("%.2f", cantidad)) cargarRecicler(artAcargar, cantidad) - modificarCantidadEnCabecera(InventarioNuevo, true, requireContext()) + modificarCantidadEnCabecera((inventarioViewModel as InventarioViewModel).InventarioNuevo, true, requireContext()) } } return cantidad @@ -702,7 +708,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList } private fun cargarArtEnBd(articulos: Articles, cant: String) { - val body = InvBody(InventarioNuevo,// TODO PREPARO PARA MANDAR A CARGAR EN LA BD + val body = InvBody((inventarioViewModel as InventarioViewModel).InventarioNuevo,// TODO PREPARO PARA MANDAR A CARGAR EN LA BD articulos.sector, articulos.codigo, articulos.descripcion, @@ -739,10 +745,10 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) { GlobalScope.launch(Dispatchers.Main) { - borrarArticulo(listArticulos[viewHolder.adapterPosition].sector.toString(), listArticulos[viewHolder.adapterPosition].codigo.toString(), InventarioNuevo.toString()) + borrarArticulo(listArticulos[viewHolder.adapterPosition].sector.toString(), listArticulos[viewHolder.adapterPosition].codigo.toString(), (inventarioViewModel as InventarioViewModel).InventarioNuevo.toString()) (viewAdapter as ProductosListAdapter).removeItem(viewHolder) viewAdapter.notifyDataSetChanged() - modificarCantidadEnCabecera(InventarioNuevo, false, requireContext()) + modificarCantidadEnCabecera((inventarioViewModel as InventarioViewModel).InventarioNuevo, false, requireContext()) } } @@ -790,7 +796,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList suspend fun SerchAreaInventario(): Boolean { return GlobalScope.async(IO) { - return@async AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.fetchAreaInvH(InventarioNuevo.toLong()) + return@async AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.fetchAreaInvH((inventarioViewModel as InventarioViewModel).InventarioNuevo.toLong()) }.await() } @@ -829,7 +835,7 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList val bundle = Bundle() bundle.putString("sector", sector!!.toInt().toString()) bundle.putString("codigo", codigo) - bundle.putInt("numeroInv", InventarioNuevo) + bundle.putInt("numeroInv", (inventarioViewModel as InventarioViewModel).InventarioNuevo) navController.navigate(R.id.action_inventarioFragment_to_detalleArtFragment, bundle) } diff --git a/app/src/main/res/drawable-v24/inicio.xml b/app/src/main/res/drawable-v24/inicio.xml deleted file mode 100644 index 6242926..0000000 --- a/app/src/main/res/drawable-v24/inicio.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable-xlarge/ic_sort19.xml b/app/src/main/res/drawable-xlarge/ic_sort19.xml new file mode 100644 index 0000000..c9943b3 --- /dev/null +++ b/app/src/main/res/drawable-xlarge/ic_sort19.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable-xlarge/ic_sort91.xml b/app/src/main/res/drawable-xlarge/ic_sort91.xml new file mode 100644 index 0000000..599adab --- /dev/null +++ b/app/src/main/res/drawable-xlarge/ic_sort91.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/drawable-xlarge/inicio.xml b/app/src/main/res/drawable-xlarge/inicio.xml new file mode 100644 index 0000000..c3cb47a --- /dev/null +++ b/app/src/main/res/drawable-xlarge/inicio.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_inicio.xml b/app/src/main/res/drawable/ic_inicio.xml new file mode 100644 index 0000000..3a4c7da --- /dev/null +++ b/app/src/main/res/drawable/ic_inicio.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/drawable/inicio.xml b/app/src/main/res/drawable/inicio.xml new file mode 100644 index 0000000..5667808 --- /dev/null +++ b/app/src/main/res/drawable/inicio.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/app/src/main/res/layout-large/item_spinner.xml b/app/src/main/res/layout-large/item_spinner.xml new file mode 100644 index 0000000..baaa7f8 --- /dev/null +++ b/app/src/main/res/layout-large/item_spinner.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/app/src/main/res/layout-xlarge/activity_splash.xml b/app/src/main/res/layout-xlarge/activity_splash.xml new file mode 100644 index 0000000..aabd131 --- /dev/null +++ b/app/src/main/res/layout-xlarge/activity_splash.xml @@ -0,0 +1,60 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout-xlarge/fragment_actua_maestros.xml b/app/src/main/res/layout-xlarge/fragment_actua_maestros.xml new file mode 100644 index 0000000..2a78fe0 --- /dev/null +++ b/app/src/main/res/layout-xlarge/fragment_actua_maestros.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + +