diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 725c9f1d3b2542bbab630114aad2b5f68a154919..92ef36bae55d477e1868e24402b11d36fcf75f0c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -34,6 +34,7 @@ <activity android:name=".ruleta.Ruleta" android:exported="true"/> <activity android:name=".minijuegoReparacion.MinijuegoReparacion" android:exported="true"/> <activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/> + <activity android:name=".TabernaActivity" android:exported="true"/> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt index f64f826f0d23e8ca8a4a9f65b7c5e23aee278bc0..e78b901e8890527bfcf4e095ffd8c0b1ea2ef8d1 100644 --- a/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt +++ b/app/src/main/java/com/example/ellegadodepintia/MapActivity.kt @@ -31,10 +31,16 @@ class MapActivity : AppCompatActivity() { leaderboardButton.setBackgroundColor(Color.TRANSPARENT) shopButton.setBackgroundColor(Color.TRANSPARENT) - val minijuego4Button = findViewById<ImageButton>(R.id.minijuego4) - minijuego4Button.setOnClickListener { + val aventura = findViewById<ImageButton>(R.id.botonAventura) + aventura.setOnClickListener { val intent = Intent(this, ExploradoresDePintia::class.java) startActivity(intent) } + + val taberna = findViewById<ImageButton>(R.id.botonTaberna) + taberna.setOnClickListener { + val intent = Intent(this, TabernaActivity::class.java) + startActivity(intent) + } } } diff --git a/app/src/main/java/com/example/ellegadodepintia/TabernaActivity.kt b/app/src/main/java/com/example/ellegadodepintia/TabernaActivity.kt new file mode 100644 index 0000000000000000000000000000000000000000..a2ff965cef5f67c9021a44387b4a79631f5821a3 --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/TabernaActivity.kt @@ -0,0 +1,11 @@ +package com.example.ellegadodepintia + +import android.os.Bundle +import androidx.appcompat.app.AppCompatActivity + +class TabernaActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_taberna) + } +} diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index c29b9f2813f94b9be32db1cc3271bb11c18edb89..716825ec26f3c274389084a76e426faa885c94f8 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -25,7 +25,7 @@ android:src="@drawable/background_ciudad" /> <ImageButton - android:id="@+id/minijuego4" + android:id="@+id/botonAventura" style="?android:attr/buttonBarButtonStyle" android:layout_width="199dp" android:layout_height="140dp"