Ready v0.3

DavidRamosArchilla · Mar 30, 2023 · e72406d · e72406d
1 parent 66b2a0c
commit e72406d
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 156 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,9 +16,6 @@
         <activity
             android:name=".PantallaInicioActivity"
             android:exported="false" />
-        <activity
-            android:name=".ActivityUltimaCarrera"
-            android:exported="false" />
         <activity
             android:name=".MainActivity"
             android:exported="true">

diff --git a/app/src/main/java/com/example/f1/ActivityUltimaCarrera.java b/app/src/main/java/com/example/f1/ActivityUltimaCarrera.java
diff --git a/app/src/main/java/com/example/f1/PantallaInicioActivity.java b/app/src/main/java/com/example/f1/PantallaInicioActivity.java
@@ -2,6 +2,7 @@
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
@@ -23,6 +24,7 @@ public class PantallaInicioActivity extends AppCompatActivity {
     private static final String API_BASE_URL = "https://ergast.com";
     private IF1ApiService service;
     private FirebaseAuth mFirebaseAuth;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -67,14 +69,12 @@ private IF1ApiService crearService(){
         return retrofit.create(IF1ApiService.class);
     }
 
-    public void logOut(View v) {
+
+    public void logOut() {
         mFirebaseAuth.signOut();
         Toast.makeText(this, R.string.signed_out, Toast.LENGTH_SHORT).show();
         Intent myIntent = new Intent(this, MainActivity.class);
         startActivity(myIntent);
     }
-    public void abrirUltimaCarrera (View view){
-        Intent myIntent = new Intent(this, ActivityUltimaCarrera.class);
-        startActivity(myIntent);
-    }
+
 }
diff --git a/app/src/main/java/com/example/f1/modelo/Piloto.java b/app/src/main/java/com/example/f1/modelo/Piloto.java
diff --git a/app/src/main/res/layout/activity_pantalla_inicio.xml b/app/src/main/res/layout/activity_pantalla_inicio.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".PantallaInicioActivity">
+    tools:context=".PantallaInicioActivity"
+    tools:menu="@menu/menu_toolbar">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"

diff --git a/app/src/main/res/layout/activity_ultima_carrera.xml b/app/src/main/res/layout/activity_ultima_carrera.xml
diff --git a/app/src/main/res/menu/menu_toolbar.xml b/app/src/main/res/menu/menu_toolbar.xml
@@ -7,6 +7,5 @@
         android:icon="@drawable/baseline_logout_24"
         android:iconTint="@color/blanco_amarillento"
         android:title="LogOut"
-        app:showAsAction="ifRoom"
-        android:onClick="LogOut"/>
+        app:showAsAction="ifRoom" />
 </menu>