diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index 81cb8030fc7732f4b0a19700c0ff410f4d5fb5c6..774e072d16c964decd5ac1b67e3dc9030715b555 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,10 +4,10 @@ <selectionStates> <SelectionState runConfigName="app"> <option name="selectionMode" value="DROPDOWN" /> - <DropdownSelection timestamp="2024-11-24T14:04:03.259758866Z"> + <DropdownSelection timestamp="2024-11-24T16:31:40.501476846Z"> <Target type="DEFAULT_BOOT"> <handle> - <DeviceId pluginId="PhysicalDevice" identifier="serial=RF8N1192C6J" /> + <DeviceId pluginId="LocalEmulator" identifier="path=/home/victor/.android/avd/Small_Phone_API_35.avd" /> </handle> </Target> </DropdownSelection> diff --git a/app/src/main/java/com/example/ellegadodepintia/minijuego1/InicioMinijuego1.kt b/app/src/main/java/com/example/ellegadodepintia/minijuego1/InicioMinijuego1.kt index bacf8a08f8dce0eaccdf41f90bef9faf1d50abf9..4818bfd175495b3f2238a47bc031ee8ed0769214 100644 --- a/app/src/main/java/com/example/ellegadodepintia/minijuego1/InicioMinijuego1.kt +++ b/app/src/main/java/com/example/ellegadodepintia/minijuego1/InicioMinijuego1.kt @@ -7,6 +7,12 @@ import androidx.appcompat.app.AppCompatActivity import com.example.ellegadodepintia.R import android.view.animation.AnimationUtils import com.example.ellegadodepintia.soundManager.SoundManager +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Button +import androidx.fragment.app.DialogFragment + class InicioMinijuego1 : AppCompatActivity() { private lateinit var titulo: ImageView @@ -30,5 +36,29 @@ class InicioMinijuego1 : AppCompatActivity() { startActivity(intent) finish() } + val tutorialButton = findViewById<ImageView>(R.id.tutorial) + tutorialButton.setOnClickListener { + // Mostrar el modal + val modal = ModalFragment() + modal.show(supportFragmentManager, "ModalFragment") + } + } +} +class ModalFragment : DialogFragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + // Inflar el diseño del modal + val view = inflater.inflate(R.layout.modal_minijuego1_tutorial, container, false) + + // Configurar el botón de cerrar + val closeButton = view.findViewById<Button>(R.id.cerrar) + closeButton.setOnClickListener { + dismiss() // Cierra el modal + } + + return view } -} \ No newline at end of file +} diff --git a/app/src/main/res/drawable/asi_boton_tutorial.png b/app/src/main/res/drawable/asi_boton_tutorial.png new file mode 100644 index 0000000000000000000000000000000000000000..3f068adb9ee4acc1e7ad42ec9b14240980bc5443 Binary files /dev/null and b/app/src/main/res/drawable/asi_boton_tutorial.png differ diff --git a/app/src/main/res/layout/activity_iniciominijuego1.xml b/app/src/main/res/layout/activity_iniciominijuego1.xml index 52ce68149fb6d39dea538ccb8834c22d2bcce33d..f867b6dc66be3a53d049e388993f63997a15b4e7 100644 --- a/app/src/main/res/layout/activity_iniciominijuego1.xml +++ b/app/src/main/res/layout/activity_iniciominijuego1.xml @@ -54,5 +54,17 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintVertical_bias="0.2" /> + <ImageView + android:id="@+id/tutorial" + android:contentDescription="tutorial" + app:layout_constraintWidth_percent="0.3" + app:layout_constraintHeight_percent="0.15" + app:layout_constraintTop_toBottomOf="@id/startButton" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintVertical_bias="0.3" + android:src="@drawable/asi_boton_tutorial" + android:layout_height="0dp" android:layout_width="0dp"></ImageView> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/modal_minijuego1_tutorial.xml b/app/src/main/res/layout/modal_minijuego1_tutorial.xml new file mode 100644 index 0000000000000000000000000000000000000000..5a9d9ae52316422cc7f4a3efa36e62892b5c0b21 --- /dev/null +++ b/app/src/main/res/layout/modal_minijuego1_tutorial.xml @@ -0,0 +1,104 @@ +<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" + android:background="@drawable/style_background_gradiente" + android:padding="10dp" + tools:ignore="HardcodedText, UseCompoundDrawables,ButtonStyle"> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <LinearLayout + android:id="@+id/mainArea" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="vertical"> + + <TextView + android:id="@+id/nombreTitulo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:fontFamily="@font/pixeled" + android:shadowColor="#000000" + android:shadowDx="2" + android:shadowDy="2" + android:shadowRadius="4" + android:text="Minijuego 1" + android:textAlignment="center" + android:textColor="#6A0000" + android:textSize="24sp" + android:textStyle="bold" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginBottom="10dp" + android:background="#000000" /> + + <androidx.cardview.widget.CardView + android:id="@+id/foto1" + android:layout_width="150dp" + android:layout_height="150dp" + android:layout_margin="5dp" + android:elevation="0dp" + app:cardCornerRadius="10dp"> + + <ImageView + android:id="@+id/imagenObjeto" + android:layout_width="150dp" + android:layout_height="150dp" + android:contentDescription="Slot de equipo 1" + android:scaleType="centerCrop" + android:scaleX="-1" + android:src="@drawable/asi_objeto_casco"/> + </androidx.cardview.widget.CardView> + + + <TextView + android:id="@+id/textoDescripcion" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="3dp" + android:fontFamily="@font/pixeled" + android:padding="8dp" + android:text="Descripción del objeto" + android:textAlignment="center" + android:textColor="#000000" + android:textSize="20sp" /> + + <TextView + android:id="@+id/textoPrecio" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/pixeled" + android:padding="8dp" + android:text="Coste: 12" + android:textAlignment="center" + android:textColor="#000000" + android:textSize="20sp" /> + + <Button + android:id="@+id/cerrar" + android:layout_width="135dp" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:backgroundTint="@color/pintiaButton" + android:fontFamily="@font/pixeled" + android:text="Cerrar" + android:textColor="@color/pintiaButtonText" + android:textStyle="bold" /> + + </LinearLayout> + </ScrollView> + +</androidx.constraintlayout.widget.ConstraintLayout>