Commit 01fb822e19dda9141002d3401c35f2156e508934
1 parent
be3b7b8379
Exists in
master
21092020 1800
Showing
20 changed files
with
547 additions
and
446 deletions
Show diff stats
app/src/main/java/com/focasoftware/deboinventariov20/Model/ProductosService.kt
1 | 1 | package com.focasoftware.deboinventariov20.Model |
2 | 2 | |
3 | 3 | import com.focasoftware.deboinventariov20.UI.actualizacionMaestros.BASE_URL |
4 | +import okhttp3.OkHttpClient | |
5 | +import okhttp3.logging.HttpLoggingInterceptor | |
4 | 6 | import retrofit2.Retrofit |
5 | 7 | import retrofit2.converter.gson.GsonConverterFactory |
8 | +import java.net.SocketTimeoutException | |
9 | +import java.util.concurrent.TimeUnit | |
6 | 10 | |
7 | 11 | object ProductosService { |
12 | + private val TIME_OUT: Long | |
13 | + get() { | |
14 | + return 15 | |
15 | + } | |
16 | + private val interceptor = run { | |
17 | + val httpLoggingInterceptor = HttpLoggingInterceptor() | |
18 | + httpLoggingInterceptor.apply { | |
19 | + httpLoggingInterceptor.level = HttpLoggingInterceptor.Level.BODY | |
20 | + } | |
21 | + } | |
22 | + private val okHttpClient = OkHttpClient.Builder() | |
23 | + .addNetworkInterceptor(interceptor) // same for .addInterceptor(...) | |
24 | + .connectTimeout(TIME_OUT, TimeUnit.SECONDS) //Backend is really slow | |
25 | + .writeTimeout(TIME_OUT, TimeUnit.SECONDS) | |
26 | + .readTimeout(TIME_OUT, TimeUnit.SECONDS) | |
27 | + .build() | |
8 | 28 | fun getProductosService(): ProductosApi { |
9 | 29 | return Retrofit.Builder() |
30 | + .client(okHttpClient) | |
10 | 31 | .baseUrl(BASE_URL) |
11 | 32 | .addConverterFactory(GsonConverterFactory.create()) |
12 | 33 | .build() |
13 | 34 | .create(ProductosApi::class.java) |
14 | 35 | } |
15 | -} | |
16 | 36 | \ No newline at end of file |
37 | +} | |
38 | +//fun prubaConexion(){ | |
39 | +// for (retries in 0..2) { | |
40 | +// try { | |
41 | +// val client: HttpClient = createHttpClientWithDefaultSocketFactory(null, null) | |
42 | +// val response: HttpResponse = client.execute(get) | |
43 | +// val statusCode: Int = response.getStatusLine().getStatusCode() | |
44 | +// return if (statusCode != 200) { | |
45 | +// throw IllegalStateException("GET Request on '" + get.getURI().toString().toString() + "' resulted in " + statusCode) | |
46 | +// } else { | |
47 | +// response.getEntity() | |
48 | +// } | |
49 | +// } catch (e: SocketTimeoutException) { | |
50 | +// // connection timed out...let's try again | |
51 | +// } | |
52 | +// } | |
53 | +//} | |
17 | 54 | \ No newline at end of file |
app/src/main/java/com/focasoftware/deboinventariov20/UI/SplashActivity.kt
app/src/main/java/com/focasoftware/deboinventariov20/UI/actualizacionMaestros/ActuaMaestrosFragment.kt
... | ... | @@ -16,7 +16,8 @@ import kotlinx.android.synthetic.main.fragment_actua_maestros.* |
16 | 16 | import kotlinx.coroutines.* |
17 | 17 | import kotlinx.coroutines.Dispatchers.IO |
18 | 18 | import kotlinx.coroutines.Dispatchers.Main |
19 | -import java.util.ArrayList | |
19 | +import java.net.SocketTimeoutException | |
20 | + | |
20 | 21 | |
21 | 22 | var BASE_URL = "" |
22 | 23 | |
... | ... | @@ -31,8 +32,8 @@ class ActuaMaestrosFragment : Fragment() { |
31 | 32 | val modalDialog = noServerConf() |
32 | 33 | modalDialog.show(requireActivity().supportFragmentManager, "confirmDialog") |
33 | 34 | } else { |
34 | - BASE_URL = serverPre.direccion.toString()+":"+serverPre.puerto.toString()+"/" | |
35 | - tvServerConectado.text="Conectado al servidor: ${serverPre.descripcion}" | |
35 | + BASE_URL = serverPre.direccion.toString() + ":" + serverPre.puerto.toString() + "/" | |
36 | + tvServerConectado.text = "Conectado al servidor: ${serverPre.descripcion}" | |
36 | 37 | } |
37 | 38 | } |
38 | 39 | |
... | ... | @@ -68,47 +69,56 @@ class ActuaMaestrosFragment : Fragment() { |
68 | 69 | val job = CoroutineScope(IO).launch { |
69 | 70 | // TODO: BORRO TODO LOS ARTICULOS DE LA BASE PARA CARGARLOS DE NUEVO |
70 | 71 | AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.deleteAllArticulos() |
71 | - | |
72 | - val response = productosService.getProductos() | |
73 | - if (response.isSuccessful) { | |
74 | - | |
75 | - for (pro in response.body()!!) { | |
76 | - val artiAcargar = Articles(pro.sector, | |
77 | - pro.codigo, | |
78 | - pro.descripcion, | |
79 | - pro.codBar, | |
80 | - pro.codOrigen, | |
81 | - pro.precio, | |
82 | - pro.costo, | |
83 | - pro.exiVenta, | |
84 | - pro.exiDeposito, | |
85 | - pro.de, | |
86 | - pro.balanza, | |
87 | - pro.depSn, | |
88 | - pro.imagen) | |
89 | - index += index | |
90 | - AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.insertArticulos(artiAcargar) | |
91 | - } | |
92 | - withContext(Main) { | |
93 | - countriesList.visibility = View.VISIBLE | |
94 | - countriesList.text = "¡Datos Importados Correctamente!" | |
95 | - loading_view.visibility = View.GONE | |
72 | + try { | |
73 | + val response = productosService.getProductos() | |
74 | + if (response.isSuccessful) { | |
75 | + | |
76 | + for (pro in response.body()!!) { | |
77 | + val artiAcargar = Articles( | |
78 | + pro.sector, | |
79 | + pro.codigo, | |
80 | + pro.descripcion, | |
81 | + pro.codBar, | |
82 | + pro.codOrigen, | |
83 | + pro.precio, | |
84 | + pro.costo, | |
85 | + pro.exiVenta, | |
86 | + pro.exiDeposito, | |
87 | + pro.de, | |
88 | + pro.balanza, | |
89 | + pro.depSn, | |
90 | + pro.imagen | |
91 | + ) | |
92 | + index += index | |
93 | + AppDb.getAppDb(requireActivity())!!.ArticulosDAO()!!.insertArticulos(artiAcargar) | |
94 | + } | |
95 | + withContext(Main) { | |
96 | + countriesList.visibility = View.VISIBLE | |
97 | + countriesList.text = "¡Datos Importados Correctamente!" | |
98 | + loading_view.visibility = View.GONE | |
99 | + } | |
100 | + } else if (!response.isSuccessful) { | |
101 | + withContext(Main) { | |
102 | + countriesList.visibility = View.VISIBLE | |
103 | + countriesList.text = "¡Sin servicio. No se puede conectar a la api o al servidor configurado en el BackEnd!" | |
104 | + loading_view.visibility = View.GONE | |
105 | + } | |
96 | 106 | } |
97 | - }else{ | |
107 | + } catch (e: SocketTimeoutException) { | |
98 | 108 | withContext(Main) { |
99 | 109 | countriesList.visibility = View.VISIBLE |
100 | - countriesList.text = "¡Error!" | |
110 | + countriesList.text = "¡Sin conexión al Servidor!" | |
101 | 111 | loading_view.visibility = View.GONE |
102 | 112 | } |
103 | 113 | } |
104 | 114 | } |
105 | - if (job == null) { | |
106 | - withContext(Main) { | |
107 | - countriesList.visibility = View.VISIBLE | |
108 | - countriesList.text = "No se puedo realizar la conexión al Servidor" | |
109 | - loading_view.visibility = View.GONE | |
110 | - } | |
111 | - } | |
115 | +// if (job == null) { | |
116 | +// withContext(Main) { | |
117 | +// countriesList.visibility = View.VISIBLE | |
118 | +// countriesList.text = "No se puedo realizar la conexión al Servidor" | |
119 | +// loading_view.visibility = View.GONE | |
120 | +// } | |
121 | +// } | |
112 | 122 | } |
113 | 123 | |
114 | 124 |
app/src/main/java/com/focasoftware/deboinventariov20/UI/descripCorigenFragment/CodigoOrigenAdapter.kt
... | ... | @@ -6,15 +6,8 @@ import android.view.View |
6 | 6 | import android.view.ViewGroup |
7 | 7 | import androidx.recyclerview.widget.RecyclerView |
8 | 8 | import com.focasoftware.deboinventariov20.Model.Articles |
9 | -import com.focasoftware.deboinventariov20.Model.InvHead | |
10 | 9 | import com.focasoftware.deboinventariov20.R |
11 | -import com.focasoftware.deboinventariov20.UI.Utils.BaseViewHolder | |
12 | -import com.focasoftware.deboinventariov20.UI.descripcionFragment.DescripcionListAdapter | |
13 | -import kotlinx.android.synthetic.main.item.view.* | |
14 | -import kotlinx.android.synthetic.main.item.view.tvCodigo | |
15 | -import kotlinx.android.synthetic.main.item.view.tvCodigoOrigen | |
16 | 10 | import kotlinx.android.synthetic.main.item.view.tvDescripcion |
17 | -import kotlinx.android.synthetic.main.item.view.tvSector | |
18 | 11 | import kotlinx.android.synthetic.main.item_codigo_origen.view.* |
19 | 12 | |
20 | 13 | class CodigoOrigenAdapter(private val cnxt: Context, private val corigen: List<Articles>) : |
app/src/main/java/com/focasoftware/deboinventariov20/UI/descripcionFragment/DescripcionListAdapter.kt
... | ... | @@ -7,6 +7,8 @@ import androidx.recyclerview.widget.RecyclerView |
7 | 7 | import com.focasoftware.deboinventariov20.Model.Articles |
8 | 8 | import com.focasoftware.deboinventariov20.R |
9 | 9 | import kotlinx.android.synthetic.main.item.view.* |
10 | +import kotlinx.android.synthetic.main.item.view.tvDescripcion | |
11 | +import kotlinx.android.synthetic.main.item_descripcion.view.* | |
10 | 12 | |
11 | 13 | class DescripcionListAdapter(private val productos: List<Articles>?) : |
12 | 14 | RecyclerView.Adapter<DescripcionListAdapter.ItemsViewHolder>() { |
app/src/main/java/com/focasoftware/deboinventariov20/UI/inventario/InventarioFragment.kt
... | ... | @@ -101,12 +101,12 @@ class InventarioFragment : Fragment(), ProductosListAdapter.OnImageDotsClickList |
101 | 101 | //TODO: CREAMOS EL INVENTARIO EN LA CABECERA DEL INVENTARIO |
102 | 102 | invHead = InvHead(InventarioNuevo, if (!SerchArea()) "Ventas" else "Deposito", 1, ObtenerFechaActual(), ObtenerFechaActual(), 0L, SerchArea(), AjusteProductos(), ProdNoCont()) |
103 | 103 | AppDb.getAppDb(requireActivity())!!.InvHeadDAO()!!.insertInvHead(invHead) |
104 | - tvTitulo.text = "Inventario Dinamico" + " N° $InventarioNuevo" | |
104 | + tvTitulo.text = "Inventario " + " # $InventarioNuevo" | |
105 | 105 | } |
106 | 106 | } else {// TODO (SI VENGO DE FRAGMENT DESCRIPCION) |
107 | 107 | listArticulos.clear() |
108 | 108 | CargarDeBdInventario(InventarioNuevo) |
109 | - tvTitulo.text = "Inventario Dinamico" + " N° $InventarioNuevo" | |
109 | + tvTitulo.text = "Inventario " + " # $InventarioNuevo" | |
110 | 110 | } |
111 | 111 | |
112 | 112 | tCodigoBarras.setOnKeyListener { _, keyCode, keyEvent -> |
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 |
38 | 38 | itemView.ivDots.setOnClickListener {itemImageClickListener.onImageDotsClick(item.sector,item.codigo) } |
39 | 39 | itemView.ivPen.setOnClickListener {itemImageClickListener.onImagePenClick(item.sector,item.codigo,item.cantTomada.toString(),adapterPosition.toString()) } |
40 | 40 | |
41 | - itemView.tvSector.text=item.sector | |
42 | - itemView.tvCodigo.text=item.codigo | |
41 | +// itemView.tvSector.text=item.sector | |
42 | +// itemView.tvCodigo.text=item.codigo | |
43 | 43 | itemView.tvDescripcion.text=item.descripcion |
44 | 44 | itemView.tvCantidad.text=item.cantTomada.toString() |
45 | - itemView.tvCodigoBarras.text=item.sector | |
46 | - itemView.tvCodigoOrigen.text=item.sector | |
45 | +// itemView.tvCodigoBarras.text=item.sector | |
46 | +// itemView.tvCodigoOrigen.text=item.sector | |
47 | 47 | itemView.ivPen.setImageResource(R.drawable.pen) |
48 | 48 | itemView.ivDots.setImageResource(R.drawable.more) |
49 | 49 | } |
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< |
29 | 29 | inner class ItemsViewHolder(itemView: View) : BaseViewHolder<InvHead>(itemView) { |
30 | 30 | override fun bind(item: InvHead, position: Int) { |
31 | 31 | itemView.setOnClickListener {itemClickListener.onItemClick(item.invNum.toString())} |
32 | - itemView.tvPrincipalinventario.text = if ( item.invNum < 10) "0${ item.invNum.toString()}" else item.invNum.toString() | |
32 | + itemView.tvPrincipalinventario.text = if ( item.invNum < 10) "#0${ item.invNum.toString()}" else "#"+item.invNum.toString() | |
33 | 33 | |
34 | 34 | itemView.tvDescription.text=item.descripcion.toString() |
35 | 35 | itemView.tvFecha.text=item.fechaInicio.toString() |
app/src/main/res/drawable/gradient_bt.xml
... | ... | @@ -0,0 +1,15 @@ |
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<shape xmlns:android="http://schemas.android.com/apk/res/android"> | |
3 | + | |
4 | + <gradient | |
5 | + android:angle="90" | |
6 | + android:endColor="@android:color/darker_gray" | |
7 | + android:startColor="@color/colorPrimaryDark" | |
8 | + android:type="linear"> | |
9 | + | |
10 | + </gradient> | |
11 | + | |
12 | + <corners | |
13 | + android:radius="20dp"/> | |
14 | + | |
15 | +</shape> | |
0 | 16 | \ No newline at end of file |
app/src/main/res/drawable/ic_izq.xml
... | ... | @@ -0,0 +1,10 @@ |
1 | +<vector xmlns:android="http://schemas.android.com/apk/res/android" | |
2 | + android:width="24dp" | |
3 | + android:height="24dp" | |
4 | + android:viewportWidth="24" | |
5 | + android:viewportHeight="24" | |
6 | + android:tint="@color/colorPrimaryDark"> | |
7 | + <path | |
8 | + android:fillColor="@color/colorPrimaryDark" | |
9 | + android:pathData="M21,11H6.83l3.58,-3.59L9,6l-6,6 6,6 1.41,-1.41L6.83,13H21z"/> | |
10 | +</vector> |
app/src/main/res/layout/fragment_codigo_ori.xml
... | ... | @@ -5,8 +5,37 @@ |
5 | 5 | xmlns:tools="http://schemas.android.com/tools" |
6 | 6 | android:layout_width="match_parent" |
7 | 7 | android:layout_height="match_parent" |
8 | + android:background="@android:color/darker_gray" | |
8 | 9 | tools:context=".UI.descripcionFragment.DescripcionFragment"> |
9 | 10 | |
11 | + <ImageView | |
12 | + android:id="@+id/ivHolder" | |
13 | + android:layout_width="40dp" | |
14 | + android:layout_height="40dp" | |
15 | + android:src="@drawable/ic_izq" | |
16 | + android:visibility="visible" | |
17 | + app:layout_constraintBottom_toTopOf="@id/guideline4" | |
18 | + app:layout_constraintStart_toStartOf="parent" /> | |
19 | + | |
20 | + | |
21 | + <TextView | |
22 | + android:id="@+id/tvCodigo" | |
23 | + android:layout_width="0dp" | |
24 | + android:layout_height="wrap_content" | |
25 | + android:layout_marginStart="2dp" | |
26 | + android:gravity="center_horizontal" | |
27 | + android:orientation="vertical" | |
28 | + android:text="Deslizar a la izquierda para seleccionar" | |
29 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
30 | + android:textColor="@color/colorPrimaryDark" | |
31 | + android:textSize="16dp" | |
32 | + android:textStyle="bold" | |
33 | + | |
34 | + app:layout_constraintBottom_toTopOf="@id/guideline4" | |
35 | + app:layout_constraintHorizontal_chainStyle="packed" | |
36 | + app:layout_constraintStart_toEndOf="@id/ivHolder" | |
37 | + app:layout_constraintTop_toTopOf="parent" /> | |
38 | + | |
10 | 39 | <androidx.recyclerview.widget.RecyclerView |
11 | 40 | android:id="@+id/rcCodigoOri" |
12 | 41 | android:layout_width="match_parent" |
app/src/main/res/layout/fragment_descripcion.xml
... | ... | @@ -5,8 +5,38 @@ |
5 | 5 | xmlns:tools="http://schemas.android.com/tools" |
6 | 6 | android:layout_width="match_parent" |
7 | 7 | android:layout_height="match_parent" |
8 | + android:background="@android:color/darker_gray" | |
8 | 9 | tools:context=".UI.descripcionFragment.DescripcionFragment"> |
9 | 10 | |
11 | + | |
12 | + <ImageView | |
13 | + android:id="@+id/ivHolder" | |
14 | + android:layout_width="40dp" | |
15 | + android:layout_height="40dp" | |
16 | + android:src="@drawable/ic_izq" | |
17 | + android:visibility="visible" | |
18 | + app:layout_constraintBottom_toTopOf="@id/guideline4" | |
19 | + app:layout_constraintStart_toStartOf="parent" /> | |
20 | + | |
21 | + | |
22 | + <TextView | |
23 | + android:id="@+id/tvCodigo" | |
24 | + android:layout_width="0dp" | |
25 | + android:layout_height="wrap_content" | |
26 | + android:layout_marginStart="2dp" | |
27 | + android:gravity="center_horizontal" | |
28 | + android:orientation="vertical" | |
29 | + android:text="Deslizar a la izquierda para seleccionar" | |
30 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
31 | + android:textColor="@color/colorPrimaryDark" | |
32 | + android:textSize="16dp" | |
33 | + android:textStyle="bold" | |
34 | + | |
35 | + app:layout_constraintBottom_toTopOf="@id/guideline4" | |
36 | + app:layout_constraintHorizontal_chainStyle="packed" | |
37 | + app:layout_constraintStart_toEndOf="@id/ivHolder" | |
38 | + app:layout_constraintTop_toTopOf="parent" /> | |
39 | + | |
10 | 40 | <androidx.recyclerview.widget.RecyclerView |
11 | 41 | android:id="@+id/rcDescripcion" |
12 | 42 | android:layout_width="match_parent" |
app/src/main/res/layout/fragment_detalle_art.xml
... | ... | @@ -24,82 +24,78 @@ |
24 | 24 | android:layout_width="match_parent" |
25 | 25 | android:layout_height="match_parent"> |
26 | 26 | |
27 | + <!-- <TextView--> | |
28 | + <!-- android:id="@+id/tvTime"--> | |
29 | + <!-- android:layout_width="0dp"--> | |
30 | + <!-- android:layout_height="wrap_content"--> | |
31 | + <!-- android:layout_marginTop="15dp"--> | |
32 | + <!-- android:gravity="center_horizontal"--> | |
33 | + <!-- android:orientation="horizontal"--> | |
34 | + <!-- android:text="Detalle del artículo"--> | |
35 | + <!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
36 | + <!-- android:textSize="@dimen/Titulos"--> | |
37 | + <!-- android:textStyle="bold"--> | |
38 | + <!-- app:layout_constraintEnd_toEndOf="parent"--> | |
39 | + <!-- app:layout_constraintStart_toStartOf="parent"--> | |
40 | + <!-- app:layout_constraintTop_toTopOf="parent" />--> | |
41 | + | |
27 | 42 | <TextView |
28 | - android:id="@+id/tvTime" | |
29 | - android:layout_width="0dp" | |
30 | - android:layout_height="wrap_content" | |
31 | - android:layout_marginTop="15dp" | |
43 | + android:id="@+id/tvDescripcion" | |
44 | + android:layout_width="wrap_content" | |
45 | + android:layout_height="0dp" | |
46 | + android:layout_marginTop="10dp" | |
32 | 47 | android:gravity="center_horizontal" |
33 | - android:orientation="horizontal" | |
34 | - android:text="Detalle del artículo" | |
48 | + | |
49 | + android:text="coaca" | |
35 | 50 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
36 | - android:textSize="@dimen/Titulos" | |
51 | + android:textSize="30sp" | |
37 | 52 | android:textStyle="bold" |
38 | 53 | app:layout_constraintEnd_toEndOf="parent" |
39 | 54 | app:layout_constraintStart_toStartOf="parent" |
40 | 55 | app:layout_constraintTop_toTopOf="parent" /> |
41 | 56 | |
57 | + | |
42 | 58 | <TextView |
43 | - android:id="@+id/textView6" | |
59 | + android:id="@+id/textView18" | |
44 | 60 | android:layout_width="wrap_content" |
45 | 61 | android:layout_height="wrap_content" |
46 | - android:layout_marginStart="5dp" | |
47 | 62 | android:layout_marginTop="10dp" |
48 | - android:text="Descripción:" | |
63 | + android:text="Códigos:" | |
49 | 64 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
50 | - android:textSize="14sp" | |
51 | - app:layout_constraintEnd_toStartOf="@id/tvDescripcion" | |
65 | + android:textSize="15sp" | |
52 | 66 | app:layout_constraintStart_toStartOf="parent" |
53 | - app:layout_constraintTop_toBottomOf="@+id/tvTime" /> | |
54 | - | |
55 | - <TextView | |
56 | - android:id="@+id/tvDescripcion" | |
57 | - android:layout_width="0dp" | |
58 | - android:layout_height="wrap_content" | |
59 | - android:layout_marginStart="5dp" | |
60 | - android:layout_marginTop="10dp" | |
61 | - android:lines="2" | |
62 | - android:text="" | |
63 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
64 | - android:textSize="18sp" | |
65 | - android:textStyle="bold" | |
66 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView6" | |
67 | - app:layout_constraintEnd_toEndOf="parent" | |
68 | - app:layout_constraintStart_toEndOf="@+id/textView6" /> | |
69 | - | |
67 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
70 | 68 | |
71 | 69 | <TextView |
72 | - android:id="@+id/textView18" | |
70 | + android:id="@+id/textView19" | |
73 | 71 | android:layout_width="wrap_content" |
74 | 72 | android:layout_height="wrap_content" |
75 | 73 | android:layout_marginStart="5dp" |
76 | - android:layout_marginTop="10dp" | |
77 | - android:text="Código:" | |
74 | + android:text="DEBO:" | |
78 | 75 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
79 | 76 | android:textSize="15sp" |
80 | - app:layout_constraintStart_toStartOf="parent" | |
81 | - app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
77 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView18" | |
78 | + app:layout_constraintStart_toEndOf="@+id/textView18" /> | |
82 | 79 | |
83 | 80 | <TextView |
84 | 81 | android:id="@+id/tvSector" |
85 | 82 | android:layout_width="0dp" |
86 | 83 | android:layout_height="wrap_content" |
87 | 84 | android:layout_marginStart="5dp" |
88 | - android:layout_marginTop="10dp" | |
89 | 85 | android:text="99" |
90 | 86 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
91 | 87 | android:textSize="18sp" |
92 | 88 | android:textStyle="bold" |
93 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView18" | |
94 | - app:layout_constraintStart_toEndOf="@+id/textView18" /> | |
89 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView19" | |
90 | + app:layout_constraintStart_toEndOf="@+id/textView19" /> | |
95 | 91 | |
96 | 92 | <TextView |
97 | 93 | android:id="@+id/tvCodigo" |
98 | 94 | android:layout_width="0dp" |
99 | 95 | android:layout_height="wrap_content" |
100 | - android:layout_marginStart="5dp" | |
96 | + android:layout_marginStart="3dp" | |
101 | 97 | android:layout_marginTop="10dp" |
102 | - android:text="99999" | |
98 | + android:text="999999" | |
103 | 99 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
104 | 100 | android:textSize="18sp" |
105 | 101 | android:textStyle="bold" |
... | ... | @@ -113,7 +109,7 @@ |
113 | 109 | android:layout_height="wrap_content" |
114 | 110 | android:layout_marginStart="5dp" |
115 | 111 | android:layout_marginTop="10dp" |
116 | - android:text="Código barras:" | |
112 | + android:text="barras:" | |
117 | 113 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
118 | 114 | android:textSize="15sp" |
119 | 115 | app:layout_constraintBaseline_toBaselineOf="@+id/tvCodigo" |
... | ... | @@ -124,7 +120,7 @@ |
124 | 120 | android:layout_width="wrap_content" |
125 | 121 | android:layout_height="wrap_content" |
126 | 122 | android:layout_marginStart="5dp" |
127 | - android:text="1234567890123" | |
123 | + android:text="12346579012345" | |
128 | 124 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
129 | 125 | android:textSize="18sp" |
130 | 126 | android:textStyle="bold" |
... | ... | @@ -137,10 +133,10 @@ |
137 | 133 | android:layout_height="wrap_content" |
138 | 134 | android:layout_marginStart="5dp" |
139 | 135 | android:layout_marginTop="10dp" |
140 | - android:text="Código origen:" | |
136 | + android:text="origen:" | |
141 | 137 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
142 | 138 | android:textSize="15sp" |
143 | - app:layout_constraintStart_toStartOf="parent" | |
139 | + app:layout_constraintStart_toEndOf="@+id/textView18" | |
144 | 140 | app:layout_constraintTop_toBottomOf="@+id/textView18" /> |
145 | 141 | |
146 | 142 | |
... | ... | @@ -150,7 +146,7 @@ |
150 | 146 | android:layout_height="wrap_content" |
151 | 147 | android:layout_marginStart="5dp" |
152 | 148 | android:layout_marginTop="10dp" |
153 | - android:text="9999999999" | |
149 | + android:text="1234567890123" | |
154 | 150 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
155 | 151 | android:textSize="18sp" |
156 | 152 | android:textStyle="bold" |
... | ... | @@ -159,91 +155,112 @@ |
159 | 155 | app:layout_constraintTop_toBottomOf="@+id/textView18" /> |
160 | 156 | |
161 | 157 | <TextView |
162 | - android:id="@+id/textView3" | |
158 | + android:id="@+id/textView9" | |
159 | + android:layout_width="wrap_content" | |
160 | + android:layout_height="wrap_content" | |
161 | + android:layout_marginTop="10dp" | |
162 | + android:text="Precio:" | |
163 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
164 | + android:textSize="15sp" | |
165 | + app:layout_constraintStart_toStartOf="parent" | |
166 | + app:layout_constraintTop_toBottomOf="@+id/textView2" /> | |
167 | + | |
168 | + <TextView | |
169 | + android:id="@+id/textView12" | |
163 | 170 | android:layout_width="wrap_content" |
164 | 171 | android:layout_height="wrap_content" |
165 | 172 | android:layout_marginStart="5dp" |
166 | 173 | android:layout_marginTop="10dp" |
167 | - android:text="Depósito:" | |
174 | + android:text="venta:" | |
168 | 175 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
169 | 176 | android:textSize="15sp" |
170 | - app:layout_constraintStart_toEndOf="@+id/tvCodigoOrigen" | |
171 | - app:layout_constraintTop_toBottomOf="@+id/textView1" /> | |
177 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView9" | |
178 | + app:layout_constraintStart_toEndOf="@+id/textView18" /> | |
172 | 179 | |
173 | 180 | <TextView |
174 | - android:id="@+id/tvDeposito" | |
181 | + android:id="@+id/tvPrecio" | |
175 | 182 | android:layout_width="wrap_content" |
176 | 183 | android:layout_height="wrap_content" |
177 | 184 | android:layout_marginStart="5dp" |
178 | - android:text="SI" | |
185 | + android:layout_marginTop="10dp" | |
186 | + android:text="99999.99" | |
179 | 187 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
180 | 188 | android:textSize="18sp" |
181 | 189 | android:textStyle="bold" |
182 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView3" | |
183 | - app:layout_constraintStart_toEndOf="@+id/textView3" /> | |
190 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView12" | |
191 | + app:layout_constraintStart_toEndOf="@+id/textView12" /> | |
184 | 192 | |
185 | 193 | <TextView |
186 | - android:id="@+id/textView9" | |
194 | + android:id="@+id/textView8" | |
187 | 195 | android:layout_width="wrap_content" |
188 | 196 | android:layout_height="wrap_content" |
189 | 197 | android:layout_marginStart="5dp" |
190 | 198 | android:layout_marginTop="10dp" |
191 | - android:text="Precio:" | |
199 | + android:text="Costo:" | |
192 | 200 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
193 | 201 | android:textSize="15sp" |
194 | - app:layout_constraintStart_toStartOf="parent" | |
195 | - app:layout_constraintTop_toBottomOf="@+id/textView2" /> | |
202 | + app:layout_constraintBaseline_toBaselineOf="@+id/tvPrecio" | |
203 | + app:layout_constraintStart_toEndOf="@+id/tvPrecio" /> | |
196 | 204 | |
197 | 205 | <TextView |
198 | - android:id="@+id/tvPrecio" | |
206 | + android:id="@+id/tvCosto" | |
199 | 207 | android:layout_width="wrap_content" |
200 | 208 | android:layout_height="wrap_content" |
201 | 209 | android:layout_marginStart="5dp" |
202 | 210 | android:layout_marginTop="10dp" |
203 | - android:text="100.99" | |
211 | + android:text="9999.99" | |
204 | 212 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
205 | 213 | android:textSize="18sp" |
206 | 214 | android:textStyle="bold" |
207 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView9" | |
208 | - app:layout_constraintStart_toEndOf="@+id/textView9" /> | |
215 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView8" | |
216 | + app:layout_constraintStart_toEndOf="@+id/textView8" /> | |
209 | 217 | |
210 | 218 | <TextView |
211 | - android:id="@+id/textView8" | |
219 | + android:id="@+id/textView3" | |
212 | 220 | android:layout_width="wrap_content" |
213 | 221 | android:layout_height="wrap_content" |
214 | - android:layout_marginStart="5dp" | |
215 | 222 | android:layout_marginTop="10dp" |
216 | - android:text="Costo:" | |
223 | + android:text="Depósito:" | |
217 | 224 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
218 | 225 | android:textSize="15sp" |
219 | - app:layout_constraintStart_toEndOf="@+id/tvPrecio" | |
220 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigoOrigen" /> | |
226 | + app:layout_constraintStart_toStartOf="parent" | |
227 | + app:layout_constraintTop_toBottomOf="@+id/textView9" /> | |
221 | 228 | |
222 | 229 | <TextView |
223 | - android:id="@+id/tvCosto" | |
230 | + android:id="@+id/tvDeposito" | |
224 | 231 | android:layout_width="wrap_content" |
225 | 232 | android:layout_height="wrap_content" |
226 | 233 | android:layout_marginStart="5dp" |
227 | - android:layout_marginTop="10dp" | |
228 | - android:text="22.99" | |
234 | + android:text="Si" | |
229 | 235 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
230 | 236 | android:textSize="18sp" |
231 | 237 | android:textStyle="bold" |
232 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView8" | |
233 | - app:layout_constraintStart_toEndOf="@+id/textView8" | |
234 | - app:layout_constraintTop_toBottomOf="@+id/tvDeposito" /> | |
238 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView3" | |
239 | + app:layout_constraintStart_toEndOf="@+id/textView3" /> | |
235 | 240 | |
236 | 241 | <TextView |
237 | 242 | android:id="@+id/textView5" |
238 | 243 | android:layout_width="wrap_content" |
239 | 244 | android:layout_height="wrap_content" |
240 | - android:layout_marginStart="5dp" | |
241 | 245 | android:layout_marginTop="10dp" |
242 | - android:text="Existencia en venta:" | |
246 | + android:text="Stock:" | |
243 | 247 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
244 | 248 | android:textSize="15sp" |
245 | 249 | app:layout_constraintStart_toStartOf="parent" |
246 | - app:layout_constraintTop_toBottomOf="@+id/textView9" /> | |
250 | + app:layout_constraintTop_toBottomOf="@+id/textView3" /> | |
251 | + | |
252 | + | |
253 | + <TextView | |
254 | + android:id="@+id/textView15" | |
255 | + android:layout_width="wrap_content" | |
256 | + android:layout_height="wrap_content" | |
257 | + android:layout_marginStart="5dp" | |
258 | + android:layout_marginTop="10dp" | |
259 | + android:text="venta:" | |
260 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
261 | + android:textSize="15sp" | |
262 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView5" | |
263 | + app:layout_constraintStart_toEndOf="@+id/textView18" /> | |
247 | 264 | |
248 | 265 | <TextView |
249 | 266 | android:id="@+id/tvExiVenta" |
... | ... | @@ -251,24 +268,23 @@ |
251 | 268 | android:layout_height="wrap_content" |
252 | 269 | android:layout_marginStart="5dp" |
253 | 270 | android:layout_marginTop="10dp" |
254 | - android:text="100" | |
271 | + android:text="99999.99" | |
255 | 272 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
256 | 273 | android:textSize="18sp" |
257 | 274 | android:textStyle="bold" |
258 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView5" | |
259 | - app:layout_constraintStart_toEndOf="@+id/textView5" /> | |
275 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView15" | |
276 | + app:layout_constraintStart_toEndOf="@+id/textView15" /> | |
260 | 277 | |
261 | 278 | <TextView |
262 | 279 | android:id="@+id/textView7" |
263 | 280 | android:layout_width="wrap_content" |
264 | 281 | android:layout_height="wrap_content" |
265 | 282 | android:layout_marginStart="5dp" |
266 | - android:layout_marginTop="10dp" | |
267 | - android:text="Existencia en deposito:" | |
283 | + android:text="deposito:" | |
268 | 284 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
269 | 285 | android:textSize="15sp" |
270 | - app:layout_constraintStart_toEndOf="@+id/tvExiVenta" | |
271 | - app:layout_constraintTop_toBottomOf="@+id/textView8" /> | |
286 | + app:layout_constraintBaseline_toBaselineOf="@+id/tvExiVenta" | |
287 | + app:layout_constraintStart_toEndOf="@+id/tvExiVenta" /> | |
272 | 288 | |
273 | 289 | <TextView |
274 | 290 | android:id="@+id/tvExiDeposito" |
... | ... | @@ -276,7 +292,7 @@ |
276 | 292 | android:layout_height="wrap_content" |
277 | 293 | android:layout_marginStart="5dp" |
278 | 294 | android:layout_marginTop="10dp" |
279 | - android:text="777" | |
295 | + android:text="99999.99" | |
280 | 296 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
281 | 297 | android:textSize="18sp" |
282 | 298 | android:textStyle="bold" |
... | ... | @@ -294,17 +310,17 @@ |
294 | 310 | android:text="Unidad de venta:" |
295 | 311 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
296 | 312 | android:textSize="15sp" |
297 | - app:layout_constraintStart_toStartOf="parent" | |
298 | - app:layout_constraintTop_toBottomOf="@+id/tvExiVenta" /> | |
313 | + app:layout_constraintBaseline_toBaselineOf="@+id/tvDeposito" | |
314 | + app:layout_constraintStart_toEndOf="@+id/tvPrecio" /> | |
299 | 315 | |
300 | 316 | <TextView |
301 | 317 | android:id="@+id/tvBal" |
302 | 318 | android:layout_width="wrap_content" |
303 | 319 | android:layout_height="wrap_content" |
304 | - android:layout_marginStart="3dp" | |
305 | - android:text="CENT. CUBICOS" | |
320 | + android:layout_marginStart="5dp" | |
321 | + android:text="Unidades" | |
306 | 322 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
307 | - android:textSize="18sp" | |
323 | + android:textSize="15sp" | |
308 | 324 | app:layout_constraintBaseline_toBaselineOf="@+id/textView10" |
309 | 325 | app:layout_constraintStart_toEndOf="@+id/textView10" /> |
310 | 326 | |
... | ... | @@ -313,25 +329,23 @@ |
313 | 329 | android:id="@+id/textView11" |
314 | 330 | android:layout_width="wrap_content" |
315 | 331 | android:layout_height="wrap_content" |
316 | - android:layout_marginStart="5dp" | |
317 | 332 | android:layout_marginTop="10dp" |
318 | 333 | android:text="Imagen:" |
319 | 334 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
320 | 335 | android:textSize="14sp" |
321 | 336 | app:layout_constraintStart_toStartOf="parent" |
322 | - app:layout_constraintTop_toBottomOf="@+id/textView10" /> | |
337 | + app:layout_constraintTop_toBottomOf="@+id/textView5" /> | |
323 | 338 | |
324 | 339 | <ImageView |
325 | 340 | android:id="@+id/ivImagen" |
326 | - android:layout_width="100dp" | |
327 | - android:layout_height="100dp" | |
341 | + android:layout_width="300dp" | |
342 | + android:layout_height="300dp" | |
328 | 343 | android:layout_marginStart="5dp" |
329 | - android:layout_marginTop="10dp" | |
330 | 344 | android:src="@drawable/no_imagen" |
331 | 345 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
332 | 346 | android:textSize="14sp" |
333 | - app:layout_constraintStart_toEndOf="@+id/textView6" | |
334 | - app:layout_constraintTop_toBottomOf="@+id/tvBal" /> | |
347 | + app:layout_constraintStart_toEndOf="@+id/textView11" | |
348 | + app:layout_constraintTop_toBottomOf="@+id/textView15" /> | |
335 | 349 | |
336 | 350 | </androidx.constraintlayout.widget.ConstraintLayout> |
337 | 351 | </androidx.cardview.widget.CardView> |
app/src/main/res/layout/fragment_inventario.xml
... | ... | @@ -11,7 +11,7 @@ |
11 | 11 | <androidx.appcompat.widget.AppCompatTextView |
12 | 12 | android:id="@+id/tvTitulo" |
13 | 13 | android:layout_width="match_parent" |
14 | - android:layout_height="90dp" | |
14 | + android:layout_height="50dp" | |
15 | 15 | android:layout_marginStart="8dp" |
16 | 16 | android:layout_marginEnd="8dp" |
17 | 17 | android:autoSizeMaxTextSize="100sp" |
... | ... | @@ -132,21 +132,21 @@ |
132 | 132 | android:layout_width="wrap_content" |
133 | 133 | android:layout_height="wrap_content" |
134 | 134 | android:orientation="horizontal" |
135 | - app:layout_constraintGuide_percent="0.12" /> | |
135 | + app:layout_constraintGuide_percent="0.12029161" /> | |
136 | 136 | |
137 | 137 | <androidx.constraintlayout.widget.Guideline |
138 | 138 | android:id="@+id/guideline3" |
139 | 139 | android:layout_width="wrap_content" |
140 | 140 | android:layout_height="wrap_content" |
141 | 141 | android:orientation="horizontal" |
142 | - app:layout_constraintGuide_percent="0.29" /> | |
142 | + app:layout_constraintGuide_percent="0.27" /> | |
143 | 143 | |
144 | 144 | <androidx.constraintlayout.widget.Guideline |
145 | 145 | android:id="@+id/guideline4" |
146 | 146 | android:layout_width="wrap_content" |
147 | 147 | android:layout_height="wrap_content" |
148 | 148 | android:orientation="horizontal" |
149 | - app:layout_constraintGuide_percent="0.35" /> | |
149 | + app:layout_constraintGuide_percent="0.32" /> | |
150 | 150 | |
151 | 151 | <androidx.constraintlayout.widget.Guideline |
152 | 152 | android:id="@+id/guideline5" |
app/src/main/res/layout/item.xml
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | android:layout_width="match_parent" |
6 | 6 | android:layout_height="wrap_content" |
7 | 7 | android:layout_margin="5dp" |
8 | - app:cardCornerRadius="2dp" | |
8 | + app:cardCornerRadius="15dp" | |
9 | 9 | app:cardElevation="10dp" |
10 | 10 | app:contentPadding="5dp" |
11 | 11 | app:cardPreventCornerOverlap="false"> |
... | ... | @@ -15,163 +15,157 @@ |
15 | 15 | android:layout_height="wrap_content"> |
16 | 16 | |
17 | 17 | <TextView |
18 | - android:id="@+id/textView2" | |
19 | - android:layout_width="wrap_content" | |
18 | + android:id="@+id/tvDescripcion" | |
19 | + android:layout_width="0dp" | |
20 | 20 | android:layout_height="wrap_content" |
21 | - android:layout_marginStart="5dp" | |
22 | - android:text="Código:" | |
23 | - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" | |
24 | - android:textSize="14sp" | |
25 | - app:layout_constraintEnd_toStartOf="@+id/tvSector" | |
26 | - app:layout_constraintHorizontal_bias="0.01" | |
27 | - app:layout_constraintHorizontal_chainStyle="packed" | |
21 | + android:layout_marginStart="3dp" | |
22 | + android:maxLines="2" | |
23 | + android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
24 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
25 | + android:textSize="16sp" | |
26 | + android:textStyle="bold" | |
28 | 27 | app:layout_constraintStart_toStartOf="parent" |
29 | 28 | app:layout_constraintTop_toTopOf="parent" /> |
30 | 29 | |
30 | +<!-- <TextView--> | |
31 | +<!-- android:id="@+id/textView2"--> | |
32 | +<!-- android:layout_width="wrap_content"--> | |
33 | +<!-- android:layout_height="wrap_content"--> | |
34 | +<!-- android:layout_marginStart="5dp"--> | |
35 | +<!-- android:text="Código:"--> | |
36 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large"--> | |
37 | +<!-- android:textSize="14sp"--> | |
38 | +<!-- app:layout_constraintEnd_toStartOf="@+id/tvSector"--> | |
39 | +<!-- app:layout_constraintHorizontal_bias="0.01"--> | |
40 | +<!-- app:layout_constraintHorizontal_chainStyle="packed"--> | |
41 | +<!-- app:layout_constraintStart_toStartOf="parent"--> | |
42 | +<!-- app:layout_constraintTop_toTopOf="parent" />--> | |
31 | 43 | |
32 | - <TextView | |
33 | - android:id="@+id/tvSector" | |
34 | - android:layout_width="wrap_content" | |
35 | - android:layout_height="match_parent" | |
36 | - android:layout_marginStart="8dp" | |
37 | - android:text="9999" | |
38 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
39 | - android:textColorHint="@android:color/black" | |
40 | - android:textSize="18sp" | |
41 | - android:textStyle="bold" | |
42 | - app:layout_constraintHorizontal_chainStyle="packed" | |
43 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView2" | |
44 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigo" | |
45 | - app:layout_constraintStart_toEndOf="@+id/textView2" /> | |
46 | 44 | |
45 | +<!-- <TextView--> | |
46 | +<!-- android:id="@+id/tvSector"--> | |
47 | +<!-- android:layout_width="wrap_content"--> | |
48 | +<!-- android:layout_height="match_parent"--> | |
49 | +<!-- android:layout_marginStart="8dp"--> | |
50 | +<!-- android:text="9999"--> | |
51 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
52 | +<!-- android:textColorHint="@android:color/black"--> | |
53 | +<!-- android:textSize="18sp"--> | |
54 | +<!-- android:textStyle="bold"--> | |
55 | +<!-- app:layout_constraintHorizontal_chainStyle="packed"--> | |
56 | +<!-- app:layout_constraintBaseline_toBaselineOf="@+id/textView2"--> | |
57 | +<!-- app:layout_constraintEnd_toStartOf="@+id/tvCodigo"--> | |
58 | +<!-- app:layout_constraintStart_toEndOf="@+id/textView2" />--> | |
47 | 59 | |
48 | - <TextView | |
49 | - android:id="@+id/tvCodigo" | |
50 | - android:layout_width="wrap_content" | |
51 | - android:layout_height="match_parent" | |
52 | - android:text="99999999" | |
53 | - android:layout_marginStart="8dp" | |
54 | - app:layout_constraintHorizontal_chainStyle="packed" | |
55 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
56 | - android:textColorHint="@android:color/black" | |
57 | - android:textSize="18sp" | |
58 | - android:textStyle="bold" | |
59 | - app:layout_constraintBaseline_toBaselineOf="@+id/tvSector" | |
60 | - app:layout_constraintEnd_toStartOf="@+id/textView5" | |
61 | - app:layout_constraintStart_toEndOf="@+id/tvSector" /> | |
60 | + | |
61 | +<!-- <TextView--> | |
62 | +<!-- android:id="@+id/tvCodigo"--> | |
63 | +<!-- android:layout_width="wrap_content"--> | |
64 | +<!-- android:layout_height="match_parent"--> | |
65 | +<!-- android:text="99999999"--> | |
66 | +<!-- android:layout_marginStart="8dp"--> | |
67 | +<!-- app:layout_constraintHorizontal_chainStyle="packed"--> | |
68 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
69 | +<!-- android:textColorHint="@android:color/black"--> | |
70 | +<!-- android:textSize="18sp"--> | |
71 | +<!-- android:textStyle="bold"--> | |
72 | +<!-- app:layout_constraintBaseline_toBaselineOf="@+id/tvSector"--> | |
73 | +<!-- app:layout_constraintEnd_toStartOf="@+id/textView5"--> | |
74 | +<!-- app:layout_constraintStart_toEndOf="@+id/tvSector" />--> | |
62 | 75 | |
63 | 76 | <TextView |
64 | 77 | android:id="@+id/textView5" |
65 | 78 | android:layout_width="wrap_content" |
66 | 79 | android:layout_height="wrap_content" |
67 | - android:layout_marginStart="12dp" | |
68 | 80 | android:text="Cantidad:" |
69 | 81 | android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" |
70 | - android:textSize="18sp" | |
71 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigoBarras" | |
72 | - app:layout_constraintStart_toEndOf="@+id/tvCodigo" | |
73 | - app:layout_constraintTop_toTopOf="parent" /> | |
82 | + android:textSize="14sp" | |
83 | + android:layout_marginStart="5dp" | |
84 | + android:layout_marginTop="5dp" | |
85 | + app:layout_constraintStart_toStartOf="parent" | |
86 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
74 | 87 | |
75 | 88 | <TextView |
76 | 89 | android:id="@+id/tvCantidad" |
77 | 90 | android:layout_width="wrap_content" |
78 | 91 | android:layout_height="match_parent" |
79 | - android:layout_margin="5dp" | |
92 | + android:layout_marginTop="5dp" | |
80 | 93 | android:text="12345.12" |
81 | 94 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
82 | 95 | android:textSize="18sp" |
83 | 96 | android:textStyle="bold" |
84 | 97 | app:layout_constraintBaseline_toBaselineOf="@+id/textView5" |
85 | - app:layout_constraintEnd_toEndOf="parent" | |
86 | - app:layout_constraintHorizontal_bias="0.0" | |
87 | - app:layout_constraintStart_toEndOf="@id/textView5" | |
88 | - app:layout_constraintTop_toTopOf="parent" /> | |
98 | + | |
99 | + app:layout_constraintStart_toEndOf="@id/textView5" /> | |
89 | 100 | |
90 | 101 | <ImageView |
91 | 102 | android:id="@+id/ivPen" |
92 | 103 | android:layout_width="30dp" |
93 | 104 | android:layout_height="30dp" |
105 | + android:layout_marginStart="3dp" | |
94 | 106 | android:src="@drawable/pen" |
95 | 107 | android:visibility="visible" |
96 | - app:layout_constraintBottom_toTopOf="@+id/tvDescripcion" | |
97 | 108 | app:layout_constraintStart_toEndOf="@+id/tvCantidad" |
98 | - app:layout_constraintTop_toTopOf="parent" | |
99 | - app:layout_constraintVertical_bias="0.0" /> | |
109 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
100 | 110 | |
101 | 111 | <ImageView |
102 | 112 | android:id="@+id/ivDots" |
103 | 113 | android:layout_width="30dp" |
104 | 114 | android:layout_height="30dp" |
115 | + android:layout_marginEnd="3dp" | |
105 | 116 | android:src="@drawable/more" |
106 | 117 | android:visibility="visible" |
107 | - app:layout_constraintBottom_toTopOf="@+id/tvDescripcion" | |
108 | 118 | app:layout_constraintEnd_toEndOf="parent" |
109 | - app:layout_constraintTop_toTopOf="parent" | |
110 | - app:layout_constraintVertical_bias="0.0" /> | |
119 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
111 | 120 | |
112 | - <TextView | |
113 | - android:id="@+id/textView85" | |
114 | - android:layout_width="wrap_content" | |
115 | - android:layout_height="wrap_content" | |
116 | - android:layout_marginStart="5dp" | |
117 | - android:layout_marginTop="8dp" | |
118 | - android:text="Desc:" | |
119 | - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" | |
120 | - android:textSize="14sp" | |
121 | - app:layout_constraintEnd_toStartOf="@+id/tvDescripcion" | |
122 | - app:layout_constraintHorizontal_bias="0.0" | |
123 | - app:layout_constraintHorizontal_chainStyle="packed" | |
124 | - app:layout_constraintStart_toStartOf="parent" | |
125 | - app:layout_constraintTop_toBottomOf="@id/tvCodigo" /> | |
121 | +<!-- <TextView--> | |
122 | +<!-- android:id="@+id/textView85"--> | |
123 | +<!-- android:layout_width="wrap_content"--> | |
124 | +<!-- android:layout_height="wrap_content"--> | |
125 | +<!-- android:layout_marginStart="5dp"--> | |
126 | +<!-- android:layout_marginTop="8dp"--> | |
127 | +<!-- android:text="Desc:"--> | |
128 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large"--> | |
129 | +<!-- android:textSize="14sp"--> | |
130 | +<!-- app:layout_constraintEnd_toStartOf="@+id/tvDescripcion"--> | |
131 | +<!-- app:layout_constraintHorizontal_bias="0.0"--> | |
132 | +<!-- app:layout_constraintHorizontal_chainStyle="packed"--> | |
133 | +<!-- app:layout_constraintStart_toStartOf="parent"--> | |
134 | +<!-- app:layout_constraintTop_toBottomOf="@id/tvCodigo" />--> | |
126 | 135 | |
127 | - <TextView | |
128 | - android:id="@+id/tvDescripcion" | |
129 | - android:layout_width="0dp" | |
130 | - android:layout_height="wrap_content" | |
131 | - android:layout_marginStart="3dp" | |
132 | - android:layout_marginTop="8dp" | |
133 | - android:maxLines="2" | |
134 | - android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
135 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
136 | - android:textSize="18sp" | |
137 | - android:textStyle="bold" | |
138 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView85" | |
139 | - app:layout_constraintEnd_toEndOf="parent" | |
140 | - app:layout_constraintStart_toEndOf="@+id/textView85" | |
141 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigo" /> | |
142 | 136 | |
143 | - <TextView | |
144 | - android:id="@+id/tvCodigoBarras" | |
145 | - android:layout_width="match_parent" | |
146 | - android:layout_height="wrap_content" | |
147 | - android:layout_marginStart="3dp" | |
148 | - android:layout_marginTop="8dp" | |
149 | - android:maxLines="2" | |
150 | - android:text="" | |
151 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
152 | - android:textSize="14sp" | |
153 | - android:visibility="gone" | |
154 | - android:textStyle="bold" | |
155 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView85" | |
156 | - app:layout_constraintEnd_toEndOf="parent" | |
157 | - app:layout_constraintStart_toEndOf="@+id/textView85" | |
158 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigo" /> | |
159 | - <TextView | |
160 | - android:id="@+id/tvCodigoOrigen" | |
161 | - android:layout_width="match_parent" | |
162 | - android:layout_height="wrap_content" | |
163 | - android:layout_marginStart="3dp" | |
164 | - android:layout_marginTop="8dp" | |
165 | - android:maxLines="2" | |
166 | - android:text="" | |
167 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
168 | - android:textSize="14sp" | |
169 | - android:visibility="gone" | |
170 | - android:textStyle="bold" | |
171 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView85" | |
172 | - app:layout_constraintEnd_toEndOf="parent" | |
173 | - app:layout_constraintStart_toEndOf="@+id/textView85" | |
174 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigo" /> | |
137 | +<!-- <TextView--> | |
138 | +<!-- android:id="@+id/tvCodigoBarras"--> | |
139 | +<!-- android:layout_width="match_parent"--> | |
140 | +<!-- android:layout_height="wrap_content"--> | |
141 | +<!-- android:layout_marginStart="3dp"--> | |
142 | +<!-- android:layout_marginTop="8dp"--> | |
143 | +<!-- android:maxLines="2"--> | |
144 | +<!-- android:text=""--> | |
145 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
146 | +<!-- android:textSize="14sp"--> | |
147 | +<!-- android:visibility="gone"--> | |
148 | +<!-- android:textStyle="bold"--> | |
149 | +<!-- app:layout_constraintBaseline_toBaselineOf="@+id/textView85"--> | |
150 | +<!-- app:layout_constraintEnd_toEndOf="parent"--> | |
151 | +<!-- app:layout_constraintStart_toEndOf="@+id/textView85"--> | |
152 | +<!-- app:layout_constraintTop_toBottomOf="@+id/tvCodigo" />--> | |
153 | +<!-- <TextView--> | |
154 | +<!-- android:id="@+id/tvCodigoOrigen"--> | |
155 | +<!-- android:layout_width="match_parent"--> | |
156 | +<!-- android:layout_height="wrap_content"--> | |
157 | +<!-- android:layout_marginStart="3dp"--> | |
158 | +<!-- android:layout_marginTop="8dp"--> | |
159 | +<!-- android:maxLines="2"--> | |
160 | +<!-- android:text=""--> | |
161 | +<!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
162 | +<!-- android:textSize="14sp"--> | |
163 | +<!-- android:visibility="gone"--> | |
164 | +<!-- android:textStyle="bold"--> | |
165 | +<!-- app:layout_constraintBaseline_toBaselineOf="@+id/textView85"--> | |
166 | +<!-- app:layout_constraintEnd_toEndOf="parent"--> | |
167 | +<!-- app:layout_constraintStart_toEndOf="@+id/textView85"--> | |
168 | +<!-- app:layout_constraintTop_toBottomOf="@+id/tvCodigo" />--> | |
175 | 169 | </androidx.constraintlayout.widget.ConstraintLayout> |
176 | 170 | |
177 | 171 | </androidx.cardview.widget.CardView> |
178 | 172 | \ No newline at end of file |
app/src/main/res/layout/item_codigo_origen.xml
... | ... | @@ -4,144 +4,118 @@ |
4 | 4 | android:layout_width="match_parent" |
5 | 5 | android:layout_height="wrap_content" |
6 | 6 | android:layout_margin="5dp" |
7 | - app:cardCornerRadius="2dp" | |
7 | + app:cardCornerRadius="15dp" | |
8 | 8 | app:cardElevation="10dp" |
9 | - app:contentPadding="5dp" | |
10 | - app:cardPreventCornerOverlap="false"> | |
9 | + app:cardPreventCornerOverlap="false" | |
10 | + app:contentPadding="5dp"> | |
11 | 11 | |
12 | 12 | <androidx.constraintlayout.widget.ConstraintLayout |
13 | 13 | android:layout_width="match_parent" |
14 | 14 | android:layout_height="wrap_content"> |
15 | 15 | |
16 | 16 | <TextView |
17 | - android:id="@+id/textView2" | |
18 | - android:layout_width="wrap_content" | |
17 | + android:id="@+id/tvDescripcion" | |
18 | + android:layout_width="0dp" | |
19 | 19 | android:layout_height="wrap_content" |
20 | 20 | android:layout_marginStart="5dp" |
21 | - android:text="Código:" | |
22 | - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" | |
23 | - android:textSize="14sp" | |
24 | - app:layout_constraintEnd_toStartOf="@+id/tvSector" | |
25 | - app:layout_constraintHorizontal_bias="0.01" | |
26 | - app:layout_constraintHorizontal_chainStyle="packed" | |
21 | + android:maxLines="2" | |
22 | + android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
23 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
24 | + android:textSize="16sp" | |
25 | + android:textStyle="bold" | |
26 | + app:layout_constraintEnd_toEndOf="parent" | |
27 | 27 | app:layout_constraintStart_toStartOf="parent" |
28 | 28 | app:layout_constraintTop_toTopOf="parent" /> |
29 | 29 | |
30 | 30 | |
31 | 31 | <TextView |
32 | - android:id="@+id/tvSector" | |
32 | + android:id="@+id/tvCantidad" | |
33 | 33 | android:layout_width="wrap_content" |
34 | 34 | android:layout_height="match_parent" |
35 | - android:layout_marginStart="8dp" | |
36 | - android:text="9999" | |
35 | + android:layout_marginStart="5dp" | |
36 | + android:text="Código Origen:" | |
37 | 37 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
38 | - android:textColorHint="@android:color/black" | |
39 | 38 | android:textSize="14sp" |
40 | - android:textStyle="bold" | |
41 | - app:layout_constraintHorizontal_chainStyle="packed" | |
42 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView2" | |
43 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigo" | |
44 | - app:layout_constraintStart_toEndOf="@+id/textView2" /> | |
39 | + app:layout_constraintStart_toStartOf="parent" | |
40 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
41 | + | |
45 | 42 | <TextView |
46 | - android:id="@+id/tvCodigo" | |
43 | + android:id="@+id/tvCodigoOrigen" | |
47 | 44 | android:layout_width="wrap_content" |
48 | 45 | android:layout_height="match_parent" |
49 | - android:layout_marginStart="8dp" | |
50 | - android:text="99999999" | |
51 | - app:layout_constraintHorizontal_chainStyle="packed" | |
46 | + android:maxLines="2" | |
47 | + android:text="987654" | |
52 | 48 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
53 | - android:textColorHint="@android:color/black" | |
54 | 49 | android:textSize="14sp" |
55 | 50 | android:textStyle="bold" |
56 | - app:layout_constraintBaseline_toBaselineOf="@+id/tvSector" | |
57 | - app:layout_constraintEnd_toStartOf="@+id/textView5" | |
58 | - app:layout_constraintStart_toEndOf="@+id/tvSector" /> | |
51 | + android:visibility="visible" | |
52 | + app:layout_constraintStart_toEndOf="@+id/tvCantidad" | |
53 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
54 | + | |
59 | 55 | |
60 | 56 | <TextView |
61 | - android:id="@+id/textView5" | |
57 | + android:id="@+id/textView2" | |
62 | 58 | android:layout_width="wrap_content" |
63 | 59 | android:layout_height="wrap_content" |
64 | - android:layout_marginStart="8dp" | |
65 | - android:text="Cantidad:" | |
60 | + android:layout_marginStart="5dp" | |
61 | + android:text="Código DEBO:" | |
66 | 62 | android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" |
67 | 63 | android:textSize="14sp" |
68 | - android:visibility="gone" | |
69 | - app:layout_constraintTop_toTopOf="parent" | |
70 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigoBarras" | |
71 | - app:layout_constraintStart_toEndOf="@+id/tvCodigo" /> | |
64 | + app:layout_constraintStart_toEndOf="@+id/tvCodigoOrigen" | |
65 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
66 | + | |
72 | 67 | |
73 | 68 | <TextView |
74 | - android:id="@+id/tvCantidad" | |
69 | + android:id="@+id/tvSector" | |
75 | 70 | android:layout_width="wrap_content" |
76 | 71 | android:layout_height="match_parent" |
77 | - android:layout_marginStart="8dp" | |
78 | - android:text="Código Origen:" | |
72 | + android:text="9999" | |
79 | 73 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
74 | + android:textColorHint="@android:color/black" | |
80 | 75 | android:textSize="14sp" |
81 | 76 | android:textStyle="bold" |
82 | - android:visibility="visible" | |
83 | - app:layout_constraintEnd_toStartOf="@id/tvCodigoOrigen" | |
84 | - app:layout_constraintStart_toEndOf="@id/textView5" | |
85 | - app:layout_constraintTop_toTopOf="parent" /> | |
77 | + app:layout_constraintStart_toEndOf="@+id/textView2" | |
78 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
86 | 79 | |
87 | 80 | <TextView |
88 | - android:id="@+id/tvCodigoOrigen" | |
89 | - android:layout_width="0dp" | |
90 | - android:layout_height="wrap_content" | |
91 | - android:layout_marginStart="3dp" | |
92 | - android:maxLines="2" | |
93 | - android:text="" | |
81 | + android:id="@+id/tvCodigo" | |
82 | + android:layout_width="wrap_content" | |
83 | + android:layout_height="match_parent" | |
84 | + android:layout_marginStart="2dp" | |
85 | + android:text="99999999" | |
94 | 86 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
87 | + android:textColorHint="@android:color/black" | |
95 | 88 | android:textSize="14sp" |
96 | - android:visibility="visible" | |
97 | 89 | android:textStyle="bold" |
98 | - app:layout_constraintEnd_toEndOf="parent" | |
99 | - app:layout_constraintStart_toEndOf="@+id/tvCantidad" | |
100 | - app:layout_constraintTop_toTopOf="parent"/> | |
101 | - | |
102 | - <ImageView | |
103 | - android:id="@+id/ivHolder" | |
104 | - android:layout_width="30dp" | |
105 | - android:layout_height="30dp" | |
106 | - android:visibility="gone" | |
107 | - android:src="@drawable/more" | |
108 | - app:layout_constraintBottom_toTopOf="@+id/tvDescripcion" | |
109 | - app:layout_constraintEnd_toEndOf="parent" | |
110 | - app:layout_constraintHorizontal_bias="0.968" | |
111 | - app:layout_constraintStart_toEndOf="@+id/tvCodigoBarras" | |
112 | - app:layout_constraintTop_toTopOf="parent" | |
113 | - app:layout_constraintVertical_bias="0.0" /> | |
114 | - | |
115 | - <TextView | |
116 | - android:id="@+id/textView85" | |
117 | - android:layout_width="wrap_content" | |
118 | - android:layout_height="wrap_content" | |
119 | - android:layout_marginStart="5dp" | |
120 | - android:layout_marginTop="8dp" | |
121 | - android:text="Desc:" | |
122 | - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" | |
123 | - android:textSize="14sp" | |
124 | - app:layout_constraintEnd_toStartOf="@+id/tvDescripcion" | |
125 | - app:layout_constraintHorizontal_bias="0.0" | |
126 | 90 | app:layout_constraintHorizontal_chainStyle="packed" |
127 | - app:layout_constraintStart_toStartOf="parent" | |
128 | - app:layout_constraintTop_toBottomOf="@id/tvCodigo" /> | |
91 | + app:layout_constraintStart_toEndOf="@+id/tvSector" | |
92 | + app:layout_constraintTop_toTopOf="@+id/textView2" /> | |
129 | 93 | |
130 | - <TextView | |
131 | - android:id="@+id/tvDescripcion" | |
132 | - android:layout_width="0dp" | |
133 | - android:layout_height="wrap_content" | |
134 | - android:layout_marginStart="3dp" | |
135 | - android:layout_marginTop="8dp" | |
136 | - android:maxLines="2" | |
137 | - android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
138 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
139 | - android:textSize="14sp" | |
140 | - android:textStyle="bold" | |
141 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView85" | |
142 | - app:layout_constraintEnd_toEndOf="parent" | |
143 | - app:layout_constraintStart_toEndOf="@+id/textView85" | |
144 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigo" /> | |
94 | + <!-- <TextView--> | |
95 | + <!-- android:id="@+id/textView5"--> | |
96 | + <!-- android:layout_width="wrap_content"--> | |
97 | + <!-- android:layout_height="wrap_content"--> | |
98 | + <!-- android:layout_marginStart="8dp"--> | |
99 | + <!-- android:text="Cantidad:"--> | |
100 | + <!-- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large"--> | |
101 | + <!-- android:textSize="14sp"--> | |
102 | + <!-- android:visibility="gone"--> | |
103 | + <!-- app:layout_constraintTop_toTopOf="parent"--> | |
104 | + <!-- app:layout_constraintEnd_toStartOf="@+id/tvCodigoBarras"--> | |
105 | + <!-- app:layout_constraintStart_toEndOf="@+id/tvCodigo" />--> | |
106 | + | |
107 | + <!-- <ImageView--> | |
108 | + <!-- android:id="@+id/ivHolder"--> | |
109 | + <!-- android:layout_width="30dp"--> | |
110 | + <!-- android:layout_height="30dp"--> | |
111 | + <!-- android:visibility="gone"--> | |
112 | + <!-- android:src="@drawable/more"--> | |
113 | + <!-- app:layout_constraintBottom_toTopOf="@+id/tvDescripcion"--> | |
114 | + <!-- app:layout_constraintEnd_toEndOf="parent"--> | |
115 | + <!-- app:layout_constraintHorizontal_bias="0.968"--> | |
116 | + <!-- app:layout_constraintStart_toEndOf="@+id/tvCodigoBarras"--> | |
117 | + <!-- app:layout_constraintTop_toTopOf="parent"--> | |
118 | + <!-- app:layout_constraintVertical_bias="0.0" />--> | |
145 | 119 | |
146 | 120 | |
147 | 121 | </androidx.constraintlayout.widget.ConstraintLayout> |
app/src/main/res/layout/item_descripcion.xml
... | ... | @@ -4,144 +4,137 @@ |
4 | 4 | android:layout_width="match_parent" |
5 | 5 | android:layout_height="wrap_content" |
6 | 6 | android:layout_margin="5dp" |
7 | - app:cardCornerRadius="2dp" | |
7 | + app:cardCornerRadius="15dp" | |
8 | 8 | app:cardElevation="10dp" |
9 | - app:contentPadding="5dp" | |
10 | - app:cardPreventCornerOverlap="false"> | |
9 | + app:cardPreventCornerOverlap="false" | |
10 | + app:contentPadding="5dp"> | |
11 | 11 | |
12 | 12 | <androidx.constraintlayout.widget.ConstraintLayout |
13 | 13 | android:layout_width="match_parent" |
14 | 14 | android:layout_height="wrap_content"> |
15 | 15 | |
16 | 16 | <TextView |
17 | + android:id="@+id/tvDescripcion" | |
18 | + android:layout_width="0dp" | |
19 | + android:layout_height="wrap_content" | |
20 | + android:layout_marginStart="5dp" | |
21 | + android:maxLines="2" | |
22 | + android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
23 | + android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
24 | + android:textSize="16sp" | |
25 | + android:textStyle="bold" | |
26 | + app:layout_constraintEnd_toEndOf="parent" | |
27 | + app:layout_constraintStart_toStartOf="parent" | |
28 | + app:layout_constraintTop_toTopOf="parent" /> | |
29 | + | |
30 | + <TextView | |
17 | 31 | android:id="@+id/textView2" |
18 | 32 | android:layout_width="wrap_content" |
19 | 33 | android:layout_height="wrap_content" |
20 | 34 | android:layout_marginStart="5dp" |
21 | - android:text="Código:" | |
35 | + android:text="Código DEBO:" | |
22 | 36 | android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" |
23 | 37 | android:textSize="14sp" |
24 | - app:layout_constraintEnd_toStartOf="@+id/tvSector" | |
25 | - app:layout_constraintHorizontal_bias="0.01" | |
26 | 38 | app:layout_constraintHorizontal_chainStyle="packed" |
27 | 39 | app:layout_constraintStart_toStartOf="parent" |
28 | - app:layout_constraintTop_toTopOf="parent" /> | |
40 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
29 | 41 | |
30 | 42 | |
31 | 43 | <TextView |
32 | 44 | android:id="@+id/tvSector" |
33 | 45 | android:layout_width="wrap_content" |
34 | 46 | android:layout_height="match_parent" |
35 | - android:layout_marginStart="8dp" | |
36 | 47 | android:text="9999" |
37 | 48 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
38 | 49 | android:textColorHint="@android:color/black" |
39 | 50 | android:textSize="14sp" |
40 | 51 | android:textStyle="bold" |
41 | - app:layout_constraintHorizontal_chainStyle="packed" | |
42 | 52 | app:layout_constraintBaseline_toBaselineOf="@+id/textView2" |
43 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigo" | |
44 | - app:layout_constraintStart_toEndOf="@+id/textView2" /> | |
53 | + app:layout_constraintHorizontal_chainStyle="packed" | |
54 | + app:layout_constraintStart_toEndOf="@+id/textView2" | |
55 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
56 | + | |
45 | 57 | <TextView |
46 | 58 | android:id="@+id/tvCodigo" |
47 | 59 | android:layout_width="wrap_content" |
48 | 60 | android:layout_height="match_parent" |
49 | - android:layout_marginStart="8dp" | |
61 | + android:layout_marginStart="2dp" | |
50 | 62 | android:text="99999999" |
51 | - app:layout_constraintHorizontal_chainStyle="packed" | |
52 | 63 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
53 | 64 | android:textColorHint="@android:color/black" |
54 | 65 | android:textSize="14sp" |
55 | 66 | android:textStyle="bold" |
56 | 67 | app:layout_constraintBaseline_toBaselineOf="@+id/tvSector" |
57 | - app:layout_constraintEnd_toStartOf="@+id/textView5" | |
58 | - app:layout_constraintStart_toEndOf="@+id/tvSector" /> | |
68 | + app:layout_constraintHorizontal_chainStyle="packed" | |
69 | + app:layout_constraintStart_toEndOf="@+id/tvSector" | |
70 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
59 | 71 | |
60 | 72 | <TextView |
61 | - android:id="@+id/textView5" | |
73 | + android:id="@+id/textView3" | |
62 | 74 | android:layout_width="wrap_content" |
63 | 75 | android:layout_height="wrap_content" |
64 | - android:layout_marginStart="8dp" | |
65 | - android:text="Cantidad:" | |
76 | + android:layout_marginStart="5dp" | |
77 | + android:text="Código barras:" | |
66 | 78 | android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" |
67 | 79 | android:textSize="14sp" |
68 | - android:visibility="gone" | |
69 | - app:layout_constraintTop_toTopOf="parent" | |
70 | - app:layout_constraintEnd_toStartOf="@+id/tvCodigoBarras" | |
71 | - app:layout_constraintStart_toEndOf="@+id/tvCodigo" /> | |
72 | - | |
73 | - <TextView | |
74 | - android:id="@+id/tvCantidad" | |
75 | - android:layout_width="wrap_content" | |
76 | - android:layout_height="match_parent" | |
77 | - android:layout_marginStart="8dp" | |
78 | - android:text="Código Barras:" | |
79 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
80 | - android:textSize="14sp" | |
81 | - android:textStyle="bold" | |
82 | - android:visibility="visible" | |
83 | - app:layout_constraintEnd_toStartOf="@id/tvCodigoBarras" | |
84 | - app:layout_constraintStart_toEndOf="@id/textView5" | |
85 | - app:layout_constraintTop_toTopOf="parent" /> | |
80 | + app:layout_constraintHorizontal_chainStyle="packed" | |
81 | + app:layout_constraintStart_toEndOf="@+id/tvCodigo" | |
82 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
86 | 83 | |
87 | 84 | <TextView |
88 | 85 | android:id="@+id/tvCodigoBarras" |
89 | - android:layout_width="0dp" | |
86 | + android:layout_width="wrap_content" | |
90 | 87 | android:layout_height="wrap_content" |
91 | 88 | android:layout_marginStart="3dp" |
92 | 89 | android:maxLines="2" |
93 | - android:text="" | |
90 | + android:text="1234567890123456" | |
94 | 91 | android:textAppearance="@style/TextAppearance.AppCompat.Large" |
95 | 92 | android:textSize="14sp" |
96 | - android:visibility="visible" | |
97 | 93 | android:textStyle="bold" |
98 | - app:layout_constraintEnd_toEndOf="parent" | |
99 | - app:layout_constraintStart_toEndOf="@+id/tvCantidad" | |
100 | - app:layout_constraintTop_toTopOf="parent"/> | |
94 | + android:visibility="visible" | |
95 | + app:layout_constraintBaseline_toBaselineOf="@+id/textView3" | |
96 | + app:layout_constraintStart_toEndOf="@+id/textView3" | |
97 | + app:layout_constraintTop_toBottomOf="@+id/tvDescripcion" /> | |
98 | + <!-- <TextView--> | |
99 | + <!-- android:id="@+id/textView5"--> | |
100 | + <!-- android:layout_width="wrap_content"--> | |
101 | + <!-- android:layout_height="wrap_content"--> | |
102 | + <!-- android:layout_marginStart="8dp"--> | |
103 | + <!-- android:text="Cantidad:"--> | |
104 | + <!-- android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large"--> | |
105 | + <!-- android:textSize="14sp"--> | |
106 | + <!-- android:visibility="gone"--> | |
107 | + <!-- app:layout_constraintTop_toTopOf="parent"--> | |
108 | + <!-- app:layout_constraintEnd_toStartOf="@+id/tvCodigoBarras"--> | |
109 | + <!-- app:layout_constraintStart_toEndOf="@+id/tvCodigo" />--> | |
101 | 110 | |
102 | - <ImageView | |
103 | - android:id="@+id/ivHolder" | |
104 | - android:layout_width="30dp" | |
105 | - android:layout_height="30dp" | |
106 | - android:visibility="gone" | |
107 | - android:src="@drawable/more" | |
108 | - app:layout_constraintBottom_toTopOf="@+id/tvDescripcion" | |
109 | - app:layout_constraintEnd_toEndOf="parent" | |
110 | - app:layout_constraintHorizontal_bias="0.968" | |
111 | - app:layout_constraintStart_toEndOf="@+id/tvCodigoBarras" | |
112 | - app:layout_constraintTop_toTopOf="parent" | |
113 | - app:layout_constraintVertical_bias="0.0" /> | |
111 | + <!-- <TextView--> | |
112 | + <!-- android:id="@+id/tvCantidad"--> | |
113 | + <!-- android:layout_width="wrap_content"--> | |
114 | + <!-- android:layout_height="match_parent"--> | |
115 | + <!-- android:layout_marginStart="8dp"--> | |
116 | + <!-- android:text="Código Barras:"--> | |
117 | + <!-- android:textAppearance="@style/TextAppearance.AppCompat.Large"--> | |
118 | + <!-- android:textSize="14sp"--> | |
119 | + <!-- android:textStyle="bold"--> | |
120 | + <!-- android:visibility="visible"--> | |
121 | + <!-- app:layout_constraintEnd_toStartOf="@id/tvCodigoBarras"--> | |
122 | + <!-- app:layout_constraintStart_toEndOf="@id/textView5"--> | |
123 | + <!-- app:layout_constraintTop_toTopOf="parent" />--> | |
114 | 124 | |
115 | - <TextView | |
116 | - android:id="@+id/textView85" | |
117 | - android:layout_width="wrap_content" | |
118 | - android:layout_height="wrap_content" | |
119 | - android:layout_marginStart="5dp" | |
120 | - android:layout_marginTop="8dp" | |
121 | - android:text="Desc:" | |
122 | - android:textAppearance="@style/TextAppearance.AppCompat.Widget.PopupMenu.Large" | |
123 | - android:textSize="14sp" | |
124 | - app:layout_constraintEnd_toStartOf="@+id/tvDescripcion" | |
125 | - app:layout_constraintHorizontal_bias="0.0" | |
126 | - app:layout_constraintHorizontal_chainStyle="packed" | |
127 | - app:layout_constraintStart_toStartOf="parent" | |
128 | - app:layout_constraintTop_toBottomOf="@id/tvCodigo" /> | |
129 | 125 | |
130 | - <TextView | |
131 | - android:id="@+id/tvDescripcion" | |
132 | - android:layout_width="0dp" | |
133 | - android:layout_height="wrap_content" | |
134 | - android:layout_marginStart="3dp" | |
135 | - android:layout_marginTop="8dp" | |
136 | - android:maxLines="2" | |
137 | - android:text="abcdefghijklmnñopqrstuvwxyz0123456789abcdefghijklmnñopqrstuvwxyz" | |
138 | - android:textAppearance="@style/TextAppearance.AppCompat.Large" | |
139 | - android:textSize="14sp" | |
140 | - android:textStyle="bold" | |
141 | - app:layout_constraintBaseline_toBaselineOf="@+id/textView85" | |
142 | - app:layout_constraintEnd_toEndOf="parent" | |
143 | - app:layout_constraintStart_toEndOf="@+id/textView85" | |
144 | - app:layout_constraintTop_toBottomOf="@+id/tvCodigo" /> | |
126 | + <!-- <ImageView--> | |
127 | + <!-- android:id="@+id/ivHolder"--> | |
128 | + <!-- android:layout_width="30dp"--> | |
129 | + <!-- android:layout_height="30dp"--> | |
130 | + <!-- android:visibility="gone"--> | |
131 | + <!-- android:src="@drawable/more"--> | |
132 | + <!-- app:layout_constraintBottom_toTopOf="@+id/tvDescripcion"--> | |
133 | + <!-- app:layout_constraintEnd_toEndOf="parent"--> | |
134 | + <!-- app:layout_constraintHorizontal_bias="0.968"--> | |
135 | + <!-- app:layout_constraintStart_toEndOf="@+id/tvCodigoBarras"--> | |
136 | + <!-- app:layout_constraintTop_toTopOf="parent"--> | |
137 | + <!-- app:layout_constraintVertical_bias="0.0" />--> | |
145 | 138 | |
146 | 139 | |
147 | 140 | </androidx.constraintlayout.widget.ConstraintLayout> |
app/src/main/res/layout/item_principal.xml
app/src/main/res/layout/item_servidores.xml
... | ... | @@ -5,7 +5,7 @@ |
5 | 5 | android:layout_width="match_parent" |
6 | 6 | android:layout_height="wrap_content" |
7 | 7 | android:layout_margin="5dp" |
8 | - app:cardCornerRadius="2dp" | |
8 | + app:cardCornerRadius="15dp" | |
9 | 9 | app:cardElevation="10dp" |
10 | 10 | app:contentPadding="5dp" |
11 | 11 | app:cardPreventCornerOverlap="false"> |
app/src/main/res/navigation/mobile_navigation.xml
... | ... | @@ -90,7 +90,7 @@ |
90 | 90 | <fragment |
91 | 91 | android:id="@+id/detalleArtFragment" |
92 | 92 | android:name="com.focasoftware.deboinventariov20.UI.detalleProducto.DetalleArtFragment" |
93 | - android:label="Detalle Articulo" | |
93 | + android:label="Información Artículo" | |
94 | 94 | tools:layout="@layout/fragment_detalle_art"> |
95 | 95 | <action |
96 | 96 | android:id="@+id/action_detalleArtFragment_to_inventarioFragment" |