From 11e933838d366335198f58cdc9dd70fa806e764d Mon Sep 17 00:00:00 2001
From: victor <victor.calleja.garcia@estudiantes.uva.es>
Date: Tue, 19 Nov 2024 23:46:13 +0100
Subject: [PATCH] Feature: arrelar vistas minijuegos
---
.idea/deploymentTargetSelector.xml | 10 +++
.../MinijuegoReparacion.kt | 11 ++-
.../example/ellegadodepintia/ruleta/Ruleta.kt | 1 -
.../main/res/drawable/asi_reparar_palo.png | Bin 13059 -> 5027 bytes
.../res/layout/activity_iniciominijuego1.xml | 58 ++++++++------
.../main/res/layout/activity_minijuego2.xml | 11 ++-
.../layout/activity_minijuego_reparacion.xml | 34 ++++-----
app/src/main/res/layout/activity_ruleta.xml | 72 ++++++++++--------
8 files changed, 113 insertions(+), 84 deletions(-)
create mode 100644 .idea/deploymentTargetSelector.xml
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..b268ef3
--- /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 461e996..0fcf8f4 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 483aa50..73b0004 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
GIT binary patch
literal 5027
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
Fe*r8Mb4>sM
literal 13059
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
diff --git a/app/src/main/res/layout/activity_iniciominijuego1.xml b/app/src/main/res/layout/activity_iniciominijuego1.xml
index faf37ce..52ce681 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 281d2e2..f9c39da 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 e5bea48..5f9aa0b 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 85a4359..9e2c952 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>
--
GitLab