From 880347544ec163fb7af7b6afb0025f6bcabb1dd5 Mon Sep 17 00:00:00 2001 From: Mauricio Sanchez Date: Thu, 22 Oct 2020 06:12:10 -0300 Subject: [PATCH] 22102020 0600 --- .../deboinventariov20/UI/SplashActivity.kt | 1 - .../actualizacionMaestros/ActuaMaestrosFragment.kt | 21 +++---- .../UI/actualizacionMaestros/InvSecImpFragment.kt | 55 +++++++++++++--- .../UI/configuracion/ConfiguracionFragment.kt | 1 - .../UI/detalleProducto/DetalleArtFragment.kt | 11 ++-- .../UI/inventario/InventarioFragment.kt | 49 +++++---------- .../UI/main/InventarioSecListAdapter.kt | 2 +- .../deboinventariov20/UI/main/MainFragment.kt | 44 +++++++++++++ .../res/layout-land/fragment_configuracion.xml | 4 +- .../main/res/layout-large-v26/fragment_main.xml | 72 ++++++++++----------- app/src/main/res/layout-large/fragment_main.xml | 73 +++++++++++----------- .../layout-xlarge-v26/fragment_actua_maestros.xml | 20 +++--- .../main/res/layout-xlarge-v26/fragment_main.xml | 71 +++++++++++---------- .../res/layout-xlarge/fragment_actua_maestros.xml | 12 ++-- .../res/layout-xlarge/fragment_configuracion.xml | 3 +- app/src/main/res/layout-xlarge/fragment_main.xml | 69 ++++++++++---------- app/src/main/res/layout-xlarge/nav_header_main.xml | 22 +++---- .../main/res/layout/fragment_actua_maestros.xml | 13 ++-- app/src/main/res/layout/fragment_configuracion.xml | 5 +- app/src/main/res/layout/fragment_main.xml | 69 ++++++++++---------- app/src/main/res/layout/nav_header_main.xml | 20 +++--- app/src/main/res/values/strings.xml | 4 +- 22 files changed, 353 insertions(+), 288 deletions(-) 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 ea5b9ef..2c6cfaf 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt @@ -23,7 +23,6 @@ class SplashActivity : Activity() { val bac = object : Thread() { override fun run() { try { - sleep(3000) val intent = Intent(baseContext, MainActivity::class.java) startActivity(intent) finish() 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 631732d..89d10d3 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 @@ -1,12 +1,11 @@ package com.focasoftware.deboinventariov20.UI.actualizacionMaestros import android.os.Bundle +import android.os.SystemClock import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Button -import android.widget.RadioButton -import android.widget.Toast +import android.widget.* import androidx.fragment.app.Fragment import androidx.navigation.NavController import androidx.navigation.Navigation @@ -29,19 +28,14 @@ import java.net.SocketTimeoutException private var serverPre: ServeInv? = null private lateinit var navController: NavController - - class ActuaMaestrosFragment : Fragment() { private val job: Job = Job() private val fragmentScopeAM = CoroutineScope(IO + job) + private lateinit var countriesList:TextView + private lateinit var loading_view:ProgressBar override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - -// val servidor = urlBajada((activity as MainActivity)) -// if (servidor != "") { -// tvServerConectado.text = "Conectado al servidor: $servidor" -// } } override fun onDestroy() { @@ -54,12 +48,13 @@ class ActuaMaestrosFragment : Fragment() { val bConfirmarAct = v.findViewById