From 01fb822e19dda9141002d3401c35f2156e508934 Mon Sep 17 00:00:00 2001 From: Mauricio Sanchez Date: Mon, 21 Sep 2020 18:08:02 -0300 Subject: [PATCH] 21092020 1800 --- .../deboinventariov20/Model/ProductosService.kt | 39 +++- .../deboinventariov20/UI/SplashActivity.kt | 2 +- .../actualizacionMaestros/ActuaMaestrosFragment.kt | 84 ++++---- .../descripCorigenFragment/CodigoOrigenAdapter.kt | 7 - .../descripcionFragment/DescripcionListAdapter.kt | 2 + .../UI/inventario/InventarioFragment.kt | 4 +- .../UI/inventario/ProductosListAdapter.kt | 8 +- .../UI/main/InventarioListAdapter.kt | 2 +- app/src/main/res/drawable/gradient_bt.xml | 15 ++ app/src/main/res/drawable/ic_izq.xml | 10 + app/src/main/res/layout/fragment_codigo_ori.xml | 29 +++ app/src/main/res/layout/fragment_descripcion.xml | 30 +++ app/src/main/res/layout/fragment_detalle_art.xml | 202 ++++++++++--------- app/src/main/res/layout/fragment_inventario.xml | 8 +- app/src/main/res/layout/item.xml | 224 ++++++++++----------- app/src/main/res/layout/item_codigo_origen.xml | 162 +++++++-------- app/src/main/res/layout/item_descripcion.xml | 159 +++++++-------- app/src/main/res/layout/item_principal.xml | 2 +- app/src/main/res/layout/item_servidores.xml | 2 +- app/src/main/res/navigation/mobile_navigation.xml | 2 +- 20 files changed, 547 insertions(+), 446 deletions(-) create mode 100644 app/src/main/res/drawable/gradient_bt.xml create mode 100644 app/src/main/res/drawable/ic_izq.xml diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt b/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt index 8ec4b81..80c4f3b 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt @@ -1,15 +1,52 @@ package com.focasoftware.deboinventariov20.Model import com.focasoftware.deboinventariov20.UI.actualizacionMaestros.BASE_URL +import okhttp3.OkHttpClient +import okhttp3.logging.HttpLoggingInterceptor import retrofit2.Retrofit import retrofit2.converter.gson.GsonConverterFactory +import java.net.SocketTimeoutException +import java.util.concurrent.TimeUnit object ProductosService { + private val TIME_OUT: Long + get() { + return 15 + } + private val interceptor = run { + val httpLoggingInterceptor = HttpLoggingInterceptor() + httpLoggingInterceptor.apply { + httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY + } + } + private val okHttpClient = OkHttpClient.Builder() + .addNetworkInterceptor(interceptor) // same for .addInterceptor(...) + .connectTimeout(TIME_OUT, TimeUnit.SECONDS) //Backend is really slow + .writeTimeout(TIME_OUT, TimeUnit.SECONDS) + .readTimeout(TIME_OUT, TimeUnit.SECONDS) + .build() fun getProductosService(): ProductosApi { return Retrofit.Builder() + .client(okHttpClient) .baseUrl(BASE_URL) .addConverterFactory(GsonConverterFactory.create()) .build() .create(ProductosApi::class.java) } -} \ No newline at end of file +} +//fun prubaConexion(){ +// for (retries in 0..2) { +// try { +// val client: HttpClient = createHttpClientWithDefaultSocketFactory(null, null) +// val response: HttpResponse = client.execute(get) +// val statusCode: Int = response.getStatusLine().getStatusCode() +// return if (statusCode != 200) { +// throw IllegalStateException("GET Request on '" + get.getURI().toString().toString() + "' resulted in " + statusCode) +// } else { +// response.getEntity() +// } +// } catch (e: SocketTimeoutException) { +// // connection timed out...let's try again +// } +// } +//} \ No newline at end of file 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 ab7f7fa..4d46324 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(3000) + Thread.sleep(3) 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 67cb475..f345f34 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 @@ -16,7 +16,8 @@ import kotlinx.android.synthetic.main.fragment_actua_maestros.* import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO import kotlinx.coroutines.Dispatchers.Main -import java.util.ArrayList +import java.net.SocketTimeoutException + var BASE_URL = "" @@ -31,8 +32,8 @@ class ActuaMaestrosFragment : Fragment() { val modalDialog = noServerConf() modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") } else { - BASE_URL = serverPre.direccion.toString()+":"+serverPre.puerto.toString()+"/" - tvServerConectado.text="Conectado al servidor: ${serverPre.descripcion}" + BASE_URL = serverPre.direccion.toString() + ":" + serverPre.puerto.toString() + "/" + tvServerConectado.text = "Conectado al servidor: ${serverPre.descripcion}" } } @@ -68,47 +69,56 @@ class ActuaMaestrosFragment : Fragment() { val job = CoroutineScope(IO).launch { // TODO: BORRO TODO LOS ARTICULOS DE LA BASE PARA CARGARLOS DE NUEVO AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.deleteAllArticulos() - - val response = productosService.getProductos() - if (response.isSuccessful) { - - for (pro in response.body()!!) { - val artiAcargar = Articles(pro.sector, - pro.codigo, - pro.descripcion, - pro.codBar, - pro.codOrigen, - pro.precio, - pro.costo, - pro.exiVenta, - pro.exiDeposito, - pro.de, - pro.balanza, - pro.depSn, - pro.imagen) - index += index - AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.insertArticulos(artiAcargar) - } - withContext(Main) { - countriesList.visibility = View.VISIBLE - countriesList.text = "¡Datos Importados Correctamente!" - loading_view.visibility = View.GONE + try { + val response = productosService.getProductos() + if (response.isSuccessful) { + + for (pro in response.body()!!) { + val artiAcargar = Articles( + pro.sector, + pro.codigo, + pro.descripcion, + pro.codBar, + pro.codOrigen, + pro.precio, + pro.costo, + pro.exiVenta, + pro.exiDeposito, + pro.de, + pro.balanza, + pro.depSn, + pro.imagen + ) + index += index + AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.insertArticulos(artiAcargar) + } + withContext(Main) { + countriesList.visibility = View.VISIBLE + countriesList.text = "¡Datos Importados Correctamente!" + loading_view.visibility = View.GONE + } + } else if (!response.isSuccessful) { + withContext(Main) { + countriesList.visibility = View.VISIBLE + countriesList.text = "¡Sin servicio. No se puede conectar a la api o al servidor configurado en el BackEnd!" + loading_view.visibility = View.GONE + } } - }else{ + } catch (e: SocketTimeoutException) { withContext(Main) { countriesList.visibility = View.VISIBLE - countriesList.text = "¡Error!" + countriesList.text = "¡Sin conexión al Servidor!" loading_view.visibility = View.GONE } } } - if (job == null) { - withContext(Main) { - countriesList.visibility = View.VISIBLE - countriesList.text = "No se puedo realizar la conexión al Servidor" - loading_view.visibility = View.GONE - } - } +// if (job == null) { +// withContext(Main) { +// countriesList.visibility = View.VISIBLE +// countriesList.text = "No se puedo realizar la conexión al Servidor" +// loading_view.visibility = View.GONE +// } +// } } diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripCorigenFragment/CodigoOrigenAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripCorigenFragment/CodigoOrigenAdapter.kt index 02b7d59..48fff85 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripCorigenFragment/CodigoOrigenAdapter.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripCorigenFragment/CodigoOrigenAdapter.kt @@ -6,15 +6,8 @@ import android.view.View import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.focasoftware.deboinventariov20.Model.Articles -import com.focasoftware.deboinventariov20.Model.InvHead import com.focasoftware.deboinventariov20.R -import com.focasoftware.deboinventariov20.UI.Utils.BaseViewHolder -import com.focasoftware.deboinventariov20.UI.descripcionFragment.DescripcionListAdapter -import kotlinx.android.synthetic.main.item.view.* -import kotlinx.android.synthetic.main.item.view.tvCodigo -import kotlinx.android.synthetic.main.item.view.tvCodigoOrigen import kotlinx.android.synthetic.main.item.view.tvDescripcion -import kotlinx.android.synthetic.main.item.view.tvSector import kotlinx.android.synthetic.main.item_codigo_origen.view.* class CodigoOrigenAdapter(private val cnxt: Context, private val corigen: List) : diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionListAdapter.kt index a162d3c..fac99d1 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionListAdapter.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionListAdapter.kt @@ -7,6 +7,8 @@ import androidx.recyclerview.widget.RecyclerView import com.focasoftware.deboinventariov20.Model.Articles import com.focasoftware.deboinventariov20.R import kotlinx.android.synthetic.main.item.view.* +import kotlinx.android.synthetic.main.item.view.tvDescripcion +import kotlinx.android.synthetic.main.item_descripcion.view.* class DescripcionListAdapter(private val productos: List?) : RecyclerView.Adapter() { 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 2eed29a..3c9cf8f 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 @@ -101,12 +101,12 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList //TODO: CREAMOS EL INVENTARIO EN LA CABECERA DEL INVENTARIO invHead = InvHead(InventarioNuevo, if (!SerchArea()) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont()) AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.insertInvHead(invHead) - tvTitulo.text = "Inventario Dinamico" + " N° $InventarioNuevo" + tvTitulo.text = "Inventario " + " # $InventarioNuevo" } } else {// TODO (SI VENGO DE FRAGMENT DESCRIPCION) listArticulos.clear() CargarDeBdInventario(InventarioNuevo) - tvTitulo.text = "Inventario Dinamico" + " N° $InventarioNuevo" + tvTitulo.text = "Inventario " + " # $InventarioNuevo" } tCodigoBarras.setOnKeyListener { _, keyCode, keyEvent -> diff --git a/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/ProductosListAdapter.kt b/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/ProductosListAdapter.kt index 54933d1..5b177f2 100644 --- a/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/ProductosListAdapter.kt +++ b/app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/ProductosListAdapter.kt @@ -38,12 +38,12 @@ class ProductosListAdapter(private val context: Context,private val productos: A itemView.ivDots.setOnClickListener {itemImageClickListener.onImageDotsClick(item.sector,item.codigo) } itemView.ivPen.setOnClickListener {itemImageClickListener.onImagePenClick(item.sector,item.codigo,item.cantTomada.toString(),adapterPosition.toString()) } - itemView.tvSector.text=item.sector - itemView.tvCodigo.text=item.codigo +// itemView.tvSector.text=item.sector +// itemView.tvCodigo.text=item.codigo itemView.tvDescripcion.text=item.descripcion itemView.tvCantidad.text=item.cantTomada.toString() - itemView.tvCodigoBarras.text=item.sector - itemView.tvCodigoOrigen.text=item.sector +// itemView.tvCodigoBarras.text=item.sector +// itemView.tvCodigoOrigen.text=item.sector itemView.ivPen.setImageResource(R.drawable.pen) itemView.ivDots.setImageResource(R.drawable.more) } 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 3f8b28e..78b6fe9 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 @@ -29,7 +29,7 @@ class InventarioListAdapter(private val context: Context, private val inv: List< inner class ItemsViewHolder(itemView: View) : BaseViewHolder(itemView) { override fun bind(item: InvHead, position: Int) { itemView.setOnClickListener {itemClickListener.onItemClick(item.invNum.toString())} - itemView.tvPrincipalinventario.text = if ( item.invNum < 10) "0${ item.invNum.toString()}" else item.invNum.toString() + itemView.tvPrincipalinventario.text = if ( item.invNum < 10) "#0${ item.invNum.toString()}" else "#"+item.invNum.toString() itemView.tvDescription.text=item.descripcion.toString() itemView.tvFecha.text=item.fechaInicio.toString() diff --git a/app/src/main/res/drawable/gradient_bt.xml b/app/src/main/res/drawable/gradient_bt.xml new file mode 100644 index 0000000..55f2699 --- /dev/null +++ b/app/src/main/res/drawable/gradient_bt.xml @@ -0,0 +1,15 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_izq.xml b/app/src/main/res/drawable/ic_izq.xml new file mode 100644 index 0000000..4dc00fa --- /dev/null +++ b/app/src/main/res/drawable/ic_izq.xml @@ -0,0 +1,10 @@ + + + diff --git a/app/src/main/res/layout/fragment_codigo_ori.xml b/app/src/main/res/layout/fragment_codigo_ori.xml index 4e03208..68afbcf 100644 --- a/app/src/main/res/layout/fragment_codigo_ori.xml +++ b/app/src/main/res/layout/fragment_codigo_ori.xml @@ -5,8 +5,37 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/darker_gray" tools:context=".UI.descripcionFragment.DescripcionFragment"> + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + app:layout_constraintBaseline_toBaselineOf="@+id/textView18" + app:layout_constraintStart_toEndOf="@+id/textView18" /> + app:layout_constraintBaseline_toBaselineOf="@+id/textView19" + app:layout_constraintStart_toEndOf="@+id/textView19" /> @@ -150,7 +146,7 @@ android:layout_height="wrap_content" android:layout_marginStart="5dp" android:layout_marginTop="10dp" - android:text="9999999999" + android:text="1234567890123" android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textSize="18sp" android:textStyle="bold" @@ -159,91 +155,112 @@ app:layout_constraintTop_toBottomOf="@+id/textView18" /> + + + app:layout_constraintBaseline_toBaselineOf="@+id/textView9" + app:layout_constraintStart_toEndOf="@+id/textView18" /> + app:layout_constraintBaseline_toBaselineOf="@+id/textView12" + app:layout_constraintStart_toEndOf="@+id/textView12" /> + app:layout_constraintBaseline_toBaselineOf="@+id/tvPrecio" + app:layout_constraintStart_toEndOf="@+id/tvPrecio" /> + app:layout_constraintBaseline_toBaselineOf="@+id/textView8" + app:layout_constraintStart_toEndOf="@+id/textView8" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/textView9" /> + app:layout_constraintBaseline_toBaselineOf="@+id/textView3" + app:layout_constraintStart_toEndOf="@+id/textView3" /> + app:layout_constraintTop_toBottomOf="@+id/textView3" /> + + + + app:layout_constraintBaseline_toBaselineOf="@+id/textView15" + app:layout_constraintStart_toEndOf="@+id/textView15" /> + app:layout_constraintBaseline_toBaselineOf="@+id/tvExiVenta" + app:layout_constraintStart_toEndOf="@+id/tvExiVenta" /> + app:layout_constraintBaseline_toBaselineOf="@+id/tvDeposito" + app:layout_constraintStart_toEndOf="@+id/tvPrecio" /> @@ -313,25 +329,23 @@ android:id="@+id/textView11" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="5dp" android:layout_marginTop="10dp" android:text="Imagen:" android:textAppearance="@style/TextAppearance.AppCompat.Large" android:textSize="14sp" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/textView10" /> + app:layout_constraintTop_toBottomOf="@+id/textView5" /> + app:layout_constraintStart_toEndOf="@+id/textView11" + app:layout_constraintTop_toBottomOf="@+id/textView15" /> diff --git a/app/src/main/res/layout/fragment_inventario.xml b/app/src/main/res/layout/fragment_inventario.xml index 36cb9e8..4507932 100644 --- a/app/src/main/res/layout/fragment_inventario.xml +++ b/app/src/main/res/layout/fragment_inventario.xml @@ -11,7 +11,7 @@ + app:layout_constraintGuide_percent="0.12029161" /> + app:layout_constraintGuide_percent="0.27" /> + app:layout_constraintGuide_percent="0.32" /> @@ -15,163 +15,157 @@ android:layout_height="wrap_content"> + + + + + + + + + + + + + - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + android:textSize="14sp" + android:layout_marginStart="5dp" + android:layout_marginTop="5dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + app:layout_constraintStart_toEndOf="@id/textView5" /> + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> - + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_codigo_origen.xml b/app/src/main/res/layout/item_codigo_origen.xml index 88b73ad..a01bc0a 100644 --- a/app/src/main/res/layout/item_codigo_origen.xml +++ b/app/src/main/res/layout/item_codigo_origen.xml @@ -4,144 +4,118 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - app:cardCornerRadius="2dp" + app:cardCornerRadius="15dp" app:cardElevation="10dp" - app:contentPadding="5dp" - app:cardPreventCornerOverlap="false"> + app:cardPreventCornerOverlap="false" + app:contentPadding="5dp"> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + android:visibility="visible" + app:layout_constraintStart_toEndOf="@+id/tvCantidad" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + app:layout_constraintStart_toEndOf="@+id/tvCodigoOrigen" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + app:layout_constraintStart_toEndOf="@+id/textView2" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> - - - - + app:layout_constraintStart_toEndOf="@+id/tvSector" + app:layout_constraintTop_toTopOf="@+id/textView2" /> - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_descripcion.xml b/app/src/main/res/layout/item_descripcion.xml index b2af7a8..366af94 100644 --- a/app/src/main/res/layout/item_descripcion.xml +++ b/app/src/main/res/layout/item_descripcion.xml @@ -4,144 +4,137 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - app:cardCornerRadius="2dp" + app:cardCornerRadius="15dp" app:cardElevation="10dp" - app:contentPadding="5dp" - app:cardPreventCornerOverlap="false"> + app:cardPreventCornerOverlap="false" + app:contentPadding="5dp"> + + + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/textView2" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/tvSector" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> - - + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toEndOf="@+id/tvCodigo" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + android:visibility="visible" + app:layout_constraintBaseline_toBaselineOf="@+id/textView3" + app:layout_constraintStart_toEndOf="@+id/textView3" + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> + + + + + + + + + + + + - + + + + + + + + + + + + + - - + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_principal.xml b/app/src/main/res/layout/item_principal.xml index 4d16b07..cf13f8a 100644 --- a/app/src/main/res/layout/item_principal.xml +++ b/app/src/main/res/layout/item_principal.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - app:cardCornerRadius="5dp" + app:cardCornerRadius="15dp" app:cardElevation="10dp" app:cardPreventCornerOverlap="false"> diff --git a/app/src/main/res/layout/item_servidores.xml b/app/src/main/res/layout/item_servidores.xml index e0938d8..10205f5 100644 --- a/app/src/main/res/layout/item_servidores.xml +++ b/app/src/main/res/layout/item_servidores.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - app:cardCornerRadius="2dp" + app:cardCornerRadius="15dp" app:cardElevation="10dp" app:contentPadding="5dp" app:cardPreventCornerOverlap="false"> diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 04201c3..0414db0 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -90,7 +90,7 @@