diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 2159e853647dc794a0b2787150f89d2bdea8f8d1..b268ef36cd2de3a14ddddf25aa9f5d4e95731e18 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="deploymentTargetSelector"> <selectionStates> - <SelectionState runConfigName="MainActivity"> + <SelectionState runConfigName="app"> <option name="selectionMode" value="DROPDOWN" /> </SelectionState> </selectionStates> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6e64bbb1bd96a794b6dc89cf937808671f286f6..9af9486a50fe031a62c0d0e4977b9b4b641e5feb 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -36,6 +36,7 @@ <activity android:name=".exploradoresDePintia.Resumen" android:exported="true"/> <activity android:name=".TabernaActivity" android:exported="true"/> <activity android:name=".TiendaActivity" android:exported="true"/> + <activity android:name=".minijuego4.Minijuego4" android:exported="true"/> </application> </manifest> \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt b/app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt index 154b78b8fddb14f362ab340de13e377dae2d931f..2f17a0b18ac5e3e004f0357cb793602495f18535 100644 --- a/app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt +++ b/app/src/main/java/com/example/ellegadodepintia/ListaMinijuegos.kt @@ -7,6 +7,7 @@ import androidx.appcompat.app.AppCompatActivity import com.example.ellegadodepintia.minijuego1.InicioMinijuego1 import com.example.ellegadodepintia.minijuego2.Minijuego2 import com.example.ellegadodepintia.minijuego3.Minijuego3 +import com.example.ellegadodepintia.minijuego4.Minijuego4 import com.example.ellegadodepintia.minijuegoInvestigacion.MinijuegoInvestigar import com.example.ellegadodepintia.ruleta.Ruleta import com.example.ellegadodepintia.minijuegoReparacion.MinijuegoReparacion @@ -38,6 +39,7 @@ class ListaMinijuegos : AppCompatActivity(){ val intent = Intent(this, Minijuego3::class.java) startActivity(intent) } + // Minijuego Investigar val minijuegoInvestigarLayout = findViewById<FrameLayout>(R.id.minijuegoInvestigar) minijuegoInvestigarLayout.setOnClickListener { @@ -60,5 +62,12 @@ class ListaMinijuegos : AppCompatActivity(){ intent.putExtra("FLAG_KEY", flag) startActivity(intent) } + + // Minijuego 4 + val minijuego4Layout = findViewById<FrameLayout>(R.id.minijuego4) + minijuego4Layout.setOnClickListener { + val intent = Intent(this, Minijuego4::class.java) + startActivity(intent) + } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/ellegadodepintia/minijuego4/Minijuego4.kt b/app/src/main/java/com/example/ellegadodepintia/minijuego4/Minijuego4.kt new file mode 100644 index 0000000000000000000000000000000000000000..bd750ca739e7e9186fbeab4c05c4d8201ddd997f --- /dev/null +++ b/app/src/main/java/com/example/ellegadodepintia/minijuego4/Minijuego4.kt @@ -0,0 +1,6 @@ +package com.example.ellegadodepintia.minijuego4 + +import androidx.appcompat.app.AppCompatActivity + +class Minijuego4 : AppCompatActivity(){ +} \ No newline at end of file diff --git a/app/src/main/res/drawable/asi_minijuego_4_tablero.png b/app/src/main/res/drawable/asi_minijuego_4_tablero.png new file mode 100644 index 0000000000000000000000000000000000000000..1a19c934d77c3c7c2e49aba4a6f3200293afc020 Binary files /dev/null and b/app/src/main/res/drawable/asi_minijuego_4_tablero.png differ diff --git a/app/src/main/res/drawable/texto_lista_raya.png b/app/src/main/res/drawable/texto_lista_raya.png new file mode 100644 index 0000000000000000000000000000000000000000..c046fde65234fd3e67fd30eb84d2c992d216536e Binary files /dev/null and b/app/src/main/res/drawable/texto_lista_raya.png differ diff --git a/app/src/main/res/layout/activity_lista_minijuegos.xml b/app/src/main/res/layout/activity_lista_minijuegos.xml index 07e4689bdb3f5b7b1929c3b598c2ebf65e230955..1e00650ecd162e7dd01d127441adeeec650288d7 100644 --- a/app/src/main/res/layout/activity_lista_minijuegos.xml +++ b/app/src/main/res/layout/activity_lista_minijuegos.xml @@ -189,5 +189,34 @@ android:src="@drawable/texto_lista_reparar" /> </LinearLayout> </FrameLayout> + <!-- Minijuego 3 raya --> + <FrameLayout + android:id="@+id/minijuego4" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="8dp" + android:layout_marginBottom="8dp"> + + <!-- Contenido (imagen y tÃtulo) --> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="center_vertical"> + + <ImageView + android:layout_width="50dp" + android:layout_height="50dp" + android:src="@drawable/asi_minijuego_4_tablero" + android:contentDescription="Imagen de tablero" /> + + <ImageView + android:layout_width="15dp" + android:layout_height="80dp" + android:layout_weight="1" + android:contentDescription="TÃtulo de 3 raya" + android:src="@drawable/texto_lista_raya" /> + </LinearLayout> + </FrameLayout> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/activity_minijuego4.xml b/app/src/main/res/layout/activity_minijuego4.xml new file mode 100644 index 0000000000000000000000000000000000000000..77d9ef65f8c7c6bf54bdef7d54d1646b86417404 --- /dev/null +++ b/app/src/main/res/layout/activity_minijuego4.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file