diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b268ef36cd2de3a14ddddf25aa9f5d4e95731e18
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="deploymentTargetSelector">
+ <selectionStates>
+ <SelectionState runConfigName="app">
+ <option name="selectionMode" value="DROPDOWN" />
+ </SelectionState>
+ </selectionStates>
+ </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt b/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
index 461e9968e8284072f4628e23a8475df900d6ac04..0fcf8f43e50e546f3c64a87888b3d0ad6896f0e3 100644
--- a/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/minijuegoReparacion/MinijuegoReparacion.kt
@@ -133,15 +133,18 @@ class MinijuegoReparacion : AppCompatActivity() {
soundManager.playSound(R.raw.sound_qte,20)
val relativeLayout = findViewById<RelativeLayout>(R.id.relativeLayoutFragmentos)
var para = false
+ val initialX = ruleImageView.x
+ val initialY = ruleImageView.y
val randomX = Random.nextFloat() * (1050 - 350)
val randomY = Random.nextFloat() * (1400 - 250)
- val randomR = 150 + Random.nextFloat() * (360 - 150)
- paloImageView.x = randomX + 75
- paloImageView.y = randomY + 130
ruleImageView.x = randomX
ruleImageView.y = randomY
+ val deltaX = ruleImageView.x - initialX
+ val deltaY = ruleImageView.y - initialY
+ paloImageView.x += deltaX
+ paloImageView.y += deltaY
+ val randomR = 150 + Random.nextFloat() * (360 - 150)
ruleImageView.rotation = randomR
-
fadeIn(paloImageView, ruleImageView)
intervaloDeAngulo = Pair((270f + randomR) % 360, (330f + randomR) % 360).let {
if (it.first > it.second) it.second to it.first else it
diff --git a/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt b/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
index 483aa50615125b987802a8705dcaa7367cb88bbc..73b0004c50ccb651fe337c51b70530df1860f4d4 100644
--- a/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
+++ b/app/src/main/java/com/example/ellegadodepintia/ruleta/Ruleta.kt
@@ -45,7 +45,6 @@ class Ruleta : AppCompatActivity() {
private fun inicializarVistas() {
ruletaImage = findViewById(R.id.ruletaImage)
puntero = findViewById(R.id.ruletaPuntero)
- multiplicadorResultado = findViewById(R.id.multiplicadorResultado)
puntuacion = findViewById(R.id.puntuacion)
titulo = findViewById(R.id.ruletaTitulo)
}
diff --git a/app/src/main/res/drawable/asi_reparar_palo.png b/app/src/main/res/drawable/asi_reparar_palo.png
index acf6a6bf3ec006bd6f7c3b223d6ffce646619ff0..08c485c3881a6f72de2053b70ad5469d2decf007 100644
Binary files a/app/src/main/res/drawable/asi_reparar_palo.png and b/app/src/main/res/drawable/asi_reparar_palo.png differ
diff --git a/app/src/main/res/layout/activity_iniciominijuego1.xml b/app/src/main/res/layout/activity_iniciominijuego1.xml
index faf37cec3e830a303e15b912b6dd509ff8544b90..52ce68149fb6d39dea538ccb8834c22d2bcce33d 100644
--- a/app/src/main/res/layout/activity_iniciominijuego1.xml
+++ b/app/src/main/res/layout/activity_iniciominijuego1.xml
@@ -1,46 +1,58 @@
-<?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"
- tools:context=".minijuego1.InicioMinijuego1">
+ android:layout_height="match_parent">
<ImageView
android:id="@+id/fondoImagen"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/background_minijuego_1"
- android:scaleType="centerCrop" />
+ android:scaleType="centerCrop"
+ app:layout_constraintWidth_percent="1.0"
+ app:layout_constraintHeight_percent="1.0"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent" />
<ImageView
android:id="@+id/titleImage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_1_titulo"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintHeight_percent="0.2"
app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintStart_toStartOf="parent" />
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0.2" />
+
<ImageView
android:id="@+id/bioImage"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_1_descripcion"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintHeight_percent="0.15"
+ app:layout_constraintTop_toBottomOf="@id/titleImage"
app:layout_constraintStart_toStartOf="parent"
- android:layout_marginTop="300dp"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0" />
<ImageView
android:id="@+id/startButton"
- android:layout_width="wrap_content"
- android:layout_height="90dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:src="@drawable/texto_minijuego_3_jugar"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintWidth_percent="0.8"
+ app:layout_constraintHeight_percent="0.1"
+ app:layout_constraintTop_toBottomOf="@id/bioImage"
app:layout_constraintStart_toStartOf="parent"
- tools:layout_editor_absoluteX="0dp"
- tools:layout_editor_absoluteY="56dp"
- android:layout_marginTop="600dp"/>
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintVertical_bias="0.2" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_minijuego2.xml b/app/src/main/res/layout/activity_minijuego2.xml
index 281d2e26cde3970ea149b504e599a798ad674316..f9c39da0dd671c83877def451fa6483e702e1f3f 100644
--- a/app/src/main/res/layout/activity_minijuego2.xml
+++ b/app/src/main/res/layout/activity_minijuego2.xml
@@ -26,25 +26,24 @@
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_alignParentTop="true"
- android:layout_marginTop="150dp"
+ android:layout_marginTop="100dp"
android:src="@drawable/texto_minijuego_2_titulo" />
<ImageView
android:id="@+id/descripcion"
android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_height="120dp"
+ android:layout_below="@id/titulo"
+ android:layout_marginTop="0dp"
android:src="@drawable/texto_minijuego_2_descripcion"
- android:layout_alignParentTop="true"
- android:layout_marginTop="400dp"
- android:layout_centerHorizontal="true"
/>
<ImageView
android:id="@+id/boton_iniciar"
android:layout_width="200dp"
android:layout_height="100dp"
- android:layout_marginTop="600dp"
android:src="@drawable/texto_minijuego_2_jugar"
+ android:layout_below="@id/descripcion"
android:layout_centerHorizontal="true"
android:textColor="@android:color/white" />
diff --git a/app/src/main/res/layout/activity_minijuego_reparacion.xml b/app/src/main/res/layout/activity_minijuego_reparacion.xml
index e5bea48bce89b9b0d8ea868fb612de94caa8b3a3..5f9aa0bb6cf76308859c94194d33e9b45fed814e 100644
--- a/app/src/main/res/layout/activity_minijuego_reparacion.xml
+++ b/app/src/main/res/layout/activity_minijuego_reparacion.xml
@@ -5,8 +5,6 @@
android:background="@drawable/background_minijuego_reparar">
-
- <!-- Imagen del martillo -->
<ImageView
android:id="@+id/martillo"
android:layout_width="100dp"
@@ -16,46 +14,42 @@
android:layout_marginTop="16dp"
android:visibility="gone" />
- <!-- Imagen de la antigüedad a reparar -->
+
<ImageView
android:id="@+id/imageToRepair"
android:layout_width="250dp"
android:layout_height="250dp"
android:src="@drawable/asi_exploradores_jabonera"
android:layout_centerHorizontal="true"
- android:layout_marginBottom="-400dp"
+ android:layout_marginBottom="16dp"
android:visibility="gone" />
- <!-- Contenedor de los fragmentos (estos se agregarán programáticamente) -->
+
<RelativeLayout
android:id="@+id/relativeLayoutFragmentos"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true" >
+ </RelativeLayout>
- </RelativeLayout>
- <!-- Imagen del Quick Time Event -->
<ImageView
android:id="@+id/QTERule"
android:layout_width="150dp"
android:layout_height="150dp"
- android:src="@drawable/asi_reparar_rule"
android:layout_centerHorizontal="true"
android:layout_marginTop="16dp"
- />
- <!-- Imagen de la aguja para el QTE -->
+ android:scaleType="fitCenter"
+ android:src="@drawable/asi_reparar_rule" />
+
+
<ImageView
android:id="@+id/QTEPalo"
- android:layout_width="90dp"
- android:layout_height="50dp"
- android:layout_marginLeft="10dp"
- android:layout_marginStart="160dp"
- android:layout_marginTop="65dp"
- android:scaleX="3"
- android:scaleY="1.5"
+ android:layout_width="100dp"
+ android:layout_height="40dp"
+ android:layout_centerHorizontal="true"
+ android:layout_marginTop="72dp"
+ android:scaleX="1.5"
+ android:scaleY="1"
android:src="@drawable/asi_reparar_palo" />
-
-
-
</RelativeLayout>
diff --git a/app/src/main/res/layout/activity_ruleta.xml b/app/src/main/res/layout/activity_ruleta.xml
index 85a4359bf87c38401c299321dcc439acb6b3350d..9e2c9522511761087f3dae9fec7f8bb0df5a2f41 100644
--- a/app/src/main/res/layout/activity_ruleta.xml
+++ b/app/src/main/res/layout/activity_ruleta.xml
@@ -1,35 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical"
android:padding="16dp"
- android:gravity="center"
- android:id="@+id/ruletaLayout"
android:background="@drawable/background_minijuego_ruleta">
<ImageView
android:id="@+id/ruletaTitulo"
- android:layout_width="wrap_content"
- android:layout_height="132dp"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:layout_marginBottom="20dp"
android:contentDescription="TÃtulo de la ruleta"
- android:src="@drawable/texto_ruleta_titulo" />
+ android:src="@drawable/texto_ruleta_titulo"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintDimensionRatio="2:1"
+ app:layout_constraintTop_toTopOf="parent"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
<ImageView
android:id="@+id/ruletaPuntero"
- android:layout_width="50dp"
- android:layout_height="50dp"
- android:layout_gravity="center"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
android:contentDescription="Puntero de la ruleta"
android:rotation="180"
- android:src="@drawable/asi_ruleta_puntero" />
+ android:src="@drawable/asi_ruleta_puntero"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="0.1"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintTop_toBottomOf="@id/ruletaTitulo"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
<FrameLayout
- android:layout_width="350dp"
- android:layout_height="350dp"
- android:layout_gravity="center"
- android:layout_marginBottom="30dp">
+ android:id="@+id/ruletaContainer"
+ android:layout_width="0dp"
+ android:layout_height="0dp"
+ app:layout_constraintWidth_default="percent"
+ app:layout_constraintWidth_percent="1"
+ app:layout_constraintDimensionRatio="1:1"
+ app:layout_constraintTop_toBottomOf="@id/ruletaPuntero"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent"
+ app:layout_constraintBottom_toTopOf="@id/puntuacion">
+
<ImageView
android:id="@+id/ruletaImage"
android:layout_width="match_parent"
@@ -39,26 +56,21 @@
android:scaleType="centerCrop"/>
</FrameLayout>
- <TextView
- android:id="@+id/multiplicadorResultado"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Multiplicador: x1"
- android:textSize="18sp"
- android:textColor="#000"
- android:visibility="gone"
- android:layout_marginTop="20dp"
- android:layout_gravity="center"/>
+
<TextView
android:id="@+id/puntuacion"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Puntuación: 33"
- android:textSize="40sp"
+ android:text="Puntuación: 33"
+ android:textSize="35sp"
android:textColor="#FFFF00"
- android:layout_marginTop="40dp"
android:fontFamily="@font/pixeled"
android:textAlignment="center"
- android:textStyle="bold"/>
-</LinearLayout>
+ android:textStyle="bold"
+ android:layout_marginTop="16dp"
+ app:layout_constraintTop_toBottomOf="@id/ruletaContainer"
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintEnd_toEndOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>