Skip to content

Commit

Permalink
Merge branch 'feature/506087-ConsultarRepostaje' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
“blantu904” committed Oct 18, 2024
2 parents b4311d2 + d6f7767 commit 74bf788
Show file tree
Hide file tree
Showing 2 changed files with 217 additions and 0 deletions.
99 changes: 99 additions & 0 deletions AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="128dp">

<TextView
android:id="@+id/litrosNum"
android:layout_width="79dp"
android:layout_height="22dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="30dp"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tvName"
tools:text="40" />

<TextView
android:id="@+id/precioTotalNum"
android:layout_width="79dp"
android:layout_height="24dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="30dp"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/precioPorLitroNum"
tools:text="60" />

<TextView
android:id="@+id/precioPorLitroNum"
android:layout_width="79dp"
android:layout_height="26dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="30dp"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/litrosNum"
tools:text="1,432" />

<TextView
android:id="@+id/litrosTexto"
android:layout_width="142dp"
android:layout_height="22dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@+id/logoGasolinera"
app:layout_constraintTop_toBottomOf="@+id/tvName"
tools:text="Litros:" />

<TextView
android:id="@+id/precioPorLitro"
android:layout_width="145dp"
android:layout_height="26dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@+id/logoGasolinera"
app:layout_constraintTop_toBottomOf="@+id/litrosTexto"
tools:text="Precio por litro:" />

<TextView
android:id="@+id/precioTotal"
android:layout_width="152dp"
android:layout_height="24dp"
android:layout_marginStart="20dp"
android:layout_marginTop="10dp"
android:textSize="20sp"
app:layout_constraintStart_toEndOf="@+id/logoGasolinera"
app:layout_constraintTop_toBottomOf="@+id/precioPorLitro"
tools:text="Precio total:" />

<ImageView
android:id="@+id/logoGasolinera"
android:layout_width="64dp"
android:layout_height="64dp"
android:layout_marginStart="16dp"
android:layout_marginTop="15dp"
android:contentDescription="Logo"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ImageContrastCheck"
tools:srcCompat="@tools:sample/avatars" />

<TextView
android:id="@+id/tvName"
android:layout_width="113dp"
android:layout_height="22dp"
android:layout_marginTop="2dp"
android:textSize="20sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="20/03/2024" />


</androidx.constraintlayout.widget.ConstraintLayout>
118 changes: 118 additions & 0 deletions AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">


<TextView
android:id="@+id/historicoTexto"
android:layout_width="331dp"
android:layout_height="34dp"
android:layout_marginStart="32dp"
android:text="Historico de Repostajes"
android:textSize="24sp"
app:layout_constraintStart_toStartOf="parent"
tools:layout_editor_absoluteY="348dp" />

<TextView
android:id="@+id/numImporteMes"
android:layout_width="99dp"
android:layout_height="35dp"
android:layout_marginTop="32dp"
android:layout_marginEnd="48dp"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/numPrecioMedio"
tools:text="242" />

<TextView
android:id="@+id/importeMes"
android:layout_width="200dp"
android:layout_height="35dp"
android:layout_marginStart="52dp"
android:layout_marginTop="30dp"
android:text="Importe total del mes:"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/precioMedio" />

<TextView
android:id="@+id/repostajes"
android:layout_width="152dp"
android:layout_height="35dp"
android:layout_marginStart="52dp"
android:layout_marginTop="30dp"
android:text="Repostajes:"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/resumenMes" />

<TextView
android:id="@+id/numPrecioMedio"
android:layout_width="99dp"
android:layout_height="35dp"
android:layout_marginTop="28dp"
android:layout_marginEnd="48dp"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/numRepostajes"
tools:text="1,534" />

<TextView
android:id="@+id/resumenMes"
android:layout_width="320dp"
android:layout_height="30dp"
android:layout_marginStart="32dp"
android:layout_marginTop="88dp"
android:text="Resumen de Octubre"
android:textSize="24sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:id="@+id/numRepostajes"
android:layout_width="99dp"
android:layout_height="35dp"
android:layout_marginTop="28dp"
android:layout_marginEnd="48dp"
android:textSize="24sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/resumenMes"
tools:text="7" />

<TextView
android:id="@+id/precioMedio"
android:layout_width="204dp"
android:layout_height="35dp"
android:layout_marginStart="52dp"
android:layout_marginTop="30dp"
android:text="Precio medio/litro:"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/repostajes" />

<ListView
android:id="@+id/historicoRepostajes"
android:layout_width="409dp"
android:layout_height="0dp"
android:layout_marginTop="400dp"
android:layout_weight=".30"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar2"
android:layout_width="409dp"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 74bf788

Please sign in to comment.