diff --git a/AndroidProject/app/src/main/AndroidManifest.xml b/AndroidProject/app/src/main/AndroidManifest.xml
index b42210a..4bfc371 100644
--- a/AndroidProject/app/src/main/AndroidManifest.xml
+++ b/AndroidProject/app/src/main/AndroidManifest.xml
@@ -22,7 +22,7 @@
             android:name=".activities.RegistrarRepostajeMenu.RegistrarView"
             android:exported="false" />
         <activity
-            android:name=".activities.ConsultarRepostajeMenu.ConsultarView"
+            android:name=".activities.ConsultarRepostaje.ConsultarRepostaje"
             android:exported="false" />
         <activity
             android:name=".activities.details.DetailsView"
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/ConsultarRepostaje.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/ConsultarRepostaje.java
index a66870b..5e04a4d 100644
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/ConsultarRepostaje.java
+++ b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/ConsultarRepostaje.java
@@ -1,5 +1,8 @@
 package es.unican.gasolineras.activities.ConsultarRepostaje;
 
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Bundle;
 import android.widget.ListView;
 import android.widget.TextView;
@@ -17,7 +20,9 @@
 
 import es.unican.gasolineras.GasolinerasApp;
 import es.unican.gasolineras.R;
+
 import es.unican.gasolineras.activities.main.IMainContract;
+import es.unican.gasolineras.activities.main.MainView;
 import es.unican.gasolineras.model.Repostaje;
 import es.unican.gasolineras.repository.AppDatabase;
 import es.unican.gasolineras.repository.RepostajeDAO;
@@ -31,14 +36,30 @@ public class ConsultarRepostaje extends AppCompatActivity implements IConsultar
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_consulta_repostaje_view);
+        try {
+            super.onCreate(savedInstanceState);
+            setContentView(R.layout.activity_consulta_repostaje_view);
+        } catch (Exception e) {
+            // Si ocurre una excepción, muestra el mensaje de error
+            new AlertDialog.Builder(ConsultarRepostaje.this)
+                    .setTitle("Error")
+                    .setMessage(getString(R.string.error_acceso_bbdd))
+                    .setPositiveButton("OK", new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            // Puedes agregar alguna acción adicional si es necesario
+                            Intent intent = new Intent(ConsultarRepostaje.this, MainView.class);
+                            startActivity(intent);
+                        }
+                    })
+                    .show();
+        }
 
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
         ActionBar bar = getSupportActionBar();
-        assert bar != null;  // to avoid warning in the line below
-        bar.setDisplayHomeAsUpEnabled(true);  // show back button in action bar
+        //assert bar != null;  // to avoid warning in the line below
+        //bar.setDisplayHomeAsUpEnabled(true);  // show back button in action bar
 
         TextView repostajesMes = findViewById(R.id.tvRepostajesMes);
         TextView precioMedioLitro = findViewById(R.id.tvPrecioMedioLitro);
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/RepostajesArrayAdapter.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/RepostajesArrayAdapter.java
index 3c5e2f6..fc3d9a7 100644
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/RepostajesArrayAdapter.java
+++ b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostaje/RepostajesArrayAdapter.java
@@ -54,7 +54,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         if (convertView == null) {
             convertView = LayoutInflater.from(context)
-                    .inflate(R.layout.activity_consultar_list_item, parent, false);
+                    .inflate(R.layout.activity_consulta_repostaje_list_item_view, parent, false);
         }
 
         //fecha
@@ -66,19 +66,19 @@ public View getView(int position, View convertView, ViewGroup parent) {
         //precio por litro
         {
 
-            TextView tv = convertView.findViewById(R.id.tvPreciolitro);
+            TextView tv = convertView.findViewById(R.id.tvPrecioPorLitroNum);
             tv.setText(String.valueOf(repostaje.getPrecioTotal() / repostaje.getLitros()));
         }
 
         //litros
         {
-            TextView tv = convertView.findViewById(R.id.tvLitros);
+            TextView tv = convertView.findViewById(R.id.tvLitrosNum);
             tv.setText(String.valueOf(repostaje.getLitros()));
         }
 
         //precio total
         {
-            TextView tv = convertView.findViewById(R.id.tvPrecioTotal);
+            TextView tv = convertView.findViewById(R.id.tvPrecioTotalNum);
             tv.setText(String.valueOf(repostaje.getPrecioTotal()));
         }
 
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostajeMenu/ConsultarView.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostajeMenu/ConsultarView.java
deleted file mode 100644
index cdd2e30..0000000
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/ConsultarRepostajeMenu/ConsultarView.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package es.unican.gasolineras.activities.ConsultarRepostajeMenu;
-
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import es.unican.gasolineras.R;
-import es.unican.gasolineras.activities.RegistrarRepostajeMenu.RegistrarView;
-import es.unican.gasolineras.activities.main.MainView;
-
-public class ConsultarView extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        try {
-            super.onCreate(savedInstanceState);
-            // setContentView(R.layout.activity_consulta_repostaje_view);
-        } catch (Exception e) {
-            // Si ocurre una excepción, muestra el mensaje de error
-            new AlertDialog.Builder(ConsultarView.this)
-                    .setTitle("Error")
-                    .setMessage(getString(R.string.error_acceso_bbdd))
-                    .setPositiveButton("OK", new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            // Puedes agregar alguna acción adicional si es necesario
-                            Intent intent = new Intent(ConsultarView.this, MainView.class);
-                            startActivity(intent);
-                        }
-                    })
-                    .show();
-        }
-
-    }
-}
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/GasolinerasArrayAdapter.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/GasolinerasArrayAdapter.java
index 0d57301..2f72292 100644
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/GasolinerasArrayAdapter.java
+++ b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/GasolinerasArrayAdapter.java
@@ -1,14 +1,11 @@
 package es.unican.gasolineras.activities.main;
 
-import static java.util.Collections.emptyList;
-
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -92,7 +89,7 @@ public View getView(int position, @Nullable View convertView, @NonNull ViewGroup
 
         // name
         {
-            TextView tv = convertView.findViewById(R.id.tvName);
+            TextView tv = convertView.findViewById(R.id.tvFecha);
             tv.setText(gasolinera.getRotulo());
         }
 
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/MainView.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/MainView.java
index 2cab2de..0a26d4e 100644
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/MainView.java
+++ b/AndroidProject/app/src/main/java/es/unican/gasolineras/activities/main/MainView.java
@@ -23,13 +23,14 @@
 
 import dagger.hilt.android.AndroidEntryPoint;
 import es.unican.gasolineras.R;
-import es.unican.gasolineras.activities.ConsultarRepostajeMenu.ConsultarView;
+import es.unican.gasolineras.activities.ConsultarRepostaje.ConsultarRepostaje;
 import es.unican.gasolineras.activities.RegistrarRepostajeMenu.RegistrarView;
 import es.unican.gasolineras.activities.info.InfoView;
 import es.unican.gasolineras.activities.details.DetailsView;
 import es.unican.gasolineras.model.Gasolinera;
 import es.unican.gasolineras.repository.IGasolinerasRepository;
 
+
 /**
  * The main view of the application. It shows a list of gas stations.
  */
@@ -183,7 +184,7 @@ public void showRegistrarActivity() {
      */
     @Override
     public void showConsultarActivity() {
-        Intent intent = new Intent(this, ConsultarView.class);
+        Intent intent = new Intent(this, ConsultarRepostaje.class);
         startActivity(intent);
     }
 }
\ No newline at end of file
diff --git a/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Repostaje.java b/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Repostaje.java
index 33f8156..d6f0070 100644
--- a/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Repostaje.java
+++ b/AndroidProject/app/src/main/java/es/unican/gasolineras/model/Repostaje.java
@@ -18,12 +18,12 @@ public class Repostaje {
     public int uid;
 
     @ColumnInfo(name = "fecha_repostaje")
-    protected String fechaRepostaje;
+    public String fechaRepostaje;
 
     @ColumnInfo(name = "precio_total")
-    protected double precioTotal;
+    public double precioTotal;
 
     @ColumnInfo(name = "litros")
-    protected double litros;
+    public double litros;
 
 }
diff --git a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml
index 00f85ad..0654dec 100644
--- a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml
+++ b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_list_item_view.xml
@@ -6,36 +6,36 @@
     android:layout_height="128dp">
 
     <TextView
-        android:id="@+id/litrosNum"
+        android:id="@+id/tvLitrosNum"
         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"
+        app:layout_constraintTop_toBottomOf="@+id/tvFecha"
         tools:text="40" />
 
     <TextView
-        android:id="@+id/precioTotalNum"
+        android:id="@+id/tvPrecioTotalNum"
         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"
+        app:layout_constraintTop_toBottomOf="@+id/tvPrecioPorLitroNum"
         tools:text="60" />
 
     <TextView
-        android:id="@+id/precioPorLitroNum"
+        android:id="@+id/tvPrecioPorLitroNum"
         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"
+        app:layout_constraintTop_toBottomOf="@+id/tvLitrosNum"
         tools:text="1,432" />
 
     <TextView
@@ -46,11 +46,11 @@
         android:layout_marginTop="10dp"
         android:textSize="20sp"
         app:layout_constraintStart_toEndOf="@+id/logoGasolinera"
-        app:layout_constraintTop_toBottomOf="@+id/tvName"
+        app:layout_constraintTop_toBottomOf="@+id/tvFecha"
         tools:text="Litros:" />
 
     <TextView
-        android:id="@+id/precioPorLitro"
+        android:id="@+id/tvPrecioLitro"
         android:layout_width="145dp"
         android:layout_height="26dp"
         android:layout_marginStart="20dp"
@@ -68,7 +68,7 @@
         android:layout_marginTop="10dp"
         android:textSize="20sp"
         app:layout_constraintStart_toEndOf="@+id/logoGasolinera"
-        app:layout_constraintTop_toBottomOf="@+id/precioPorLitro"
+        app:layout_constraintTop_toBottomOf="@+id/tvPrecioLitro"
         tools:text="Precio total:" />
 
     <ImageView
@@ -85,7 +85,7 @@
         tools:srcCompat="@tools:sample/avatars" />
 
     <TextView
-        android:id="@+id/tvName"
+        android:id="@+id/tvFecha"
         android:layout_width="113dp"
         android:layout_height="22dp"
         android:layout_marginTop="2dp"
diff --git a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml
index ce5fa2f..e690316 100644
--- a/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml
+++ b/AndroidProject/app/src/main/res/layout/activity_consulta_repostaje_view.xml
@@ -11,20 +11,22 @@
         android:layout_width="331dp"
         android:layout_height="34dp"
         android:layout_marginStart="32dp"
+        android:gravity="center"
         android:text="Historico de Repostajes"
         android:textSize="24sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         tools:layout_editor_absoluteY="348dp" />
 
     <TextView
-        android:id="@+id/numImporteMes"
+        android:id="@+id/tvAcumuladoMes"
         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"
+        app:layout_constraintTop_toBottomOf="@+id/tvPrecioMedioLitro"
         tools:text="242" />
 
     <TextView
@@ -50,14 +52,14 @@
         app:layout_constraintTop_toBottomOf="@+id/resumenMes" />
 
     <TextView
-        android:id="@+id/numPrecioMedio"
+        android:id="@+id/tvPrecioMedioLitro"
         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"
+        app:layout_constraintTop_toBottomOf="@+id/tvRepostajesMes"
         tools:text="1,534" />
 
     <TextView
@@ -66,13 +68,15 @@
         android:layout_height="30dp"
         android:layout_marginStart="32dp"
         android:layout_marginTop="88dp"
-        android:text="Resumen de Octubre"
-        android:textSize="24sp"
+        android:gravity="start"
+        android:text="Este mes "
+        android:textSize="28sp"
+        android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/numRepostajes"
+        android:id="@+id/tvRepostajesMes"
         android:layout_width="99dp"
         android:layout_height="35dp"
         android:layout_marginTop="28dp"
@@ -94,7 +98,7 @@
         app:layout_constraintTop_toBottomOf="@+id/repostajes" />
 
     <ListView
-        android:id="@+id/historicoRepostajes"
+        android:id="@+id/lvRepostajes"
         android:layout_width="409dp"
         android:layout_height="0dp"
         android:layout_marginTop="400dp"
@@ -106,8 +110,8 @@
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar2"
-        android:layout_width="409dp"
-        android:layout_height="wrap_content"
+        android:layout_width="431dp"
+        android:layout_height="58dp"
         android:background="?attr/colorPrimary"
         android:minHeight="?attr/actionBarSize"
         android:theme="?attr/actionBarTheme"
diff --git a/AndroidProject/app/src/main/res/layout/activity_main_list_item.xml b/AndroidProject/app/src/main/res/layout/activity_main_list_item.xml
index 7cfcf50..422070d 100644
--- a/AndroidProject/app/src/main/res/layout/activity_main_list_item.xml
+++ b/AndroidProject/app/src/main/res/layout/activity_main_list_item.xml
@@ -18,7 +18,7 @@
         tools:srcCompat="@tools:sample/avatars" />
 
     <TextView
-        android:id="@+id/tvName"
+        android:id="@+id/tvFecha"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
@@ -34,7 +34,7 @@
         tools:text="Direccion"
         app:layout_constraintBottom_toTopOf="@+id/tv95"
         app:layout_constraintStart_toEndOf="@+id/ivLogo"
-        app:layout_constraintTop_toBottomOf="@+id/tvName" />
+        app:layout_constraintTop_toBottomOf="@+id/tvFecha" />
 
     <TextView
         android:id="@+id/tv95Label"
diff --git a/AndroidProject/app/src/main/res/menu/menu.xml b/AndroidProject/app/src/main/res/menu/menu.xml
index de06b0f..2ab017f 100644
--- a/AndroidProject/app/src/main/res/menu/menu.xml
+++ b/AndroidProject/app/src/main/res/menu/menu.xml
@@ -11,11 +11,11 @@
         android:id="@+id/RegistrarRepostajeItem"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:title="Registrar repostaje" />
+        android:title="@string/registrarRepostaje" />
 
     <item
         android:id="@+id/ConsultarRepostajeItem"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:title="Historial repostajes" />
+        android:title="@string/historialRepostaje" />
 </menu>
\ No newline at end of file
diff --git a/AndroidProject/app/src/main/res/values/strings.xml b/AndroidProject/app/src/main/res/values/strings.xml
index adbcc42..9497fd1 100644
--- a/AndroidProject/app/src/main/res/values/strings.xml
+++ b/AndroidProject/app/src/main/res/values/strings.xml
@@ -4,6 +4,8 @@
     <string name="dieselAlabel">Diesel</string>
     <string name="refresh">Recargar</string>
     <string name="info">Info</string>
+    <string name="registrarRepostaje">Registrar repostaje</string>
+    <string name="historialRepostaje">Historial repostajes</string>
     <string name="loadCorrect">Se han cargado %d gasolineras</string>
     <string name="loadError">Ha habido un error cargando las gasolineras</string>
     <string name="info_text">Aplicación creada para el Proyecto Integrado Curso 2024-2025</string>